From 433c084d2c6bb343b4802b0b424b34a5991559e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 25 Jan 2022 20:36:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzpg/step5.vue | 147 ++++++++++-------- 1 file changed, 80 insertions(+), 67 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue index 82d9cc9c1..188779b39 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue @@ -158,25 +158,26 @@ align="center"> + min-width="180" + prop="projectGroup" + label="项目群"> @@ -187,6 +188,17 @@ align="center" label="条款名称"> + + + @@ -420,6 +432,15 @@ @checkedRole="checkedTransferRole" :nodeList="nodeList" > + +
+
+ 关闭 +
+ { + this.itermsConditionsTitle = res.data[0].termsConditions.replace(/''/g, '\'') + }) + this.itermsConditionsFlag = true + }, //点击查看详情 handlePreview(item){ let routeUrl = this.$router.resolve({ @@ -722,44 +760,14 @@ export default { * @description: 动态表单读取 */ getFormFieldList(item) { - console.log(item); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); if (item.form === undefined) { - if (item.fenFlag === undefined) { - item.step3DTOS.forEach(item => { - item.implementerId = this.$store.getters.userInfo.userId; - item.implementer = this.$store.getters.userInfo.userName; - }); - // this.commentText = '' - 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; - // this.commentText = '' - this.dataList.forEach(item => { - item.implementerId = this.$store.getters.userInfo.userId; - item.implementer = this.$store.getters.userInfo.userName; - }); - } - // this.getLocalTime() - this.listForm.prcNum = this.prcNum; - this.listForm.prcName = this.prcName; - this.listForm["id"] = item.id; - this.listForm.standName = item.step3DTOS[0].standName; - this.listForm.standNumber = item.step3DTOS[0].standNumber; - this.listForm.id = item.step3DTOS[0].id; - this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName; - this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName; - this.listForm.itemsName = item.step3DTOS[0].itemsName; - this.listForm.itemNum = item.step3DTOS[0].itemNum; - this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit; - this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer; + this.fileType = item.fileType + this.listForm.prcNum = this.prcNum + this.listForm.prcName = this.prcName + this.listForm['id'] = item.id + this.dataList = item.dataList } else { this.listForm = item.form; this.dataList = item.form.dataList; @@ -827,27 +835,32 @@ export default { this.$message.warning('请填写完整的不符合项信息') this.comFlag = 0 }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.$confirm("请确认表单数据是否填写完整", "提示", { + confirmButtonText: "确认", + confirmButtonClass: "common-button-primary", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + this.listForm.commentText = this.commentText; + 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 => { + }); + }).catch(() => { }); } } @@ -872,7 +885,7 @@ export default { saveBatchEditForm() { this.dataList.forEach(item => { this.selectList.forEach(items => { - if (item.itemNum === items.itemNum && item.projectName === items.projectName) { + if (item.itemsNum === items.itemsNum && item.projectName === items.projectName) { item.complianceReasons = this.batchEditForm.complianceReasons; //不合规 item.noCompliance = this.batchEditForm.noCompliance; @@ -904,7 +917,7 @@ export default { this.searchData(); }, pageSizeChange(pageSize) { - this.pageSize = this.$store.getters.userInfo.configContent; + this.pageSize = pageSize; this.searchData(); } }, From f78f9ea60b92193365f30ba8bb6cc4beaf507118 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, 26 Jan 2022 10:54:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzpg/step6.vue | 736 +++++++++++++++++- .../pages/creatProcess/bzpg/step7.vue | 726 ++++++++++++++++- .../pages/creatProcess/bzpg/step8.vue | 726 ++++++++++++++++- 3 files changed, 2182 insertions(+), 6 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue index face62e72..080d38a15 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue @@ -1,13 +1,745 @@ + - diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue index f5307e9a6..31ef4c729 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue @@ -1,13 +1,735 @@ + - diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue index 1ad204b53..369406c68 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue @@ -1,13 +1,735 @@ + - From dea008076ef4fea728876296adacf16a739b3776 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 26 Jan 2022 10:55:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=BD=92=E6=A1=A3=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 3 ++- src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index d07f72008..0c86eb228 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -2274,7 +2274,8 @@ export default { getListTree(bringData) { this.$http.get('sarResource/ts-resource/getListStand', { sorDivide: bringData.standInData === '0' ? 'INLAND_STAND' : 'FOREIGN_STAND', - userId: this.$store.getters.userInfo.userId + userId: this.$store.getters.userInfo.userId, + isFlow: 'flow' }, {}, res => { if (res.ok) { this.treeListOptions = res.data diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 50b17a121..e5f5eaa95 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -2597,7 +2597,8 @@ export default { getListTree(bringData) { this.$http.get('sarResource/ts-resource/getListStand', { sorDivide: bringData.standInData === '0' ? 'INLAND_STAND' : 'FOREIGN_STAND', - userId: this.$store.getters.userInfo.userId + userId: this.$store.getters.userInfo.userId, + isFlow: 'flow' }, {}, res => { if (res.ok) { this.treeListOptions = res.data From 8a542b9435a9474b66b1c3cf30d839dc9aece4ef Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 26 Jan 2022 11:03:43 +0800 Subject: [PATCH 4/5] commit --- .../standardForComments/pags/AddFileDetails.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue index 72f75e6e7..55764abd8 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue @@ -101,6 +101,7 @@ _this: this }, res => { if (res.respCode === '200') { + // 储存变量监听刷新页面 localStorage.setItem('freshClueNum', new Date().getTime()) this.isSubmit = false this.opinionContent.partCode = '' From b903cda5ce66c96568e03ebbcf460170b1073f34 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, 26 Jan 2022 11:09:32 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzpg/step6.vue | 33 +++++++++++++++---- .../pages/creatProcess/bzpg/step7.vue | 12 ++++--- .../pages/creatProcess/bzpg/step8.vue | 12 ++++--- 3 files changed, 41 insertions(+), 16 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue index 080d38a15..86e5cb9a8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue @@ -217,7 +217,7 @@ label="在产车实施日期"> @@ -225,25 +225,27 @@ + { + if (res.success) { + this.$message.success(res.message) + this.$router.push('/processCenter') + } + this.isSubmit = false + }, e => { + }); } }, //提交事件 handleSubmit() { this.listForm.dataList = this.dataList + this.listForm.passFlag = '0' this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.isSubmit = true @@ -620,7 +642,6 @@ export default { this.isSubmit = false }, e => { }); - }, //标准表格选择框改变 selectStandChange(data) { diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue index 31ef4c729..471af52e5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue @@ -217,7 +217,7 @@ label="在产车实施日期"> @@ -225,25 +225,27 @@ + @@ -225,25 +225,27 @@ +