更新地图属性下来框查询

BIZ/jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qyxx/controller/QcQyxxController.java

@@ -1163,6 +1163,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
     @GetMapping(value = "/yjdwmjhz")
     public Result<?> yjdwmjhz() {
         List<HashMap<String, Object>> list = qcQyxxService.yjdwhz();
+
         return getResult(list);
     }
 

BIZ/jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qyxx/mapper/xml/QcQyxxMapper.xml

@@ -260,7 +260,7 @@
     </select>
 
     <select id="yjdwhz" resultType="map">
-        select a.depart_name as "name", sum(b.area) as "value"
+        select a.depart_name as "name", ROUND(sum(b.area),2) as "value"
         from (select id, depart_name, org_code from sys_depart where org_type = '2' and org_code like 'A04%') a
                  LEFT JOIN (
             select sum(SJZYTDMJ_M) as area, sys_ORG_CODE as orgcode

BIZ/jeecg-boot-module-zrzyqc/target/classes/org/jeecg/modules/zrzyqc/qyxx/mapper/xml/QcQyxxMapper.xml

@@ -260,7 +260,7 @@
     </select>
 
     <select id="yjdwhz" resultType="map">
-        select a.depart_name as "name", sum(b.area) as "value"
+        select a.depart_name as "name", ROUND(sum(b.area),2) as "value"
         from (select id, depart_name, org_code from sys_depart where org_type = '2' and org_code like 'A04%') a
                  LEFT JOIN (
             select sum(SJZYTDMJ_M) as area, sys_ORG_CODE as orgcode

UI2/src/components/OneMap/widgets/QueryTool.vue

@@ -10,20 +10,51 @@
             </a-select-option>
           </a-select>
 
-          <a-select v-model='queryList' style='width:50%;margin-left: 3%'>
-            <a-select-option v-for='(item,index) in this.queryLists'  :key='item.id' :value='item.queryname'>
+          <a-select v-model='queryList' style='width:50%;margin-left: 3%' @pressEnter='handleSearch'>
+            <a-select-option v-for='(item,index) in this.queryLists' :key='item.id' :value='item.queryname'>
               {{ item.chinesename }}
             </a-select-option>
           </a-select>
-          <a-input-search allow-clear :loading='isLoading' style='width: 88%;margin-top: 3%' v-model='keyword'
+
+          <a-select v-if="this.queryList.includes('SF')" @pressEnter='handleSearch' v-model='keyword' style='width:76%;margin-top: 3%'>
+            <a-select-option value='是'>
+              是
+            </a-select-option>
+            <a-select-option value='否'>
+              否
+            </a-select-option>
+          </a-select>
+          <a-select v-if="this.queryList.includes('SY')" @pressEnter='handleSearch' v-model='keyword' style='width:76%;margin-top: 3%'>
+            <a-select-option value='出让'>
+              出让
+            </a-select-option>
+            <a-select-option value='划拨'>
+              划拨
+            </a-select-option>
+            <a-select-option value='转让'>
+              正常使用
+            </a-select-option>
+            <a-select-option value='作价出资'>
+               作价出资
+            </a-select-option>
+          </a-select>
+          <a-input-search v-else allow-clear :loading='isLoading' style='width: 86%;margin-top: 3%' v-model='keyword'
                           @search='handleSearch' :placeholder='placeholder'
                           @pressEnter='handleSearch'/>
 
+          <a-tooltip placement='bottom' v-if="this.queryList.includes('SF')||this.queryList.includes('SY')">
+            <template  slot='title'>
+              <span>搜索</span>
+            </template>
+            <a-button  icon="search" style='width: 10%;margin-top: 3%' @click='handleSearch'></a-button>
+          </a-tooltip>
+
           <a-tooltip placement='bottom'>
             <template slot='title'>
               <span>重置</span>
             </template>
-            <a-button type='primary' icon='reload' style='width: 10%;margin-top: 3%' @click='reset'></a-button>
+            <a-button type='primary' icon='reload' style='width: 10%;margin-top: 3%;margin-left: 2%'
+                      @click='reset'></a-button>
           </a-tooltip>
         </a-input-group>
         <template v-if='returntree'>
@@ -55,9 +86,9 @@
               <!--          <a-tag color='blue' style='padding-left: 0.5em;'>-->
               <!--            {{ item.layerName }}-->
               <!--          </a-tag>-->
-<!--              <a-button slot='actions' type='primary' ghost size='small' @click='handleDetail(item)'>-->
-<!--                详情-->
-<!--              </a-button>-->
+              <!--              <a-button slot='actions' type='primary' ghost size='small' @click='handleDetail(item)'>-->
+              <!--                详情-->
+              <!--              </a-button>-->
             </a-list-item>
           </a-list>
         </template>
@@ -155,12 +186,13 @@ export default {
       this.$message.warn('没有查询到配置信息，请联系管理员！');
     }
   },
- mounted() {
-   this.selectChange()
- },
+  mounted() {
+    this.selectChange()
+  },
   methods: {
     async handleSearch() {
-      if (this.queryType && this.keyword && this.queryList.length>0) {
+
+      if (this.queryType && this.keyword && this.queryList.length > 0) {
         this.infoShow = false;
         if (this.queryType !== this.lastType) {
           this.pagination.current = 1;

UI2/src/views/qcsb/QcSsgqzysytdqkList1.vue

@@ -35,6 +35,12 @@
             </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>
+
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="文件类型">
               <j-dict-select-tag placeholder="请选择文件类型" v-model="queryParam.wjlx" dictCode="wjlx"/>
             </a-form-item>

UI2/src/views/qcsb/QcSsgqzysytdqkList2.vue

@@ -49,7 +49,11 @@
               <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-category-select v-model="queryParam.sjyt" pcode="A04" placeholder="请选择实际用途"/>
+            </a-form-item>
+          </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="是否通过审核">

UI2/src/views/qcsb/QcSsgqzysytdqkList3.vue

@@ -24,7 +24,11 @@
               <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-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="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="土地使用权人">

UI2/src/views/qcsb/QcSsgqzysytdqkList_gly.vue

@@ -39,11 +39,7 @@
               <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.sfczslsj" dictCode="sfgyz"/>
-            </a-form-item>
-          </a-col>
+
 
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="土地使用现状">
@@ -55,6 +51,12 @@
               <j-dict-select-tag type='list' 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-category-select v-model="queryParam.sjyt" pcode="A04" 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"/>
@@ -67,6 +69,11 @@
               </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.sfczslsj" dictCode="sfgyz"/>
+              </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>
@@ -155,7 +162,7 @@
                           <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-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>

UI2/src/views/qcsb/modules/QcSsgqzysytdqkModal2.vue

@@ -18,6 +18,7 @@
         <a-button @click="handleCancel">
           关闭
         </a-button>
+        <a-button v-if="this.result.sfsb == 3" @click="handleWCSH()"style=" margin-bottom: 0;margin-left: 8px">完成审核</a-button>
       </div>
 
     </template>
@@ -30,6 +31,7 @@
 <script>
 
   import QcSsgqzysytdqkForm from './QcSsgqzysytdqkForm2'
+  import {getAction} from '@api/manage'
   export default {
     name: 'QcSsgqzysytdqkModal',
     components: {
@@ -39,6 +41,7 @@
       return {
         title:'',
         width:896,
+        result:{},
         visible: false,
         disableSubmit: false
       }
@@ -51,6 +54,7 @@
         })
       },
       edit (record) {
+        this.result = record
         this.visible=true
         this.$nextTick(()=>{
           this.$refs.realForm.edit(record);
@@ -60,6 +64,20 @@
         this.$emit('close');
         this.visible = false;
       },
+      handleWCSH() {
+        new Promise((resolve, reject)=>{
+          this.handleOk()
+          resolve()
+        }).then(()=>{
+          getAction("/qcsb/qcSsgqzysytdqk/wcsh", {id: this.result.id}).then(res => {
+            if (res.success) {
+              this.visible=false
+              this.loadData();
+            }
+          })
+        })
+
+      },
       handleOk () {
           this.disableSubmit=true
         this.$refs.realForm.submitForm();
@@ -70,7 +88,8 @@
       },
       handleCancel () {
         this.close()
-      }
+      },
+
     }
   }
 </script>

UI2/src/views/qcsb/qyxx/QcQyxxList_gly.vue

@@ -103,7 +103,7 @@
                           <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-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>

UI2/src/views/qcsb/qyxx/modules/QcQyxxModal2.vue

@@ -14,10 +14,13 @@
     <!-- 邱东宝 增加modal按钮调整到顶部 1-->
     <template>
       <div style="position: absolute;left: 10%;top:13px;">
-        <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;margin-right: 8px">保存</a-button>
+        <a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;margin-right: 8px">保存
+        </a-button>
         <a-button @click="handleCancel">
           关闭
         </a-button>
+        <a-button v-if="this.result.sfsb == 3" @click="handleWCSH()" style=" margin-bottom: 0;margin-left: 8px">完成审核
+        </a-button>
       </div>
 
     </template>
@@ -28,49 +31,66 @@
 
 
 <script>
+import {getAction} from '@api/manage'
+import QcQyxxForm from './QcQyxxForm2'
 
-  import QcQyxxForm from './QcQyxxForm2'
-  export default {
-    name: 'QcQyxxModal',
-    components: {
-      QcQyxxForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
+export default {
+  name: 'QcQyxxModal',
+  components: {
+    QcQyxxForm
+  },
+  data() {
+    return {
+      title: '',
+      result: {},
+      width: 800,
+      visible: false,
+      disableSubmit: false
+    }
+  },
+  methods: {
+    add() {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs.realForm.add();
+      })
     },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
+    handleWCSH() {
+      new Promise((resolve, reject) => {
+        this.handleOk()
+        resolve()
+      }).then(() => {
+        getAction("/qcsb.qyxx/qcQyxx/wcsh", {id: this.result.id}).then(res => {
+         
+          if (res.success == false) {
+              this.$message.error("出错了，请联系管理员！")
+          }
         })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-          this.disableSubmit=true
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
+      })
+
+    },
+    edit(record) {
+      this.result = record
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs.realForm.edit(record);
+      })
+    },
+    close() {
+      this.$emit('close');
+      this.visible = false;
+    },
+    handleOk() {
+      this.disableSubmit = true
+      this.$refs.realForm.submitForm();
+    },
+    submitCallback() {
+      this.$emit('ok');
+      this.visible = false;
+    },
+    handleCancel() {
+      this.close()
     }
   }
+}
 </script>

UI2/src/views/sydwqcsb/QcSsgqzysytdqkList_glyy.vue

@@ -155,7 +155,7 @@
                           <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-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>

UI2/src/views/sydwqcsb/modules/QcSsgqzysytdqkModal2.vue

@@ -14,10 +14,13 @@
     <!-- 邱东宝 增加modal按钮调整到顶部 1-->
     <template>
       <div style="position: absolute;left: 10%;top:13px;">
-        <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;margin-right: 8px">保存</a-button>
+        <a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;margin-right: 8px">保存
+        </a-button>
         <a-button @click="handleCancel">
           关闭
         </a-button>
+        <a-button v-if="this.result.sfsb == 3" @click="handleWCSH()" style=" margin-bottom: 0;margin-left: 8px">完成审核
+        </a-button>
       </div>
 
     </template>
@@ -28,49 +31,67 @@
 </template>
 
 <script>
+import {getAction} from '@api/manage'
+import QcSsgqzysytdqkForm from './QcSsgqzysytdqkForm2'
 
-  import QcSsgqzysytdqkForm from './QcSsgqzysytdqkForm2'
-  export default {
-    name: 'QcSsgqzysytdqkModal',
-    components: {
-      QcSsgqzysytdqkForm
-    },
-    data () {
-      return {
-        title:'',
-        width:896,
-        visible: false,
-        disableSubmit: false
-      }
+export default {
+  name: 'QcSsgqzysytdqkModal',
+  components: {
+    QcSsgqzysytdqkForm
+  },
+  data() {
+    return {
+      title: '',
+      result: {},
+      width: 896,
+      visible: false,
+      disableSubmit: false
+    }
+  },
+  methods: {
+    add() {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs.realForm.add();
+      })
     },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
+    handleWCSH() {
+      new Promise((resolve, reject) => {
+        this.handleOk()
+        resolve()
+      }).then(() => {
+        debugger
+        getAction("/qcsb/qcSsgqzysytdqk/wcsh", {id: this.result.id}).then(res => {
+          if (res.success) {
+            this.visible = false
+            this.loadData();
+          }
         })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-          this.disableSubmit=true
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
+      })
+
+    },
+    edit(record) {
+      this.result = record
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs.realForm.edit(record);
+      })
+    },
+    close() {
+      this.$emit('close');
+      this.visible = false;
+    },
+    handleOk() {
+      this.disableSubmit = true
+      this.$refs.realForm.submitForm();
+    },
+    submitCallback() {
+      this.$emit('ok');
+      this.visible = false;
+    },
+    handleCancel() {
+      this.close()
     }
   }
+}
 </script>

UI2/src/views/sydwqcsb/sydwxx/QcQyxxList_glyy.vue

@@ -103,7 +103,7 @@
                           <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-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>

UI2/src/views/sydwqcsb/sydwxx/modules/QcQyxxModal2.vue

@@ -18,6 +18,8 @@
         <a-button @click="handleCancel">
           关闭
         </a-button>
+        <a-button v-if="this.result.sfsb == 3" @click="handleWCSH()" style=" margin-bottom: 0;margin-left: 8px">完成审核
+        </a-button>
       </div>
 
     </template>
@@ -30,6 +32,7 @@
 <script>
 
   import QcQyxxForm from './QcQyxxForm2'
+  import {getAction} from '@api/manage'
   export default {
     name: 'QcQyxxModal',
     components: {
@@ -38,6 +41,7 @@
     data () {
       return {
         title:'',
+        result:{},
         width:800,
         visible: false,
         disableSubmit: false
@@ -51,6 +55,7 @@
         })
       },
       edit (record) {
+        this.result=record
         this.visible=true
         this.$nextTick(()=>{
           this.$refs.realForm.edit(record);
@@ -64,6 +69,20 @@
           this.disableSubmit=true
         this.$refs.realForm.submitForm();
       },
+      handleWCSH() {
+        new Promise((resolve, reject) => {
+          this.handleOk()
+          resolve()
+        }).then(() => {
+          getAction("/qcsb.qyxx/qcQyxx/wcsh", {id: this.result.id}).then(res => {
+
+            if (res.success == false) {
+              this.$message.error("出错了，请联系管理员！")
+            }
+          })
+        })
+
+      },
       submitCallback(){
         this.$emit('ok');
         this.visible = false;