diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 0bd81f495..32df2bcfe 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -150,7 +150,7 @@ show-overflow-tooltip align="center"> + + + + + +
选择附件 @@ -51,7 +61,7 @@ v-model="form.fjListId" style="display: none;" > -
+
{{ item.fileName }} { - // this.fjList = res.data - // this.fzlistModel = true - // }) }, handleSelection2(data) { - if (data.length > 1) { - this.$message.warning('最多选择1条附件') - } else { - this.addFjList = data - } + this.addFjList = data }, closeDrawer2() { this.fzlistModel = false @@ -619,16 +623,18 @@ export default { enterDrawer2() { this.fzlistModel = false this.form.fjList = this.addFjList - this.form.textType = this.setWBType(this.addFjList[0].standFileClassify) - this.form.textValue = this.addFjList[0].standFileClassify let idList = [] let nameList = [] this.addFjList.forEach(item => { - idList.push(item.id) - nameList.push(item.fileName) + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.fileName }) - this.form.fjListName = nameList.join(',') - this.form.fjListId = idList.join(',') + this.form.fjListName = nameList + this.form.fjListId = idList }, // 点击查看 handlePreview(item) { @@ -681,7 +687,7 @@ export default { sarStandCompareHis() { this.spinShow = true var formData = this.standCommonlySearch - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1', formData, { _this: this }, res => { this.standInfoList = res.data.list @@ -725,7 +731,14 @@ export default { } else { this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + ' ' + bringData[0].standName } + this.form.standType = bringData[0].standType + this.form.standId = bringData[0].id this.listModel = false; + this.$http.get('SarStandItems/sar-stand-items/getFileType', { + standId: bringData[0].id + }, {}, res => { + this.textTypeList = res.data + }) } else if (this.selectedList.length > 1) { this.$message.warning("只能选择一条数据进行带入"); } else { @@ -747,7 +760,7 @@ export default { }) if (this.type2 === '1') { this.roleForm.dockUserList = idList - this.roleForm.dockUserName = nameList + this.roleForm.dockUserListName = nameList } else { this.roleForm.directorUser = idList this.roleForm.directorUserName = nameList diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue index 0a2f22706..3d6e695ee 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue @@ -53,7 +53,7 @@ v-model="form.fjListId" style="display: none;" > -
+
{{ item.fileName }}
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 850227d12..947de6b05 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -43,6 +43,16 @@ placeholder="请选择结束日期"> + + + + + +
选择附件 @@ -51,7 +61,7 @@ v-model="form.fjListId" style="display: none;" > -
+
{{ item.fileName }} { - // this.fjList = res.data - // this.fzlistModel = true - // }) }, handleSelection2(data) { - if (data.length > 1) { - this.$message.warning('最多选择1条附件') - } else { - this.addFjList = data - } + this.addFjList = data }, closeDrawer2() { this.fzlistModel = false @@ -629,16 +632,18 @@ export default { enterDrawer2() { this.fzlistModel = false this.form.fjList = this.addFjList - this.form.textType = this.setWBType(this.addFjList[0].standFileClassify) - this.form.textValue = this.addFjList[0].standFileClassify let idList = [] let nameList = [] this.addFjList.forEach(item => { - idList.push(item.id) - nameList.push(item.fileName) + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.fileName }) - this.form.fjListName = nameList.join(',') - this.form.fjListId = idList.join(',') + this.form.fjListName = nameList + this.form.fjListId = idList }, // 点击查看 handlePreview(item) { @@ -729,9 +734,8 @@ export default { this.listModel = false; this.$http.get('SarStandItems/sar-stand-items/getFileType', { standId: bringData[0].id - }, res => { - console.log(data); - console.log(res.data); + }, {}, res => { + this.textTypeList = res.data }) } else if (this.selectedList.length > 1) { this.$message.warning("只能选择一条数据进行带入"); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 94ef10e6d..3b8a22377 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -45,7 +45,7 @@ v-model="form.fjListId" style="display: none;" > -
+
-
+
{ if (res.ok) { this.options = res.data.list + console.log(res); } }, e => { }) @@ -691,7 +692,7 @@ this.form.endTime = data.endTime || data.form.endTime this.todoId = res.id this.json = data - this.getItemList(data.standId,this.form.textValue) + this.getItemList(data.standId,data.textType) this.data = data.info || data.data || data.form.data || [] }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 9a957e8d5..f885298fb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -45,7 +45,7 @@ v-model="form.fjListId" style="display: none;" > -
+
-
+
-
+
{ }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 7982461c2..1dbab8c1c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -45,7 +45,7 @@ v-model="form.fjListId" style="display: none;" > -
+
-
+
-
+
-
+
-
+
@@ -352,6 +355,13 @@ @checkedRole="checkedRole" :nodeList="nodeList" > + @@ -560,7 +570,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process"; + import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process"; import {getEvaluationIndex} from "api/businessApi"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; @@ -2310,6 +2320,37 @@ this.rules.commentText[0].required = true; } }, + checkedRoleTransfer (data) { + this.assigneeNewLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + userId:this.$store.getters.userInfo.userId, // 委托人 + assignee: data[0].id, // 被委托人 + pId: this.$route.query.prcId, // 流程实例 + }).then(res => { + this.assigneeNewLoading = false + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } else { + this.$message.warning(res.message) + } + }) + }, + handleTransfer() { + this.drawerModal = true + this.drawerTitle = '转办处理人' + }, + handle1(){ + this.formTongGuo.approvalOpinion = 1 + this.handleSubmit() + }, + handle2(){ + this.formTongGuo.approvalOpinion = 0 + this.handleSubmit() + }, handleSubmit() { this.getRule() // const val= this.form.country; diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue index 0032d2c0a..b92f7ccad 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue @@ -314,13 +314,18 @@ + + + @@ -665,7 +678,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process"; + import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process"; import {getEvaluationIndex} from "api/businessApi"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; @@ -1383,6 +1396,25 @@ this.roleForm.hqUserName=nameList; } }, + checkedRoleTransfer (data) { + this.assigneeNewLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + userId:this.$store.getters.userInfo.userId, // 委托人 + assignee: data[0].id, // 被委托人 + pId: this.$route.query.prcId, // 流程实例 + }).then(res => { + this.assigneeNewLoading = false + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } else { + this.$message.warning(res.message) + } + }) + }, checkedRole (data) { if (this.type === 0) { this.roleForm.deptUserId = data[0].id @@ -2234,6 +2266,22 @@ handleTabs(name) { this.active = name }, + handleTransfer() { + this.drawerModal = true + this.drawerTitle = '转办处理人' + }, + handle1(){ + this.formTongGuo.approvalOpinion = 1 + this.handleSubmit() + }, + handle2(){ + this.formTongGuo.approvalOpinion = 0 + this.$refs['form'].validate((valid) => { + if (valid) { + this.handleSubmit() + } + }) + }, //保存 handleSave() { this.form.country=this.countryArr; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 92c075e4a..c93396988 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -443,32 +443,34 @@
- + - - - - - - - + @selection-change="selectThree" + > + + + + + + + +
- + - - - - - - - + @selection-change="selectThree" + > + + + + + + + +
{ let index; index = this.breakdownList.findIndex(items => { - return items.itemsName === item.itemsName; + return items.itemsName === item.itemsName && items.projectName === item.projectName; }); if (index > -1) { this.breakdownList.splice(index, 1); @@ -874,6 +875,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.listForm.breakdownList = this.breakdownList; let _formData = new FormData(); _formData.append("id", this.bpnId || ""); _formData.append("prcType", "5"); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index c73ea50ae..c56e7c3fd 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -731,6 +731,7 @@ export default { 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', '') @@ -740,6 +741,7 @@ export default { }) } 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; @@ -870,7 +872,7 @@ export default { saveBatchEditForm() { this.dataList.forEach(item => { this.selectList.forEach(items => { - if (item.itemNum === items.itemNum) { + if (item.itemNum === items.itemNum && item.projectName === items.projectName) { item.complianceReasons = this.batchEditForm.complianceReasons; //不合规 item.noCompliance = this.batchEditForm.noCompliance; @@ -881,6 +883,7 @@ export default { } }); }); + this.$refs.multipleTable.clearSelection() this.modalShowFlag = false; }, cancelBatchEditForm() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 47848c7d6..365050bf3 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -568,6 +568,7 @@ export default { if(!this.commentText){ this.$message.warning('请填写审批意见') }else{ + this.isSubmit = true this.listForm.applyUpdUserId = this.dataList[0].distributePersonId this.listForm.commentText = this.commentText; this.listForm.dataList = this.dataList @@ -584,6 +585,7 @@ export default { this.$message.success(res.message) this.$router.push('/processCenter') } + this.isSubmit = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 9b38a0e3c..34161e456 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -553,6 +553,7 @@ export default { this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName this.listForm.id = item.id + // this.commentText = '' this.dataList = item.dataList }) },