diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 58f1a1b86..ebb110b56 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -6,7 +6,7 @@
基础信息
-
流程信息
+
人员信息
@@ -22,33 +22,39 @@ - - - - - - - + + + + + + + + +
- - -
- - -
- - + + + + + + + + + + + + +
@@ -110,32 +116,20 @@ :maxlength="100"> - - - -
- - -
- +
{ + this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 + }) standUnqualified(this.queryUnqualidiedData).then(res => { this.unqualidiedData = res.data.records this.unqualidiedData.forEach(item => { + this.$set(item,'engineer','') + this.$set(item,'engineerId','') this.$set(item,'dutyPeopleInfo','') this.$set(item,'dutyPeople','') this.$set(item,'dutyPeopleInfoId','') @@ -306,10 +277,13 @@ export default { }) this.standModel = true; }, - + // 批量删除按钮table，选择数据 + selectedDelete(val) { + this.deleteDataList = val + }, // 点击批量删除事件 deleteList() { - if (this.selectedList.length < 1) { + if (this.deleteDataList.length < 1) { this.$message.warning("请选择一条数据进行删除"); } else { this.$confirm("您确认删除这些数据?", "提示", { @@ -319,7 +293,7 @@ export default { type: "warning" }).then(() => { let exits = []; - this.selectedList.map(item => { + this.deleteDataList.map(item => { let index; index = this.dataList.findIndex(items => { return items.id = item; @@ -329,19 +303,37 @@ export default { } exits.push(item); }); - this.selectedList = []; + this.deleteDataList = []; }).catch(() => { }); } }, //选择标准取消事件 closeDrawer() { - this.ListModel = false; + this.standModel = false }, //未符合项整合确定事件 OkDrawer() { if (this.selectedList.length !== 0) { - this.dataList = this.selectedList + // this.dataList = this.selectedList + // 追加字段 + this.selectedList.map(item => { + let addList; + addList = this.dataList.findIndex(items => { + return items.id == item.id + }) + if(addList > -1){ + // this.$refs.accessTypeSelect.clearSelection() + this.$refs.entryTable.clearSelection() + this.$refs.searchTable.clearSelection() + this.$message.warning('请勿添加重复数据') + } else{ + this.dataList.push(item) + // this.$refs.accessTypeSelect.clearSelection() + this.$refs.entryTable.clearSelection() + this.$refs.searchTable.clearSelection() + } + }) this.standModel = false; } else { this.$message.warning("请选择至少一条数据进行带入"); @@ -356,11 +348,31 @@ export default { }, // 保存按钮 - handleSave() {}, + handleSave() { + this.saveLoading = true + let _formData = new FormData() + _formData.append('id', this.bpnId || '') + _formData.append('createUser', this.$store.getters.userInfo.userId) + _formData.append('createUserName', this.$store.getters.userInfo.userName) + _formData.append('prcType', '8') + _formData.append('json', JSON.stringify({ + roleForm: this.roleForm, + dataList: this.dataList, + commentText: this.commentText + })) + saveTaskFirst(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) + }, // 提交按钮 handleSubmit() { let json = { - startUser: this.$store.getters.userInfo.userId, + prcCreateUser: this.$store.getters.userInfo.userId, + prcCreateUserName: this.$store.getters.userInfo.userName, engineer: this.roleForm.dockUser, standardInfoList: this.dataList, } @@ -372,10 +384,12 @@ export default { } else { this.$refs['roleForm'].validate((valid) => { if (valid) { + this.isSubmit = true const paramsInfo = { type: '8' } startProcess(paramsInfo).then(res => { + console.log(res) this.taskID = res.data const params = new FormData(); params.set('json', JSON.stringify(json)) @@ -386,6 +400,7 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } + this.isSubmit = false }) }) } @@ -402,6 +417,10 @@ export default { this.modalshowflag = true }, drawerCheck (data) { + this.unqualidiedData.forEach(item => { + item.engineer = data[0].name + item.engineerId = data[0].id + }) this.roleForm.dockUser = data[0].id this.roleForm.dockUserName = data[0].name this.modalshowflag = false diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 25ec3cc3e..d0c774c8a 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -6,8 +6,9 @@
基础信息
+
审批历史
-
+
@@ -83,7 +84,7 @@ size="small" type="primary" @click="dutyEngineerList"> - 批量分发负责人 + 批量选择分发负责人
- - - - - - - - + + + + + + + + + + @@ -133,6 +135,73 @@
+
+
+ + + + + + + + + + + + + + + + + + + + + 流程列表加载中 +
+
{ + this.detailData = res + }, e => { + }) + }, getData() { const params = { taskIds: this.taskIds, @@ -250,6 +340,14 @@ export default { this.modalshowflag = true } }, + // 每行选择负责人点击操作 + clickOpen(val, id) { + this.$refs.multipleTable.clearSelection() + this.rowDutyPeople = val + this.nodeList = [] + this.nodeList.push(id) + this.modalshowflag = true + }, // 选择勾选项的集合 handleSelectionChange(value) { this.multipleSelection = value @@ -263,6 +361,7 @@ export default { handleSave() {}, // 提交按钮 handleSubmit() { + this.isSubmit = true let zqa = new Map(); for (let lastDataListElement of this.lastDataList) { let a = zqa.get(lastDataListElement.dutyPeopleInfoId) @@ -286,11 +385,11 @@ export default { let flag=false this.dataList.forEach(item => { if (item.dutyPeopleInfo === '') { - this.$message.warning('请选择分发负责人填入') flag=true + this.isSubmit = false } }) - if(flag)return; + if(flag)return this.$message.warning('请选择分发负责人填入') const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) @@ -300,7 +399,10 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } - }) + this.isSubmit = false + }).catch(e => { + this.isSubmit = false + }) }, // 流程阶段负责人选择 @@ -312,16 +414,21 @@ export default { this.modalshowflag = true }, drawerCheck (data) { - this.roleRow = data + this.roleRow = data[0] // 选取负责人时的操作 - this.multipleSelection.forEach(item => { - item.dutyPeopleInfo = this.roleRow[0].name - item.dutyPeopleInfoId = this.roleRow[0].id - }) + if (this.multipleSelection.length === 0) { + this.rowDutyPeople.dutyPeopleInfo = this.roleRow.name + this.rowDutyPeople.dutyPeopleInfoId = this.roleRow.id + }else { + this.multipleSelection.forEach(item => { + item.dutyPeopleInfo = this.roleRow.name + item.dutyPeopleInfoId = this.roleRow.id + }) + this.$refs.multipleTable.clearSelection() + } this.lastDataList = this.dataList - this.$refs.multipleTable.clearSelection(); // 选取流程信息完成 - this.roleForm.dutyUserInfoName = this.roleRow[0].name + // this.roleForm.dutyUserInfoName = this.roleRow.name this.modalshowflag = false }, //查询按钮 diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index d6d601ff7..e7b4bc4e9 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -6,8 +6,9 @@
基础信息
+
审批历史
-
+
@@ -78,35 +79,49 @@ +
+ + 批量选择负责人 + +
- - - - - - - - + + + + + + + + + + + @@ -126,6 +141,73 @@
+
+
+ + + + + + + + + + + + + + + + + + + + + 流程列表加载中 +
+
{ + this.detailData = res + }, e => { + }); + }, getData() { const params = { taskIds: this.taskIds, @@ -217,19 +322,36 @@ export default { }, // 选择责任人的按钮操作 selectPeople(val) { + this.$refs.multipleTable.clearSelection(); this.newDataList = val this.nodeList = [] this.modalshowflag = true }, + // 批量选择负责人按钮 + dutyPeopleList(id) { + if (this.selectTableMore.length === 0) { + this.$message.warning("请选择至少一条数据进行分发责任人"); + } else { + this.nodeList = [] + this.nodeList.push(id) + this.modalshowflag = true + } + }, + // 勾选的列表事件 + handleSelectionMore(val) { + this.selectTableMore = val + }, handleTabs(name) { this.active = name }, handleSubmitNo() { if (this.commentText) { - var json = this.json - json.actionFlag = 1 - json.commentText = this.commentText + var json = { + actionFlag: 1, + commentText: this.commentText + } + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -239,6 +361,7 @@ export default { this.$message.success('驳回成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') @@ -248,6 +371,15 @@ export default { handleSave() {}, // 提交按钮 handleSubmit() { + this.isSubmit = true + let flag=false + this.dataList.forEach(item => { + if (item.dutyPeople === '') { + flag = true + this.isSubmit = false + } + }) + if(flag)return this.$message.warning('请选择负责人填入') let zqa = new Map(); for (let lastDataListElement of this.lastDataList) { let a = zqa.get(lastDataListElement.dutyPeopleId) @@ -269,13 +401,6 @@ export default { responUserList: list, actionFlag: 0 } - let flag=false - this.dataList.forEach(item => { - if (item.dutyPeople === '') { - this.$message.warning('请选择负责人填入') - flag=true - } - }) if(flag)return; const params = new FormData(); params.set('json', JSON.stringify(json)) @@ -286,14 +411,24 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } + this.isSubmit = false + }).catch(e => { + this.isSubmit = false }) }, drawerCheck (data) { this.roleForm = data[0] // 选择责任人时input框内值 - this.newDataList.dutyPeople = this.roleForm.name - this.newDataList.dutyPeopleId = this.roleForm.id + if (this.selectTableMore.length ===0) { + this.newDataList.dutyPeople = this.roleForm.name + this.newDataList.dutyPeopleId = this.roleForm.id + }else { + this.selectTableMore.forEach(item => { + item.dutyPeople = this.roleForm.name + item.dutyPeopleId = this.roleForm.id + }) + } this.lastDataList = this.dataList this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index 1054cb987..b5827c953 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -6,8 +6,9 @@
基础信息
+
审批历史
-
+
@@ -86,13 +87,17 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> - - - - - - - + + + + + + + + +