From e612860b0bc04586a04a4ae30c7c950598a1b608 Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Sun, 27 Feb 2022 17:17:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/homesteadSurvey/index.js    |  8 +++++
 src/views/homesteadSurvey/add.vue   | 45 +++++++++++++++++++++--------
 src/views/homesteadSurvey/index.vue |  1 -
 src/views/homesteadSurvey/list.vue  |  3 +-
 4 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/src/api/homesteadSurvey/index.js b/src/api/homesteadSurvey/index.js
index 209455f7..c744154c 100644
--- a/src/api/homesteadSurvey/index.js
+++ b/src/api/homesteadSurvey/index.js
@@ -67,3 +67,11 @@ export function delTask(id) {
     method: 'get'
   })
 }
+// 查询附件上传配置列表
+export function listAttachmentConfig(query) {
+  return request({
+    url: '/system/attachmentConfig/list',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index 521d0f41..ca462734 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -21,8 +21,8 @@
     top:1.2rem">
       <van-row>
         <van-col span="4" :offset="1" style="text-align:center;" >
-          <div @click="active=1,mapClickLoading">
-            <van-icon :name="require('../../assets/images/housesteadSurvey/zjd'+(active==1?'A':'D')+'.png')" size="1rem"  style="margin-top:0px;"/>
+          <div @click="active=1">
+            <van-icon :name="require('../../assets/images/housesteadSurvey/zjd'+(active==1?'A':'D')+'.png')" size="1rem" @click="mapClickLoading" style="margin-top:0px;"/>
             <p :style="{color:(active==1?'rgb(34, 183, 242)':'#000')}">宅基地</p>
           </div>
         </van-col>
@@ -1312,7 +1312,7 @@
             input-align="right"
             v-model="nmfwform.mortgageMoney"
             name="抵押金额"
-            label="抵押金额(元)"
+            label="抵押金额( 元)"
             placeholder="抵押金额"
             type="number"
           />
@@ -2303,6 +2303,7 @@
   import {listFsss,addFsss,updateFsss,delFsss,getFsssZjdDmList} from "@/api/homesteadSurvey/fsss";
   import { listTown, getTown } from "@/api/homesteadSurvey/town";
   import { listVillage} from "@/api/homesteadSurvey/village";
+  import { listAttachmentConfig} from "@/api/homesteadSurvey/index";
   import { Notify, Dialog, Toast } from 'vant';
   export default {
     name: "homesteadAdd",
@@ -2578,13 +2579,28 @@
       this.getDicts("tddj").then(response => {
         this.tddjOptions = response.data;
       });
-      this.getnhdmlist()
-      this.getZjd()
+      this.getnhdmlist();
+      this.getZjd();
+      this.getBaseUrl();
     },
     mounted(){
       this.mapClickLoading();
     },
     methods: {
+      getBaseUrl(){
+        let params={
+          parentId: null,
+          processKey: null,
+          nodeStatus: null,
+          fileType: null,
+          fileTypeName: null,
+          configLevel: null,
+          nodeStatusName: null,
+          businessType: null}
+        listAttachmentConfig(params).then(response => {
+          console.log(response)
+        })
+      },
       // 验证
       validator(val){
         console.log(val.length)
@@ -3135,7 +3151,8 @@
       getZjd() {
         if(this.item.zjddm){
           let params = {
-            "zjddm":this.item.zjddm
+            "zjddm":this.item.zjddm,
+            deptId:this.item.deptId
           }
           listZjdzd(params).then(response => {
             this.form = response.rows[0];
@@ -3219,7 +3236,8 @@
       getSyqrList() {
         if(this.item.zjddm) {
           let params = {
-            "zjddm":this.item.zjddm
+            "zjddm":this.item.zjddm,
+            deptId:this.item.deptId
           }
           listShyqr(params).then(response => {
             this.syqrlist = response.rows;
@@ -3230,7 +3248,8 @@
         if(this.item.zjddm){
  /*         let _this = this*/
           let params = {
-            "zjddm":this.item.zjddm
+            "zjddm":this.item.zjddm,
+            deptId:this.item.deptId
           }
           listZrz(params).then(response => {
             this.zrzlist = response.rows;
@@ -3244,7 +3263,8 @@
       getFsssList() {
         if(this.item.zjddm){
           let params = {
-            "zjddm":this.item.zjddm
+            "zjddm":this.item.zjddm,
+            deptId:this.item.deptId
           }
           listFsss(params).then(response => {
             this.fssslist = response.rows;
@@ -3455,7 +3475,7 @@
             this.form1={
               zjddm:this.form.zjddm,
               suyqrdm:this.form.suyqrdm,
-              deptId:this.form.deptId,
+              deptId:this.item.deptId,
               gj:'1',
               hklx:'1',
               xb:'1',
@@ -3704,7 +3724,8 @@
           }else{
             this.hncylist=[]
             let params = {
-              "nhdm":item.nhdm
+              "nhdm":item.nhdm,
+              deptId:this.item.deptId
             }
             listNhhncy(params).then((response) => {
               this.hncylist = response.rows
@@ -3935,6 +3956,7 @@
       },
       //地图加载js------start
       mapClickLoading(){
+        console.log(1)
         setTimeout(() => {
           this.$refs.drewingClickLoading.drawingPaceCountryDarw();
         }, 500);
@@ -3950,7 +3972,6 @@
         } else {
 
         }
-        this.form.theGeom = data;
       },
       //地图加载js------end
     }
diff --git a/src/views/homesteadSurvey/index.vue b/src/views/homesteadSurvey/index.vue
index fe1f3d38..3bb78092 100644
--- a/src/views/homesteadSurvey/index.vue
+++ b/src/views/homesteadSurvey/index.vue
@@ -166,7 +166,6 @@
           false
         );
         getInfo().then(response => {
-          console.log(response)
           this.nickName = response.user.nickName
           this.queryParams.taskExecutor = response.user.userName
           this.getList();
diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 8696ce9d..a6a7639c 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -1746,7 +1746,8 @@
         showPopuphncylist(item){
           this.showhncylist =  true
           let params = {
-            "nhdm":item.nhdm
+            "nhdm":item.nhdm,
+            "deptId":this.item.deptId
           }
           listNhhncy(params).then((response) => {
             if (response.code == 200) {