From 2bb8f30f8d001dff7b073abacd337b75ca996ad9 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 24 Dec 2021 11:02:05 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E3=80=81=E6=A0=B7=E5=BC=8F=E3=80=81=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step1.vue | 151 ++++++++++-------- .../pages/creatProcess/wfhxzg/step2.vue | 4 +- .../pages/creatProcess/wfhxzg/step3.vue | 2 +- .../pages/creatProcess/wfhxzg/step4.vue | 2 +- .../pages/creatProcess/wfhxzg/step5-1.vue | 2 +- .../pages/creatProcess/wfhxzg/step5.vue | 2 +- 6 files changed, 86 insertions(+), 77 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 006476cef..183eebc5a 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -10,46 +10,46 @@
- - - -
-
- 添加 - 批量删除 -
+ + + +
+
+ 添加 + 批量删除
- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
@@ -173,7 +173,7 @@ class="common-button-primary" size="mini" v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'" - @click="getTableByPage('')"> + @click="getTableByPage"> 查询 @@ -326,8 +326,9 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel,processBack } from '@/api/process.js' -import { standUnqualified, dicTypeData } from '@/api/unqualProcess.js' +import {startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel, processBack} from '@/api/process.js' +import {standUnqualified, dicTypeData} from '@/api/unqualProcess.js' + export default { name: "wfhxzgStep1", data() { @@ -365,7 +366,7 @@ export default { }, deleteDataList: [], roleFormRules: { - dockUserName: [{ required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}] + dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}] }, nodeList: [], drawerTitle: '', //drawer标题 @@ -419,23 +420,23 @@ export default { if (item.responsibleUnit !== null || item.responsibleUnit !== "") { let k = (item.responsibleUnit || "").split(',') for (let i in this.zrbmOptions) { - for (let m = 0; m< k.length; m++) { + for (let m = 0; m < k.length; m++) { if (this.zrbmOptions[i].value === k[m]) { - k[m] = this.zrbmOptions[i].label + k[m] = this.zrbmOptions[i].label } item.responsibleUnit = k.join(',') } } } - this.$set(item,'engineer','') - this.$set(item,'engineerId','') - this.$set(item,'dutyPeopleInfo','') - this.$set(item,'dutyPeople','') - this.$set(item,'dutyPeopleInfoId','') - this.$set(item,'dutyPeopleId','') - this.$set(item,'fileText',[]) - this.$set(item,'fileTextId',[]) - this.$set(item,'fileTextPath',[]) + this.$set(item, 'engineer', '') + this.$set(item, 'engineerId', '') + this.$set(item, 'dutyPeopleInfo', '') + this.$set(item, 'dutyPeople', '') + this.$set(item, 'dutyPeopleInfoId', '') + this.$set(item, 'dutyPeopleId', '') + this.$set(item, 'fileText', []) + this.$set(item, 'fileTextId', []) + this.$set(item, 'fileTextPath', []) }) this.total = res.data.total this.loading = false @@ -478,7 +479,7 @@ export default { } }, // 点击查看 - handlePreview (item) { + handlePreview(item) { let routeUrl = this.$router.resolve({ name: 'OtherStandardDetails', params: { @@ -506,12 +507,12 @@ export default { addList = this.dataList.findIndex(items => { return items.id === item.id }) - if(addList > -1){ + if (addList > -1) { // this.$refs.accessTypeSelect.clearSelection() this.$refs.entryTable.clearSelection() this.$refs.searchTable.clearSelection() this.$message.warning('请勿添加重复数据') - } else{ + } else { this.dataList.push(item) // this.$refs.accessTypeSelect.clearSelection() this.$refs.entryTable.clearSelection() @@ -557,7 +558,7 @@ export default { }, // 提交按钮 handleSubmit() { - this.dataList.forEach(item =>{ + this.dataList.forEach(item => { item.standId = item.standSerialNumber }) let json = { @@ -593,13 +594,13 @@ export default { params.set('userId', this.$store.getters.userInfo.userId) params.set('taskIds', this.taskID) completeTask(params).then(res => { - if(res.success === true) { + if (res.success === true) { this.$message.success('提交成功') if (this.bpnId !== '') { let taskId = { id: this.bpnId } - taskDel(taskId).then(res=>{ + taskDel(taskId).then(res => { return res }) } @@ -614,14 +615,14 @@ export default { } }, // 流程阶段负责人选择 - choiceZRR (type, title, id) { + choiceZRR(type, title, id) { this.nodeList = [] this.nodeList.push(id) this.type = type this.drawerTitle = title this.modalshowflag = true }, - drawerCheck (data) { + drawerCheck(data) { this.unqualidiedData.forEach(item => { item.engineer = data[0].name item.engineerId = data[0].id @@ -635,20 +636,18 @@ export default { this.addList() }, // 清空 查询条件 - clearAllSearch (search = true) { - this.queryUnqualidiedData = { - standSerialNumber: '', - productName: '', - responsibleUnit: '' - } + clearAllSearch() { + this.queryUnqualidiedData.standSerialNumber = '' + this.queryUnqualidiedData.productName = '' + this.queryUnqualidiedData.responsibleUnit = '' this.getTableByPage() }, // 分页事件 - pageChange (page) { + pageChange(page) { this.pageNo = page this.getTableByPage() }, - pageSizeChange (pageSize) { + pageSizeChange(pageSize) { this.size = pageSize this.getTableByPage(pageSize) }, @@ -659,18 +658,22 @@ export default { diff --git a/src/router/index.js b/src/router/index.js index fc41c12da..674d19bd8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2211,7 +2211,7 @@ const routes = [ }, { path: '/phoneXmpg2Step2', - name: 'phoneXmpg2Step22', + name: 'phoneXmpg2Step2', component: () => import('@/pages/processCenter/pages/phone/xmpg2/step2.vue'), meta: { isBoolean: true, @@ -2219,6 +2219,16 @@ const routes = [ title: '项目合规评估流程' } }, + { + path: '/phoneXmpg2Step3', + name: 'phoneXmpg2Step3', + component: () => import('@/pages/processCenter/pages/phone/xmpg2/step3.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '项目合规评估流程' + } + }, { path: '/phoneXmpg2Step7', name: 'phoneXmpg2Step7', From bcbdf947799ae05d40f7f69db62d26e52adb6e6e Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 24 Dec 2021 16:52:49 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/phone/xmpg2/step3.vue | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/pages/processCenter/pages/phone/xmpg2/step3.vue b/src/pages/processCenter/pages/phone/xmpg2/step3.vue index 06c812fd1..f0242772e 100644 --- a/src/pages/processCenter/pages/phone/xmpg2/step3.vue +++ b/src/pages/processCenter/pages/phone/xmpg2/step3.vue @@ -375,27 +375,28 @@ export default { this.listForm.jgUser = data[0].name } } else { - changeAssigneeNew({ - taskId: this.$route.query.taskIds, // 任务id - assignee: data[0].id, // 被委托人 - userId: this.$store.getters.userInfo.userId, // 委托人 - pId: this.$route.query.prcId // 流程实例 - }).then(res => { - this.isTransfer = false - if (res.success) { - this.$message.success('调整成功') - this.$router.push("/processCenter"); - this.processNum() - } else { - this.$message.warning(res.message) - } - }) + if (data.length > 0) { + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res => { + this.isTransfer = false + if (res.success) { + this.$message.success('调整成功') + this.$router.push("/processCenter"); + this.processNum() + } else { + this.$message.warning(res.message) + } + }) + } } }, }, mounted() { this.getData(); - this.getTree(); } }; From 1f45d2d1501b10b94253198fde7416fc267b1063 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 24 Dec 2021 16:57:13 +0800 Subject: [PATCH 10/16] commit --- src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzdy/step1.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index 4e254bf55..714e09912 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -410,7 +410,7 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.PPTX' || fileSuffix === '.pptx') { return true } else { this.spinShow = false diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index d78451f29..d0bb9d7a5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -402,7 +402,7 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.PPTX' || fileSuffix === '.pptx') { return true } else { this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件') From 9374d63d37b7418a5a35c35b8a7c8e7d9bc8a63c 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, 24 Dec 2021 15:21:19 +0800 Subject: [PATCH 11/16] commit --- .../pages/creatProcess/xmpg/step3.vue | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 84d1538ad..aabf9187a 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -892,13 +892,16 @@ export default { }, //提交事件 handleSubmit() { - let standList = [] - this.breakdownList.forEach(item => { - if (item.implementer) { - standList.push(item); - } - }); - this.listForm.breakdownList = standList + if(this.breakdownList < 1){ + this.$message.warning('请添加产品线数据') + }else{ + let standList = []; + this.breakdownList.forEach(item => { + if (item.implementer) { + standList.push(item); + } + }); + this.listForm.breakdownList = standList; this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; @@ -922,6 +925,7 @@ export default { this.isSubmit = false; }, e => { }); + } }, drawerCheck(data) { var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); From 2a83a0d74ad7a35b43fb0d115c809530f503c94a 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, 24 Dec 2021 16:34:23 +0800 Subject: [PATCH 12/16] zxk commit --- src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 39b8aaee5..d5f99098f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -184,7 +184,7 @@
- +
- +
Date: Fri, 24 Dec 2021 17:34:46 +0800 Subject: [PATCH 13/16] commit --- .../details/otherLawsStandDetails/index.vue | 2 +- .../details/otherStandardDetails/index.vue | 19 +-- .../pages/creatProcess/bzjd/step1-6.vue | 149 ++++++++++++++---- .../pages/creatProcess/bzjd/step5.vue | 1 + .../pages/creatProcess/bzjd/step6.vue | 16 +- 5 files changed, 125 insertions(+), 62 deletions(-) diff --git a/src/pages/details/otherLawsStandDetails/index.vue b/src/pages/details/otherLawsStandDetails/index.vue index c6c20ddff..2a55b0ad1 100644 --- a/src/pages/details/otherLawsStandDetails/index.vue +++ b/src/pages/details/otherLawsStandDetails/index.vue @@ -17,7 +17,7 @@ >
+ style="border-top:none; position: absolute;right: 36px;border: none">
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 2320b4b2b..f5d615690 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -46,7 +46,7 @@