diff --git a/src/pages/policyRegulation/problemControl/index.vue b/src/pages/policyRegulation/problemControl/index.vue index 46e2c122b..aec9b53db 100644 --- a/src/pages/policyRegulation/problemControl/index.vue +++ b/src/pages/policyRegulation/problemControl/index.vue @@ -48,6 +48,10 @@ export default { // this.getActiveName() }, mounted () { + if (this.$route.query.keynoteActiveName) { + this.keynoteActiveName = this.$route.query.keynoteActiveName + this.$router.replace({ query: null }) + } var list = []; const menuList = this.$store.getters.getMenuList; let menuData = []; diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index a73609cd6..604347a82 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -345,7 +345,7 @@

费用管理部门

- +
@@ -425,6 +425,12 @@ :nodeList="nodeList" @checkedRole="drawerCheck" /> + 0) { + this.nodeList = id.split(',') + } this.type = type this.drawerTitle = title this.roleShowflag = true }, + choiceFEE(type, title, id) { + this.nodeList = [] + this.nodeList = JSON.parse(JSON.stringify(id.split(','))) + this.drawerTitle = title + this.roleShowflagFEE = true + }, drawerCheck(data) { var idList = '' var nameList = '' @@ -786,6 +801,21 @@ export default { } this.roleShowflag = false }, + drawerCheckFEE(data) { + var idList = '' + var nameList = '' + data.forEach(item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id; + nameList += item.name; + }); + this.roleForm.feeUser = nameList + this.roleForm.feeUserId = idList + this.roleShowflag = false + }, // 流程阶段人选择 choiceZRROne(type, title, id) { diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index b8a95191c..48df85cbe 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -381,6 +381,7 @@ export default { }, // 退回按钮 handleSubmitNo() { + this.$refs['rh_pageData'].clearValidate('comityOpRoleId') if (this.commentText === '') { this.$message.warning('请输入审批意见') } else { @@ -391,22 +392,18 @@ export default { commentText: this.commentText, rh_pageData: this.rh_pageData, } - this.$refs['rh_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('退回成功') - this.$router.push("/processCenter"); - } - }).finally(() => { - this.isSubmit = false - }) + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('退回成功') + this.$router.push("/processCenter"); } + }).finally(() => { + this.isSubmit = false }) } }, diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue index db88f7917..53dee04f2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue @@ -393,6 +393,7 @@ export default { let json = { passFlag: '0', rh_pageData: this.rh_pageData, + commentText: this.textarea, roleList: this.roleForm } if (this.taskInfo === '标准法规部主管领导审核') { diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 41961537d..c20e48566 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -273,7 +273,7 @@

管理推进部

- +
@@ -346,6 +346,12 @@ :nodeList="nodeListOne" @checkedRole="drawerCheckOne" /> + 0) { + this.nodeListOne = id.split(',') + } + this.drawerTitleOne = title + this.roleShowflagFEE = true + }, + drawerCheckFEE(data) { + var idList = '' + var nameList = '' + data.forEach(item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id; + nameList += item.name; + }); + this.roleForm.feeUser = nameList + this.roleForm.feeUserId = idList + this.roleShowflag = false + }, drawerCheckOne(data) { this.unqualidiedData.forEach(item => { item.engineer = data[0].name diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue index d06f9abee..1461b4d12 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue @@ -50,7 +50,7 @@
+ @click.native="choiceDirector('directorUser', '选择标准法规部部长', roleForm.directorUser)">
@@ -73,6 +73,13 @@ @checkedRole="checkedRole" :nodeList="nodeList" > + 0) { @@ -165,6 +180,7 @@ export default { } else if (this.type === "directorUser") { this.roleForm.directorUser = data[0].id; this.roleForm.directorUserName = data[0].name; + this.modalshowflagDirector = false } this.modalshowflag = false; }, diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue index 9e3def10d..e97cc8920 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue @@ -50,7 +50,7 @@
+ @click.native="choiceZRRS('workPeople', '选择责任工程师', roleForm.workPeople)">
@@ -88,7 +88,6 @@ :nodeList="nodeList" > 0) { + if (this.roleForm.workPeople && this.roleForm.workPeople.length > 0) { this.nodeList2 = this.roleForm.workPeople.split(","); } this.modalshowflag2 = true; diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue index f73a17fe1..5e209bb67 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue @@ -441,6 +441,7 @@ export default { loading: false, detailData: [], //审批历史信息 standardData: [], + selectList: [], standModel: false, pageNo: 1, pageSizeNo: this.$store.getters.userInfo.configContent, @@ -680,6 +681,7 @@ export default { this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, + commentText: this.commentStep, json: JSON.stringify(json) }, { _this: this @@ -692,18 +694,24 @@ export default { }); }, handleSubmit() { + let isValid = true if (this.participantsData.length < 1) { this.$message.warning("项目信息不能为空"); } else { this.participantsData.forEach(item => { - if (item.projectNumber === undefined) { + if (item.projectNumber === undefined || item.projectNumber === '') { this.$message.warning("请完善项目信息"); + isValid = false } }); + if (!isValid){ + return + } this.wbbzform.commentText = this.commentStep; let json = { participantsData: this.participantsData, wbbzform: this.wbbzform, + commentText: this.commentStep, signFlag: '1', }; this.isSubmit = true; @@ -723,6 +731,7 @@ export default { this.isSubmit = false }); } else { + this.isSubmit = false return this.$message.warning("请完善基础信息"); } }); @@ -735,15 +744,46 @@ export default { projectName: this.projectName, expenses: this.expenses, costBudget: this.costBudget, + delId: Date.now() }; this.participantsData.push(list); }, //批量刪除按鈕事件 deleteProject() { - + if(this.selectList.length < 1){ + this.$message.warning('请选择一条数据进行删除') + }else{ + this.$confirm('您确认删除这些数据？', '提示', { + confirmButtonText: "确认", + confirmButtonClass: "common-button-primary", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + let exits = []; + this.selectList.map(item => { + let index; + index = this.participantsData.findIndex(items => { + return items.delId === item; + }); + if (index > -1) { + this.participantsData.splice(index, 1); + } + exits.push(item); + }); + this.selectList = []; + }).catch(() => { + }); + } }, handleSelectionChange1(data) { - + if (this.participantsData.length === 0){ + this.selectList = [] + return + } + this.selectList = [] + for (let i = 0; i < data.length; i++){ + this.selectList.push(data[i].delId) + } } }, computed: { diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue index 75037495d..4c2e65c1e 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue @@ -373,6 +373,7 @@ export default { let json = { participantsData: this.participantsData, wbbzform: this.wbbzform, + commentText: this.commentText, signFlag: '2', }; this.$refs["wbbzForm"].validate((valid) => { @@ -410,6 +411,7 @@ export default { let json = { participantsData: this.participantsData, wbbzform: this.wbbzform, + commentText: this.commentText, signFlag: '1', }; this.$refs["wbbzForm"].validate((valid) => { diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue index 2bceeb15f..8e418ec24 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue @@ -373,6 +373,7 @@ export default { let json = { participantsData: this.participantsData, wbbzform: this.wbbzform, + commentText: this.commentText, signFlag: "2" }; this.$refs["wbbzForm"].validate((valid) => { @@ -410,6 +411,7 @@ export default { let json = { participantsData: this.participantsData, wbbzform: this.wbbzform, + commentText: this.commentText, signFlag: '1', }; this.$refs["wbbzForm"].validate((valid) => { diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue index cf7a6a50d..896b267db 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue @@ -373,6 +373,7 @@ export default { let json = { participantsData: this.participantsData, wbbzform: this.wbbzform, + commentText: this.commentText, bzFlag: '2', }; this.$refs["wbbzForm"].validate((valid) => { @@ -410,6 +411,7 @@ export default { let json = { participantsData: this.participantsData, wbbzform: this.wbbzform, + commentText: this.commentText, bzFlag: '1', }; this.$refs["wbbzForm"].validate((valid) => { diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue index 571142ff9..8a2fcbc19 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue @@ -548,18 +548,16 @@ export default { parList.forEach(items => { if(items.name === item.workPeople){ this.$message.warning('请勿重复添加参与人') - return - }else{ + throw new Error('请勿重复添加参与人') } }) }) - }else{ - this.participantsData = data - this.participantsData.forEach(item => { + } + this.participantsData[this.selectedId] = data[0] + this.participantsData.forEach(item => { this.$set(item, "workPeople", item.name) }); - this.participantsData = JSON.parse(JSON.stringify(this.participantsData)); - } + this.participantsData = JSON.parse(JSON.stringify(this.participantsData)); }, handleTabs(type) { @@ -618,6 +616,33 @@ export default { //流程提交 handleSubmit() { this.isSubmit = true + let isValid1 = true + let isValid2 = true + this.participantsData.forEach(item => { + if (Array.isArray(item) && item.length === 0) { + this.isSubmit = false + isValid1 = false + }else if (typeof item === 'object') { + if (!item.accounts || !item.duties || !item.email || !item.passwords) { + this.isSubmit = false + isValid1 = false + } + } + }) + this.associationData.forEach(item => { + if (!item.contactPerson || !item.mailbox || !item.telephone) { + this.isSubmit = false + isValid2 = false + } + }) + if (!isValid1) { + this.$message.warning('请完善参与人信息') + return + } + if (!isValid2) { + this.$message.warning('请完善协会信息') + return + } this.wbbzform.dlFlag = '1' this.wbbzform.comityOptionsOne = this.comityOptionsOne this.wbbzform.comityOptionsTwo = this.comityOptionsTwo @@ -645,13 +670,23 @@ export default { }); }, handleSelectionChange1(data){ + if (this.participantsData.length === 0){ + this.selectList1 = [] + return + } + this.selectList1 = [] for (let i = 0; i < data.length; i++){ this.selectList1.push(data[i].account) } }, handleSelectionChange2(data){ + if (this.associationData.length === 0){ + this.selectList2 = [] + return + } + this.selectList2 = [] for (let i = 0; i < data.length; i++){ - this.selectList2.push(data[i].id) + this.selectList2.push(data[i].delId) } }, //添加参与人信息 @@ -692,13 +727,37 @@ export default { contactPerson: this.contactPerson, telephone: this.telephone, mailbox: this.mailbox, + delId: Date.now() } console.log(this.associationData); this.associationData.push(list) }, //批量删除协会信息 deleteSociety(){ - + if(this.selectList2.length < 1){ + this.$message.warning('请选择一条数据进行删除') + }else{ + this.$confirm('您确认删除这些数据？', '提示', { + confirmButtonText: "确认", + confirmButtonClass: "common-button-primary", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + let exits = []; + this.selectList2.map(item => { + let index; + index = this.associationData.findIndex(items => { + return items.delId === item; + }); + if (index > -1) { + this.associationData.splice(index, 1); + } + exits.push(item); + }); + this.selectList2 = []; + }).catch(() => { + }); + } }, // 删除上传的文件 delFileInfo(file, fileList) { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 9bf111c7a..ca6f934ad 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -12,11 +12,11 @@
@@ -27,49 +27,49 @@