From 90e00f157cd6272e95f73cf947fc294046187c37 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 1 Dec 2021 14:06:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E8=B4=A3=E4=BB=BB=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/rectificationDatabase.vue | 56 +++++++++++++++---- 1 file changed, 46 insertions(+), 10 deletions(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 2a9d53cf0..910c210c9 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -137,10 +137,6 @@ prop="productType" width="100" label="产品类型"> - 提交 + @@ -671,12 +675,19 @@ export default { // 新增编辑框的disabled serialNumber: true, + // 提交按钮loading + submiting: false, + // 选择人（单选） roleShowflag: false, nodeList: [], - + // 选择人（多选） titleMore: '', nodeListMore: [], roleShowMore: false, + + // 选择责任部门 + nodeListZRBM: [], + modalshowflagZRBM: false }; }, methods: { @@ -886,6 +897,7 @@ export default { if (this.drawerTitle === "新增") { this.$refs["addForm"].validate((valid) => { if (valid) { + this.submiting = true addUn( closeState, standId, standSerialNumber, standName, itemsNum, itemsName, productType, @@ -893,6 +905,7 @@ export default { responsibleUnit, dutyEngineer, authEngineer, qaEngineer, planCloseTime).then(res => { if (res.ok) { + this.submiting = false this.$message.success("新增成功"); this.drawerTable = false; this.getTableByPage(); @@ -900,11 +913,13 @@ export default { }); } else { this.$message.warning("请完善基础信息"); + this.submiting = false } }); } else { this.$refs["addForm"].validate((valid) => { if (valid) { + this.submiting = true editUn( closeState, standId, standSerialNumber, standName, itemsNum, itemsName, productType, @@ -912,6 +927,7 @@ export default { dutyEngineer, authEngineer, qaEngineer, planCloseTime, id).then(res => { if (res.ok) { + this.submiting = false this.$message.success("编辑成功"); this.drawerTable = false; this.getTableByPage(); @@ -919,6 +935,7 @@ export default { }); } else { this.$message.warning("请完善基础信息"); + this.submiting = false } }); } @@ -954,7 +971,7 @@ export default { } }); this.dataList = res.data.records; - this.dataList.forEach(item => { + /*this.dataList.forEach(item => { // 责任部门转换 if (item.zrbm !== null || item.zrbm !== "") { let k = (item.zrbm || "").split(","); @@ -967,7 +984,7 @@ export default { } } } - }); + });*/ }); }, //新增事件 @@ -1066,7 +1083,6 @@ export default { if (this.drawerTitle === '编辑') { this.addForm.standName = '' this.addForm.standSerialNumber = '' - this.addForm.responsibleUnit = '' } this.addForm.productId = val.id this.addForm.productLine = val.productLine @@ -1080,7 +1096,6 @@ export default { standChange(item) { this.addForm.standName = item.standName this.addForm.standSerialNumber = item.standSort + '-' + item.standNumber + '-' + item.standYear - this.addForm.responsibleUnit = item.zrbm || "--"; }, /** 责任工程师选择 */ choiceZRR(type, title, id) { @@ -1120,6 +1135,27 @@ export default { this.roleShowMore = true }, + /** 选择责任部门 */ + choiceZRBM(type, title, id) { + this.nodeListZRBM = [] + this.nodeListZRBM.push(id) + this.modalshowflagZRBM = true + }, + drawerCheckZRBM(data) { + let idList = '' + let nameList = '' + data.forEach(item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.name + }) + this.addForm.responsibleUnit = nameList; + + }, + }, mounted() { //查询已维护的项目 From 59b85836e08ec63db7196e2baef31b95e75c1273 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, 1 Dec 2021 14:27:10 +0800 Subject: [PATCH 2/2] commit --- src/api/unqualProcess.js | 3 +- src/pages/details/complianceDetails/index.vue | 4 +- .../pages/creatProcess/xmpg2/step6.vue | 44 +++---------------- .../pages/rectificationDatabase.vue | 17 ++++++- 4 files changed, 25 insertions(+), 43 deletions(-) diff --git a/src/api/unqualProcess.js b/src/api/unqualProcess.js index c51fad700..229f11353 100644 --- a/src/api/unqualProcess.js +++ b/src/api/unqualProcess.js @@ -65,7 +65,7 @@ export function meetingByMonth(params) { export function addUn( closeState,standId, standSerialNumber, standName, itemsNum, itemsName, productType, - productLine, productName, reason, responsibleUnit, + productLine, productName,productId,reason, responsibleUnit, dutyEngineer, authEngineer, qaEngineer, planCloseTime) { const data = { closeState, @@ -77,6 +77,7 @@ export function addUn( productType, productLine, //产品线 productName, //项目名称 + productId, //项目编号 reason, //不合规项目 responsibleUnit, //责任部门 dutyEngineer, //责任工程师 diff --git a/src/pages/details/complianceDetails/index.vue b/src/pages/details/complianceDetails/index.vue index 30cb0f9ab..8c64e0cd7 100644 --- a/src/pages/details/complianceDetails/index.vue +++ b/src/pages/details/complianceDetails/index.vue @@ -54,8 +54,8 @@ - + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 16cfd87e2..f0d287889 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -456,7 +456,7 @@ >
@@ -531,32 +531,6 @@
- - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -628,7 +602,7 @@ export default { todoId: "", showColumn: true, drawerTitle: "", //drawer标题 - modalshowflag: false, // drawer开关 + modalShowFlag: false, // drawer开关 selectList: [], treeData: [], // 人员数据 roleForm: { @@ -723,10 +697,10 @@ export default { } }); }); - this.modalshowflag = false; + this.modalShowFlag = false; }, cancelBatchEditForm() { - this.modalshowflag = false; + this.modalShowFlag = false; }, //批量编辑 batchEdit() { @@ -739,15 +713,7 @@ export default { this.batchEditForm.countermeasures = ""; //完成时间 this.batchEditForm.completionTime = ""; - //合规 - this.batchEditForm.zcComplianceReasons = ""; - //不合规 - this.batchEditForm.zcNoCompliance = ""; - //应对措施 - this.batchEditForm.zcCountermeasures = ""; - //完成时间 - this.batchEditForm.zcCompletionTime = ""; - this.modalshowflag = true; + this.modalShowFlag = true; } else { this.$message.warning("请选择要编辑的数据"); } diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 910c210c9..64976940d 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -425,6 +425,14 @@ > + + + { if (res.ok) { @@ -1080,11 +1093,13 @@ export default { /** 项目名称change事件 */ handleChange(val) { + console.log(val); if (this.drawerTitle === '编辑') { this.addForm.standName = '' this.addForm.standSerialNumber = '' } this.addForm.productId = val.id + this.addForm.projectNumber = val.projectNumber this.addForm.productLine = val.productLine this.addForm.productName = val.projectName this.addForm.productType = val.projectPlatfor