From 1ea35ee8c61e76a1f565f9c3da50ab6f1ea83015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 21 Dec 2021 16:29:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2bug=20?= =?UTF-8?q?=20=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step1-1.vue | 123 +++--- .../pages/creatProcess/xmpg/step1-7.vue | 272 ++++++------- .../pages/creatProcess/xmpg/step1.vue | 89 ++-- .../pages/creatProcess/xmpg/step2.vue | 96 ++--- .../pages/creatProcess/xmpg/step3.vue | 225 ++++++----- .../pages/creatProcess/xmpg/step4.vue | 380 +++++++++--------- .../pages/creatProcess/xmpg/step5.vue | 272 ++++++------- .../pages/creatProcess/xmpg/step6.vue | 272 ++++++------- .../pages/creatProcess/xmpg/step7.vue | 272 ++++++------- 9 files changed, 1005 insertions(+), 996 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 61751a987..779be09ba 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -10,7 +10,7 @@
人员信息
-
+
@@ -149,76 +149,77 @@ - - - -
-
- 添加 - 批量删除 -
-
- - - - - - - - - - - - - - - - - - - +
-
-
+ + + +
+
+ 添加 + 批量删除 +
+
+ + + + + + + + + + + + + + + + + + +
+ type="textarea" + :rows="3" + resize="none" + placeholder="请输入意见" + v-model="commentText">
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue index 31429b97f..fecc071a4 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue @@ -11,7 +11,7 @@
审批历史
-
+
@@ -132,143 +132,143 @@ - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ +
- - -
- - -
- -
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 4e537e0a6..a9b8e2959 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -10,7 +10,7 @@
人员信息
-
+
@@ -163,50 +163,49 @@ - - - -
-
- 添加 - 批量删除 -
-
- - - - - - - - - - - +
-
-
+ + + +
+
+ 添加 + 批量删除 +
+
+ + + + + + + + + + +
@@ -221,6 +220,8 @@
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index ee767fa04..64aaa2992 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -10,7 +10,7 @@
审批历史
-
+
@@ -131,55 +131,55 @@ - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + +
+ + +
+ +
- - -
- - -
- -
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index cb4584e91..84d1538ad 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -15,7 +15,7 @@ -
+
- - - -
-
- 添加 - - 批量删除 - - - 批量分发落实人 - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + + +
+
+ 添加 + + 批量删除 + + + 批量分发落实人 + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -341,7 +342,7 @@ type="primary" class="common-button-primary" size="small" - @click="getProject"> + @click="getProjectBtn"> 查询 @@ -360,7 +361,7 @@ style="width: 100%" border ref="table" - height="100%" + class="table-height" :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="selectThree" @@ -679,6 +680,10 @@ export default { } }, + getProjectBtn(){ + this.pageNo = 1, + this.getProject() + }, getProject() { this.$http.get("sarStandProjectLibrary/queryProjectUnderLine", { productLine: this.projectLineId, @@ -967,16 +972,14 @@ export default { padding: 0 20px 0; } } - + position: relative; + height: 100%; .choiceBtn { .el-button--primary { width: 150px; } } - position: relative; - height: 100%; - .headerTabs { height: 52px; display: flex; @@ -1035,6 +1038,10 @@ export default { .demo-drawer-content { margin-top: 10px; } + .table-height{ + height: calc(~'100% - 65px'); + overflow: auto; + } } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index d53e467ad..ad6f211cc 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -10,7 +10,7 @@
审批历史
-
+
@@ -131,201 +131,201 @@ - - - -
-
- 批量编辑 - -
+
+ + + +
+
+ 批量编辑 +
- - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
+ + +
+ + +
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 913ab3266..47848c7d6 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -10,7 +10,7 @@
审批历史
-
+
@@ -131,143 +131,143 @@ - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ +
- - -
- - -
- -
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index a8c69fcbc..3452a93fc 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -10,7 +10,7 @@
审批历史
-
+
@@ -131,143 +131,143 @@ - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ +
- - -
- - -
- -
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index af28d33af..9b38a0e3c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -10,7 +10,7 @@
审批历史
-
+
@@ -131,143 +131,143 @@ - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ +
- - -
- - -
- -
From 4757f1f0c2c315ba60977c91835ff7614f9509d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 21 Dec 2021 16:44:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=BA=9F=E6=AD=A2=20?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8E=86=E5=8F=B2=E8=A1=A8=E6=A0=BC=E9=AB=98?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbfz/step2.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbfz/step3.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbfz/step4.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbfz/step5.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbfz/step6.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbfz/step7.vue | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue index f4031ff2c..e3f943558 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue @@ -159,7 +159,7 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Date: Tue, 21 Dec 2021 17:03:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzhHd-rh/step1.vue | 29 +- .../pages/creatProcess/bzhHd-rh/step2.vue | 5 +- .../pages/creatProcess/bzhHd-rh/step3.vue | 2 +- .../pages/creatProcess/bzhHd-rh/step5.vue | 288 +++++++++++++++++- 4 files changed, 306 insertions(+), 18 deletions(-) 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 {