1. 调整查询字段,增加是否存在图片,是否存在全景

2. 增加闲置低效年份查询

src/api/api.js

@@ -93,6 +93,8 @@ const checkRuleByCode = (params) => getAction('/sys/checkRule/checkByCode', para
 const getUserNoticeInfo= (params)=>getAction("/sys/sysAnnouncementSend/getMyAnnouncementSend",params);
 const getTransitURL = url => `/sys/common/transitRESTful?url=${encodeURIComponent(url)}`
 const getyear = ()=>getAction("/qcsb.qyxx/qcQyxx/queryYears");
+const getxzdx = ()=>getAction("/qcsb.qyxx/qcQyxx/queryXzdx");
+
 // 中转HTTP请求
 export const transitRESTful = {
   get: (url, parameter) => getAction(getTransitURL(url), parameter),
@@ -160,6 +162,7 @@ export {
   getUserNoticeInfo,
   getDictItemsFromCache,
   getyear,
+  getxzdx,
 }
 
 

src/views/infoSearch/infoSearchSs.vue

@@ -12,7 +12,7 @@
       <!--省属企业信息管理-->
       <company-info v-show="'ssqyxxgl' === defaultValue"></company-info>
       <!--省属企业地块管理-->
-      <company-land v-show="'ssqydkgl' === defaultValue" :year-list='yearList' ref='ssqydkgl'></company-land>
+      <company-land v-show="'ssqydkgl' === defaultValue" :year-list='yearList' :xzdx-list='xzdxList' ref='ssqydkgl'></company-land>
 
     </a-card>
   </div>
@@ -20,7 +20,7 @@
 <script>
 import companyInfo from '../qcsb/qyxx/QcQyxxList_gly.vue'
 import companyLand from '../qcsb/QcSsgqzysytdqkList_gly.vue'
-import { getyear } from '@/api/api'
+import { getyear,getxzdx } from '@/api/api'
 
 export default {
   name: 'landInfo',
@@ -32,7 +32,8 @@ export default {
     return {
       defaultValue: '',
       menus: [],
-      yearList: []
+      yearList: [],
+      xzdxList: []
 
     }
   },
@@ -45,6 +46,7 @@ export default {
     }
     this.defaultValue = this.menus.length > 0 ? this.menus[0].value : ''
     this.getYear()
+    this.gertXzdx()
   },
   //挂载时,获取一次图表数据
   mounted() {
@@ -69,6 +71,15 @@ export default {
           console.table(this.yearList)
         }
       })
+    },
+    gertXzdx() {
+      getxzdx().then((res) => {
+        if (res.success) {
+          this.xzdxList = res.result
+          console.log('###################')
+          console.log(this.xzdxList)
+        }
+      })
     }
   }
 

src/views/infoSearch/infoSearchSz.vue

@@ -12,14 +12,14 @@
       <!--省直单位信息管理-->
       <depart-info v-show="'szdwxxgl' === defaultValue"></depart-info>
       <!--省直单位地块管理-->
-      <depart-land v-show="'szdwdkgl' === defaultValue" :year-list="yearList" ref="szdwdkgl"></depart-land>
+      <depart-land v-show="'szdwdkgl' === defaultValue" :year-list="yearList" :xzdx-list='xzdxList' ref="szdwdkgl"></depart-land>
     </a-card>
   </div>
 </template>
 <script>
 import departInfo from '../sydwqcsb/sydwxx/QcQyxxList_glyy.vue'
 import departLand from '../sydwqcsb/QcSsgqzysytdqkList_glyy.vue'
-import { getyear } from '@/api/api'
+import { getyear ,getxzdx} from '@/api/api'
 
 export default {
   name: 'landInfo',
@@ -31,7 +31,8 @@ export default {
     return {
       defaultValue: '',
       menus: [],
-      yearList: []
+      yearList: [],
+      xzdxList: []
     }
   },
   created() {
@@ -43,6 +44,7 @@ export default {
     }
     this.defaultValue = this.menus.length > 0 ? this.menus[0].value : ''
     this.getYear()
+    this.gertXzdx()
   },
   //挂载时,获取一次图表数据
   mounted() {
@@ -67,6 +69,15 @@ export default {
           console.table(this.yearList)
         }
       })
+    },
+    gertXzdx() {
+      getxzdx().then((res) => {
+        if (res.success) {
+          this.xzdxList = res.result
+          console.log('###################')
+          console.log(this.xzdxList)
+        }
+      })
     }
   }
 }

src/views/qcsb/QcSsgqzysytdqkList_gly.vue

@@ -5,18 +5,23 @@
       <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-form-item>
           </a-col>
           <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 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-select v-model="queryParam.year" placeholder="请选择入库年份">
+              <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 }}
@@ -24,76 +29,67 @@
               </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-form-item label="文件类型">
-              <j-multi-select-tag placeholder="请选择文件类型" v-model="queryParam.wjlx" dictCode="wjlx" />
-            </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 label="实际用途">
+                <j-category-select v-model="queryParam.sjyt" pcode="A04" 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 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="行政区划">
-                <JAreaSelect ref="JArea" @Area="SelectArea"></JAreaSelect>
+              <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-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-category-select v-model="queryParam.sjyt" pcode="A04" placeholder="请选择实际用途" />
+              <a-form-item label="是否存在图片">
+                <j-dict-select-tag placeholder="请选择是否存在图片" v-model="queryParam.sfcztp" dictCode="sfgyz" />
               </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="是否存在矢量">
-                <j-dict-select-tag placeholder="请选择是否存在矢量" v-model="queryParam.sfczslsj" dictCode="sfgyz" />
+              <a-form-item label="是否存在全景">
+                <j-dict-select-tag placeholder="请选择是否存在全景" v-model="queryParam.sfczvr" dictCode="sfgyz" />
               </a-form-item>
             </a-col>
-            <!--            <a-col :xl="5" :lg="7" :md="8" :sm="24">
-              <a-form-item :label="'取得方式'">
-                <j-multi-select-tag
-                  type="list_multi"
-                  v-model="queryParam.syqsyfs"
-                  dictCode="syqsyfs"
-                  placeholder="请选择使用权使用方式"
-                />
-                <j-dict-select-tag type='list' v-model='queryParam.syqsyfs' dictCode='syqsyfs' placeholder='请选择使用权使用方式'/>
+<!--            <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="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="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.dkbh"></a-input>-->
+<!--              </a-form-item>-->
+<!--            </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 :xl="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="闲置低效年份查询">
+                <a-select v-model="queryParam.xzdx" placeholder="请选择入库年份">
+                  <a-select-option :value="undefined">请选择</a-select-option>
+                  <a-select-option v-for="item in xzdxList" :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="审核结果">
-                <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-input placeholder="请输入土地使用权人" v-model="queryParam.tdsyqr"></a-input>
-              </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">
@@ -237,6 +233,10 @@
       yearList: {
         type: Array,
         required: true
+      },
+      xzdxList: {
+        type: Array,
+        required: true
       }
     },
     components: {

src/views/qcsb/qyxx/QcQyxxList_gly.vue

@@ -88,7 +88,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)">
@@ -204,11 +204,11 @@
               align: "center",
               dataIndex: 'sjh'
             },
-            {
-              title: '是否上报',
-              align: "center",
-              dataIndex: 'sfsb_dictText'
-            },
+            // {
+            //   title: '是否上报',
+            //   align: "center",
+            //   dataIndex: 'sfsb_dictText'
+            // },
             {
               title: '操作',
               dataIndex: 'action',

src/views/sydwqcsb/QcSsgqzysytdqkList_glyy.vue

@@ -14,22 +14,74 @@
               <a-input placeholder="请输入地块名称" v-model="queryParam.dk"></a-input>
             </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-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-dict-select-tag
+                type="list"
+                v-model="queryParam.tdsyxz"
+                dictCode="tdsyxz"
+                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 placeholder="请选择是否存在矢量" v-model="queryParam.sfczslsj" dictCode="sfgyz" />
               </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="是否存在图片">
+                <j-dict-select-tag placeholder="请选择是否存在图片" v-model="queryParam.sfcztp" dictCode="sfgyz" />
+              </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.sfczvr" dictCode="sfgyz" />
+              </a-form-item>
+            </a-col>
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="闲置低效年份查询">
+                <a-select v-model="queryParam.xzdx" placeholder="请选择年份">
+                  <a-select-option :value="undefined">请选择</a-select-option>
+                  <a-select-option v-for="item in xzdxList" :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="取得方式">-->
+<!--                <j-multi-select-tag-->
+<!--                  type="list_multi"-->
+<!--                  v-model="queryParam.syqsyfs"-->
+<!--                  dictCode="qdfs"-->
+<!--                  placeholder="请选择使用权使用方式"-->
+<!--                />-->
+<!--              </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.pzyt" pcode="A04" 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>
@@ -40,11 +92,7 @@
                 <j-multi-select-tag placeholder="请选择证书类型" v-model="queryParam.zslx" dictCode="zslx" />
               </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.pzyt" pcode="A04" placeholder="请选择批准用途" />
-              </a-form-item>
-            </a-col>
+
 <!--            <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" />
@@ -55,46 +103,6 @@
                 <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="取得方式">
-                <j-multi-select-tag
-                  type="list_multi"
-                  v-model="queryParam.syqsyfs"
-                  dictCode="qdfs"
-                  placeholder="请选择使用权使用方式"
-                />
-              </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="是否上报">
-                <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt" />
-              </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-form-item label="土地使用权人">
-                <a-input placeholder="请输入土地使用权人" v-model="queryParam.tdsyqr"></a-input>
-              </a-form-item>
-            </a-col>
           </template>
           <a-col :xl="3" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -242,6 +250,10 @@ export default {
     yearList: {
       type: Array,
       required: true
+    },
+    xzdxList: {
+      type: Array,
+      required: true
     }
   },
   components: {