From 2183ab22da60cee8b557f1af997b800d1b6e07a1 Mon Sep 17 00:00:00 2001 From: "wangxiahui@91isoft.com" <140316hui> Date: Wed, 1 Dec 2021 10:45:29 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E6=95=B4?= =?UTF-8?q?=E6=94=B9=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/rectificationDatabase.vue | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index cb7767e23..2a9d53cf0 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -115,7 +115,7 @@ @@ -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 05/16] 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 From 79b446ce5938cc688364e4f47e478c8fdb44c3ce Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 1 Dec 2021 14:53:26 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=BA=93=E7=9A=84=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E5=A4=9A?= =?UTF-8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index abfba54fd..ba33d303e 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -932,14 +932,14 @@ :disabled="formdisableflag" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -525,6 +430,96 @@ @checkedRole="checkedTransferRole" :nodeList="nodeList" > + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ + 确定 + + 取消 + +
+
@@ -546,12 +541,24 @@ export default { return { //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, - comFlag: true, + comFlag: 0, nodeList:[], drawerTitle:'', isTransfer: false, // 调整处理人抽屉状态 drawerModal: false, + modalShowFlag: false, // 批量编辑开关 + batchEditForm: { + // 在研产品 + // 合规 + complianceReasons: "", + // 不合规 + noCompliance: "", + // 应对措施 + countermeasures: "", + // 完成时间 + completionTime: "", + }, detailData: [], sarProStateTableHeight: null, // 项目列表高度 // 当前流程类型(1待办/2已办) @@ -735,6 +742,12 @@ export default { item.implementer = this.$store.getters.userInfo.userName; }); this.dataList = item.step3DTOS; + this.dataList.forEach(item => { + this.$set(item,'complianceReasons', '') + this.$set(item,'noCompliance', '') + this.$set(item,'countermeasures', '') + this.$set(item,'completionTime', '') + }) } else { this.dataList = item.dataList; @@ -800,40 +813,76 @@ export default { }, handlePrice(row){ if(row.complianceReasons !== '' || (row.noCompliance !== '' && row.countermeasures !== '' && row.completionTime !== '') || (row.complianceReasons === '' && row.noCompliance === '' && row.countermeasures === '' && row.completionTime === '')){ - this.comFlag = true + this.comFlag = 0 }else{ - this.comFlag = false + this.comFlag = this.comFlag + 1 } }, //提交事件 handleSubmit() { - if(!this.comFlag) { + if(this.comFlag > 0) { this.$message.warning('请填写完整的不符合项信息') }else{ - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.commentText = this.commentText; - this.listForm.approvalOpinion = ""; - this.listForm.signFlag = ""; - this.listForm.dataList = this.dataList; - const json = JSON.stringify(this.listForm); - this.isSubmit = true; - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }, e => { - - }); + // this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; + // this.listForm.commentText = this.commentText; + // this.listForm.approvalOpinion = ""; + // this.listForm.signFlag = ""; + // this.listForm.dataList = this.dataList; + // const json = JSON.stringify(this.listForm); + // this.isSubmit = true; + // this.$http.post("lawss/activiti/completeTask", { + // taskIds: this.taskIds, + // userId: this.userId, + // json: json + // }, { + // _this: this + // }, res => { + // if (res.success) { + // this.$message.success(res.message); + // this.$router.push("/processCenter"); + // } + // this.isSubmit = false; + // }, e => { + // + // }); } }, + //批量编辑 + batchEdit() { + if (this.selectList.length > 0) { + //合规 + this.batchEditForm.complianceReasons = ""; + //不合规 + this.batchEditForm.noCompliance = ""; + //应对措施 + this.batchEditForm.countermeasures = ""; + //完成时间 + this.batchEditForm.completionTime = ""; + this.modalShowFlag = true; + } else { + this.$message.warning("请选择要编辑的数据"); + } + }, + //批量编辑确定按钮事件 + saveBatchEditForm() { + this.dataList.forEach(item => { + this.selectList.forEach(items => { + if (item.id === items) { + item.complianceReasons = this.batchEditForm.complianceReasons; + //不合规 + item.noCompliance = this.batchEditForm.noCompliance; + //应对措施 + item.countermeasures = this.batchEditForm.countermeasures; + //完成时间 + item.completionTime = this.batchEditForm.completionTime; + } + }); + }); + this.modalShowFlag = false; + }, + cancelBatchEditForm() { + this.modalShowFlag = false; + }, //标准表格选择框改变 selectStandChange(data) { this.selectList = []; From 09f2f1a6e01957206f76acdbc14c276bfd4dc031 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Wed, 1 Dec 2021 15:37:33 +0800 Subject: [PATCH 08/16] feat: There is no way the, add stand_number --- .../components/EnterpriseStandardDatabase.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 193910268..d17405e5b 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -510,12 +510,12 @@ Date: Wed, 1 Dec 2021 15:39:48 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E5=90=88=E8=A7=84=E9=A1=B9=E5=A1=AB?= =?UTF-8?q?=E5=86=99=E6=A0=A1=E9=AA=8C(+)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step4.vue | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 3ab32b9d8..f8c3ee931 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -235,7 +235,6 @@ v-else :disabled="acceptShow" clearable - @click.native="handlePrice(scope.row)" v-model="dataList[scope.$index].complianceReasons" placeholder="请输入合规原因" > @@ -263,7 +262,6 @@ @@ -285,7 +283,6 @@ @@ -811,18 +807,31 @@ export default { this.isSubmit = false }) }, - handlePrice(row){ - if(row.complianceReasons !== '' || (row.noCompliance !== '' && row.countermeasures !== '' && row.completionTime !== '') || (row.complianceReasons === '' && row.noCompliance === '' && row.countermeasures === '' && row.completionTime === '')){ - this.comFlag = 0 - }else{ - this.comFlag = this.comFlag + 1 + handlePrice(){ + for (let i = 0; i < this.dataList.length; i++) { + console.log('815',this.dataList[i]) + if (this.dataList[i].complianceReasons !== '' || (this.dataList[i].noCompliance !== '' && this.dataList[i].countermeasures !== '' && this.dataList[i].completionTime !== '') || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === '')){ + console.log('目前可以通过') + }else { + this.comFlag ++ + console.log('有没有输全的，不能通过',this.comFlag) + } } + + // if(row.complianceReasons !== '' || (row.noCompliance !== '' && row.countermeasures !== '' && row.completionTime !== '') || (row.complianceReasons === '' && row.noCompliance === '' && row.countermeasures === '' && row.completionTime === '')){ + // this.comFlag = 0 + // }else{ + // this.comFlag = this.comFlag + 1 + // } }, //提交事件 handleSubmit() { + this.handlePrice() if(this.comFlag > 0) { this.$message.warning('请填写完整的不符合项信息') + this.comFlag = 0 }else{ + this.$message.success('通过') // this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; // this.listForm.commentText = this.commentText; // this.listForm.approvalOpinion = ""; From 77699b40fc0b4fb609e67ae17f52846388bcc6af 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 15:44:06 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E7=AC=A6=E5=90=88=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/complianceDetails/index.vue | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/pages/details/complianceDetails/index.vue b/src/pages/details/complianceDetails/index.vue index 8c64e0cd7..9a33fbf29 100644 --- a/src/pages/details/complianceDetails/index.vue +++ b/src/pages/details/complianceDetails/index.vue @@ -1,6 +1,7 @@ - - - - - - - - - - - - - - - Date: Wed, 1 Dec 2021 17:27:53 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B02?= =?UTF-8?q?=E7=9A=84=E7=AC=AC=E5=85=AD=E6=AD=A5=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index f5922415f..90222f38a 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -895,9 +895,9 @@ export default { this.isSubmit = false; }); }, - handlePrice(row){ + handlePrice(){ for (let i = 0; i < this.dataList.length; i++) { - if (this.dataList[i].complianceReasons !== '' || (this.dataList[i].noCompliance !== '' && this.dataList[i].countermeasures !== '' && this.dataList[i].completionTime !== '') || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === '')){ + if (this.dataList[i].complianceReasons !== '' || (this.dataList[i].noCompliance !== '' && this.dataList[i].countermeasures !== '' && this.dataList[i].completionTime !== undefined) || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === undefined)){ }else { this.comFlag ++ } From f2e520ae0e9098f009f743b3b366537a8736d72a Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 1 Dec 2021 17:57:58 +0800 Subject: [PATCH 16/16] commit --- .../CustomFormComponents/SelectArray.vue | 1 + .../pages/creatProcess/bzrk/step1.vue | 374 ++++++++---------- .../domesticStandardsAndRegulations/index.vue | 70 +++- 3 files changed, 224 insertions(+), 221 deletions(-) diff --git a/src/components/CustomFormComponents/SelectArray.vue b/src/components/CustomFormComponents/SelectArray.vue index 7090d5e0b..d7ffd381a 100644 --- a/src/components/CustomFormComponents/SelectArray.vue +++ b/src/components/CustomFormComponents/SelectArray.vue @@ -10,6 +10,7 @@ -
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - -
+
+
+
{{ item.name }}
+
+
+ + + +
+
-
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - -
+
+
+
{{ item.name }}
+
+
+ + + +
+
-
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - -
+
+
+
{{ item.name }}
+
+
+ + + +
+
-
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - -
+
+
+
{{ item.name }}
+
+
+ + + +
+
-
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - -
+
+
+
{{ item.name }}
+
+
+ + + +
+
@@ -414,28 +379,21 @@ v-model="form.kwjName" clearable > -
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - -
+
+
+
{{ item.name }}
+
+
+ + + +
+
@@ -446,28 +404,21 @@ v-model="form.jdwjName" clearable > -
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - -
+
+
+
{{ item.name }}
+
+
+ + + +
+
-
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - -
+
+
+
{{ item.name }}
+
+
+ + + +
+
-
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - -
+
+
+
{{ item.name }}
+
+
+ + + +
+
@@ -771,27 +708,20 @@ v-model="form.glwjName" clearable > -
- - - - 查看已上传文件 - - -
-
- - - 点击上传 - +
+
+
{{ item.name }}
+
+
+ + + +
@@ -2868,6 +2798,12 @@ position: relative; overflow: hidden; } + .fileClass { + width: 100%; + overflow: hidden; + text-overflow:ellipsis; + white-space: nowrap; + } .prc-content-border { /deep/ .el-input__inner { padding-left: 30px; diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 344e5e8cb..9c9355a48 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -698,7 +698,6 @@ :disabled="formdisableflag" > -