From 5dc0d25380589b6c36ed0c958cf3147aaf619777 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Tue, 22 Aug 2023 13:41:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=8C=85=E6=96=B9=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/contracted/fbf.js                           |  9 +++++++++
 .../contracted/village/contractor/contractWord.vue  |  8 ++++----
 src/views/contracted/village/employer/employer.vue  | 13 +++++++++++--
 src/views/contracted/village/massif/massif.vue      |  2 +-
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/api/contracted/fbf.js b/src/api/contracted/fbf.js
index cc4206fc..5c25ebef 100644
--- a/src/api/contracted/fbf.js
+++ b/src/api/contracted/fbf.js
@@ -35,3 +35,12 @@ export function manualSignature(data) {
     data: data
   });
 }
+
+// 生成发包方编码
+export function generateEmployerCode(params) {
+  return request({
+    url: '/service/fbf/generateCode',
+    method: 'get',
+    params: params
+  });
+}
diff --git a/src/views/contracted/village/contractor/contractWord.vue b/src/views/contracted/village/contractor/contractWord.vue
index f72362e4..259236d0 100644
--- a/src/views/contracted/village/contractor/contractWord.vue
+++ b/src/views/contracted/village/contractor/contractWord.vue
@@ -19,9 +19,9 @@
 
     <div class="list_main">
       <van-form ref="formData">
-        <van-field v-model="form.cbhtbm" label="承包合同代码：" placeholder="请输入承包合同代码" required :rules="[{ required: true }]" :border="false" input-align="left" :disabled="isDisabled">
+        <van-field v-model="form.cbhtbm" label="承包合同代码：" placeholder="请输入承包合同代码" required :rules="[{ required: true }]" :border="false" input-align="left" label-width="auto" :disabled="isDisabled">
           <template #button v-if="!isDisabled">
-            <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成代码</van-button>
+            <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成</van-button>
           </template>
         </van-field>
         <van-field v-model="form.ycbhtbm" label="原承包合同代码：" placeholder="请输入原承包合同代码" :border="false" input-align="left" />
@@ -109,8 +109,8 @@
           clickable
           @click="showCbqxq = true"
         >
-          <template #button>
-            <van-button size="small" type="primary" native-type="button" @click.stop="extension">延期</van-button>
+          <template #button v-if="isDisabled">
+            <van-button size="mini" type="primary" native-type="button" @click.stop="extension">延期</van-button>
           </template>
         </van-field>
         <van-popup v-model="showCbqxq" position="bottom">
diff --git a/src/views/contracted/village/employer/employer.vue b/src/views/contracted/village/employer/employer.vue
index 3410db79..4eacddbc 100644
--- a/src/views/contracted/village/employer/employer.vue
+++ b/src/views/contracted/village/employer/employer.vue
@@ -18,7 +18,11 @@
 
     <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" />
+        <van-field v-model="form.fbfbm" label="代码：" placeholder="请输入代码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" :disabled="isDisabled">
+          <template #button v-if="!isDisabled">
+            <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成代码</van-button>
+          </template>
+        </van-field>
         <van-field v-model="form.fbfmc" label="名称：" placeholder="请输入名称" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" />
         <van-field v-model="form.fbffzrxm" label="负责人姓名：" placeholder="请输入负责人姓名" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" />
         <van-field v-model="credentialTypeText" label="证件类型："
@@ -82,7 +86,7 @@
 </template>
 <script>
   import Cookies from "js-cookie";
-  import { listFbf, addFbf, updateFbf, manualSignature } from "@/api/contracted/fbf";
+  import { listFbf, addFbf, updateFbf, manualSignature, generateEmployerCode } from "@/api/contracted/fbf";
   import vueEsign from "vue-esign";
   import $ from "jquery";
 
@@ -134,6 +138,11 @@
           }
         });
       },
+      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/massif/massif.vue b/src/views/contracted/village/massif/massif.vue
index a5cf25bd..fa30169d 100644
--- a/src/views/contracted/village/massif/massif.vue
+++ b/src/views/contracted/village/massif/massif.vue
@@ -264,7 +264,7 @@
       background: #dbf1ea;
       border: 1px solid #cdcdcd;
       color: #5f5f5f;
-      padding: 5PX 8PX;
+      padding: 5PX 5PX;
       margin-right: 3vw;
       border-radius: 50PX;
     }