From c70d436e0f570487216f15ab759a40bf896be8c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 14 Jul 2021 13:48:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step1.vue | 126 ++-- .../pages/creatProcess/xmpg/step2.vue | 11 +- .../pages/creatProcess/xmpg/step3.vue | 24 +- .../pages/creatProcess/xmpg/step4.vue | 180 +++++- .../pages/creatProcess/xmpg/step5.vue | 554 +++++++++++++++++- .../tabComponents/processCenter/index.vue | 22 + 6 files changed, 823 insertions(+), 94 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index d0a06cde7..2fcc2a5ed 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -17,6 +17,7 @@ @@ -39,18 +40,17 @@ clearable > - + - - + - +

标准法规部领导

- - + +
@@ -354,26 +354,35 @@ export default { startUser: this.$store.getters.userInfo.id, qualityEngineer: "", certifiedEngineer:"", + qualityEngineerName: "", + certifiedEngineerName:"", distributePerson: "", + dockUser:'', + ministerUser:"", + dockUserName:'', + ministerUserName:"", }, formRules: { - listType: [ - { required: true, message: "请选择清单类型", trigger: "blur" } + standName: [ + { required: true, message: "请填写标准名称", trigger: "change" } + ], + standNumber: [ + { required: true, message: "请填写标准编号", trigger: "change" } + ], + qualityEngineer: [ + { required: true, message: "请选择质量工程师", trigger: "change" } + ], + certifiedEngineer: [ + { required: true, message: "请选择认证工程师", trigger: "change" } ], - listName: [ - { required: true, message: "请填写清单名称", trigger: "change" } - ] }, roleFormRules: { - // dockUserName: [ - // { required: true, message: "请选择会签责任人", trigger: "blur" } - // ], + dockUserName: [ + { required: true, message: "请选择业务经理", trigger: "change" } + ], ministerUserName: [ - { required: true, message: "请选择修订责任人", trigger: "blur" } + { required: true, message: "请选择标准法规部领导", trigger: "change" } ], - directorUserName: [ - { required: true, message: "请选择审批责任人", trigger: "blur" } - ] }, ListModel: false, //选择拆分标准抽屉状态 treeData: [], // 人员数据 @@ -440,16 +449,16 @@ export default { } else if (this.type === "ministerUser") { this.roleForm.ministerUser = this.roleRow.id; this.roleForm.ministerUserName = this.roleRow.name; - } else if (this.type === "directorUser") { - this.roleForm.directorUser = this.roleRow.id; - this.roleForm.directorUserName = this.roleRow.name; - } else if (this.type === "presidentUser") { - this.roleForm.presidentUser = this.roleRow.id; - this.roleForm.presidentUserName = this.roleRow.name; } else if (this.type === "qualityEngineer") { - this.listForm.qualityEngineer = this.roleRow.name; + this.roleForm.qualityEngineer = this.roleRow.id; + this.roleForm.qualityEngineerName = this.roleRow.name; + this.listForm.qualityEngineer = this.roleForm.qualityEngineer; + this.listForm.qualityEngineerName = this.roleForm.qualityEngineerName; } else if (this.type === "certifiedEngineer") { - this.listForm.certifiedEngineer = this.roleRow.name; + this.roleForm.certifiedEngineer = this.roleRow.id; + this.roleForm.certifiedEngineerName = this.roleRow.name; + this.listForm.certifiedEngineer = this.roleForm.certifiedEngineer; + this.listForm.certifiedEngineerName = this.roleForm.certifiedEngineerName; } else if (this.type === "distributePerson") { this.listForm.distributePerson = this.roleRow.name; this.listForm.dataList[this.dsadadadsada].distributePersonId=this.roleRow.id @@ -527,32 +536,41 @@ export default { }, //提交事件 handleSubmit() { - let json = this.listForm; - json.zrUserId = this.$store.getters.userInfo.userId; - json.jlUserId = this.$store.getters.userInfo.userId; - json.applyUpdUserId = this.$store.getters.userInfo.userId; - json.approvalOpinion = ""; - json.prcCreateUser = this.$store.getters.userInfo.userId; - json.prcCreateUserName = this.$store.getters.userInfo.account; + console.log(this.roleForm) + console.log(this.listForm); + // var json = this.listForm + var json = Object.assign(this.listForm, this.roleForm) json.prcCreateUser = this.$store.getters.userInfo.userId; json.prcCreateUserName = this.$store.getters.userInfo.account; json.standId = this.listForm.standId; - this.$http.get("lawss/activiti/startProcess", { type: "5" }, { - _this: this - }, res => { - if (res.ok) { - this.$http.post("lawss/activiti/completeTask", { - taskIds: res.data, - userId: this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); + this.$refs["xmpgForm"].validate((valid) => { + if (valid) { + this.$refs["Form"].validate((valid) => { + if (valid) { + this.$http.get("lawss/activiti/startProcess", { type: "5" }, { + _this: this + }, res => { + if (res.ok) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: res.data, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }); + } + }); + } else { + return this.$message.warning("请完善人员信息"); } }); + } else { + return this.$message.warning("请完善基础信息"); } }); }, @@ -600,7 +618,9 @@ export default { this.standList = data; }, choiceZRR(scope,type, title, id) { - if(scope!=null)this.dsadadadsada=scope.$index; + if(scope!=null){ + this.dsadadadsada = scope.$index; + } this.nodeList = []; this.nodeList.push(id); this.type = type; @@ -632,8 +652,8 @@ export default { }, { _this: this }, res => { - console.log(res.data.records); - this.productData = res.data.records; + console.log(res.data); + this.productData = res.data; this.totalNo = res.data.total; }, e => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 5802df6c1..cc668d048 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -35,16 +35,16 @@ clearable > - + - + @@ -234,6 +234,8 @@ export default { standName: "",//标准名称 certifiedEngineer: "", //认证工程师 qualityEngineer: "", //质量工程师 + certifiedEngineerName: "", //认证工程师 + qualityEngineerName: "", //质量工程师 breakdownList: [{ applyArctic: "", busStandCover: "", @@ -302,6 +304,7 @@ 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) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 1f5b0c1a7..fc188ebc6 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -35,16 +35,16 @@ clearable > - + - + @@ -97,6 +97,16 @@ align="center" label="条款名称"> + + + + - +
基础信息
@@ -75,90 +75,166 @@ + + + + - - + + + + - - + + + + + + @@ -285,6 +361,7 @@ export default { }, data() { return { + detailData: [], sarProStateTableHeight: null, // 项目列表高度 // 当前流程类型(1待办/2已办) @@ -307,24 +384,62 @@ export default { total: 0, pageSize: this.$store.getters.userInfo.configContent, listForm: { - listType: "", //区分是哪个清单 - listName: "", //清单名称 - applyRegion: "", //适用区域 - descriptionList: "", //清单说明 - enclosure: "", //附件 - inforlist: "",//用来存放标准的id + standNumber: "", //标准编号 + standName: "",//标准名称 + certifiedEngineer: "", //认证工程师 + qualityEngineer: "", //质量工程师 dataList: [{ - standNumber: "", //标准号 - cnName: "", //中文名称 - enName: "", //英文名称 - isSubTime: "", //发布日期 - newCarTime: "", //新车型实施日期 - oldCarTime: "", //在产车实施日期 - applyCar: "", //适用车型 - textState: "", //文本状态 - id: "" + projectManager: '', + itemsName: '', + uname: '', + projectNumber: '', + implementer: '', + implementerId: '', + productLine: '', + itemNum:'', + distributePerson:'', + projectName:'', + distributePersonId:'', + complianceReasons:'', //在研合规原因 + noCompliance:'', //在研不合规项目 + countermeasures:'', //在研应对措施 + completionTime:'', //在研完成时间 + zcComplianceReasons: '', //在产的合规原因 + zcNoCompliance:'', //在产不合规项目 + zcCountermeasures:'', //在产的应对措施 + 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: "", @@ -358,6 +473,7 @@ 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) @@ -375,8 +491,11 @@ export default { this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName this.listForm['id'] = item.id - this.listForm.dataList = item.dataList - this.dataList = item.dataList + this.dataList = item.step3DTOS + this.listForm.standName = item.step3DTOS[0].standName + this.listForm.standNumber = item.step3DTOS[0].standNumber + this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer + this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer }) }, @@ -394,6 +513,7 @@ export default { this.listForm.approvalOpinion = ""; this.listForm.standId = this.listForm.standId; this.listForm.signFlag = ""; + this.listForm.dataList = this.dataList const json = JSON.stringify(this.listForm); this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index d657db275..e73024ac3 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -1,13 +1,563 @@ + - + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 6ba2be88c..81adb0245 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -498,6 +498,28 @@ export default { prcType: row.prcType } }) + }else if(row.taskInfo === '合规性评估'){ + this.$router.push({ + name: 'xmpgStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '分发责任人审核'){ + this.$router.push({ + name: 'xmpgStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } break