From 4c58d88f9504af300dfa26b701e1f495d32b7eb8 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Sat, 15 Jun 2024 17:28:45 +0800
Subject: [PATCH] =?UTF-8?q?task=20=E5=9C=9F=E5=9C=B0=E7=A1=AE=E6=9D=83=20?=
=?UTF-8?q?=E6=89=BF=E5=8C=85=E6=96=B9=E5=AE=B6=E5=BA=AD=E6=88=90=E5=91=98?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../village/contractor/contractWord.vue | 10 +++
.../village/contractor/contractorDetail.vue | 36 +++++-----
.../contractor/contractorDetailAdd.vue | 32 ++++-----
.../village/contractor/contractorFamily.vue | 66 ++++++++++++++++++-
.../contractor/contractorFamilyDetail.vue | 18 ++++-
.../village/contractor/contractorHeader.vue | 3 +
6 files changed, 126 insertions(+), 39 deletions(-)
diff --git a/src/views/contracted/village/contractor/contractWord.vue b/src/views/contracted/village/contractor/contractWord.vue
index cd5f5639..7fa67e00 100644
--- a/src/views/contracted/village/contractor/contractWord.vue
+++ b/src/views/contracted/village/contractor/contractWord.vue
@@ -248,6 +248,16 @@
});
},
submitForm() {
+ let householdStatus = Cookies.get('householdStatus');
+ if (householdStatus !== '1') {
+ let msg = '当前承包方已' + Cookies.get('householdStatusText') + ',不能保存承包合同信息';
+ this.$toast({
+ icon: 'fail', // 找到自己需要的图标
+ message: msg,
+ duration:"2000"
+ });
+ return;
+ }
this.$refs.formData.validate().then(() => {
if (this.form.id) {
updateCbht(this.form).then(response => {
diff --git a/src/views/contracted/village/contractor/contractorDetail.vue b/src/views/contracted/village/contractor/contractorDetail.vue
index a5dd3245..96f6063e 100644
--- a/src/views/contracted/village/contractor/contractorDetail.vue
+++ b/src/views/contracted/village/contractor/contractorDetail.vue
@@ -71,28 +71,26 @@
-
-
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+ 是
+ 否
+
+
+
-
-
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+ 是
+ 否
+
+
+
-
- 新增
+
+ 新增
@@ -135,6 +135,28 @@
}
});
},
+ addMember() {
+ let householdStatus = Cookies.get('householdStatus');
+ if (householdStatus !== '1') {
+ let msg = '当前承包方已' + Cookies.get('householdStatusText') + ',不能新增家庭成员信息';
+ this.$toast({
+ icon: 'fail', // 找到自己需要的图标
+ message: msg,
+ duration:"2000"
+ });
+ return;
+ }
+ this.$router.push({
+ name: 'contractedVillageContractorFamilyDetail',
+ params: {
+ id: undefined,
+ deptId: this.$route.params.deptId,
+ cbfbm: this.$route.params.cbfbm,
+ cbfmc: this.$route.params.cbfmc,
+ surveyStatus: this.$route.params.surveyStatus
+ }
+ });
+ },
goDetail(id) {
this.$router.push({
name: 'contractedVillageContractorFamilyDetail',
@@ -148,6 +170,16 @@
});
},
deleteFamilyMember(id, index) {
+ let householdStatus = Cookies.get('householdStatus');
+ if (householdStatus !== '1') {
+ let msg = '当前承包方已' + Cookies.get('householdStatusText') + ',不能删除家庭成员信息';
+ this.$toast({
+ icon: 'fail', // 找到自己需要的图标
+ message: msg,
+ duration:"2000"
+ });
+ return;
+ }
this.$dialog.confirm({
message: '是否确认删除此条家庭成员信息?',
}).then(() => {
@@ -163,6 +195,16 @@
});
},
householdDivision(item, index) {
+ let householdStatus = Cookies.get('householdStatus');
+ if (householdStatus !== '1') {
+ let msg = '当前承包方已' + Cookies.get('householdStatusText') + ',不能执行分户操作';
+ this.$toast({
+ icon: 'fail', // 找到自己需要的图标
+ message: msg,
+ duration:"2000"
+ });
+ return;
+ }
if (item.yhzgx === '户主') {
this.$toast.fail('该成员身份为户主,不能分户');
return false;
@@ -188,6 +230,16 @@
});
},
householdTransfer(item) {
+ let householdStatus = Cookies.get('householdStatus');
+ if (householdStatus !== '1') {
+ let msg = '当前承包方已' + Cookies.get('householdStatusText') + ',不能执行移户操作';
+ this.$toast({
+ icon: 'fail', // 找到自己需要的图标
+ message: msg,
+ duration:"2000"
+ });
+ return;
+ }
if (item.yhzgx === '户主') {
this.$toast.fail('该成员身份为户主,不能移户');
return false;
@@ -220,6 +272,16 @@
});
},
houseHolder(item) {
+ let householdStatus = Cookies.get('householdStatus');
+ if (householdStatus !== '1') {
+ let msg = '当前承包方已' + Cookies.get('householdStatusText') + ',不能执行设为户主操作';
+ this.$toast({
+ icon: 'fail', // 找到自己需要的图标
+ message: msg,
+ duration:"2000"
+ });
+ return;
+ }
if (item.yhzgx === '户主') {
this.$toast.fail('该成员身份为户主,无需设置');
return false;
diff --git a/src/views/contracted/village/contractor/contractorFamilyDetail.vue b/src/views/contracted/village/contractor/contractorFamilyDetail.vue
index a6ffab33..dfe1cb91 100644
--- a/src/views/contracted/village/contractor/contractorFamilyDetail.vue
+++ b/src/views/contracted/village/contractor/contractorFamilyDetail.vue
@@ -138,7 +138,7 @@
-
+ /> -->
{
if (this.$route.params.id) {
updateJtcy(this.form).then(response => {
@@ -340,7 +352,7 @@
xhjd: null,
wdyy: null,
sfhdr: 'N',
- householdStatus: '1',
+ // householdStatus: '1',
};
this.cyzjlxText = '居民身份证';
}
diff --git a/src/views/contracted/village/contractor/contractorHeader.vue b/src/views/contracted/village/contractor/contractorHeader.vue
index d054565c..f5e3d89a 100644
--- a/src/views/contracted/village/contractor/contractorHeader.vue
+++ b/src/views/contracted/village/contractor/contractorHeader.vue
@@ -45,6 +45,7 @@
import { contractorSignature, hangUp } from "@/api/contracted/cbf";
import vueEsign from "vue-esign";
import $ from "jquery";
+ import Cookies from "js-cookie";
export default {
name: 'contractedVillageHeader',
@@ -86,6 +87,8 @@
goBack() {
getDept(this.deptId).then(response => {
this.$router.push({path:'/contracted/village/contractor', query: { deptId: this.deptId, deptName: response.data.deptName }});
+ Cookies.remove('householdStatus');
+ Cookies.remove('householdStatusText');
});
},
handleSign() {