diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index c7d65f6e4..2b52174d8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -197,7 +197,8 @@ align="center" label="联络人"> + @@ -517,8 +525,10 @@ export default { }, roleShowflag: false, roleShowflagOne: false, + telShowflag: false, nodeList: [], nodeListOne: [], + nodeListTel: [], isSubmit: false, saveLoading: false, @@ -724,6 +734,21 @@ export default { this.deleteDataList = val }, + // 列表选人 + choiceTel(type, title, val,id) { + this.choiceTelList = val + this.nodeListTel = [] + this.nodeListTel.push(id) + this.type = type + this.telShowflag = true + }, + drawerCheckTel(data) { + if(data.length > 0) { + this.choiceTelList.tel_nameId = data[0].id + this.choiceTelList.tel_name = data[0].name + } + this.telShowflag = false + }, // 流程阶段负责人选择 choiceZRR(type, title, id) { this.nodeList = [] @@ -774,7 +799,7 @@ export default { } else if (this.type === 'engineerUser') { this.roleForm.engineerUser = data[0].name this.roleForm.engineerUserId = data[0].id - } else { + }else { this.roleForm.directorUserName = data[0].name this.roleForm.directorUserId = data[0].id } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index b3d7f0df8..b49d22b79 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -112,10 +112,11 @@ + @@ -380,7 +381,7 @@ export default { }, /** 选择入会人员 */ - choiceRole(id) { + choiceRole(type,title,id) { this.nodeList = [] this.nodeList.push(id) this.roleShowflag = true diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index d47554dbc..c44e9d1f7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -431,7 +431,7 @@ export default { this.rh_pageData.fillDept = this.$store.getters.userInfo.institutionName this.rh_pageData.fillUnit = this.$store.getters.userInfo.upDeptName this.rh_pageData.fillTel = this.$store.getters.userInfo.phone - this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName + this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName + '(' + this.$store.getters.userInfo.userId + ')' if (this.rh_pageData.fillFile !== undefined) { this.fillFileList = this.rh_pageData.fillFile } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue index e6f16403b..633899635 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue @@ -138,11 +138,16 @@
+ + 新增 + + @click="del_partForm"> 批量删除
@@ -156,18 +161,53 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '20px'}"> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -256,6 +296,88 @@ 流程列表加载中 + +
+ + + + + + + + + + + + + + + + + + + + + + + + 上传文件 + + + + +
+
+ 取消 + 确认 +
+ + + + + +
+ +

点击或拖拽上传文件

+
+ + + @@ -333,7 +462,25 @@ export default { deleteDataList: [], infoSourcesLength: '', - commentText: '' + commentText: '', + + editFlag: false, + editForm: { + fillPeople: '', + fillUnit: '', + fillDept: '', + fillPost: '', + fillTel: '', + fillMail: '', + }, + + // 上传文件储存 + reData: [], + upDialog: false, + actionPath: 'api/att/attFile/upload', + acceptShow: false, + roleShowflag: false, + nodeList: [], } }, computed: { @@ -382,8 +529,123 @@ export default { // this.rh_pageData.comityFileNum = this.fileTextList }) }, + /** 我司参与人员新增 */ + add_partForm() { + var list = { + fillPeople: this.fillPeople, + fillUnit: this.fillUnit, + fillDept: this.fillDept, + fillPost: this.fillPost, + fillTel: this.fillTel, + fillMail: this.fillMail, + fillFile: this.fillFile = [] + } + this.rh_pageData.myPartRole.push(list) + }, + + fillFile_up(row) { + this.fileListData = row + this.reData = this.fileListData.fillFile + this.upDialog = true + }, + // 文件上传成功 + handleOnsuccess(res, file, fileList) { + if (res.ok) { + if (this.reData !== undefined) { + this.newDataList = this.reData + this.newDataList.push({ + id: res.data.attId, + name: res.data.name + }) + } else { + this.newDataList.push({ + id: res.data.attId, + name: res.data.name + }) + } + + this.fileListData.fillFile = this.newDataList + this.$message({ + showClose: true, + message: res.message, + type: 'success' + }) + this.newDataList = [] + this.fileMadel = false + } + }, + // 文件上传限制条件 + handleBeforeUpload(file) { + var filename = file.name + var index1 = filename.lastIndexOf('.') + var index2 = filename.length + var fileSuffix = filename.substring(index1, index2) + // const fileSuffix = file.name.split('.')[1] // 后缀名 + // 判断上传文件格式 + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { + return true + } else { + this.spinShow = false + this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件') + return false + } + // 判断文件上传大小 + // eslint-disable-next-line no-unreachable + if (file.size / 1024 / 1024 <= 200) { + return true + } else { + this.$message.error('文件' + file.name + '大小不超过200M') + return false + } + return true + }, + // 移除上传的文件 + handleBeforeRemove(file, fileList) { + this.reData.forEach((item, index) => { + if (item.name === file.name || item.id === file.id) { + this.reData.splice(index, 1) + } + }) + this.fileListData.fillFile = this.reData + }, + + handleClose() { + this.upDialog = false + }, + // 编辑按钮 + edit_partForm(row) { + // 用来储存取消时原来的数据，防止取消时修改 + localStorage.setItem('obj', JSON.stringify(row)) + this.fileListData = row + this.reData = this.fileListData.fillFile + this.editForm = row + this.editFlag = true + }, + // 编辑框确认按钮 + OkDrawer() { + this.editFlag = false + }, + falseDrawer() { + let item = JSON.parse(localStorage.getItem('obj')) + this.editForm = item + this.editFlag = false + }, + // 编辑框选人 + choiceRole(type, title,id) { + this.nodeList = [] + this.nodeList.push(id) + this.type = type + this.roleShowflag = true + }, + drawerCheck(data) { + if(data.length > 0) { + this.fileListData.fillPeopleId = data[0].id + this.fileListData.fillPeople = data[0].name + } + this.roleShowflag = false + }, /** 批量删除 */ - del_paryForm() { + del_partForm() { if (this.deleteDataList.length < 1) { this.$message.warning("请选择一条数据进行删除"); } else {