diff --git a/src/api/contracted/cbf.js b/src/api/contracted/cbf.js
index dc3d315b..733afecb 100644
--- a/src/api/contracted/cbf.js
+++ b/src/api/contracted/cbf.js
@@ -46,7 +46,7 @@ export function updateCbf(data) {
// 删除承包方信息
export function deleteCbf(id) {
return request({
- url: '/service/cbf/mobile/remove/' + id,
+ url: '/service/cbf/delete/' + id,
method: 'get'
});
}
diff --git a/src/views/contracted/village/contractor/contractor.vue b/src/views/contracted/village/contractor/contractor.vue
index 3ca43788..8c9ef13d 100644
--- a/src/views/contracted/village/contractor/contractor.vue
+++ b/src/views/contracted/village/contractor/contractor.vue
@@ -186,7 +186,7 @@
},
deleteContractor(id, index) {
this.$dialog.confirm({
- message: '是否确认删除此条承包方信息？',
+ message: '是否确认删除此条承包方信息以及与其相关联的家庭成员、承包合同、承包地块？',
}).then(() => {
// on confirm
deleteCbf(id).then(res => {
diff --git a/src/views/contracted/village/contractor/contractorDetail.vue b/src/views/contracted/village/contractor/contractorDetail.vue
index bfa2fdb8..a5dd3245 100644
--- a/src/views/contracted/village/contractor/contractorDetail.vue
+++ b/src/views/contracted/village/contractor/contractorDetail.vue
@@ -70,12 +70,13 @@
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
保存
@@ -140,6 +171,8 @@
showType:false,
showZjType:false,
showZhzt:false,
+ showDcrq: false,
+ showGsshrq: false,
// 承包方信息表单
form: {},
// 承包方类型字典
@@ -150,6 +183,8 @@
taskStatus: null,
// 整户状态类型字典
householdStatusOptions: [],
+ minDate: new Date(1978, 0, 1),
+ maxDate: new Date(2100, 11, 31),
};
},
created() {
@@ -175,6 +210,7 @@
this.form = response.data;
this.$set(this.form, 'cbflxText', this.selectDictLabel(this.contractorTypeOptions, response.data.cbflx));
this.$set(this.form, 'cbfzjlxText', this.selectDictLabel(this.credentialTypeOptions, response.data.cbfzjlx));
+ this.$set(this.form, 'householdStatusText', this.selectDictLabel(this.householdStatusOptions, response.data.householdStatus));
});
},
onConfirmTypeOptions(value){
@@ -187,6 +223,19 @@
this.form.cbfzjlxText = value.dictLabel;
this.showZjType = false;
},
+ onConfirmHouseholdStatusOptions(value){
+ this.form.householdStatus = value.dictValue;
+ this.form.householdStatusText = value.dictLabel;
+ this.showZhzt = false;
+ },
+ onConfirmDcrq(data) {
+ this.form.cbfdcrq = this.format(data, 'yyyy-MM-dd');
+ this.showDcrq = false;
+ },
+ onConfirmGsshrq(data) {
+ this.form.gsshrq = this.format(data, 'yyyy-MM-dd');
+ this.showGsshrq = false;
+ },
submitForm() {
this.$refs.formData.validate().then(() => {
updateCbf(this.form).then(response => {
diff --git a/src/views/contracted/village/contractor/contractorDetailAdd.vue b/src/views/contracted/village/contractor/contractorDetailAdd.vue
index 55087863..b9d056f8 100644
--- a/src/views/contracted/village/contractor/contractorDetailAdd.vue
+++ b/src/views/contracted/village/contractor/contractorDetailAdd.vue
@@ -11,7 +11,7 @@
-
+
@@ -66,12 +66,13 @@
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
保存
@@ -136,6 +165,8 @@
showType:false,
showZjType:false,
showZhzt:false,
+ showDcrq: false,
+ showGsshrq: false,
// 承包方信息表单
form: {
deptId: null,
@@ -148,19 +179,38 @@
yzbm: null,
lxdh: null,
cbfcysl: null,
+ cbfdcy: null,
+ cbfdcrq: null,
cbfdcjs: null,
+ gsjsr: null,
+ gsjs: null,
+ gsshr: null,
+ gsshrq: null,
+ sfyzf: 'Y',
+ sfzcjz: 'Y',
+ householdStatus: '1',
+ totalArea: null,
+ qqArea: null,
+ qtArea: null,
+ dks: null,
+ zzjyArea: null,
+ lzcArea: null,
+ shArea: null,
+ zzArea: null,
},
// 承包方类型(标签名)
cbflxText: '农户',
// 承包方证件类型(标签名)
cbfzjlxText: '居民身份证',
- householdStatusText:"",
+ householdStatusText: "正常",
// 承包方类型字典
contractorTypeOptions: [],
// 承包方证件类型字典
credentialTypeOptions: [],
// 整户状态类型字典
householdStatusOptions: [],
+ minDate: new Date(1978, 0, 1),
+ maxDate: new Date(2100, 11, 31),
};
},
created() {
@@ -190,10 +240,18 @@
this.householdStatusText = value.dictLabel;
this.showZhzt = false;
},
+ onConfirmDcrq(data) {
+ this.form.cbfdcrq = this.format(data, 'yyyy-MM-dd');
+ this.showDcrq = false;
+ },
+ onConfirmGsshrq(data) {
+ this.form.gsshrq = this.format(data, 'yyyy-MM-dd');
+ this.showGsshrq = false;
+ },
submitForm() {
this.$refs.formData.validate().then(() => {
this.form.deptId = this.$route.params.deptId;
- this.form.cbfcysl = 1;
+ // this.form.cbfcysl = 1;
addCbf(this.form).then(response => {
if (response.code == 200) {
this.$toast({
diff --git a/src/views/contracted/village/contractor/contractorFamilyDetail.vue b/src/views/contracted/village/contractor/contractorFamilyDetail.vue
index e9402d89..a6ffab33 100644
--- a/src/views/contracted/village/contractor/contractorFamilyDetail.vue
+++ b/src/views/contracted/village/contractor/contractorFamilyDetail.vue
@@ -27,6 +27,29 @@
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+