diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue
index 3b912a230..a9d365639 100644
--- a/src/components/roleTree/index.vue
+++ b/src/components/roleTree/index.vue
@@ -120,6 +120,10 @@
default: () => {
return []
}
+ },
+ type: {
+ type: Number,
+ default: 0
}
},
data () {
diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step4.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step4.vue
index 8b66bd7b8..4146782a4 100644
--- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step4.vue
@@ -178,6 +178,7 @@
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole2"
:nodeList="nodeList"
+ :type="1"
>
@@ -307,7 +308,7 @@ export default {
institutionIdList += ",";
institutionNameList += ",";
}
- institutionIdList += item.institutionId;
+ institutionIdList += item.idList;
institutionNameList += item.institutionName;
});
//蛀掉的
@@ -326,7 +327,7 @@ export default {
this.form.responUserList = idList;
this.form.responUserListName = nameList;
-
+ console.log(institutionNameList, '???')
this.form.institutionNameValid = institutionNameList.split(',');
},
diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue
index 883681366..93f3a4ef5 100644
--- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue
@@ -1133,6 +1133,24 @@ export default {
handleTabs(name) {
this.active = name;
},
+ // 验证表格
+ validateTableData() {
+ let flag = false
+ this.ruleForm.multipleTableData.forEach((item1, index1) => {
+ for (let item in item1) {
+ if (item === 'xiangmumiaoshu' || item === 'dangqianjiedian' || item === 'qitashuoming') {
+ continue
+ } else {
+ if (item1[item] === '' || item1[item] === undefined || item1[item] === null) {
+ flag = true
+ this.$message.warning('请完善表格')
+ break
+ }
+ }
+ }
+ })
+ return flag
+ },
//保存事件
handleSave() {
this.saveLoading = true;
@@ -1141,6 +1159,8 @@ export default {
_formData.append("prcType", "3");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
+ ...this.json,
+ table: this.ruleForm.multipleTableData,
form: this.form,
commentText: this.commentText
}));
@@ -1153,6 +1173,9 @@ export default {
});
},
handleSubmit() {
+ if (this.validateTableData() && this.feedbackDept === '2') {
+ return
+ }
this.$refs["zdrzbzORzchgxxmscForm"].validate((valid) => {
if (valid) {
let infoTableDatas = []
@@ -1161,6 +1184,7 @@ export default {
localStorage.setItem('infoTableDatas', JSON.stringify(this.infoTableDatas))
var json = this.json;
json.infoTableDatas = infoTableDatas
+ json.table = this.ruleForm.multipleTableData
json.commentText = this.commentText;
json.responUserList = this.form.responUserList;
json.responUserListName = this.form.responUserListName;
@@ -1221,6 +1245,9 @@ export default {
this.form.fjList = data.fjList
this.form.fjListId = data.fjListId
this.json = data
+ if (typeof Array(data.table) && data.feedbackDept === '2') {
+ this.ruleForm.multipleTableData = data.table
+ }
this.feedbackDept = this.json.feedbackDept
}).catch(e => {
});
diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step6.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step6.vue
index a050ababd..162296f37 100644
--- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step6.vue
@@ -104,87 +104,206 @@
+ type="index"
+ label="序号"
+ width="55"
+ align="center">
-
-
+ show-overflow-tooltip
+ prop="G0"
+ label="G0"
+ min-width="150"
+ align="center"
+ >
+ show-overflow-tooltip
+ prop="G1"
+ label="G1"
+ min-width="150"
+ align="center"
+ >
+ show-overflow-tooltip
+ prop="G2"
+ label="G2"
+ min-width="150"
+ align="center"
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -294,6 +413,9 @@ export default {
name: "zdrzbzORzchgxxmscStep6",
data() {
return {
+ ruleForm: {
+ multipleTableData: [],
+ },
infoTableDatas: [],
//用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门
feedbackDept: "",
@@ -482,6 +604,9 @@ export default {
this.form.fjList = data.fjList
this.form.fjListId = data.fjListId
this.json = data
+ if (typeof Array(data.table) && data.feedbackDept === '2') {
+ this.ruleForm.multipleTableData = data.table
+ }
this.feedbackDept = this.json.feedbackDept
console.log('485',this.feedbackDept)
}).catch(e => {
diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step7.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step7.vue
index ea2403bc3..cef48c012 100644
--- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step7.vue
@@ -116,87 +116,206 @@
+ type="index"
+ label="序号"
+ width="55"
+ align="center">
-
-
+ show-overflow-tooltip
+ prop="G0"
+ label="G0"
+ min-width="150"
+ align="center"
+ >
+ show-overflow-tooltip
+ prop="G1"
+ label="G1"
+ min-width="150"
+ align="center"
+ >
+ show-overflow-tooltip
+ prop="G2"
+ label="G2"
+ min-width="150"
+ align="center"
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -304,6 +423,9 @@ export default {
name: "zdrzbzORzchgxxmscStep7",
data() {
return {
+ ruleForm: {
+ multipleTableData: [],
+ },
infoTableDatas: [],
//用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门
feedbackDept: "",
@@ -492,6 +614,9 @@ export default {
this.form.fjList = data.fjList
this.form.fjListId = data.fjListId
this.json = data
+ if (typeof Array(data.table) && data.feedbackDept === '2') {
+ this.ruleForm.multipleTableData = data.table
+ }
this.feedbackDept = this.json.feedbackDept
}).catch(e => {
});
diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8.vue
index b4f05a86e..ecc8640f3 100644
--- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8.vue
@@ -110,87 +110,206 @@
+ type="index"
+ label="序号"
+ width="55"
+ align="center">
-
-
+ show-overflow-tooltip
+ prop="G0"
+ label="G0"
+ min-width="150"
+ align="center"
+ >
+ show-overflow-tooltip
+ prop="G1"
+ label="G1"
+ min-width="150"
+ align="center"
+ >
+ show-overflow-tooltip
+ prop="G2"
+ label="G2"
+ min-width="150"
+ align="center"
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -300,6 +419,9 @@ export default {
name: "zdrzbzORzchgxxmscStep8",
data() {
return {
+ ruleForm: {
+ multipleTableData: [],
+ },
infoTableDatas: [],
//用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门
feedbackDept: "",
@@ -495,6 +617,9 @@ export default {
this.form.fjList = data.fjList
this.form.fjListId = data.fjListId
this.json = data
+ if (typeof Array(data.table) && data.feedbackDept === '2') {
+ this.ruleForm.multipleTableData = data.table
+ }
this.feedbackDept = this.json.feedbackDept
console.log('485',this.feedbackDept)
}).catch(e => {