From 9dd9f6d8995ce178756c0b9f4aaaf67d702223e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 11 Mar 2022 16:10:00 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0=20?= =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/phone/bzpg/step2.vue | 393 +++++++++++++ .../pages/phone/{xmpg => bzpg}/step6.vue | 134 +++-- .../pages/phone/{xmpg => bzpg}/step7.vue | 135 +++-- .../phone/{xmpg/step2.vue => bzpg/step8.vue} | 188 ++++-- .../{xmpg2/step12.vue => xmpg/step4.vue} | 45 +- .../processCenter/pages/phone/xmpg/step5.vue | 467 +++++++-------- .../pages/phone/xmpg2/step10.vue | 550 ------------------ .../pages/phone/xmpg2/step11.vue | 525 ----------------- .../processCenter/pages/phone/xmpg2/step2.vue | 452 -------------- .../processCenter/pages/phone/xmpg2/step3.vue | 464 --------------- .../processCenter/pages/phone/xmpg2/step7.vue | 549 ----------------- .../processCenter/pages/phone/xmpg2/step8.vue | 550 ------------------ .../processCenter/pages/phone/xmpg2/step9.vue | 549 ----------------- src/router/index.js | 148 ++--- 14 files changed, 959 insertions(+), 4190 deletions(-) create mode 100644 src/pages/processCenter/pages/phone/bzpg/step2.vue rename src/pages/processCenter/pages/phone/{xmpg => bzpg}/step6.vue (90%) rename src/pages/processCenter/pages/phone/{xmpg => bzpg}/step7.vue (89%) rename src/pages/processCenter/pages/phone/{xmpg/step2.vue => bzpg/step8.vue} (78%) rename src/pages/processCenter/pages/phone/{xmpg2/step12.vue => xmpg/step4.vue} (94%) delete mode 100644 src/pages/processCenter/pages/phone/xmpg2/step10.vue delete mode 100644 src/pages/processCenter/pages/phone/xmpg2/step11.vue delete mode 100644 src/pages/processCenter/pages/phone/xmpg2/step2.vue delete mode 100644 src/pages/processCenter/pages/phone/xmpg2/step3.vue delete mode 100644 src/pages/processCenter/pages/phone/xmpg2/step7.vue delete mode 100644 src/pages/processCenter/pages/phone/xmpg2/step8.vue delete mode 100644 src/pages/processCenter/pages/phone/xmpg2/step9.vue diff --git a/src/pages/processCenter/pages/phone/bzpg/step2.vue b/src/pages/processCenter/pages/phone/bzpg/step2.vue new file mode 100644 index 000000000..ca9f5d9d0 --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzpg/step2.vue @@ -0,0 +1,393 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmpg/step6.vue b/src/pages/processCenter/pages/phone/bzpg/step6.vue similarity index 90% rename from src/pages/processCenter/pages/phone/xmpg/step6.vue rename to src/pages/processCenter/pages/phone/bzpg/step6.vue index b58f8d2e4..88d2b3f31 100644 --- a/src/pages/processCenter/pages/phone/xmpg/step6.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step6.vue @@ -136,29 +136,35 @@ style="width: 100%" border @selection-change="selectStandChange" - height="55%" + height="100%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}"> + type="selection" + width="55" + align="center"> + + @@ -170,34 +176,41 @@ label="条款名称"> + + + - - - - - + width="180" + label="评估人" + /> @@ -294,7 +300,7 @@ import axios from "axios"; import ProcessHeader from "process/components/ProcessHeader"; export default { - name: "phoneXmpgStep6", + name: "phoneBzpgStep6", components: { ProcessHeader, ProcessFooter, @@ -498,40 +504,56 @@ export default { /** * @description: 动态表单读取 */ - getFormFieldList (item) { + getFormFieldList(item) { + console.log(item); this.$nextTick(() => { - this.listForm = JSON.parse(JSON.stringify(item)) - this.listForm.prcNum = this.prcNum - this.listForm.prcName = this.prcName - this.dataList = item.dataList - this.listForm.id = item.step3DTOS[0].id - this.listForm.standName = item.step3DTOS[0].standName - this.listForm.standNumber = item.step3DTOS[0].standNumber - this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName - this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName - }) + this.listForm = JSON.parse(JSON.stringify(item)); + if (item.form === undefined) { + 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; + } + + }); }, //驳回事件 beforeBack () { if(!this.commentText){ - this.$message.warning('请填写审批意见') - } else { - this.listForm.fenFlag = '2' - this.handleSubmit() - } + this.$message.warning('请填写审批意见') + }else{ + this.listForm.dataList = this.dataList + this.listForm.passFlag = '1' + this.listForm.commentText = this.commentText; + 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 => { + }); + } }, //提交事件 handleSubmit() { - this.isSubmit = true - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; - this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; - this.listForm.zrUserId = this.$store.getters.userInfo.userId ; - this.listForm.commentText = this.commentText; - this.listForm.standId = this.listForm.standId; - this.listForm.fenFlag = "1"; this.listForm.dataList = this.dataList + this.listForm.passFlag = '0' + this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -545,9 +567,7 @@ export default { } this.isSubmit = false }, e => { - }); - }, //标准表格选择框改变 selectStandChange(data) { diff --git a/src/pages/processCenter/pages/phone/xmpg/step7.vue b/src/pages/processCenter/pages/phone/bzpg/step7.vue similarity index 89% rename from src/pages/processCenter/pages/phone/xmpg/step7.vue rename to src/pages/processCenter/pages/phone/bzpg/step7.vue index 582c84325..a4a689296 100644 --- a/src/pages/processCenter/pages/phone/xmpg/step7.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step7.vue @@ -2,7 +2,7 @@
- +
基础信息
@@ -129,36 +129,51 @@ + + + + + type="selection" + width="55" + align="center"> + + @@ -170,34 +185,41 @@ label="条款名称"> + + + - - - - - + width="180" + label="评估人" + /> @@ -264,14 +279,12 @@
@@ -294,7 +307,7 @@ import axios from "axios"; import ProcessHeader from "process/components/ProcessHeader"; export default { - name: "phoneXmpgStep7", + name: "phoneBzpgStep7", components: { ProcessHeader, ProcessFooter, @@ -304,7 +317,9 @@ export default { data() { return { phoneshowflag: false, + activeName: '', phoneRoleList: [], + projectTabName: [], phoneDrawerTitle: '', //折叠的标志,true为折叠,false为不折叠 foldFormFlag: false, @@ -388,6 +403,9 @@ export default { }; }, methods: { + handleClick(tab) { + this.projectName = tab.name + }, //折叠/展开基础信息方法 foldForm() { this.foldFormFlag = !this.foldFormFlag @@ -498,36 +516,34 @@ export default { /** * @description: 动态表单读取 */ - getFormFieldList (item) { + getFormFieldList(item) { this.$nextTick(() => { - this.listForm = JSON.parse(JSON.stringify(item)) - this.listForm.prcNum = this.prcNum - this.listForm.prcName = this.prcName - this.listForm.id = item.id - this.dataList = item.dataList - }) - }, - //驳回事件 - beforeBack () { - if(!this.commentText){ - this.$message.warning('请填写审批意见') - } else { - this.listForm.fenFlag = '2' - this.handleSubmit() - } + this.listForm = JSON.parse(JSON.stringify(item)); + if (item.form === undefined) { + this.fileType = item.fileType + this.listForm.prcNum = this.prcNum + this.listForm.prcName = this.prcName + this.listForm['id'] = item.id + this.dataList = item.dataList + item.dataList.forEach(item => { + if(!this.projectTabName.includes(item.projectName)){ + this.projectTabName.push(item.projectName) + } + }) + this.projectName = this.activeName = this.projectTabName[Object.keys(this.projectTabName)[0]] + } else { + this.listForm = item.form; + this.dataList = item.form.dataList; + } + + }); }, //提交事件 handleSubmit() { - this.isSubmit = true - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; - this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; - this.listForm.zrUserId = this.$store.getters.userInfo.userId ; - this.listForm.commentText = this.commentText; - this.listForm.standId = this.listForm.standId; - this.listForm.fenFlag = "1"; this.listForm.dataList = this.dataList + this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -541,7 +557,6 @@ export default { } this.isSubmit = false }, e => { - }); }, diff --git a/src/pages/processCenter/pages/phone/xmpg/step2.vue b/src/pages/processCenter/pages/phone/bzpg/step8.vue similarity index 78% rename from src/pages/processCenter/pages/phone/xmpg/step2.vue rename to src/pages/processCenter/pages/phone/bzpg/step8.vue index 2ee9bbc26..241b7d293 100644 --- a/src/pages/processCenter/pages/phone/xmpg/step2.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step8.vue @@ -1,8 +1,8 @@