Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

src/views/sunVillage_info/arbitration/arbitrationDetail.vue

@@ -38,6 +38,8 @@
                     label="宅基地代码"
                     readonly
                     input-align="right"
+                    :rules="[{ required: true }]"
+                    required
                   >
                     <template #button>
                       <van-icon name="../../../static/images/22.png"  color="#539FFD" size="20" @click="mapLook"/>

src/views/sunVillage_info/homeApplication/applicationList.vue

@@ -29,7 +29,7 @@
         @load="getList('+1')"
       >
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.ywh" center @click="viewItem(item)">
+          <van-cell :title="item.sqhhzxm" center @click="viewItem(item)">
 <!--          <van-cell :title="item.ywh" :value="item.houseApplyStatusName" center @click="viewItem(item)">-->
 <!--            <template #icon>-->
 <!--              <van-icon name="../../../static/images/onlineHome/icon_zjd1.png" size="30" color="#539FFD" style="margin-right: 10px;" />-->

src/views/sunVillage_info/homeApplication/proposerLite.vue

@@ -3285,8 +3285,13 @@ export default {
           }
           else
           {
-            this.notify("保存成功", 'success');
-            this.goBack();
+            if(response.code === 200){
+              this.notify("保存成功", 'success');
+              this.goBack();
+            }else{
+              this.notify("保存失败,申请人没有资格权！", 'danger');
+            }
+
           }
         }).catch((e) => {
           this.notify("保存失败!", 'danger');

src/views/yinnong/homestead/circulation/circulationAdd.vue

@@ -50,6 +50,8 @@
         v-model="circulation.zjddm"
         label="宅基地代码"
         input-align="right"
+        :rules="[{ required: true }]"
+        required
       >
         <template #button>
           <van-icon name="../../../../../static/images/22.png"  color="#539FFD" size="20" @click="mapLook"/>

src/views/yinnong/homestead/freeExit/freeExitAdd.vue

@@ -50,6 +50,8 @@
           v-model="circulation.zjddm"
           label="宅基地代码"
           input-align="right"
+          :rules="[{ required: true }]"
+          required
         >
           <template #button>
             <van-icon name="../../../../../static/images/22.png"  color="#539FFD" size="20" @click="mapLook"/>

src/views/yinnong/homestead/freeExit/freeExitModify.vue

@@ -49,6 +49,8 @@
           v-model="circulation.zjddm"
           label="宅基地代码"
           input-align="right"
+          :rules="[{ required: true }]"
+          required
         >
           <template #button>
             <van-icon name="../../../../../static/images/22.png"  color="#539FFD" size="20" @click="mapLook"/>

src/views/yinnong/homestead/homeApplication/applicationList.vue

@@ -29,7 +29,7 @@
         @load="getList('+1')"
       >
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.ywh" center @click="viewItem(item)">
+          <van-cell :title="item.sqhhzxm" center @click="viewItem(item)">
 <!--          <van-cell :title="item.ywh" :value="item.houseApplyStatusName" center @click="viewItem(item)">-->
 <!--            <template #icon>-->
 <!--              <van-icon name="../../../static/images/onlineHome/icon_zjd1.png" size="30" color="#539FFD" style="margin-right: 10px;" />-->
@@ -96,10 +96,8 @@ export default {
     this.houseGetDicts("home_stage_status").then((response) => {
       this.houseApplyStatus = response.data;
     });
-    this.deptId = Cookies.get('deptId')
-    this.idcard = Cookies.get('idcard')
+    this.deptId = this.$store.state.user.loginDeptId;
     this.$set(this.queryParams, "deptId", this.deptId);
-    this.$set(this.queryParams, "sqhhzsfzh", this.idcard);
     this.getList();
   },
   methods: {

src/views/yinnong/homestead/homeApplication/proposerLite.vue

@@ -3285,11 +3285,13 @@ export default {
           }
           else
           {
-            this.notify("保存成功", 'success');
-            this.goBack();
+            if(response.code === 200){
+              this.notify("保存成功", 'success');
+              this.goBack();
+            }
           }
         }).catch((e) => {
-          this.notify("保存失败!", 'danger');
+          // this.notify("保存失败,申请人没有资格权！", 'danger');
         }).finally(() => {
         });
       }).catch(e => {

src/views/yinnong/homestead/paidUtilize/paidUtilizeAdd.vue

@@ -4,6 +4,7 @@
       有偿使用
       <div class="return_btn" @click="onClickLeft"></div>
     </div>
+    <van-form ref="_Form">
     <div class="main_box">
       <van-field v-model="circulation.shyqrdbxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
       <div id="dropList" v-show="showDropList"  style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;" >
@@ -16,6 +17,8 @@
         v-model="circulation.zjddm"
         label="宅基地代码"
         input-align="right"
+        :rules="[{ required: true }]"
+        required
       >
         <template #button>
           <van-button size="small" @click="mapLook" type="primary">查看地图</van-button>
@@ -115,6 +118,7 @@
       <van-field v-model="circulation.bz" label="备注" placeholder="请输入内容" input-align="right" label-width="auto"/>
 
     </div>
+    </van-form>
     <van-dialog v-model="mapShow" show-cancel-button>
       <MapGisObtainTc ref="zjdProductResh" :shqrxm="circulation.shyqrdbxm" :landStatus="landStatus" :deptId="circulation.deptId" @closeMoule="closeMoule"></MapGisObtainTc>
     </van-dialog>
@@ -389,13 +393,15 @@
         }
       },
       goSubmit(){
-        ycsyAdd(this.circulation).then(response => {
-          if(response.code = 200){
-            this.$toast.success('新增成功');
-            setTimeout(function(){
-              window.location.replace("paidUtilizeList")
-            },1000)
-          }
+        this.$refs._Form.validate().then(() => {
+          ycsyAdd(this.circulation).then(response => {
+            if (response.code = 200) {
+              this.$toast.success('新增成功');
+              setTimeout(function () {
+                window.location.replace("paidUtilizeList")
+              }, 1000)
+            }
+          });
         });
       }
     },

src/views/yinnong/homestead/paidUtilize/paidUtilizeModify.vue

@@ -4,6 +4,7 @@
       有偿使用
       <div class="return_btn" @click="onClickLeft"></div>
     </div>
+    <van-form ref="_Form">
     <div class="main_box">
       <van-field readonly v-model="circulation.shyqrdbxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
       <div id="dropList" v-show="showDropList"  style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;" >
@@ -115,6 +116,7 @@
       <van-field v-model="circulation.bz" label="备注" placeholder="请输入内容" input-align="right" label-width="auto"/>
 
     </div>
+    </van-form>
     <van-dialog v-model="mapShow" show-cancel-button>
       <MapGisObtainTc ref="zjdProductResh" :shqrxm="circulation.shyqrdbxm" :landStatus="landStatus" :deptId="circulation.deptId" @closeMoule="closeMoule"></MapGisObtainTc>
     </van-dialog>
@@ -399,13 +401,15 @@
         }
       },
       goSubmit(){
-        ycsyEdit(this.circulation).then(response => {
-          if(response.code = 200){
-            this.$toast.success('新增成功');
-            setTimeout(function(){
-              window.location.replace("paidUtilizeList")
-            },1000)
-          }
+        this.$refs._Form.validate().then(() => {
+          ycsyEdit(this.circulation).then(response => {
+            if (response.code = 200) {
+              this.$toast.success('新增成功');
+              setTimeout(function () {
+                window.location.replace("paidUtilizeList")
+              }, 1000)
+            }
+          });
         });
       }
     },