diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index a26e77563..d3f680706 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -413,36 +413,6 @@ export default {
zcCompletionTime: "" //在产的完成时间
}]
},
- // listForm: {
- // standNumber: "", //标准编号
- // standName: "",//标准名称
- // certifiedEngineer: "", //认证工程师
- // qualityEngineer: "", //质量工程师
- // dataList: [{
- // certifiedEngineer: '',
- // projectManager: '',
- // standNumber: '',
- // itemsName: '',
- // uname: '',
- // projectNumber: '',
- // implementer: '',
- // implementerId: '',
- // productLine: '',
- // itemNum:'',
- // qualityEngineer: '',
- // distributePerson:'',
- // projectName:'',
- // standName:'',
- // distributePersonId:'',
- // complianceReasons:'', //在研合规原因
- // noCompliance:'', //在研不合规项目
- // countermeasures:'', //在研应对措施
- // completionTime:'', //在研完成时间
- // zcComplianceReasons: '', //在产的合规原因
- // zcCountermeasures:'', //在产的应对措施
- // zcCompletionTime:'', //在产的完成时间
- // }]
- // },
choiceForm: {}, //选择标准清单列表
countryOptions: [], //适用区域下拉框数据
user1: "",
@@ -477,7 +447,6 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
- console.log(res.mesg);
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
@@ -492,11 +461,18 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
- console.log(item.fenFlag);
if (item.fenFlag === undefined ) {
+ item.step3DTOS.forEach(item => {
+ item.implementerId = this.$store.getters.userInfo.userId
+ item.implementer = this.$store.getters.userInfo.userName
+ })
this.dataList = item.step3DTOS;
} else {
this.dataList = item.dataList;
+ this.dataList.forEach(item => {
+ item.implementerId = this.$store.getters.userInfo.userId
+ item.implementer = this.$store.getters.userInfo.userName
+ })
}
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
@@ -524,6 +500,7 @@ export default {
this.listForm.signFlag = "";
this.listForm.dataList = this.dataList;
const json = JSON.stringify(this.listForm);
+ console.log(json);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
new file mode 100644
index 000000000..5ef4d2c7b
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
@@ -0,0 +1,368 @@
+
+
+ 流程发起人
+ 审批责任人
+ 工程经理
+ 标准法规部部长
+