1. 统计页面：省直单位详情修改；

2. 地块审核页面列表字段合并成同意获取自columns.js，方便添加修改;

src/utils/columns.js

@@ -2,8 +2,10 @@ import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
 import vueBus from './vueBus'
 
 let dictOptions = [];
+let type = "";
 
-const colunms = [
+// 统计页字段
+const tjColunms = [
   {
     title: '#',
     dataIndex: '',
@@ -25,11 +27,6 @@ const colunms = [
     dataIndex: 'dk'
   },
   {
-    title: '文件类型',
-    align: "center",
-    dataIndex: 'wjlx_dictText'
-  },
-  {
     title: '证书/合同/文件编号',
     align: "center",
     dataIndex: 'wjbh'
@@ -61,10 +58,160 @@ const colunms = [
   }
 ];
 
+// 省属企业审核字段
+const CompanyauditColumns = [
+  {
+    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: 'wjlx_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(dictOptions['sjyt'], text) : '')
+  },
+  {
+    title:'是否上报',
+    align:"center",
+    dataIndex: 'sfsb_dictText'
+  },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    align:"center",
+    fixed:"right",
+    width:147,
+    scopedSlots: { customRender: 'action' }
+  }
+];
+
+// 省直单位审核字段
+const departAuditColumns = [
+  {
+    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'
+  },
+  {
+    title:'证书/合同/文件编号',
+    align:"center",
+    dataIndex: 'wjbh'
+  },
+  {
+    title:'土地使用权人',
+    align:"center",
+    dataIndex: 'tdsyqr'
+  },
+  {
+    title:'使用权使用方式',
+    align:"center",
+    dataIndex: 'syqsyfs'
+  },
+  {
+    title:'实际用途',
+    align:"center",
+    dataIndex: 'sjyt',
+    customRender:
+      (text) => (text ? filterMultiDictText(dictOptions['sjyt'], text) : '')
+  },
+  {
+    title:'是否上报',
+    align:"center",
+    dataIndex: 'sfsb_dictText'
+  },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    align:"center",
+    fixed:"right",
+    width:147,
+    scopedSlots: { customRender: 'action' }
+  }
+];
 
+// 获取实际用途类型
 export function getDictOption(data) {
   console.log("columns...data", data)
   dictOptions = data;
 }
 
-export default colunms;
+// 获取传参页面
+export function getViewType(data) {
+  type = data;
+  let num = (tjColunms[3].title ==='证书类型' || tjColunms[3].title ==='文件类型') ? 1 : 0;
+  if (data === 'ss') {
+    console.log("tjColunms[3].title", tjColunms[3].title);
+
+    tjColunms.splice(3, num,
+      {
+        title: '文件类型',
+        align: "center",
+        dataIndex: 'wjlx_dictText'
+      },);
+  } else {
+    tjColunms.splice(3, num, {
+      title: '证书类型',
+      align: "center",
+      dataIndex: 'zslx_dictText'
+    },);
+  }
+}
+
+export { tjColunms, CompanyauditColumns, departAuditColumns };

src/views/qcsb/QcSsgqzysytdqkList1.vue

@@ -167,6 +167,7 @@
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
   import { getAction } from '../../api/manage'
   import { loadCategoryData } from '@/api/api'
+  import { CompanyauditColumns, getDictOption } from '@/utils/columns'
 
   export default {
     name: 'QcSsgqzysytdqkList',
@@ -178,68 +179,7 @@
       return {
         description: '省属国企占有使用土地情况调查管理页面',
         // 表头
-        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: 'wjlx_dictText'
-          },
-          {
-            title:'证书/合同/文件编号',
-            align:"center",
-            dataIndex: 'wjbh'
-          },
-          {
-            title:'土地使用权人',
-            align:"center",
-            dataIndex: 'tdsyqr'
-          },
-          {
-            title:'使用权使用方式',
-            align:"center",
-            dataIndex: 'syqsyfs_dictText'
-          },
-          {
-            title:'实际用途',
-            align:"center",
-            dataIndex: 'sjyt',
-            customRender:
-              (text) => (text ? filterMultiDictText(this.dictOptions['sjyt'], text) : '')
-          },
-          {
-            title:'是否上报',
-            align:"center",
-            dataIndex: 'sfsb_dictText'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
+        columns: CompanyauditColumns,
         url: {
           list: "/qcsb/qcSsgqzysytdqk/list1",
           delete: "/qcsb/qcSsgqzysytdqk/delete",
@@ -275,6 +215,8 @@
           if (res.success) {
             console.log(res.result)
             this.$set(this.dictOptions, 'sjyt', res.result)
+            // 传参到columns.js解析实际用途
+            getDictOption(this.dictOptions);
           }
         })
       },

src/views/qcsb/QcSsgqzysytdqkList2.vue

@@ -175,6 +175,7 @@
   import QcSsgqzysytdqkModal from './modules/QcSsgqzysytdqkModal1'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
   import { loadCategoryData, getyear } from '@/api/api'
+  import { CompanyauditColumns, getDictOption } from '@/utils/columns'
 
   export default {
     name: 'QcSsgqzysytdqkList',
@@ -192,69 +193,7 @@
       return {
         description: '省属国企占有使用土地情况调查管理页面',
         // 表头
-        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: 'wjlx_dictText'
-          },
-          {
-            title:'证书/合同/文件编号',
-            align:"center",
-            dataIndex: 'wjbh'
-          },
-          {
-            title:'土地使用权人',
-            align:"center",
-            dataIndex: 'tdsyqr'
-          },
-          {
-            title:'使用权使用方式',
-            align:"center",
-            dataIndex: 'syqsyfs_dictText'
-          },
-          {
-            title:'实际用途',
-            align:"center",
-            dataIndex: 'sjyt',
-            customRender:
-              (text) => (text ? filterMultiDictText(this.dictOptions['sjyt'], text) : '')
-          },
-          {
-            title:'是否上报',
-            align:"center",
-            dataIndex: 'sfsb_dictText'
-          },
-
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
+        columns: CompanyauditColumns,
         url: {
           list: "/qcsb/qcSsgqzysytdqk/list2",
           delete: "/qcsb/qcSsgqzysytdqk/delete",
@@ -281,6 +220,8 @@
           if (res.success) {
             console.log(res.result)
             this.$set(this.dictOptions, 'sjyt', res.result)
+            // 传参到columns.js解析实际用途
+            getDictOption(this.dictOptions);
           }
         })
       },

src/views/qcsb/QcSsgqzysytdqkList_tj.vue

@@ -174,8 +174,7 @@ import listTable from '@/views/listStatistics/listTab'
 import store from '@/store'
 import JAreaSelect from "@comp/jeecg/JAreaSelect";
 import { filterObj } from '@/utils/util';
-import columns from '@/utils/columns'
-import { getDictOption } from '../../utils/columns'
+import { tjColunms, getDictOption, getViewType } from '@/utils/columns'
 
 
 export default {
@@ -200,7 +199,7 @@ export default {
       load: true,
       changes:'1',
       // 表头
-      columns: columns,
+      columns: tjColunms,
       url: {
         list: "/qcsb/qcSsgqzysytdqk/listBygly",
         delete: "/qcsb/qcSsgqzysytdqk/delete",
@@ -225,6 +224,7 @@ export default {
   mounted() {
     this.show()
     this.searchQuery()
+    getViewType("ss")
 
   },
   watch: {

src/views/sydwqcsb/QcSsgqzysytdqkList1.vue

@@ -164,6 +164,7 @@ import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 import {getAction} from '../../api/manage'
 import {loadCategoryData} from '@/api/api'
 import JAreaSelect from "@comp/jeecg/JAreaSelect";
+import { departAuditColumns, getDictOption } from '@/utils/columns'
 
 export default {
   name: 'QcSsgqzysytdqkList',
@@ -180,68 +181,7 @@ export default {
         order: 'asc'
       },
       // 表头
-      columns: [
-        {
-          title: '#',
-          dataIndex: '',
-          key: 'rowIndex',
-          width: 60,
-          align: "center",
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1;
-          }
-        },
-        {
-          title: '用地单位名称',
-          align: "center",
-          dataIndex: 'createBy'
-        },
-        {
-          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: 'sfsb_dictText'
-        },
-        {
-          title: '操作',
-          dataIndex: 'action',
-          align: "center",
-          fixed: "right",
-          width: 147,
-          scopedSlots: {customRender: 'action'}
-        }
-      ],
+      columns: departAuditColumns,
       url: {
         list: "/qcsb/qcSsgqzysytdqk/list6",
         delete: "/qcsb/qcSsgqzysytdqk/delete",
@@ -289,6 +229,8 @@ export default {
         if (res.success) {
           console.log(res.result)
           this.$set(this.dictOptions, 'sjyt', res.result)
+          // 传参到columns.js解析实际用途
+          getDictOption(this.dictOptions);
         }
       })
     },

src/views/sydwqcsb/QcSsgqzysytdqkList2.vue

@@ -172,6 +172,7 @@ import QcSsgqzysytdqkModal from './modules/QcSsgqzysytdqkModal1'
 import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 import {loadCategoryData} from '@/api/api'
 import JAreaSelect from "@comp/jeecg/JAreaSelect";
+import { departAuditColumns, getDictOption } from '@/utils/columns'
 
 export default {
   name: 'QcSsgqzysytdqkList',
@@ -196,68 +197,7 @@ export default {
       allClear: "",
       description: '省属国企占有使用土地情况调查管理页面',
       // 表头
-      columns: [
-        {
-          title: '#',
-          dataIndex: '',
-          key: 'rowIndex',
-          width: 60,
-          align: "center",
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1;
-          }
-        },
-        {
-          title: '用地单位名称',
-          align: "center",
-          dataIndex: 'createBy'
-        },
-        {
-          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: 'sfsb_dictText'
-        },
-        {
-          title: '操作',
-          dataIndex: 'action',
-          align: "center",
-          fixed: "right",
-          width: 147,
-          scopedSlots: {customRender: 'action'}
-        }
-      ],
+      columns: departAuditColumns,
       url: {
         list: "/qcsb/qcSsgqzysytdqk/list7",
         delete: "/qcsb/qcSsgqzysytdqk/delete",
@@ -296,6 +236,8 @@ export default {
         if (res.success) {
           console.log(res.result)
           this.$set(this.dictOptions, 'sjyt', res.result)
+          // 传参到columns.js解析实际用途
+          getDictOption(this.dictOptions);
         }
       })
     },

src/views/sydwqcsb/QcSsgqzysytdqkList_tj.vue

@@ -4,74 +4,75 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="用地单位名称">
-              <a-input placeholder="请输入用地单位名称" v-model="queryParam.createBy"/>
+          <a-col :xl="5" :lg="7" :md="8" :sm="24">
+            <a-form-item label="单位名称">
+              <a-input placeholder="请输入单位名称" v-model="queryParam.createBy"/>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :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.dk"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :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.dkbh"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="toggleSearchStatus ? 4 : 5" :lg="7" :md="8" :sm="24">
             <a-form-item label="行政区划">
               <JAreaSelect ref="JArea" @Area="SelectArea"></JAreaSelect>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="证书/合同/文件编号">
-              <a-input placeholder="请输入证书/合同/文件编号" v-model="queryParam.wjbh"></a-input>
-            </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"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="取得方式">
 
-          <a-col :xl="6" :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="6" :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="6" :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>
+                <j-multi-select-tag v-model='queryParam.syqsyfs' dictCode='qdfs' placeholder='请选择取得方式'/>
+              </a-form-item>
+            </a-col>
 
-          <a-col :xl="6" :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="6" :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-multi-select-tag placeholder="请选择证书类型" v-model="queryParam.zslx" dictCode="zslx"/>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :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-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-form-item label="证书类型">
+                <j-multi-select-tag placeholder="请选择证书类型" v-model="queryParam.zslx" dictCode="zslx"/>
+              </a-form-item>
+            </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>-->
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
             </span>
           </a-col>
         </a-row>
@@ -174,6 +175,7 @@ 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',
@@ -196,63 +198,7 @@ export default {
       load: true,
       changes: '1',
       // 表头
-      columns: [
-        {
-          title: '#',
-          dataIndex: '',
-          key: 'rowIndex',
-          width: 60,
-          align: "center",
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1;
-          }
-        },
-        {
-          title: '用地单位名称',
-          align: "center",
-          dataIndex: 'createBy'
-        },
-        {
-          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_dictText'
-        },
-        {
-          title: '实际用途',
-          align: "center",
-          dataIndex: 'sjyt',
-          customRender:
-            (text) => (text ? filterMultiDictText(this.dictOptions['sjyt'], text) : '')
-        },
-        {
-          title: '操作',
-          dataIndex: 'action',
-          align: "center",
-          fixed: "right",
-          width: 147,
-          scopedSlots: {customRender: 'action'}
-        }
-      ],
+      columns: tjColunms,
       url: {
         list: "/qcsb/qcSsgqzysytdqk/listByglyy",
         delete: "/qcsb/qcSsgqzysytdqk/delete",
@@ -273,6 +219,7 @@ export default {
   mounted() {
     this.show()
     this.searchQuery()
+    getViewType("sz")
   },
   computed: {
 
@@ -415,6 +362,8 @@ export default {
         if (res.success) {
           console.log(res.result)
           this.$set(this.dictOptions, 'sjyt', res.result)
+          // 传参到columns.js解析实际用途
+          getDictOption(this.dictOptions);
         }
       })
     },