1. 统计页面修改；

src/utils/columns.js

@@ -0,0 +1,70 @@
+import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
+import vueBus from './vueBus'
+
+let dictOptions = [];
+
+const colunms = [
+  {
+    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',
+    // dataIndex: 'sjyt_dictText',
+    customRender: (text) => (text ? filterMultiDictText(dictOptions['sjyt'], text) : '')
+  },
+  {
+    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;

src/views/qcsb/QcSsgqzysytdqkList_tj.vue

@@ -4,71 +4,77 @@
     <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-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>
-          <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="文件类型">
               <j-multi-select-tag placeholder="请选择文件类型" v-model="queryParam.wjlx" dictCode="wjlx"/>
             </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-category-select v-model="queryParam.sjyt" pcode="A04" placeholder="请选择实际用途"/>
-            </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="行政区划">
+                <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="实际用途">
+                <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-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 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-multi-select-tag  v-model='queryParam.syqsyfs' dictCode='syqsyfs' 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.sysOrgCode" dictCode="yjdw"/>
-            </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-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"/>
+              </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>
+          </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>
             </span>
           </a-col>
         </a-row>
@@ -168,6 +174,8 @@ 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'
 
 
 export default {
@@ -192,63 +200,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: '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: '操作',
-          dataIndex: 'action',
-          align: "center",
-          fixed: "right",
-          width: 147,
-          scopedSlots: {customRender: 'action'}
-        }
-      ],
+      columns: columns,
       url: {
         list: "/qcsb/qcSsgqzysytdqk/listBygly",
         delete: "/qcsb/qcSsgqzysytdqk/delete",
@@ -432,6 +384,8 @@ export default {
         if (res.success) {
           console.log(res.result)
           this.$set(this.dictOptions, 'sjyt', res.result)
+
+          getDictOption(this.dictOptions);
         }
       })
     },
@@ -464,7 +418,9 @@ export default {
       fieldList.push({type: 'string', value: 'xgwj', text: '附件材料', dictCode: ''})
       fieldList.push({type: 'int', value: 'sfsb', text: '是否上报', dictCode: 'xxsbzt'})
       this.superFieldList = fieldList
-    }
+    },
+
+
   }
 }
 </script>

src/views/qcsb/modules/QcSsgqzysytdqkDetail.vue

@@ -3,7 +3,7 @@
     <j-form-container ><!--:disabled='formDisabled'-->
       <a-form-model ref='form' :model='model' :rules='validatorRules' slot='detail'>
         <a-row>
-          <a-col :span="24">
+          <a-col :span="24" v-if="title != ''">
             <div style="text-align: center;font-size: larger;margin-bottom: 20px">{{title}}</div>
           </a-col>
           <table style="background-color: white">

src/views/qcsb/modules/QcSsgqzysytdqkModal_tj.vue

@@ -24,18 +24,21 @@
     </template>
     <!--邱东宝 增加modal按钮调整到顶部 end-->
 
-    <qc-ssgqzysytdqk-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></qc-ssgqzysytdqk-form>
+<!--    <qc-ssgqzysytdqk-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></qc-ssgqzysytdqk-form>-->
+    <qc-ssgqzysytdqk-detail title="" ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></qc-ssgqzysytdqk-detail>
   </j-modal>
 </template>
 
 <script>
 
   import QcSsgqzysytdqkForm from './QcSsgqzysytdqkForm_tj'
+  import qcSsgqzysytdqkDetail from './QcSsgqzysytdqkDetail.vue'
   import {getAction} from '@api/manage'
   export default {
     name: 'QcSsgqzysytdqkModal',
     components: {
-      QcSsgqzysytdqkForm
+      QcSsgqzysytdqkForm,
+      qcSsgqzysytdqkDetail
     },
     data () {
       return {