From a45ffd8bcca544ec817b01427c29f1b8a9410b3b Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Thu, 24 Aug 2023 10:03:26 +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 | 16 +++++++++-------
.../village/contractor/contractorDetail.vue | 4 ++--
.../village/contractor/contractorDetailAdd.vue | 4 ++--
.../contractor/contractorFamilyDetail.vue | 7 ++++---
.../contracted/village/employer/employer.vue | 9 +++++----
.../contracted/village/massif/massifDetail.vue | 2 +-
6 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/src/views/contracted/village/contractor/contractWord.vue b/src/views/contracted/village/contractor/contractWord.vue
index ae1210c9..8727bb85 100644
--- a/src/views/contracted/village/contractor/contractWord.vue
+++ b/src/views/contracted/village/contractor/contractWord.vue
@@ -19,13 +19,13 @@
-
+
生成
-
-
+
+
-
+
-
+
保存
@@ -172,10 +172,10 @@
return {
form: {}, // 承包合同表单信息
cbfsOptions: [], // 承包方式字典
- cbfsText: '家庭承包', // 承包方式标签名
+ cbfsText: null, // 承包方式标签名
showCbfs: false, // 控制承包方式字典弹出层的显示和隐藏
cbflxOptions: [], // 承包方类型字典
- cbflxText: '农户', // 承包方类型标签名
+ cbflxText: null, // 承包方类型标签名
showType: false, // 控制承包方类型字典弹出层的显示和隐藏
showQDSJ: false, // 控制签订时间弹出层的显示和隐藏
showCbqxq: false, // 控制承包起始时间弹出层的显示和隐藏
@@ -292,6 +292,8 @@
cbdkzs: null,
htzmjm: null,
};
+ this.cbfsText = '家庭承包';
+ this.cbflxText = '农户';
},
extension() {
if (this.form.id) {
diff --git a/src/views/contracted/village/contractor/contractorDetail.vue b/src/views/contracted/village/contractor/contractorDetail.vue
index 2d01dac8..268da6e3 100644
--- a/src/views/contracted/village/contractor/contractorDetail.vue
+++ b/src/views/contracted/village/contractor/contractorDetail.vue
@@ -19,7 +19,7 @@
-
+
-
+
diff --git a/src/views/contracted/village/contractor/contractorDetailAdd.vue b/src/views/contracted/village/contractor/contractorDetailAdd.vue
index d8f4ad68..b37953f4 100644
--- a/src/views/contracted/village/contractor/contractorDetailAdd.vue
+++ b/src/views/contracted/village/contractor/contractorDetailAdd.vue
@@ -11,7 +11,7 @@
-
+
生成代码
@@ -64,7 +64,7 @@
-
+
diff --git a/src/views/contracted/village/contractor/contractorFamilyDetail.vue b/src/views/contracted/village/contractor/contractorFamilyDetail.vue
index 84ae82ba..c0585910 100644
--- a/src/views/contracted/village/contractor/contractorFamilyDetail.vue
+++ b/src/views/contracted/village/contractor/contractorFamilyDetail.vue
@@ -100,8 +100,8 @@
/>
-
-
+
保存
@@ -121,7 +121,7 @@
form: {}, // 承包方家庭成员表单信息
cyxbOptions: [], // 成员性别字典
cyzjlxOptions: [], // 成员证件类型字典
- cyzjlxText: '居民身份证', // 成员证件类型标签名
+ cyzjlxText: null, // 成员证件类型标签名
showCredentialType: false, // 控制证件类型字典弹出层的显示和隐藏
cybzOptions: [], // 成员备注字典
cybzText: null, // 成员备注标签名
@@ -245,6 +245,7 @@
cycgfs: null,
gqzbh: null
};
+ this.cyzjlxText = '居民身份证';
}
},
};
diff --git a/src/views/contracted/village/employer/employer.vue b/src/views/contracted/village/employer/employer.vue
index 4eacddbc..d2429816 100644
--- a/src/views/contracted/village/employer/employer.vue
+++ b/src/views/contracted/village/employer/employer.vue
@@ -18,7 +18,7 @@
-
+
生成代码
@@ -49,7 +49,7 @@
-
+
@@ -185,14 +185,15 @@
fbfbm: null,
fbfmc: null,
fbffzrxm: null,
- fzrzjlx: null,
+ fzrzjlx: '1',
fzrzjhm: null,
lxdh: null,
fbfdz: null,
yzbm: null,
fbfdcjs: null,
fbfdcqz: null
- }
+ };
+ this.credentialTypeText = '居民身份证';
},
handleSign() {
this.showSignPopup = true;
diff --git a/src/views/contracted/village/massif/massifDetail.vue b/src/views/contracted/village/massif/massifDetail.vue
index 83596cb8..41682dc6 100644
--- a/src/views/contracted/village/massif/massifDetail.vue
+++ b/src/views/contracted/village/massif/massifDetail.vue
@@ -18,7 +18,7 @@
-
+
生成代码