From 8ee4cafbf110da798885da1f9a07bf17814ed5f1 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Tue, 29 Aug 2023 14:20:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E6=9D=83=E8=B0=83=E6=9F=A5=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../village/contractor/contractWord.vue       |  2 +-
 .../village/contractor/contractorDetail.vue   |  6 +++++-
 .../contractor/contractorDetailAdd.vue        | 10 +++++-----
 .../contracted/village/employer/employer.vue  | 16 +++++++--------
 src/views/contracted/village/map/map.vue      | 20 +++++++++++++++++--
 .../village/massif/massifDetail.vue           | 20 ++++++++++---------
 6 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/src/views/contracted/village/contractor/contractWord.vue b/src/views/contracted/village/contractor/contractWord.vue
index 05fe4cfa..cd5f5639 100644
--- a/src/views/contracted/village/contractor/contractWord.vue
+++ b/src/views/contracted/village/contractor/contractWord.vue
@@ -109,7 +109,7 @@
           clickable
           @click="showCbqxq = true"
         >
-          <template #button v-if="isDisabled">
+          <template #button v-if="taskStatus === '2' && $route.params.surveyStatus !== '3' && this.form.id">
             <van-button size="mini" type="primary" native-type="button" @click.stop="extension">延期</van-button>
           </template>
         </van-field>
diff --git a/src/views/contracted/village/contractor/contractorDetail.vue b/src/views/contracted/village/contractor/contractorDetail.vue
index 55a47f72..83b3c5b6 100644
--- a/src/views/contracted/village/contractor/contractorDetail.vue
+++ b/src/views/contracted/village/contractor/contractorDetail.vue
@@ -141,7 +141,11 @@
               this.$toast({
                 icon: 'success',
                 message: '保存成功',
-                duration:"1000"
+                duration:"1000",
+                onClose: () => {
+                  this.$route.params.cbfmc = this.form.cbfmc;
+                  this.getDetail();
+                }
               })
             }
           }).catch(() => {
diff --git a/src/views/contracted/village/contractor/contractorDetailAdd.vue b/src/views/contracted/village/contractor/contractorDetailAdd.vue
index e564d4cb..edaaf8da 100644
--- a/src/views/contracted/village/contractor/contractorDetailAdd.vue
+++ b/src/views/contracted/village/contractor/contractorDetailAdd.vue
@@ -11,10 +11,10 @@
 
     <div class="list_main">
       <van-form ref="formData">
-        <van-field v-model="form.cbfbm" label="代码：" placeholder="请输入代码" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="18">
-          <template #button>
+        <van-field v-model="form.cbfbm" label="代码：" placeholder="<自动生成>" :border="false" input-align="left" maxlength="18">
+          <!-- <template #button>
             <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成代码</van-button>
-          </template>
+          </template> -->
         </van-field>
         <van-field
           v-model="cbflxText"
@@ -147,11 +147,11 @@
           this.$notify({ type: 'danger', message: '请填写完整的表单项' });
         });
       },
-      generateCode() {
+      /* generateCode() {
         generateContractorCode({deptId: this.$route.params.deptId}).then(response => {
           this.$set(this.form, 'cbfbm', response.data);
         });
-      },
+      }, */
     },
   };
 </script>
diff --git a/src/views/contracted/village/employer/employer.vue b/src/views/contracted/village/employer/employer.vue
index e895d4c4..669bff61 100644
--- a/src/views/contracted/village/employer/employer.vue
+++ b/src/views/contracted/village/employer/employer.vue
@@ -18,10 +18,10 @@
 
     <div class="list_main">
       <van-form ref="formData">
-        <van-field v-model="form.fbfbm" label="代码：" placeholder="请输入代码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" :disabled="isDisabled" maxlength="14">
-          <template #button v-if="!isDisabled">
+        <van-field v-model="form.fbfbm" label="代码：" placeholder="<自动生成>" :border="false" input-align="right" label-width="auto" :disabled="true" maxlength="14">
+          <!-- <template #button v-if="!isDisabled">
             <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成代码</van-button>
-          </template>
+          </template> -->
         </van-field>
         <van-field v-model="form.fbfmc" label="名称：" placeholder="请输入名称" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" maxlength="50" />
         <van-field v-model="form.fbffzrxm" label="负责人姓名：" placeholder="请输入负责人姓名" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" maxlength="50" />
@@ -98,7 +98,7 @@
     data() {
       return {
         form: {},                         // 发包方信息表单
-        isDisabled: false,                // 是否禁用
+        // isDisabled: false,                // 是否禁用
         credentialTypeOptions: [],        // 证件类型字典
         credentialTypeText: null,         // 证件类型标签名
         showCredentialType: false,        // 控制证件类型字典弹出层的显示和隐藏
@@ -130,21 +130,21 @@
         listFbf({deptId: this.$route.query.deptId}).then(response => {
           if (response.rows.length > 0) {
             this.form = response.rows[0];
-            this.isDisabled = true;
+            // this.isDisabled = true;
             this.$nextTick(() => {
               this.credentialTypeText = this.selectDictLabel(this.credentialTypeOptions, this.form.fzrzjlx);
             });
           } else {
             this.resetForm();
-            this.isDisabled = false;
+            // this.isDisabled = false;
           }
         });
       },
-      generateCode() {
+      /* generateCode() {
         generateEmployerCode({deptId: this.$route.query.deptId}).then(response => {
           this.$set(this.form, 'fbfbm', response.data);
         });
-      },
+      }, */
       onConfirmTypeOptions(value){
         this.form.fzrzjlx = value.dictValue;
         this.credentialTypeText = value.dictLabel;
diff --git a/src/views/contracted/village/map/map.vue b/src/views/contracted/village/map/map.vue
index 725ddeb0..a3901c6f 100644
--- a/src/views/contracted/village/map/map.vue
+++ b/src/views/contracted/village/map/map.vue
@@ -73,7 +73,7 @@
                      right-icon="arrow-down"
                      readonly
                      clickable
-                     @click="showLandCategory = true"
+                     @click="openLandCategoryPopup"
           />
           <van-popup v-model="showLandCategory" position="bottom" get-container=".app-container">
             <van-picker
@@ -375,7 +375,11 @@
                         this.reset();
                         this.form = data;
                         this.syqxzText = this.selectDictLabel(this.syqxzOptions, data.syqxz);
-                        this.dklbText = this.selectDictLabel(this.dklbOptions, data.dklb);
+                        if (data.dklb === '10') {
+                          this.dklbText = '承包地块';
+                        } else {
+                          this.dklbText = this.selectDictLabel(this.dklbOptions, data.dklb);
+                        }
                         this.dldjText = this.selectDictLabel(this.dldjOptions, data.dldj);
                         this.tdytText = this.selectDictLabel(this.tdytOptions, data.tdyt);
                         this.tdlylxText = this.selectDictLabel(this.tdlylxOptions, data.tdlylx);
@@ -594,6 +598,18 @@
         this.dldjText = '一等地';
         this.tdytText = '种植业';
       },
+      openLandCategoryPopup() {
+        // 修改时 && 地块类别为承包地块  不允许打开地块类别弹出层
+        if (this.form.id && this.form.dklb === '10') {
+          this.$toast({
+            icon: 'fail',
+            message: '当前地块为承包地块，不能更改地块类别',
+            duration: '2000'
+          })
+          return ;
+        }
+        this.showLandCategory = true;
+      }
     },
   };
 </script>
diff --git a/src/views/contracted/village/massif/massifDetail.vue b/src/views/contracted/village/massif/massifDetail.vue
index aceac4c3..cf0579ed 100644
--- a/src/views/contracted/village/massif/massifDetail.vue
+++ b/src/views/contracted/village/massif/massifDetail.vue
@@ -18,10 +18,10 @@
 
     <div class="list_main">
       <van-form ref="formData">
-        <van-field v-model="form.dkbm" label="地块代码：" placeholder="请输入地块代码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" :disabled="isDisabled" maxlength="19">
-          <template #button v-if="!$route.query.id">
+        <van-field v-model="form.dkbm" label="地块代码：" placeholder="<自动生成>" :border="false" input-align="right" label-width="auto" :disabled="true" maxlength="19">
+          <!-- <template #button v-if="!$route.query.id">
             <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成代码</van-button>
-          </template>
+          </template> -->
         </van-field>
         <van-field v-model="form.dkmc" label="地块名称：" placeholder="请输入地块名称" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="50" />
         <van-field v-model="syqxzText" label="所有权性质："
@@ -190,7 +190,6 @@
         currentDate: new Date(2021, 0, 17),
 
         titleName: '',                    // 标题信息
-        isDisabled: false,                // 是否禁用
         form: {},                         // 地块信息表单
         syqxzOptions: [],                 // 所有权性质字典
         syqxzText: null,                  // 所有权性质标签名
@@ -243,7 +242,6 @@
     mounted() {
       if (this.$route.query.id) {
         this.titleName = '修改地块信息';
-        this.isDisabled = true;
         setTimeout(() => {
           this.getDetail();
         }, 500);
@@ -259,7 +257,11 @@
           const data = response.data;
           this.form = data;
           this.syqxzText = this.selectDictLabel(this.syqxzOptions, data.syqxz);
-          this.dklbText = this.selectDictLabel(this.dklbOptions, data.dklb);
+          if (data.dklb === '10') {
+            this.dklbText = '承包地块';
+          } else {
+            this.dklbText = this.selectDictLabel(this.dklbOptions, data.dklb);
+          }
           this.dldjText = this.selectDictLabel(this.dldjOptions, data.dldj);
           this.tdytText = this.selectDictLabel(this.tdytOptions, data.tdyt);
           this.tdlylxText = this.selectDictLabel(this.tdlylxOptions, data.tdlylx);
@@ -401,11 +403,11 @@
           this.form.theGeom = null;
         }
       },
-      generateCode() {
+      /* generateCode() {
         generateLandCode({deptId: this.$route.query.deptId}).then(response => {
           this.$set(this.form, 'dkbm', response.data);
         });
-      },
+      }, */
       goBack() {
         // history.back(-1);
         this.$router.push({
@@ -421,7 +423,7 @@
         if (this.$route.query.id && this.form.dklb === '10') {
           this.$toast({
             icon: 'fail',
-            message: '当前地块为承包地块，不能修改地块类别',
+            message: '当前地块为承包地块，不能更改地块类别',
             duration: '2000'
           })
           return ;