-
-
-
+
+
+
+
+
-
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index fde11ae9b..2fa77ea9c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -1169,8 +1169,14 @@ export default {
* @description: 动态表单读取
*/
getFormFieldList(item) {
+ console.log(item);
this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item))
+ console.log(this.form);
+ this.form.sycpx = this.form.sycpx.split(',')
+ this.form.nylx = this.form.nylx.split(',')
+ this.form.cllx = this.form.cllx.split(',')
+ this.form.syrz = this.form.syrz.split(',')
this.defaultCheckedKeys = [this.form.standSystem]
this.defaultCheckedKeys1 = [this.form.cycvppsbm]
this.defaultCheckedKeys2 = [this.form.kccvppsbm]
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 90f4868cf..5109f1d53 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -1656,6 +1656,7 @@ export default {
validFlag: '0',
menuId: 'nomenu'
},
+ loading: false,
replaceLawsNumRow: [], // 代替政策号 数组内容
replaceTotal: 0,
selectedListRep: [],
@@ -1848,11 +1849,9 @@ export default {
if (val === '1') {
this.rules.standName[0].required = false
this.rules.standEnName[0].required = true;
- this.rules.standNature[0].required = false
} else {
this.rules.standName[0].required = true
this.rules.standNature[0].required = true
- this.rules.standEnName[0].required = false;
}
this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN'
},
@@ -2607,31 +2606,49 @@ export default {
/**
* @description: 动态表单读取
*/
+ // getFormFieldList(item) {
+ // this.$nextTick(() => {
+ // this.form = JSON.parse(JSON.stringify(item))
+ // this.defaultCheckedKeys = [this.form.standSystem];
+ // this.defaultCheckedKeys1 = [this.form.cycvppsbm];
+ // this.defaultCheckedKeys2 = [this.form.kccvppsbm];
+ // this.defaultCheckedKeys3 = [this.form.dybxh];
+ // this.treeCheckedKeys = this.form.treeListId.split(',')
+ // this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+ // this.form.standYear = this.form.standYear ? this.form.standYear : ''
+ // this.form.prcNum = this.prcNum
+ // this.form.prcName = this.prcName
+ // this.form['id'] = item.id
+ //
+ //
+ // // 遍历对象
+ // for (const p in this.form) {
+ // if (typeof (this.form[p]) != "function") {
+ // this.initializeFileList(p, this.form[p]);
+ // }
+ // }
+ //
+ // this.$forceUpdate()
+ // })
+ // },
getFormFieldList(item) {
this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item))
- this.defaultCheckedKeys = [this.form.standSystem];
- this.defaultCheckedKeys1 = [this.form.cycvppsbm];
- this.defaultCheckedKeys2 = [this.form.kccvppsbm];
- this.defaultCheckedKeys3 = [this.form.dybxh];
- this.treeCheckedKeys = this.form.treeListId.split(',')
+ this.defaultCheckedKeys = [this.form.standSystem]
+ this.defaultCheckedKeys1 = [this.form.cycvppsbm]
+ this.defaultCheckedKeys2 = [this.form.kccvppsbm]
+ this.defaultCheckedKeys3 = [this.form.dybxh]
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = this.form.standYear ? this.form.standYear : ''
+ if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
+ this.form.country = this.form.country.split(",");
+ }
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
this.form['id'] = item.id
-
-
- // 遍历对象
- for (const p in this.form) {
- if (typeof (this.form[p]) != "function") {
- this.initializeFileList(p, this.form[p]);
- }
- }
-
- this.$forceUpdate()
})
- }, initializeFileList(property, value) {
+ },
+ initializeFileList(property, value) {
switch (property) {
case 'xgd':
this.getFileList(value, this.xgdFileList);
@@ -2939,11 +2956,9 @@ export default {
if (this.form.standInData === '1') {
this.rules.standYear[0].required = false;
this.rules.standName[0].required = false
- this.rules.standNature[0].required = false
} else {
this.rules.standYear[0].required = true;
this.rules.standName[0].required = true
- this.rules.standNature[0].required = true
}
}
},
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index beb0960e6..6bf09993a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -680,6 +680,8 @@ export default {
reviewer: "",
draftTime: "",
isSubTime: "",
+ resPerson: "", // 评审责任人
+ drafter: "", // 起草人
planStatus: "0",
mergeReason: "",
company: "",
@@ -988,12 +990,12 @@ export default {
unIdList.push(item)
}
})
- if(this.roleType === '1'){
+ if(this.type === '1'){
this.$set(this.qbfsForm, 'drafter', idList)
this.$set(this.qbfsForm, 'drafterName', nameList)
this.$set(this.qbfsForm, 'unit', unIdList.join(','))
this.$set(this.qbfsForm, 'unitName', unNameList.join(','))
- }else if(this.roleType === '2'){
+ }else if(this.type === '2'){
this.$set(this.qbfsForm, 'resPerson', idList)
this.$set(this.qbfsForm, 'resPersonName', nameList)
}