1. 调整查询字段,去掉是否上报, 是否审核条件

src/views/dkjz/QcSsgqzysytdqkGzvList.vue

@@ -153,11 +153,11 @@
             align: "center",
             dataIndex: 'dk'
           },
-          {
-            title: '土地坐落市',
-            align: "center",
-            dataIndex: 'regCity'
-          },
+          // {
+          //   title: '土地坐落市',
+          //   align: "center",
+          //   dataIndex: 'regCity'
+          // },
           {
             title: '土地坐落区',
             align: "center",

src/views/qcsb/QcSsgqzysytdqkList_gly.vue

@@ -15,24 +15,34 @@
             </a-form-item>
           </a-col>
           <a-col :xl="5" :lg="7" :md="8" :sm="24">
+            <a-form-item label="入库年份">
+              <a-select v-model="queryParam.year" placeholder="请选择入库年份">
+                <a-select-option :value="undefined">请选择</a-select-option>
+                <a-select-option v-for="item in yearList" :key="item" :value="item">
+                  {{ item }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <!--          <a-col :xl="5" :lg="7" :md="8" :sm="24">
             <a-form-item label="地块编号">
               <a-input placeholder="请输入地块编号" v-model="queryParam.dkbh"></a-input>
             </a-form-item>
-          </a-col>
-         <a-col :xl="4" :lg="7" :md="8" :sm="24">
+          </a-col> -->
+          <!--         <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <a-form-item label="文件类型">
               <j-multi-select-tag placeholder="请选择文件类型" v-model="queryParam.wjlx" dictCode="wjlx" />
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <template v-if="toggleSearchStatus">
             <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="土地使用现状">
-                <j-dict-select-tag
-                  type="list"
-                  v-model="queryParam.tdsyxz"
-                  dictCode="tdsyxz"
-                  placeholder="请选择土地使用现状"
-                />
+                <j-dict-select-tag type="list" v-model="queryParam.tdsyxz" dictCode="tdsyxz" placeholder="请选择土地使用现状" />
+              </a-form-item>
+            </a-col>
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="一级单位">
+                <j-dict-select-tag placeholder="请选择一级单位" v-model="queryParam.sysOrgCode" dictCode="yjdw" />
               </a-form-item>
             </a-col>
             <a-col :xl="5" :lg="7" :md="8" :sm="24">
@@ -40,27 +50,27 @@
                 <JAreaSelect ref="JArea" @Area="SelectArea"></JAreaSelect>
               </a-form-item>
             </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+            <!--            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="文件编号">
                 <a-input placeholder="请输入证书/合同/文件编号" v-model="queryParam.wjbh"></a-input>
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="实际用途">
                 <j-category-select v-model="queryParam.sjyt" pcode="A04" placeholder="请选择实际用途" />
               </a-form-item>
             </a-col>
-            <a-col :xl="4" :lg="7" :md="8" :sm="24">
+            <!--            <a-col :xl="4" :lg="7" :md="8" :sm="24">
               <a-form-item label="是否上报">
                 <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt" />
               </a-form-item>
-            </a-col>
-           <a-col :xl="5" :lg="7" :md="8" :sm="24">
+            </a-col> -->
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="是否存在矢量">
                 <j-dict-select-tag placeholder="请选择是否存在矢量" v-model="queryParam.sfczslsj" dictCode="sfgyz" />
               </a-form-item>
             </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+            <!--            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item :label="'取得方式'">
                 <j-multi-select-tag
                   type="list_multi"
@@ -68,34 +78,22 @@
                   dictCode="syqsyfs"
                   placeholder="请选择使用权使用方式"
                 />
-                <!--              <j-dict-select-tag type='list' v-model='queryParam.syqsyfs' dictCode='syqsyfs' placeholder='请选择使用权使用方式'/>-->
-              </a-form-item>
-            </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
-              <a-form-item label="一级单位">
-                <j-dict-select-tag placeholder="请选择一级单位" v-model="queryParam.sysOrgCode" dictCode="yjdw" />
+                <j-dict-select-tag type='list' v-model='queryParam.syqsyfs' dictCode='syqsyfs' placeholder='请选择使用权使用方式'/>
               </a-form-item>
             </a-col>
-           <a-col :xl="5" :lg="7" :md="8" :sm="24">
+            -->
+
+            <!--           <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="审核结果">
                 <j-dict-select-tag placeholder="请选择是否通过审核" v-model="queryParam.shzt" dictCode="shzt" />
               </a-form-item>
-            </a-col>
-            <a-col :xl="4" :lg="7" :md="8" :sm="24">
-              <a-form-item label="入库年份">
-                <a-select v-model="queryParam.year" placeholder="请选择入库年份">
-                  <a-select-option :value="undefined">请选择</a-select-option>
-                  <a-select-option v-for="item in yearList" :key="item" :value="item">
-                    {{ item }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-           <a-col :xl="5" :lg="7" :md="8" :sm="24">
+            </a-col> -->
+
+            <!--           <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="土地使用权人">
                 <a-input placeholder="请输入土地使用权人" v-model="queryParam.tdsyqr"></a-input>
               </a-form-item>
-            </a-col>
+            </a-col> -->
           </template>
           <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -116,8 +114,7 @@
     <div class="table-operator">
       <!--      <a-button v-has="'conts:add'" @click="handleAdd2" type="primary" icon="plus">填报信息</a-button>-->
       <a-button type="primary" icon="download" @click="handleExportXls('省属国企占有使用土地情况调查')">导出</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('省属国企占有使用土地情况调查')"
-        >全部导出
+      <a-button type="primary" icon="download" @click="handleExportXls('省属国企占有使用土地情况调查')">全部导出
       </a-button>
       <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
@@ -139,8 +136,7 @@
           <a-col :span="6">
             <div class='cho'>
               <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择
-              <a style="font-weight: 600">{{ selectedRowKeys.length }}</a
-              >项
+              <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
               <a style="margin-left: 24px" @click="onClearSelected">清空</a>
             </div>
           </a-col>
@@ -149,17 +145,19 @@
             <a-row>
               <a-col :span="11">
                 <div class="szdk">
-                  <span><img src="../sydwqcsb/img/dk.png" style="margin-left: 10px;margin-right: 10px"/></span>
+                  <span><img src="../sydwqcsb/img/dk.png" style="margin-left: 10px;margin-right: 10px" /></span>
                   <span style="color: rgb(50,150,255);font-size: 16px;width: 130px">地块数量（块）</span>
-                  <span style="margin-right: 20px;text-align:right; color: rgb(50,150,255);font-size: 16px;width: calc(100% - 174px);">{{ countDk }}</span>
+                  <span
+                    style="margin-right: 20px;text-align:right; color: rgb(50,150,255);font-size: 16px;width: calc(100% - 174px);">{{ countDk }}</span>
                 </div>
                 <!--                <a-statistic title="地块数量" v-model="countDk" />-->
               </a-col>
               <a-col :span="13">
                 <div class="szarea">
-                  <span><img src="../sydwqcsb/img/area.png" style="margin-left: 10px;margin-right: 10px"/></span>
+                  <span><img src="../sydwqcsb/img/area.png" style="margin-left: 10px;margin-right: 10px" /></span>
                   <span style="color: rgb(30,196,146);font-size: 16px;width: 130px">地块面积（亩）</span>
-                  <span style="margin-right: 20px;text-align:right;color: rgb(30,196,146);font-size: 16px;width:calc(100% - 174px);">{{ areaDk }}</span>
+                  <span
+                    style="margin-right: 20px;text-align:right;color: rgb(30,196,146);font-size: 16px;width:calc(100% - 174px);">{{ areaDk }}</span>
                 </div>
               </a-col>
             </a-row>
@@ -171,33 +169,17 @@
           <listTable ref="table" :loading="this.load" :result-data="this.resultData" :title="title"></listTable>
         </a-tab-pane>
         <a-tab-pane key="1" tab="列表信息">
-          <a-table
-            ref="table"
-            size="middle"
-            :scroll="{ x: true }"
-            bordered
-            rowKey="id"
-            :columns="columns"
-            :dataSource="dataSource"
-            :pagination="ipagination"
-            :loading="loading"
-            :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
-            class="j-table-force-nowrap"
-            @change="handleTableChange"
-          >
+          <a-table ref="table" size="middle" :scroll="{ x: true }" bordered rowKey="id" :columns="columns"
+            :dataSource="dataSource" :pagination="ipagination" :loading="loading"
+            :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" class="j-table-force-nowrap"
+            @change="handleTableChange">
             <template slot="htmlSlot" slot-scope="text">
               <div v-html="text"></div>
             </template>
             <template slot="imgSlot" slot-scope="text, record">
               <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-              <img
-                v-else
-                :src="getImgView(text)"
-                :preview="record.id"
-                height="25px"
-                alt=""
-                style="max-width:80px;font-size: 12px;font-style: italic;"
-              />
+              <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt=""
+                style="max-width:80px;font-size: 12px;font-style: italic;" />
             </template>
             <template slot="fileSlot" slot-scope="text">
               <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
@@ -208,7 +190,7 @@
             <span slot="action" slot-scope="text, record">
               <a-space>
                 <a-button v-if="record.sfsb < 3" @click="handleEdit(record)">编辑</a-button>
-                <a-button v-if="record.sfsb == 3" @click="handleEdit(record)">重新审核</a-button>
+               <!-- <a-button v-if="record.sfsb == 3" @click="handleEdit(record)">重新审核</a-button> -->
                 <a-button @click="handleDetail(record)" type="primary">查看</a-button>
                 <!--                          <a-button v-if="record.sfsb===3" @click="handleWCSH(record.id)">完成审核</a-button>-->
                 <a-popconfirm title="确定恢复么吗?" @confirm="() => handleHFYSH(record.id)">
@@ -225,338 +207,453 @@
 </template>
 
 <script>
-import '@/assets/less/TableExpand.less'
-import { mixinDevice } from '@/utils/mixin'
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import QcSsgqzysytdqkModal from './modules/QcSsgqzysytdqkModal2'
-import { filterMultiDictText, getDictItems } from '@/components/dict/JDictSelectUtil'
-import { getAction } from '../../api/manage'
-import { loadCategoryData } from '@/api/api'
-import listTable from '@/views/listStatistics/listTab'
-import store from '@/store'
-import JAreaSelect from '@comp/jeecg/JAreaSelect'
+  import '@/assets/less/TableExpand.less'
+  import {
+    mixinDevice
+  } from '@/utils/mixin'
+  import {
+    JeecgListMixin
+  } from '@/mixins/JeecgListMixin'
+  import QcSsgqzysytdqkModal from './modules/QcSsgqzysytdqkModal2'
+  import {
+    filterMultiDictText,
+    getDictItems
+  } from '@/components/dict/JDictSelectUtil'
+  import {
+    getAction
+  } from '../../api/manage'
+  import {
+    loadCategoryData
+  } from '@/api/api'
+  import listTable from '@/views/listStatistics/listTab'
+  import store from '@/store'
+  import JAreaSelect from '@comp/jeecg/JAreaSelect'
 
-// 省属企业
-export default {
-  name: 'QcSsgqzysytdqkList',
-  mixins: [JeecgListMixin, mixinDevice],
-  props: {
-    yearList: {
-      type: Array,
-      required: true
-    }
-  },
-  components: {
-    QcSsgqzysytdqkModal,
-    listTable,
-    JAreaSelect
-  },
-  data() {
-    return {
-      countDk: 0,
-      areaDk: 0,
-      dlr: false,
-      description: '省属国企占有使用土地情况调查管理页面',
-      resultData: [],
-      load: true,
-      changes: '2',
-      title: '',
-      queryParam: {
-        sysOrgCode: null
-      },
-      // 表头
-      columns: [
-        {
-          title: '#',
-          dataIndex: '',
-          key: 'rowIndex',
-          width: 60,
-          align: 'center',
-          customRender: function(t, r, index) {
-            return parseInt(index) + 1
-          }
-        },
-        {
-          title: '用地单位名称',
-          align: 'center',
-          dataIndex: 'sysOrgCode_dictText'
-        },
-        {
-          title: '地块',
-          align: 'center',
-          dataIndex: 'dk'
-        },
-        {
-          title: '证书类型',
-          align: 'center',
-          dataIndex: 'zslx_dictText'
-        },
-        {
-          title: '证书/合同/文件编号',
-          align: 'center',
-          dataIndex: 'wjbh'
-        },
-        {
-          title: '土地使用权人',
-          align: 'center',
-          dataIndex: 'tdsyqr'
-        },
-        {
-          title: '使用权使用方式',
-          align: 'center',
-          dataIndex: 'syqsyfs'
-        },
-        {
-          title: '实际用途',
-          align: 'center',
-          dataIndex: 'sjyt',
-          customRender: text => (text ? filterMultiDictText(this.dictOptions['sjyt'], text) : '')
-        },
-        {
-          title: '土地价值/元',
-          align: "center",
-          dataIndex: 'worth'
+  // 省属企业
+  export default {
+    name: 'QcSsgqzysytdqkList',
+    mixins: [JeecgListMixin, mixinDevice],
+    props: {
+      yearList: {
+        type: Array,
+        required: true
+      }
+    },
+    components: {
+      QcSsgqzysytdqkModal,
+      listTable,
+      JAreaSelect
+    },
+    data() {
+      return {
+        countDk: 0,
+        areaDk: 0,
+        dlr: false,
+        description: '省属国企占有使用土地情况调查管理页面',
+        resultData: [],
+        load: true,
+        changes: '2',
+        title: '',
+        queryParam: {
+          sysOrgCode: null
         },
-        {
-          title: '是否上报',
-          align: 'center',
-          dataIndex: 'sfsb_dictText'
+        // 表头
+        columns: [{
+            title: '#',
+            dataIndex: '',
+            key: 'rowIndex',
+            width: 60,
+            align: 'center',
+            customRender: function(t, r, index) {
+              return parseInt(index) + 1
+            }
+          },
+          {
+            title: '一级企业',
+            align: 'center',
+            dataIndex: 'firstOrgName'
+          },
+          {
+            title: '用地单位名称',
+            align: 'center',
+            dataIndex: 'sysOrgCode_dictText'
+          },
+          {
+            title: '地块',
+            align: 'center',
+            dataIndex: 'dk'
+          },
+          // {
+          //   title: '证书类型',
+          //   align: 'center',
+          //   dataIndex: 'zslx_dictText'
+          // },
+          {
+            title: '证书/合同/文件编号',
+            align: 'center',
+            dataIndex: 'wjbh'
+          },
+          {
+            title: '土地使用权人',
+            align: 'center',
+            dataIndex: 'tdsyqr'
+          },
+          {
+            title: '使用权使用方式',
+            align: 'center',
+            dataIndex: 'syqsyfs'
+          },
+          {
+            title: '实际用途',
+            align: 'center',
+            dataIndex: 'sjyt',
+            customRender: text => (text ? filterMultiDictText(this.dictOptions['sjyt'], text) : '')
+          },
+          {
+            title: '土地价值/元',
+            align: "center",
+            dataIndex: 'worth'
+          },
+          // {
+          //   title: '是否上报',
+          //   align: 'center',
+          //   dataIndex: 'sfsb_dictText'
+          // },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align: 'center',
+            fixed: 'right',
+            width: 147,
+            scopedSlots: {
+              customRender: 'action'
+            }
+          }
+        ],
+        url: {
+          list: '/qcsb/qcSsgqzysytdqk/listBygly',
+          delete: '/qcsb/qcSsgqzysytdqk/delete',
+          deleteBatch: '/qcsb/qcSsgqzysytdqk/deleteBatch',
+          exportXlsUrl: '/qcsb/qcSsgqzysytdqk/exportXls',
+          importExcelUrl: 'qcsb/qcSsgqzysytdqk/importExcel',
+          wcsh: '/qcsb/qcSsgqzysytdqk/wcsh',
+          hfysh: '/qcsb/qcSsgqzysytdqk/hfysh',
+          listTable: '/qcsb/qcSsgqzysytdqk/sumList',
+          listQuery: '/qcsb/qcSsgqzysytdqk/listByglyCount'
         },
-        {
-          title: '操作',
-          dataIndex: 'action',
-          align: 'center',
-          fixed: 'right',
-          width: 147,
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      url: {
-        list: '/qcsb/qcSsgqzysytdqk/listBygly',
-        delete: '/qcsb/qcSsgqzysytdqk/delete',
-        deleteBatch: '/qcsb/qcSsgqzysytdqk/deleteBatch',
-        exportXlsUrl: '/qcsb/qcSsgqzysytdqk/exportXls',
-        importExcelUrl: 'qcsb/qcSsgqzysytdqk/importExcel',
-        wcsh: '/qcsb/qcSsgqzysytdqk/wcsh',
-        hfysh: '/qcsb/qcSsgqzysytdqk/hfysh',
-        listTable: '/qcsb/qcSsgqzysytdqk/sumList',
-        listQuery: '/qcsb/qcSsgqzysytdqk/listByglyCount'
-      },
-      dictOptions: {},
-      superFieldList: []
-    }
-  },
-  created() {
-    this.getSuperFieldList()
-  },
-  watch: {
-    'queryParam.sysOrgCode': {
-      handler(newVal) {
-        if (newVal != '') {
-          getDictItems('yjdw', newVal).then(res => {
-            for (const re of res) {
-              if (re.value == newVal) {
-                this.title = re.text
+        dictOptions: {},
+        superFieldList: []
+      }
+    },
+    created() {
+      this.getSuperFieldList()
+    },
+    watch: {
+      'queryParam.sysOrgCode': {
+        handler(newVal) {
+          if (newVal != '') {
+            getDictItems('yjdw', newVal).then(res => {
+              for (const re of res) {
+                if (re.value == newVal) {
+                  this.title = re.text
+                }
               }
-            }
-          })
-        } else {
-          this.title = ''
+            })
+          } else {
+            this.title = ''
+          }
         }
       }
-    }
-  },
-  mounted() {
-    this.show()
-  },
-  computed: {
-    importExcelUrl: function() {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
-    }
-  },
-  methods: {
-    searchQuery() {
-      this.changes = '1'
-      this.loadData(1)
-      this.queryDkInfo()
-      // 点击查询清空列表选中行
-      // https://gitee.com/jeecg/jeecg-boot/issues/I4KTU1
-      this.selectedRowKeys = []
-      this.selectionRows = []
     },
-    callback(key) {
-      if (key == 1) {
-        this.emptyData()
-        this.changes = '1'
-      }
-      if (key == 2) {
-        this.changes = '2'
-        this.updataData()
+    mounted() {
+      this.show()
+    },
+    computed: {
+      importExcelUrl: function() {
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
       }
     },
+    methods: {
+      searchQuery() {
+        this.changes = '1'
+        this.loadData(1)
+        this.queryDkInfo()
+        // 点击查询清空列表选中行
+        // https://gitee.com/jeecg/jeecg-boot/issues/I4KTU1
+        this.selectedRowKeys = []
+        this.selectionRows = []
+      },
+      callback(key) {
+        if (key == 1) {
+          this.emptyData()
+          this.changes = '1'
+        }
+        if (key == 2) {
+          this.changes = '2'
+          this.updataData()
+        }
+      },
 
-    emptyData() {
-      this.load = true
-      this.$refs.table.data = []
-      this.$refs.table.areaData = []
-      this.$refs.table.pieResultData = []
-      this.$refs.table.pieAreaResultData = []
-      this.$refs.table.DoughnutResultData = []
-      this.$refs.table.doughnutByXzResultData = []
-      this.$refs.table.xzData = []
-      this.$refs.table.registerData = []
-      this.$refs.table.barResultData = []
-      this.$refs.table.nan = []
-      this.$refs.table.va = []
-      this.$refs.table.xqData = []
-      this.$refs.table.sjytData = []
-      this.$refs.table.sjytValue = []
-      this.$refs.table.sjytName = []
-      this.$refs.table.barBysjytResultData = []
-      this.$refs.table.number = 0
-    },
-    // 查询地块和面积统计
-    queryDkInfo() {
-      console.log('查询地块和面积')
-      let _this = this
-      new Promise(function(resolve, reject) {
-        getAction(_this.url.listQuery, _this.queryParam).then(res => {
+      emptyData() {
+        this.load = true
+        this.$refs.table.data = []
+        this.$refs.table.areaData = []
+        this.$refs.table.pieResultData = []
+        this.$refs.table.pieAreaResultData = []
+        this.$refs.table.DoughnutResultData = []
+        this.$refs.table.doughnutByXzResultData = []
+        this.$refs.table.xzData = []
+        this.$refs.table.registerData = []
+        this.$refs.table.barResultData = []
+        this.$refs.table.nan = []
+        this.$refs.table.va = []
+        this.$refs.table.xqData = []
+        this.$refs.table.sjytData = []
+        this.$refs.table.sjytValue = []
+        this.$refs.table.sjytName = []
+        this.$refs.table.barBysjytResultData = []
+        this.$refs.table.number = 0
+      },
+      // 查询地块和面积统计
+      queryDkInfo() {
+        console.log('查询地块和面积')
+        let _this = this
+        new Promise(function(resolve, reject) {
+          getAction(_this.url.listQuery, _this.queryParam).then(res => {
+            if (res.success) {
+              console.log('#############################> 地块统计#############>')
+              console.log(res)
+              _this.countDk = res.result.countDk
+              _this.areaDk = res.result.areaDk.toFixed(4)
+              resolve()
+            }
+          })
+        })
+      },
+      updataData() {
+        let _this = this
+        new Promise(function(resolve, reject) {
+          getAction(_this.url.listTable, _this.queryParam).then(res => {
+            if (res.success) {
+              _this.load = false
+              _this.resultData = res.result
+              resolve()
+            }
+          })
+        })
+      },
+      SelectArea(val) {
+        if (val.length > 4) {
+          this.queryParam.xzqh = val + '*'
+        } else {
+          this.queryParam.xzqh = val.slice(0, 4) + '*'
+        }
+      },
+      searchReset() {
+        this.$refs.JArea.allClear(), (this.queryParam = {})
+        this.changes = '1'
+        this.queryDkInfo()
+        this.loadData()
+      },
+      show() {
+        getAction('/qcsb.qyxx/qcQyxx/dlr').then(res => {
           if (res.success) {
-            console.log('#############################> 地块统计#############>')
-            console.log(res)
-            _this.countDk = res.result.countDk
-            _this.areaDk = res.result.areaDk.toFixed(4)
-            resolve()
+            if (res.result == 'gzw') {
+              this.dl = true
+            }
           }
         })
-      })
-    },
-    updataData() {
-      let _this = this
-      new Promise(function(resolve, reject) {
-        getAction(_this.url.listTable, _this.queryParam).then(res => {
+      },
+      handleWCSH(id) {
+        getAction(this.url.wcsh, {
+          id: id
+        }).then(res => {
           if (res.success) {
-            _this.load = false
-            _this.resultData = res.result
-            resolve()
+            this.$message.success('审核完成')
+            this.loadData()
           }
         })
-      })
-    },
-    SelectArea(val) {
-      if (val.length > 4) {
-        this.queryParam.xzqh = val + '*'
-      } else {
-        this.queryParam.xzqh = val.slice(0, 4) + '*'
-      }
-    },
-    searchReset() {
-      this.$refs.JArea.allClear(), (this.queryParam = {})
-      this.changes = '1'
-      this.queryDkInfo()
-      this.loadData()
-    },
-    show() {
-      getAction('/qcsb.qyxx/qcQyxx/dlr').then(res => {
-        if (res.success) {
-          if (res.result == 'gzw') {
-            this.dl = true
+      },
+      handleHFYSH(id) {
+        getAction(this.url.hfysh, {
+          id: id
+        }).then(res => {
+          if (res.success) {
+            this.$message.success('已经恢复')
+            this.loadData()
           }
-        }
-      })
-    },
-    handleWCSH(id) {
-      getAction(this.url.wcsh, { id: id }).then(res => {
-        if (res.success) {
-          this.$message.success('审核完成')
-          this.loadData()
-        }
-      })
-    },
-    handleHFYSH(id) {
-      getAction(this.url.hfysh, { id: id }).then(res => {
-        if (res.success) {
-          this.$message.success('已经恢复')
-          this.loadData()
-        }
-      })
-    },
-    initDictConfig() {
-      loadCategoryData({ code: 'A04' }).then(res => {
-        if (res.success) {
-          console.log(res.result)
-          this.$set(this.dictOptions, 'sjyt', res.result)
-        }
-      })
-    },
-    getSuperFieldList() {
-      let fieldList = []
-      fieldList.push({ type: 'string', value: 'dk', text: '地块', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'wjlx', text: '文件类型', dictCode: 'wjlx' })
-      fieldList.push({ type: 'string', value: 'wjbh', text: '证书/合同/文件编号', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'tdsyqr', text: '土地使用权人', dictCode: '' })
-      fieldList.push({ type: 'double', value: 'sjzytdmj', text: '实际占用土地面积', dictCode: '' })
-      fieldList.push({ type: 'double', value: 'qzpzsymj', text: '其中批准使用面积', dictCode: '' })
-      fieldList.push({ type: 'double', value: 'sjsyjzmj', text: '实际使用建筑面积', dictCode: '' })
-      fieldList.push({ type: 'double', value: 'qzpzsymj2', text: '其中批准使用面积', dictCode: '' })
-      fieldList.push({ type: 'double', value: 'sjrjl', text: '容积率', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'syqsyfs', text: '使用权使用方式', dictCode: 'syqsyfs' })
-      fieldList.push({ type: 'string', value: 'zlwz', text: '坐落位置', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'sjyt', text: '实际用途', dictCode: 'tdyt' })
-      fieldList.push({ type: 'date', value: 'qsqssj', text: '权属起始时间' })
-      fieldList.push({ type: 'date', value: 'qsdqsj', text: '权属到期时间' })
-      fieldList.push({ type: 'string', value: 'tdsyxz', text: '土地使用现状', dictCode: 'tdsyxz' })
-      fieldList.push({
-        type: 'list_multi',
-        value: 'dbdycfqk',
-        text: '担保、抵押、查封情况',
-        dictTable: '',
-        dictText: '',
-        dictCode: 'dbdycfqk'
-      })
-      fieldList.push({ type: 'string', value: 'bz', text: '备注', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'xgwj', text: '附件材料', dictCode: '' })
-      fieldList.push({ type: 'int', value: 'sfsb', text: '是否上报', dictCode: 'xxsbzt' })
-      this.superFieldList = fieldList
+        })
+      },
+      initDictConfig() {
+        loadCategoryData({
+          code: 'A04'
+        }).then(res => {
+          if (res.success) {
+            console.log(res.result)
+            this.$set(this.dictOptions, 'sjyt', res.result)
+          }
+        })
+      },
+      getSuperFieldList() {
+        let fieldList = []
+        fieldList.push({
+          type: 'string',
+          value: 'dk',
+          text: '地块',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'wjlx',
+          text: '文件类型',
+          dictCode: 'wjlx'
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'wjbh',
+          text: '证书/合同/文件编号',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'tdsyqr',
+          text: '土地使用权人',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'double',
+          value: 'sjzytdmj',
+          text: '实际占用土地面积',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'double',
+          value: 'qzpzsymj',
+          text: '其中批准使用面积',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'double',
+          value: 'sjsyjzmj',
+          text: '实际使用建筑面积',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'double',
+          value: 'qzpzsymj2',
+          text: '其中批准使用面积',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'double',
+          value: 'sjrjl',
+          text: '容积率',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'syqsyfs',
+          text: '使用权使用方式',
+          dictCode: 'syqsyfs'
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'zlwz',
+          text: '坐落位置',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'sjyt',
+          text: '实际用途',
+          dictCode: 'tdyt'
+        })
+        fieldList.push({
+          type: 'date',
+          value: 'qsqssj',
+          text: '权属起始时间'
+        })
+        fieldList.push({
+          type: 'date',
+          value: 'qsdqsj',
+          text: '权属到期时间'
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'tdsyxz',
+          text: '土地使用现状',
+          dictCode: 'tdsyxz'
+        })
+        fieldList.push({
+          type: 'list_multi',
+          value: 'dbdycfqk',
+          text: '担保、抵押、查封情况',
+          dictTable: '',
+          dictText: '',
+          dictCode: 'dbdycfqk'
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'bz',
+          text: '备注',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'xgwj',
+          text: '附件材料',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'int',
+          value: 'sfsb',
+          text: '是否上报',
+          dictCode: 'xxsbzt'
+        })
+        this.superFieldList = fieldList
+      }
     }
   }
-}
 </script>
 <style scoped>
-@import '~@assets/less/common.less';
+  @import '~@assets/less/common.less';
 
-.szdk {
-  background-color: #ffffff;
-  border-style: solid;
-  border-width: 1px;
-  border-radius: 5px;
-  border-color:#3297FF;
-  display: flex;
-  width: calc(100% - 2px);
-  height: 36px;
-  background-size: contain;
-  background-repeat: no-repeat;
-  align-items: center; /* 垂直居中 */
-}
+  .szdk {
+    background-color: #ffffff;
+    border-style: solid;
+    border-width: 1px;
+    border-radius: 5px;
+    border-color: #3297FF;
+    display: flex;
+    width: calc(100% - 2px);
+    height: 36px;
+    background-size: contain;
+    background-repeat: no-repeat;
+    align-items: center;
+    /* 垂直居中 */
+  }
 
-.szarea {
-  background-color: #ffffff;
-  border-style: solid;
-  border-width: 1px;
-  border-radius: 5px;
-  border-color:#1FC493;
-  display: flex;
-  width: 100%;
-  height: 36px;
-  background-size: contain;
-  background-repeat: no-repeat;
-  align-items: center; /* 垂直居中 */
-  margin-left: 7px;
-}
-.cho {
-  display: flex;
-  width: 100%;
-  height: 36px;
-  align-items: center; /* 垂直居中 */
-}
-</style>
+  .szarea {
+    background-color: #ffffff;
+    border-style: solid;
+    border-width: 1px;
+    border-radius: 5px;
+    border-color: #1FC493;
+    display: flex;
+    width: 100%;
+    height: 36px;
+    background-size: contain;
+    background-repeat: no-repeat;
+    align-items: center;
+    /* 垂直居中 */
+    margin-left: 7px;
+  }
+
+  .cho {
+    display: flex;
+    width: 100%;
+    height: 36px;
+    align-items: center;
+    /* 垂直居中 */
+  }
+</style>

src/views/qcsb/QcSsgqzysytdqkList_tj.vue

@@ -5,8 +5,13 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="5" :lg="7" :md="8" :sm="24">
+            <a-form-item label="一级单位">
+              <j-dict-select-tag placeholder="请选择一级单位" v-model="queryParam.sysOrgCode" dictCode="yjdw" />
+            </a-form-item>
+          </a-col>
+          <a-col :xl="5" :lg="7" :md="8" :sm="24">
             <a-form-item label="单位名称">
-              <a-input placeholder="请输入单位名称" v-model="queryParam.createBy"/>
+              <a-input placeholder="请输入单位名称" v-model="queryParam.createBy" />
             </a-form-item>
           </a-col>
           <a-col :xl="5" :lg="7" :md="8" :sm="24">
@@ -15,57 +20,55 @@
             </a-form-item>
           </a-col>
           <a-col :xl="5" :lg="7" :md="8" :sm="24">
-            <a-form-item label="地块编号">
-              <a-input placeholder="请输入地块编号" v-model="queryParam.dkbh"></a-input>
+            <a-form-item label="土地使用现状">
+              <j-dict-select-tag type='list' v-model='queryParam.tdsyxz' dictCode='tdsyxz' placeholder='请选择土地使用现状' />
             </a-form-item>
           </a-col>
-          <a-col :xl="toggleSearchStatus ? 4 : 5" :lg="7" :md="8" :sm="24">
+          <!--          <a-col :xl="toggleSearchStatus ? 4 : 5" :lg="7" :md="8" :sm="24">
             <a-form-item label="文件类型">
               <j-multi-select-tag placeholder="请选择文件类型" v-model="queryParam.wjlx" dictCode="wjlx"/>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <template v-if="toggleSearchStatus">
+
             <a-col :xl="5" :lg="7" :md="8" :sm="24">
-              <a-form-item label="土地使用现状">
-                <j-dict-select-tag type='list' v-model='queryParam.tdsyxz' dictCode='tdsyxz' placeholder='请选择土地使用现状'/>
+              <a-form-item label="行政区划">
+                <JAreaSelect ref="JArea" @Area="SelectArea"></JAreaSelect>
               </a-form-item>
             </a-col>
             <a-col :xl="5" :lg="7" :md="8" :sm="24">
-              <a-form-item label="文件编号">
-                <a-input placeholder="请输入证书/合同/文件编号" v-model="queryParam.wjbh"></a-input>
+              <a-form-item label="地块编号">
+                <a-input placeholder="请输入地块编号" v-model="queryParam.dkbh"></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
-              <a-form-item label="行政区划">
-                <JAreaSelect ref="JArea" @Area="SelectArea"></JAreaSelect>
+            <!--            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="文件编号">
+                <a-input placeholder="请输入证书/合同/文件编号" v-model="queryParam.wjbh"></a-input>
               </a-form-item>
-            </a-col>
+            </a-col> -->
+
             <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="实际用途">
-                <j-category-select v-model="queryParam.sjyt" pcode="A04" placeholder="请选择实际用途"/>
+                <j-category-select v-model="queryParam.sjyt" pcode="A04" placeholder="请选择实际用途" />
               </a-form-item>
             </a-col>
-            <a-col :xl="4" :lg="7" :md="8" :sm="24">
+            <!--            <a-col :xl="4" :lg="7" :md="8" :sm="24">
               <a-form-item label="是否上报">
                 <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt"/>
               </a-form-item>
-            </a-col>
+            </a-col> -->
 
             <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="使用权使用方式">
-                <j-multi-select-tag  v-model='queryParam.syqsyfs' dictCode='syqsyfs' placeholder='请选择使用权使用方式'/>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
-              <a-form-item label="一级单位">
-                <j-dict-select-tag placeholder="请选择一级单位" v-model="queryParam.sysOrgCode" dictCode="yjdw"/>
+                <j-multi-select-tag v-model='queryParam.syqsyfs' dictCode='syqsyfs' placeholder='请选择使用权使用方式' />
               </a-form-item>
             </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+
+            <!--            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="审核结果">
                 <j-dict-select-tag placeholder="请选择是否通过审核" v-model="queryParam.shzt" dictCode="shzt"/>
               </a-form-item>
-            </a-col>
+            </a-col> -->
           </template>
           <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -73,7 +76,7 @@
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
               <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
               </a>
             </span>
           </a-col>
@@ -84,9 +87,9 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-<!--      <a-button v-has="'conts:add'" @click="handleAdd2" type="primary" icon="plus">填报信息</a-button>-->
+      <!--      <a-button v-has="'conts:add'" @click="handleAdd2" type="primary" icon="plus">填报信息</a-button>-->
       <a-button type="primary" icon="download" @click="handleExportXls('省属国企占有使用土地情况调查')">导出</a-button>
-    <a-button type="primary" icon="download" @click="handleExportXls('省属国企占有使用土地情况调查')">全部导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('省属国企占有使用土地情况调查')">全部导出</a-button>
       <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      </a-upload>
@@ -101,329 +104,422 @@
     </div>
 
     <!-- table区域-begin -->
-<!--    <div>-->
-<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
-<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a-->
-<!--        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
-<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
-<!--      </div>-->
-      <a-tabs  :active-key="this.changes"  @change="callback" >
-        <a-tab-pane key="1" tab="列表信息">
-          <a-table
-            ref="table"
-            size="middle"
-            :scroll="{x:true}"
-            bordered
-            rowKey="id"
-            :columns="columns"
-            :dataSource="dataSource"
-            :pagination="ipagination"
-            :loading="loading"
+    <!--    <div>-->
+    <!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+    <!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a-->
+    <!--        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+    <!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+    <!--      </div>-->
+    <a-tabs :active-key="this.changes" @change="callback">
+      <a-tab-pane key="1" tab="列表信息">
+        <a-table ref="table" size="middle" :scroll="{x:true}" bordered rowKey="id" :columns="columns"
+          :dataSource="dataSource" :pagination="ipagination" :loading="loading" class="j-table-force-nowrap"
+          @change="handleTableChange">
 
-            class="j-table-force-nowrap"
-            @change="handleTableChange">
-
-            <template slot="htmlSlot" slot-scope="text">
-              <div v-html="text"></div>
-            </template>
-            <template slot="imgSlot" slot-scope="text,record">
-              <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-              <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt=""
-                   style="max-width:80px;font-size: 12px;font-style: italic;"/>
-            </template>
-            <template slot="fileSlot" slot-scope="text">
-              <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-              <a-button
-                v-else
-                :ghost="true"
-                type="primary"
-                icon="download"
-                size="small"
-                @click="downloadFile(text)">
-                下载
-              </a-button>
-            </template>
-            <span slot="action" slot-scope="text, record">
-                          <a-space>
+          <template slot="htmlSlot" slot-scope="text">
+            <div v-html="text"></div>
+          </template>
+          <template slot="imgSlot" slot-scope="text,record">
+            <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+            <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt=""
+              style="max-width:80px;font-size: 12px;font-style: italic;" />
+          </template>
+          <template slot="fileSlot" slot-scope="text">
+            <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+            <a-button v-else :ghost="true" type="primary" icon="download" size="small" @click="downloadFile(text)">
+              下载
+            </a-button>
+          </template>
+          <span slot="action" slot-scope="text, record">
+            <a-space>
 
-                          <a-button @click="handleDetail(record)" type='primary'>查看</a-button>
+              <a-button @click="handleDetail(record)" type='primary'>查看</a-button>
 
-                        </a-space>
-        </span>
+            </a-space>
+          </span>
 
-          </a-table>
-        </a-tab-pane>
-        <a-tab-pane key="2" tab="统计图表" force-render>
-          <listTable ref="table" :loading="this.load" :result-data="this.resultData" :title="title"></listTable>
-        </a-tab-pane>
-      </a-tabs>
+        </a-table>
+      </a-tab-pane>
+      <a-tab-pane key="2" tab="统计图表" force-render>
+        <listTable ref="table" :loading="this.load" :result-data="this.resultData" :title="title"></listTable>
+      </a-tab-pane>
+    </a-tabs>
 
     <qc-ssgqzysytdqk-modal ref="modalForm" @ok="modalFormOk"></qc-ssgqzysytdqk-modal>
   </a-card>
 </template>
 
 <script>
-import '@/assets/less/TableExpand.less'
-import {mixinDevice} from '@/utils/mixin'
-import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-import QcSsgqzysytdqkModal from './modules/QcSsgqzysytdqkModal_tj'
-import {filterMultiDictText,getDictItems} from '@/components/dict/JDictSelectUtil'
-import {getAction} from '../../api/manage'
-import {loadCategoryData} from '@/api/api'
-import listTable from '@/views/listStatistics/listTab'
-import store from '@/store'
-import JAreaSelect from "@comp/jeecg/JAreaSelect";
-import { filterObj } from '@/utils/util';
-import { ssColunms, getDictOption, getViewType } from '@/utils/columns'
+  import '@/assets/less/TableExpand.less'
+  import {
+    mixinDevice
+  } from '@/utils/mixin'
+  import {
+    JeecgListMixin
+  } from '@/mixins/JeecgListMixin'
+  import QcSsgqzysytdqkModal from './modules/QcSsgqzysytdqkModal_tj'
+  import {
+    filterMultiDictText,
+    getDictItems
+  } from '@/components/dict/JDictSelectUtil'
+  import {
+    getAction
+  } from '../../api/manage'
+  import {
+    loadCategoryData
+  } from '@/api/api'
+  import listTable from '@/views/listStatistics/listTab'
+  import store from '@/store'
+  import JAreaSelect from "@comp/jeecg/JAreaSelect";
+  import {
+    filterObj
+  } from '@/utils/util';
+  import {
+    ssColunms,
+    getDictOption,
+    getViewType
+  } from '@/utils/columns'
 
 
-export default {
-  name: 'QcSsgqzysytdqkList',
-  props: {
-    param: {
-      default: ""
-    }
-  },
-  mixins: [JeecgListMixin, mixinDevice],
-  components: {
-    QcSsgqzysytdqkModal,
-    listTable,
-    JAreaSelect,
-  },
-  data() {
-    return {
-      dlr: false,
-      title:'',
-      description: '省属国企占有使用土地情况调查管理页面',
-      resultData: [],
-      load: true,
-      changes:'1',
-      // 表头
-      columns: ssColunms,
-      url: {
-        list: "/qcsb/qcSsgqzysytdqk/listBygly",
-        delete: "/qcsb/qcSsgqzysytdqk/delete",
-        deleteBatch: "/qcsb/qcSsgqzysytdqk/deleteBatch",
-        exportXlsUrl: "/qcsb/qcSsgqzysytdqk/exportXls",
-        importExcelUrl: "qcsb/qcSsgqzysytdqk/importExcel",
-        wcsh: "/qcsb/qcSsgqzysytdqk/wcsh",
-        hfysh: "/qcsb/qcSsgqzysytdqk/hfysh",
-        listTable: "/qcsb/qcSsgqzysytdqk/sumList"
-      },
-      dictOptions: {},
-      superFieldList: [],
-      // 查询条件
-      queryParam: {},
-    }
-  },
+  export default {
+    name: 'QcSsgqzysytdqkList',
+    props: {
+      param: {
+        default: ""
+      }
+    },
+    mixins: [JeecgListMixin, mixinDevice],
+    components: {
+      QcSsgqzysytdqkModal,
+      listTable,
+      JAreaSelect,
+    },
+    data() {
+      return {
+        dlr: false,
+        title: '',
+        description: '省属国企占有使用土地情况调查管理页面',
+        resultData: [],
+        load: true,
+        changes: '1',
+        // 表头
+        columns: ssColunms,
+        url: {
+          list: "/qcsb/qcSsgqzysytdqk/listBygly",
+          delete: "/qcsb/qcSsgqzysytdqk/delete",
+          deleteBatch: "/qcsb/qcSsgqzysytdqk/deleteBatch",
+          exportXlsUrl: "/qcsb/qcSsgqzysytdqk/exportXls",
+          importExcelUrl: "qcsb/qcSsgqzysytdqk/importExcel",
+          wcsh: "/qcsb/qcSsgqzysytdqk/wcsh",
+          hfysh: "/qcsb/qcSsgqzysytdqk/hfysh",
+          listTable: "/qcsb/qcSsgqzysytdqk/sumList"
+        },
+        dictOptions: {},
+        superFieldList: [],
+        // 查询条件
+        queryParam: {},
+      }
+    },
 
-  created() {
-    this.getSuperFieldList();
+    created() {
+      this.getSuperFieldList();
 
-  },
-  mounted() {
-    this.show()
-    this.searchQuery()
-    getViewType("ss")
+    },
+    mounted() {
+      this.show()
+      this.searchQuery()
+      getViewType("ss")
 
-  },
-  watch: {
-    'queryParam.sysOrgCode': {
-      handler(newVal) {
-        if (newVal != ''){
-          getDictItems('yjdw', newVal).then(res => {
-            for (const re of res) {
-              if (re.value == newVal) {
-                this.title = re.text
+    },
+    watch: {
+      'queryParam.sysOrgCode': {
+        handler(newVal) {
+          if (newVal != '') {
+            getDictItems('yjdw', newVal).then(res => {
+              for (const re of res) {
+                if (re.value == newVal) {
+                  this.title = re.text
+                }
               }
-            }
 
-          })
-        }else{
-          this.title = ''
+            })
+          } else {
+            this.title = ''
+          }
         }
       }
-    }
-  },
-  computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
     },
-  },
-  methods: {
-    searchQuery() {
-      this.changes='1'
-      this.loadData(1);
-      // 点击查询清空列表选中行
-      // https://gitee.com/jeecg/jeecg-boot/issues/I4KTU1
-      this.selectedRowKeys = []
-      this.selectionRows = []
+    computed: {
+      importExcelUrl: function() {
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
     },
-    loadData(arg) {
-      if (!this.url.list) {
-        this.$message.error("请设置url.list属性!")
-        return
-      }
-      this.queryParam = Object.assign(this.queryParam, this.param);
+    methods: {
+      searchQuery() {
+        this.changes = '1'
+        this.loadData(1);
+        // 点击查询清空列表选中行
+        // https://gitee.com/jeecg/jeecg-boot/issues/I4KTU1
+        this.selectedRowKeys = []
+        this.selectionRows = []
+      },
+      loadData(arg) {
+        if (!this.url.list) {
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        this.queryParam = Object.assign(this.queryParam, this.param);
 
-      //加载数据 若传入参数1则加载第一页的内容
-      if (arg === 1) {
-        this.ipagination.current = 1;
-      }
-      this.loading = true;
-      console.log(777777777777777777,this.getQueryParams())
-      getAction(this.url.list, this.getQueryParams()).then((res) => {
-        if (res.success) {
-          //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
-          this.dataSource = res.result.records || res.result;
-          this.dataSource.forEach((item) => {
-            if (item.gyzccgbl) {
-              item.gyzccgbl = Number(item.gyzccgbl).toFixed(2)
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        this.loading = true;
+        getAction(this.url.list, this.getQueryParams()).then((res) => {
+          if (res.success) {
+            //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+            this.dataSource = res.result.records || res.result;
+            this.dataSource.forEach((item) => {
+              if (item.gyzccgbl) {
+                item.gyzccgbl = Number(item.gyzccgbl).toFixed(2)
+              }
+            })
+            if (res.result.total) {
+              this.ipagination.total = res.result.total;
+            } else {
+              this.ipagination.total = 0;
             }
-          })
-          if (res.result.total) {
-            this.ipagination.total = res.result.total;
+            //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
           } else {
-            this.ipagination.total = 0;
+            this.$message.warning(res.message)
           }
-          //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+        }).finally(() => {
+          this.loading = false
+        })
+      },
+      callback(key) {
+
+        if (key == 1) {
+          this.emptyData()
+          this.changes = '1'
+        }
+        if (key == 2) {
+          this.changes = '2'
+          this.emptyData()
+          this.updataData()
+        }
+      },
+      emptyData() {
+        this.load = true
+        this.$refs.table.data = []
+        this.$refs.table.areaData = []
+        this.$refs.table.pieResultData = []
+        this.$refs.table.pieAreaResultData = []
+        this.$refs.table.DoughnutResultData = []
+        this.$refs.table.doughnutByXzResultData = []
+        this.$refs.table.xzData = []
+        this.$refs.table.registerData = []
+        this.$refs.table.barResultData = []
+        this.$refs.table.nan = []
+        this.$refs.table.va = []
+        this.$refs.table.xqData = []
+        this.$refs.table.sjytData = []
+        this.$refs.table.sjytValue = []
+        this.$refs.table.sjytName = []
+        this.$refs.table.barBysjytResultData = []
+        this.$refs.table.number = 0
+      },
+      updataData() {
+        let _this = this;
+        new Promise(function(resolve, reject) {
+          getAction(_this.url.listTable, _this.queryParam).then(res => {
+            if (res.success) {
+              _this.load = false
+              _this.resultData = res.result
+              resolve();
+            }
+          })
+        })
+      },
+      SelectArea(val) {
+        if (val.length > 4) {
+          this.queryParam.xzqh = val + '*'
         } else {
-          this.$message.warning(res.message)
+          this.queryParam.xzqh = val.slice(0, 4) + '*'
         }
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    callback(key) {
-
-      if (key == 1) {
-        this.emptyData()
-        this.changes='1'
-      }
-      if (key == 2) {
-        this.changes='2'
-        this.emptyData()
-        this.updataData()
-      }
-    },
-    emptyData(){
-      this.load = true
-      this.$refs.table.data=[]
-      this.$refs.table.areaData=[]
-      this.$refs.table.pieResultData=[]
-      this.$refs.table.pieAreaResultData=[]
-      this.$refs.table.DoughnutResultData=[]
-      this.$refs.table.doughnutByXzResultData=[]
-      this.$refs.table.xzData=[]
-      this.$refs.table.registerData=[]
-      this.$refs.table.barResultData=[]
-      this.$refs.table.nan=[]
-      this.$refs.table.va=[]
-      this.$refs.table.xqData=[]
-      this.$refs.table.sjytData=[]
-      this.$refs.table.sjytValue=[]
-      this.$refs.table.sjytName=[]
-      this.$refs.table.barBysjytResultData=[]
-      this.$refs.table.number=0
-    },
-    updataData(){
-      let _this = this;
-      new Promise(function (resolve, reject) {
-        getAction(_this.url.listTable, _this.queryParam).then(res => {
+      },
+      searchReset() {
+        this.$refs.JArea.allClear(),
+          // this.param={}
+          this.queryParam = {}
+        this.loadData(1);
+      },
+      show() {
+        getAction("/qcsb.qyxx/qcQyxx/dlr").then(res => {
           if (res.success) {
-            _this.load = false
-            _this.resultData = res.result
-            resolve();
+            if (res.result == 'gzw') {
+              this.dl = true
+            }
           }
         })
-      })
-    },
-    SelectArea(val) {
-      if (val.length > 4) {
-        this.queryParam.xzqh = val + '*'
-      } else {
-        this.queryParam.xzqh = val.slice(0, 4) + '*'
-      }
-    },
-    searchReset() {
-      this.$refs.JArea.allClear(),
-        // this.param={}
-        this.queryParam = {}
-      this.loadData(1);
-    },
-    show() {
-      getAction("/qcsb.qyxx/qcQyxx/dlr").then(res => {
-        if (res.success) {
-          if (res.result == 'gzw') {
-            this.dl = true
+      },
+      handleWCSH(id) {
+        getAction(this.url.wcsh, {
+          id: id
+        }).then(res => {
+          if (res.success) {
+            this.$message.success('审核完成');
+            this.loadData();
           }
-        }
-      })
-    }
-    ,
-    handleWCSH(id) {
-      getAction(this.url.wcsh, {id: id}).then(res => {
-        if (res.success) {
-          this.$message.success('审核完成');
-          this.loadData();
-        }
-      })
+        })
 
-    },
-    handleHFYSH(id) {
-      getAction(this.url.hfysh, {id: id}).then(res => {
-        if (res.success) {
-          this.$message.success('已经恢复');
-          this.loadData();
-        }
-      })
+      },
+      handleHFYSH(id) {
+        getAction(this.url.hfysh, {
+          id: id
+        }).then(res => {
+          if (res.success) {
+            this.$message.success('已经恢复');
+            this.loadData();
+          }
+        })
 
-    },
-    initDictConfig() {
-      loadCategoryData({code: 'A04'}).then((res) => {
-        if (res.success) {
-          console.log(res.result)
-          this.$set(this.dictOptions, 'sjyt', res.result)
+      },
+      initDictConfig() {
+        loadCategoryData({
+          code: 'A04'
+        }).then((res) => {
+          if (res.success) {
+            console.log(res.result)
+            this.$set(this.dictOptions, 'sjyt', res.result)
 
-          getDictOption(this.dictOptions);
-        }
-      })
-    },
-    getSuperFieldList() {
-      let fieldList = [];
-      fieldList.push({type: 'string', value: 'dk', text: '地块', dictCode: ''})
-      fieldList.push({type: 'string', value: 'wjlx', text: '文件类型', dictCode: 'wjlx'})
-      fieldList.push({type: 'string', value: 'wjbh', text: '证书/合同/文件编号', dictCode: ''})
-      fieldList.push({type: 'string', value: 'tdsyqr', text: '土地使用权人', dictCode: ''})
-      fieldList.push({type: 'double', value: 'sjzytdmj', text: '实际占用土地面积', dictCode: ''})
-      fieldList.push({type: 'double', value: 'qzpzsymj', text: '其中批准使用面积', dictCode: ''})
-      fieldList.push({type: 'double', value: 'sjsyjzmj', text: '实际使用建筑面积', dictCode: ''})
-      fieldList.push({type: 'double', value: 'qzpzsymj2', text: '其中批准使用面积', dictCode: ''})
-      fieldList.push({type: 'double', value: 'sjrjl', text: '容积率', dictCode: ''})
-      fieldList.push({type: 'string', value: 'syqsyfs', text: '使用权使用方式', dictCode: 'syqsyfs'})
-      fieldList.push({type: 'string', value: 'zlwz', text: '坐落位置', dictCode: ''})
-      fieldList.push({type: 'string', value: 'sjyt', text: '实际用途', dictCode: 'tdyt'})
-      fieldList.push({type: 'date', value: 'qsqssj', text: '权属起始时间'})
-      fieldList.push({type: 'date', value: 'qsdqsj', text: '权属到期时间'})
-      fieldList.push({type: 'string', value: 'tdsyxz', text: '土地使用现状', dictCode: 'tdsyxz'})
-      fieldList.push({
-        type: 'list_multi',
-        value: 'dbdycfqk',
-        text: '担保、抵押、查封情况',
-        dictTable: "",
-        dictText: '',
-        dictCode: 'dbdycfqk'
-      })
-      fieldList.push({type: 'string', value: 'bz', text: '备注', dictCode: ''})
-      fieldList.push({type: 'string', value: 'xgwj', text: '附件材料', dictCode: ''})
-      fieldList.push({type: 'int', value: 'sfsb', text: '是否上报', dictCode: 'xxsbzt'})
-      this.superFieldList = fieldList
-    },
+            getDictOption(this.dictOptions);
+          }
+        })
+      },
+      getSuperFieldList() {
+        let fieldList = [];
+        fieldList.push({
+          type: 'string',
+          value: 'dk',
+          text: '地块',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'wjlx',
+          text: '文件类型',
+          dictCode: 'wjlx'
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'wjbh',
+          text: '证书/合同/文件编号',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'tdsyqr',
+          text: '土地使用权人',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'double',
+          value: 'sjzytdmj',
+          text: '实际占用土地面积',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'double',
+          value: 'qzpzsymj',
+          text: '其中批准使用面积',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'double',
+          value: 'sjsyjzmj',
+          text: '实际使用建筑面积',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'double',
+          value: 'qzpzsymj2',
+          text: '其中批准使用面积',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'double',
+          value: 'sjrjl',
+          text: '容积率',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'syqsyfs',
+          text: '使用权使用方式',
+          dictCode: 'syqsyfs'
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'zlwz',
+          text: '坐落位置',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'sjyt',
+          text: '实际用途',
+          dictCode: 'tdyt'
+        })
+        fieldList.push({
+          type: 'date',
+          value: 'qsqssj',
+          text: '权属起始时间'
+        })
+        fieldList.push({
+          type: 'date',
+          value: 'qsdqsj',
+          text: '权属到期时间'
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'tdsyxz',
+          text: '土地使用现状',
+          dictCode: 'tdsyxz'
+        })
+        fieldList.push({
+          type: 'list_multi',
+          value: 'dbdycfqk',
+          text: '担保、抵押、查封情况',
+          dictTable: "",
+          dictText: '',
+          dictCode: 'dbdycfqk'
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'bz',
+          text: '备注',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'xgwj',
+          text: '附件材料',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'int',
+          value: 'sfsb',
+          text: '是否上报',
+          dictCode: 'xxsbzt'
+        })
+        this.superFieldList = fieldList
+      },
 
 
+    }
   }
-}
 </script>
 <style scoped>
-@import '~@assets/less/common.less';
+  @import '~@assets/less/common.less';
 </style>

src/views/sydwqcsb/QcSsgqzysytdqkList_glyy.vue

@@ -30,31 +30,31 @@
                 <j-dict-select-tag placeholder="请选择是否存在矢量" v-model="queryParam.sfczslsj" dictCode="sfgyz" />
               </a-form-item>
             </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+<!--            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="文件编号">
                 <a-input placeholder="请输入证书/合同/文件编号" v-model="queryParam.wjbh"></a-input>
               </a-form-item>
-            </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+            </a-col> -->
+<!--            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="证书类型">
                 <j-multi-select-tag placeholder="请选择证书类型" v-model="queryParam.zslx" dictCode="zslx" />
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="批准用途">
                 <j-category-select v-model="queryParam.pzyt" pcode="A04" placeholder="请选择批准用途" />
               </a-form-item>
             </a-col>
-            <a-col :xl="4" :lg="7" :md="8" :sm="24">
+<!--            <a-col :xl="4" :lg="7" :md="8" :sm="24">
               <a-form-item label="主管单位">
                 <j-multi-select-tag placeholder="请选择主管单位" v-model="queryParam.sysOrgCode" dictCode="zgbm" />
               </a-form-item>
-            </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+            </a-col> -->
+<!--            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="是否通过审核">
                 <j-dict-select-tag placeholder="请选择是否通过审核" v-model="queryParam.shzt" dictCode="shzt" />
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="取得方式">
                 <j-multi-select-tag
@@ -75,11 +75,11 @@
                 />
               </a-form-item>
             </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+<!--            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="是否上报">
                 <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt" />
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :xl="4" :lg="7" :md="8" :sm="24">
               <a-form-item label="入库年份">
                 <a-select v-model="queryParam.year" placeholder="请选择入库年份">
@@ -207,7 +207,7 @@
             <span slot="action" slot-scope="text, record">
               <a-space>
                 <a-button v-if="record.sfsb < 3" @click="handleEdit(record)">编辑</a-button>
-                <a-button v-if="record.sfsb == 3" @click="handleEdit(record)">重新审核</a-button>
+                <!-- <a-button v-if="record.sfsb == 3" @click="handleEdit(record)">重新审核</a-button> -->
                 <a-button @click="handleDetail(record)" type="primary">查看</a-button>
                 <!--                          <a-button v-if="record.sfsb===3" @click="handleWCSH(record.id)">完成审核</a-button>-->
                 <a-popconfirm title="确定恢复么吗?" @confirm="() => handleHFYSH(record.id)">
@@ -311,11 +311,11 @@ export default {
           align: "center",
           dataIndex: 'worth'
         },
-        {
-          title: '是否上报',
-          align: 'center',
-          dataIndex: 'sfsb_dictText'
-        },
+        // {
+        //   title: '是否上报',
+        //   align: 'center',
+        //   dataIndex: 'sfsb_dictText'
+        // },
         {
           title: '操作',
           dataIndex: 'action',

src/views/sydwqcsb/QcSsgqzysytdqkList_tj.vue

@@ -6,7 +6,7 @@
         <a-row :gutter="24">
           <a-col :xl="5" :lg="7" :md="8" :sm="24">
             <a-form-item label="单位名称">
-              <a-input placeholder="请输入单位名称" v-model="queryParam.createBy"/>
+              <a-input placeholder="请输入单位名称" v-model="queryParam.createBy" />
             </a-form-item>
           </a-col>
           <a-col :xl="5" :lg="7" :md="8" :sm="24">
@@ -19,23 +19,13 @@
               <a-input placeholder="请输入地块编号" v-model="queryParam.dkbh"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="toggleSearchStatus ? 4 : 5" :lg="7" :md="8" :sm="24">
+          <a-col :xl="5" :lg="7" :md="8" :sm="24">
             <a-form-item label="行政区划">
               <JAreaSelect ref="JArea" @Area="SelectArea"></JAreaSelect>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
-              <a-form-item label="土地使用现状">
-                <j-dict-select-tag type='list' v-model='queryParam.tdsyxz' dictCode='tdsyxz' placeholder='请选择土地使用现状'/>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
-              <a-form-item label="文件编号">
-                <a-input placeholder="请输入证书/合同/文件编号" v-model="queryParam.wjbh"></a-input>
-              </a-form-item>
-            </a-col>
-
+            <!--            
             <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="审核结果">
                 <j-dict-select-tag placeholder="请选择是否通过审核" v-model="queryParam.shzt" dictCode="shzt"/>
@@ -43,35 +33,42 @@
             </a-col>
             <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="取得方式">
-
                 <j-multi-select-tag v-model='queryParam.syqsyfs' dictCode='qdfs' placeholder='请选择取得方式'/>
               </a-form-item>
             </a-col>
-
             <a-col :xl="4" :lg="7" :md="8" :sm="24">
               <a-form-item label="是否上报">
                 <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt"/>
               </a-form-item>
+            </a-col> -->
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="文件编号">
+                <a-input placeholder="请输入证书/合同/文件编号" v-model="queryParam.wjbh"></a-input>
+              </a-form-item>
             </a-col>
             <a-col :xl="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="土地使用现状">
+                <j-dict-select-tag type='list' v-model='queryParam.tdsyxz' dictCode='tdsyxz' placeholder='请选择土地使用现状' />
+              </a-form-item>
+            </a-col>
+            <!--            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="土地使用权人">
                 <a-input placeholder="请输入土地使用权人" v-model="queryParam.tdsyqr"></a-input>
               </a-form-item>
-            </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+            </a-col> -->
+            <!--            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="证书类型">
                 <j-multi-select-tag placeholder="请选择证书类型" v-model="queryParam.zslx" dictCode="zslx"/>
               </a-form-item>
-            </a-col>
+            </a-col> -->
           </template>
           <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
               <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
               </a>
             </span>
           </a-col>
@@ -106,18 +103,9 @@
     <!--      </div>-->
     <a-tabs :active-key="this.changes" @change="callback">
       <a-tab-pane key="1" tab="列表信息">
-        <a-table
-          ref="table"
-          size="middle"
-          :scroll="{x:true}"
-          bordered
-          rowKey="id"
-          :columns="columns"
-          :dataSource="dataSource"
-          :pagination="ipagination"
-          :loading="loading"
-          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-          class="j-table-force-nowrap"
+        <a-table ref="table" size="middle" :scroll="{x:true}" bordered rowKey="id" :columns="columns"
+          :dataSource="dataSource" :pagination="ipagination" :loading="loading"
+          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" class="j-table-force-nowrap"
           @change="handleTableChange">
 
           <template slot="htmlSlot" slot-scope="text">
@@ -126,31 +114,25 @@
           <template slot="imgSlot" slot-scope="text,record">
             <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
             <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt=""
-                 style="max-width:80px;font-size: 12px;font-style: italic;"/>
+              style="max-width:80px;font-size: 12px;font-style: italic;" />
           </template>
           <template slot="fileSlot" slot-scope="text">
             <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-            <a-button
-              v-else
-              :ghost="true"
-              type="primary"
-              icon="download"
-              size="small"
-              @click="downloadFile(text)">
+            <a-button v-else :ghost="true" type="primary" icon="download" size="small" @click="downloadFile(text)">
               下载
             </a-button>
           </template>
 
           <span slot="action" slot-scope="text, record">
-                          <a-space>
-<!--                          <a-button  @click="handleEdit(record)">编辑</a-button>-->
-                          <a-button @click="handleDetail(record)" type='primary'>查看</a-button>
-                            <!--                          <a-button v-if="record.sfsb===3" @click="handleWCSH(record.id)">重新审核</a-button>-->
-                            <!--                             <a-popconfirm title="确定恢复么吗?" @confirm="() => handleHFYSH(record.id)">-->
-                            <!--                            <a-button v-if="record.sfsb===4">恢复为已审核</a-button>-->
-                            <!--                             </a-popconfirm>-->
-                        </a-space>
-        </span>
+            <a-space>
+              <!--                          <a-button  @click="handleEdit(record)">编辑</a-button>-->
+              <a-button @click="handleDetail(record)" type='primary'>查看</a-button>
+              <!--                          <a-button v-if="record.sfsb===3" @click="handleWCSH(record.id)">重新审核</a-button>-->
+              <!--                             <a-popconfirm title="确定恢复么吗?" @confirm="() => handleHFYSH(record.id)">-->
+              <!--                            <a-button v-if="record.sfsb===4">恢复为已审核</a-button>-->
+              <!--                             </a-popconfirm>-->
+            </a-space>
+          </span>
 
         </a-table>
       </a-tab-pane>
@@ -164,242 +146,348 @@
 </template>
 
 <script>
+  import '@/assets/less/TableExpand.less'
+  import {
+    mixinDevice
+  } from '@/utils/mixin'
+  import {
+    JeecgListMixin
+  } from '@/mixins/JeecgListMixin'
+  import QcSsgqzysytdqkModal from './modules/QcSsgqzysytdqkModal_tj'
+  import {
+    filterMultiDictText
+  } from '@/components/dict/JDictSelectUtil'
+  import {
+    getAction
+  } from '../../api/manage'
+  import {
+    loadCategoryData
+  } from '@/api/api'
+  import JAreaSelect from "@comp/jeecg/JAreaSelect";
+  import listTabBySz from '@/views/listStatistics/listTabBySz'
+  import store from '@/store'
+  import {
+    tjColunms,
+    getDictOption,
+    getViewType
+  } from '@/utils/columns'
 
-import '@/assets/less/TableExpand.less'
-import {mixinDevice} from '@/utils/mixin'
-import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-import QcSsgqzysytdqkModal from './modules/QcSsgqzysytdqkModal_tj'
-import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-import {getAction} from '../../api/manage'
-import {loadCategoryData} from '@/api/api'
-import JAreaSelect from "@comp/jeecg/JAreaSelect";
-import listTabBySz from '@/views/listStatistics/listTabBySz'
-import store from '@/store'
-import { tjColunms, getDictOption,getViewType } from '@/utils/columns'
-
-export default {
-  name: 'QcSsgqzysytdqkList',
-  props: {
-    param: {
-      default: ""
-    }
-  },
-  mixins: [JeecgListMixin, mixinDevice],
-  components: {
-    QcSsgqzysytdqkModal,
-    JAreaSelect,
-    listTabBySz
-  },
-  data() {
-    return {
-      dlr: false,
-      resultData: [],
-      description: '省属国企占有使用土地情况调查管理页面',
-      load: true,
-      changes: '1',
-      // 表头
-      columns: tjColunms,
-      url: {
-        list: "/qcsb/qcSsgqzysytdqk/listByglyy",
-        delete: "/qcsb/qcSsgqzysytdqk/delete",
-        deleteBatch: "/qcsb/qcSsgqzysytdqk/deleteBatch",
-        exportXlsUrl: "/qcsb/qcSsgqzysytdqk/exportXls3",
-        importExcelUrl: "qcsb/qcSsgqzysytdqk/importExcel",
-        wcsh: "/qcsb/qcSsgqzysytdqk/wcsh",
-        hfysh: "/qcsb/qcSsgqzysytdqk/hfysh",
-        listTable: "/qcsb/qcSsgqzysytdqk/sumListBysz"
-      },
-      dictOptions: {},
-      superFieldList: [],
-    }
-  },
-  created() {
-    this.getSuperFieldList();
-  },
-  mounted() {
-    this.show()
-    this.searchQuery()
-    getViewType("sz")
-  },
-  computed: {
-
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    },
-  },
-  methods: {
-    updataData() {
-      let _this = this;
-      new Promise(function (resolve, reject) {
-        getAction(_this.url.listTable, _this.queryParam).then(res => {
-          if (res.success) {
-            _this.load = false
-            _this.resultData = res.result
-            resolve();
-          }
-        })
-      })
+  export default {
+    name: 'QcSsgqzysytdqkList',
+    props: {
+      param: {
+        default: ""
+      }
     },
-    searchQuery() {
-      this.changes = '1'
-      this.loadData(1);
-      // 点击查询清空列表选中行
-      // https://gitee.com/jeecg/jeecg-boot/issues/I4KTU1
-      this.selectedRowKeys = []
-      this.selectionRows = []
+    mixins: [JeecgListMixin, mixinDevice],
+    components: {
+      QcSsgqzysytdqkModal,
+      JAreaSelect,
+      listTabBySz
     },
-    loadData(arg) {
-      if (!this.url.list) {
-        this.$message.error("请设置url.list属性!")
-        return
+    data() {
+      return {
+        dlr: false,
+        resultData: [],
+        description: '省属国企占有使用土地情况调查管理页面',
+        load: true,
+        changes: '1',
+        // 表头
+        columns: tjColunms,
+        url: {
+          list: "/qcsb/qcSsgqzysytdqk/listByglyy",
+          delete: "/qcsb/qcSsgqzysytdqk/delete",
+          deleteBatch: "/qcsb/qcSsgqzysytdqk/deleteBatch",
+          exportXlsUrl: "/qcsb/qcSsgqzysytdqk/exportXls3",
+          importExcelUrl: "qcsb/qcSsgqzysytdqk/importExcel",
+          wcsh: "/qcsb/qcSsgqzysytdqk/wcsh",
+          hfysh: "/qcsb/qcSsgqzysytdqk/hfysh",
+          listTable: "/qcsb/qcSsgqzysytdqk/sumListBysz"
+        },
+        dictOptions: {},
+        superFieldList: [],
       }
-      this.queryParam = Object.assign(this.queryParam, this.param);
+    },
+    created() {
+      this.getSuperFieldList();
+    },
+    mounted() {
+      this.show()
+      this.searchQuery()
+      getViewType("sz")
+    },
+    computed: {
 
-      //加载数据 若传入参数1则加载第一页的内容
-      if (arg === 1) {
-        this.ipagination.current = 1;
-      }
-      this.loading = true;
-      getAction(this.url.list, this.getQueryParams()).then((res) => {
-        if (res.success) {
-          console.log(res)
-          //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
-          this.dataSource = res.result.records || res.result;
-          this.dataSource.forEach((item) => {
-            if (item.gyzccgbl) {
-              item.gyzccgbl = Number(item.gyzccgbl).toFixed(2)
+      importExcelUrl: function() {
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      updataData() {
+        let _this = this;
+        new Promise(function(resolve, reject) {
+          getAction(_this.url.listTable, _this.queryParam).then(res => {
+            if (res.success) {
+              _this.load = false
+              _this.resultData = res.result
+              resolve();
             }
           })
-          if (res.result.total) {
-            this.ipagination.total = res.result.total;
+        })
+      },
+      searchQuery() {
+        this.changes = '1'
+        this.loadData(1);
+        // 点击查询清空列表选中行
+        // https://gitee.com/jeecg/jeecg-boot/issues/I4KTU1
+        this.selectedRowKeys = []
+        this.selectionRows = []
+      },
+      loadData(arg) {
+        if (!this.url.list) {
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        this.queryParam = Object.assign(this.queryParam, this.param);
+
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        this.loading = true;
+        getAction(this.url.list, this.getQueryParams()).then((res) => {
+          if (res.success) {
+            console.log(res)
+            //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+            this.dataSource = res.result.records || res.result;
+            this.dataSource.forEach((item) => {
+              if (item.gyzccgbl) {
+                item.gyzccgbl = Number(item.gyzccgbl).toFixed(2)
+              }
+            })
+            if (res.result.total) {
+              this.ipagination.total = res.result.total;
+            } else {
+              this.ipagination.total = 0;
+            }
+            //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
           } else {
-            this.ipagination.total = 0;
+            this.$message.warning(res.message)
           }
-          //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+        }).finally(() => {
+          this.loading = false
+        })
+      },
+      callback(key) {
+
+        if (key == 1) {
+          this.emptyData()
+          this.changes = '1'
+        }
+        if (key == 2) {
+          this.changes = '2'
+          this.emptyData()
+          this.updataData()
+        }
+      },
+      SelectArea(val) {
+        if (val.length > 4) {
+          this.queryParam.xzqh = val + '*'
         } else {
-          this.$message.warning(res.message)
+          this.queryParam.xzqh = val.slice(0, 4) + '*'
         }
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    callback(key) {
-
-      if (key == 1) {
-        this.emptyData()
-        this.changes = '1'
-      }
-      if (key == 2) {
-        this.changes = '2'
-        this.emptyData()
-        this.updataData()
-      }
-    },
-    SelectArea(val) {
-      if (val.length > 4) {
-        this.queryParam.xzqh = val + '*'
-      } else {
-        this.queryParam.xzqh = val.slice(0, 4) + '*'
-      }
-    },
-    emptyData() {
-      this.load = true
-      this.$refs.table.data = []
-      this.$refs.table.areaData = []
-      this.$refs.table.pieResultData = []
-      this.$refs.table.pieAreaResultData = []
-      this.$refs.table.DoughnutResultData = []
-      this.$refs.table.doughnutByXzResultData = []
-      this.$refs.table.xzData = []
-      this.$refs.table.registerData = []
-      this.$refs.table.barResultData = []
-      this.$refs.table.nan = []
-      this.$refs.table.va = []
-      this.$refs.table.xqData = []
-      this.$refs.table.sjytData = []
-      this.$refs.table.sjytValue = []
-      this.$refs.table.sjytName = []
-      this.$refs.table.barBysjytResultData = []
-      this.$refs.table.number = 0
-    },
-    searchReset() {
-      this.$refs.JArea.allClear(),
+      },
+      emptyData() {
+        this.load = true
+        this.$refs.table.data = []
+        this.$refs.table.areaData = []
+        this.$refs.table.pieResultData = []
+        this.$refs.table.pieAreaResultData = []
+        this.$refs.table.DoughnutResultData = []
+        this.$refs.table.doughnutByXzResultData = []
+        this.$refs.table.xzData = []
+        this.$refs.table.registerData = []
+        this.$refs.table.barResultData = []
+        this.$refs.table.nan = []
+        this.$refs.table.va = []
+        this.$refs.table.xqData = []
+        this.$refs.table.sjytData = []
+        this.$refs.table.sjytValue = []
+        this.$refs.table.sjytName = []
+        this.$refs.table.barBysjytResultData = []
+        this.$refs.table.number = 0
+      },
+      searchReset() {
+        this.$refs.JArea.allClear(),
 
-      // this.param={}
-        this.queryParam = {}
+          // this.param={}
+          this.queryParam = {}
         this.loadData(1);
-    },
-    show() {
-      getAction("/qcsb.qyxx/qcQyxx/dlr").then(res => {
-        if (res.success) {
-          if (res.result == 'gzw') {
-            this.dl = true
+      },
+      show() {
+        getAction("/qcsb.qyxx/qcQyxx/dlr").then(res => {
+          if (res.success) {
+            if (res.result == 'gzw') {
+              this.dl = true
+            }
           }
-        }
-      })
-    }
-    ,
-    handleWCSH(id) {
-      getAction(this.url.wcsh, {id: id}).then(res => {
-        if (res.success) {
-          this.$message.success('审核完成');
-          this.loadData();
-        }
-      })
+        })
+      },
+      handleWCSH(id) {
+        getAction(this.url.wcsh, {
+          id: id
+        }).then(res => {
+          if (res.success) {
+            this.$message.success('审核完成');
+            this.loadData();
+          }
+        })
 
-    },
-    handleHFYSH(id) {
-      getAction(this.url.hfysh, {id: id}).then(res => {
-        if (res.success) {
-          this.$message.success('已经恢复');
-          this.loadData();
-        }
-      })
+      },
+      handleHFYSH(id) {
+        getAction(this.url.hfysh, {
+          id: id
+        }).then(res => {
+          if (res.success) {
+            this.$message.success('已经恢复');
+            this.loadData();
+          }
+        })
 
-    },
-    initDictConfig() {
-      loadCategoryData({code: 'A04'}).then((res) => {
-        if (res.success) {
-          console.log(res.result)
-          this.$set(this.dictOptions, 'sjyt', res.result)
-          // 传参到columns.js解析实际用途
-          getDictOption(this.dictOptions);
-        }
-      })
-    },
-    getSuperFieldList() {
-      let fieldList = [];
-      fieldList.push({type: 'string', value: 'dk', text: '地块', dictCode: ''})
-      fieldList.push({type: 'string', value: 'wjlx', text: '文件类型', dictCode: 'wjlx'})
-      fieldList.push({type: 'string', value: 'wjbh', text: '证书/合同/文件编号', dictCode: ''})
-      fieldList.push({type: 'string', value: 'tdsyqr', text: '土地使用权人', dictCode: ''})
-      fieldList.push({type: 'double', value: 'sjzytdmj', text: '实际占用土地面积', dictCode: ''})
-      fieldList.push({type: 'double', value: 'qzpzsymj', text: '其中批准使用面积', dictCode: ''})
-      fieldList.push({type: 'double', value: 'sjsyjzmj', text: '实际使用建筑面积', dictCode: ''})
-      fieldList.push({type: 'double', value: 'qzpzsymj2', text: '其中批准使用面积', dictCode: ''})
-      fieldList.push({type: 'double', value: 'sjrjl', text: '容积率', dictCode: ''})
-      fieldList.push({type: 'string', value: 'syqsyfs', text: '使用权使用方式', dictCode: 'syqsyfs'})
-      fieldList.push({type: 'string', value: 'zlwz', text: '坐落位置', dictCode: ''})
-      fieldList.push({type: 'string', value: 'sjyt', text: '实际用途', dictCode: 'tdyt'})
-      fieldList.push({type: 'date', value: 'qsqssj', text: '权属起始时间'})
-      fieldList.push({type: 'date', value: 'qsdqsj', text: '权属到期时间'})
-      fieldList.push({type: 'string', value: 'tdsyxz', text: '土地使用现状', dictCode: 'tdsyxz'})
-      fieldList.push({
-        type: 'list_multi',
-        value: 'dbdycfqk',
-        text: '担保、抵押、查封情况',
-        dictTable: "",
-        dictText: '',
-        dictCode: 'dbdycfqk'
-      })
-      fieldList.push({type: 'string', value: 'bz', text: '备注', dictCode: ''})
-      fieldList.push({type: 'string', value: 'xgwj', text: '附件材料', dictCode: ''})
-      fieldList.push({type: 'int', value: 'sfsb', text: '是否上报', dictCode: 'xxsbzt'})
-      this.superFieldList = fieldList
+      },
+      initDictConfig() {
+        loadCategoryData({
+          code: 'A04'
+        }).then((res) => {
+          if (res.success) {
+            console.log(res.result)
+            this.$set(this.dictOptions, 'sjyt', res.result)
+            // 传参到columns.js解析实际用途
+            getDictOption(this.dictOptions);
+          }
+        })
+      },
+      getSuperFieldList() {
+        let fieldList = [];
+        fieldList.push({
+          type: 'string',
+          value: 'dk',
+          text: '地块',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'wjlx',
+          text: '文件类型',
+          dictCode: 'wjlx'
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'wjbh',
+          text: '证书/合同/文件编号',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'tdsyqr',
+          text: '土地使用权人',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'double',
+          value: 'sjzytdmj',
+          text: '实际占用土地面积',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'double',
+          value: 'qzpzsymj',
+          text: '其中批准使用面积',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'double',
+          value: 'sjsyjzmj',
+          text: '实际使用建筑面积',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'double',
+          value: 'qzpzsymj2',
+          text: '其中批准使用面积',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'double',
+          value: 'sjrjl',
+          text: '容积率',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'syqsyfs',
+          text: '使用权使用方式',
+          dictCode: 'syqsyfs'
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'zlwz',
+          text: '坐落位置',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'sjyt',
+          text: '实际用途',
+          dictCode: 'tdyt'
+        })
+        fieldList.push({
+          type: 'date',
+          value: 'qsqssj',
+          text: '权属起始时间'
+        })
+        fieldList.push({
+          type: 'date',
+          value: 'qsdqsj',
+          text: '权属到期时间'
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'tdsyxz',
+          text: '土地使用现状',
+          dictCode: 'tdsyxz'
+        })
+        fieldList.push({
+          type: 'list_multi',
+          value: 'dbdycfqk',
+          text: '担保、抵押、查封情况',
+          dictTable: "",
+          dictText: '',
+          dictCode: 'dbdycfqk'
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'bz',
+          text: '备注',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'string',
+          value: 'xgwj',
+          text: '附件材料',
+          dictCode: ''
+        })
+        fieldList.push({
+          type: 'int',
+          value: 'sfsb',
+          text: '是否上报',
+          dictCode: 'xxsbzt'
+        })
+        this.superFieldList = fieldList
+      }
     }
   }
-}
 </script>
 <style scoped>
-@import '~@assets/less/common.less';
+  @import '~@assets/less/common.less';
 </style>

src/views/sydwqcsb/sydwxx/QcQyxxList_glyy.vue

@@ -15,16 +15,17 @@
               <!--<a-input placeholder="请输入企业类型" v-model="queryParam.qymc"></a-input>-->
             </a-form-item>
           </a-col>
-          <a-col :xl="5" :lg="7" :md="8" :sm="24">
-            <a-form-item label="是否上报">
-              <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt"/>
-            </a-form-item>
-          </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="是否涉及省内土地资产">
               <j-dict-select-tag placeholder="请选择是否涉及省内土地资产" v-model="queryParam.sfsjtdzc" dictCode="sfsjtdzc"/>
             </a-form-item>
           </a-col>
+<!--          <a-col :xl="5" :lg="7" :md="8" :sm="24">
+            <a-form-item label="是否上报">
+              <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt"/>
+            </a-form-item>
+          </a-col> -->
+
           <a-col :xl="3" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
 
@@ -101,7 +102,7 @@
         <span slot="action" slot-scope="text, record">
                         <a-space>
                           <a-button  v-if="record.sfsb<3"  @click="handleEdit(record)">编辑</a-button>
-                            <a-button v-if="record.sfsb==3" @click="handleEdit(record)">重新审核</a-button>
+                           <!-- <a-button v-if="record.sfsb==3" @click="handleEdit(record)">重新审核</a-button> -->
                           <a-button @click="handleDetail(record)" type='primary'>查看</a-button>
 <!--                         <a-button v-if="record.sfsb===3" @click="handleWCSH(record.id)">完成审核</a-button>-->
                           <a-popconfirm title="确定恢复么吗?" @confirm="() => handleHFYSH(record.id)">
@@ -191,11 +192,12 @@
             align:"center",
             dataIndex: 'tyshxybm'
           },
-          /*  {
+          {
               title:'企业类型',
               align:"center",
-              dataIndex: 'qylx_dictText'
+              dataIndex: 'qylx'
             },
+          /*  
             {
               title:'国有资产持股比例',
               align:"center",
@@ -216,11 +218,11 @@
             align:"center",
             dataIndex: 'sjh'
           },
-          {
-            title:'是否上报',
-            align:"center",
-            dataIndex: 'sfsb_dictText'
-          },
+          // {
+          //   title:'是否上报',
+          //   align:"center",
+          //   dataIndex: 'sfsb_dictText'
+          // },
           {
             title: '操作',
             dataIndex: 'action',