diff --git a/src/api/unqualProcess.js b/src/api/unqualProcess.js index 94d623b60..e28290abc 100644 --- a/src/api/unqualProcess.js +++ b/src/api/unqualProcess.js @@ -33,7 +33,7 @@ export function dicTypeData (data) { } export function StandardsInfoPage (data) { return axios({ - url: 'api/sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', + url: 'api/sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageBak', method: 'get', params: data }) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index 9d714ddac..6fa355143 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -491,6 +491,7 @@ export default { }, //上传按钮 uploadFile(val) { + this.fileListData = val }, // 文件上传限制条件 handleBeforeUpload(file) { @@ -541,7 +542,7 @@ export default { name: res.data.standName }) } - this.rh_pageData.infoSources = this.newDataList + this.fileListData.fileText = this.newDataList this.$message({ showClose: true, message: res.message, @@ -671,6 +672,8 @@ export default { // 提交按钮 handleSubmit() { let json = { + prcCreateUser: this.$store.getters.userInfo.userId, + prcCreateUserName: this.$store.getters.userInfo.userName, roleList: this.roleForm, rh_pageData: this.rh_pageData, directorList: this.rh_pageData.comityInRoleId, diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index 861f77827..a5422c02b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -102,8 +102,7 @@ :disabled="true" style="width: 30%" v-model="rh_pageData.comityOpRole" - > - + /> @@ -432,6 +431,9 @@ export default { .comityTel_btn { text-align: right; } + /deep/ .el-table__body-wrapper { + height: auto !important; + } /deep/ .el-table th { padding: 0px; diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index bbcb9c090..a9adcf329 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -495,6 +495,9 @@ export default { .comityTel_btn { text-align: right; } + /deep/ .el-table__body-wrapper { + height: auto !important; + } /deep/.el-table th { padding: 0px; } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue index 9e1605eea..3b3a6d8c8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue @@ -445,6 +445,9 @@ export default { .comityTel_btn { text-align: right; } + /deep/ .el-table__body-wrapper { + height: auto !important; + } /deep/.el-table th { padding: 0px; } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue index b82f77cb2..92532257d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue @@ -2,7 +2,10 @@
- + + + +
基础信息
@@ -195,14 +198,20 @@
- + /> + @@ -349,21 +358,22 @@ export default { // 退回按钮 handleSubmitNo() { let json = { + passFlag: '0', rh_pageData: this.rh_pageData, roleList: this.roleForm } if (this.taskInfo === '标准法规部主管领导审核') { - json.passFlag = '0', json.manageDepartmentList = this.roleForm.feeUserId } else if (this.taskInfo === '费用管理部门会签') { - json.passFlag = '0', json.manageDepartment = this.$store.getters.userInfo.userId json.president = this.roleForm.engineerUserId } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { - json.passFlag = '0', json.engineerSumDone = this.roleForm.startUser } else { - json = json + json = { + rh_pageData: this.rh_pageData, + roleList: this.roleForm + } } this.$refs['rh_pageData'].validate((valid) => { if (valid) { @@ -386,21 +396,22 @@ export default { // 提交按钮 handleSubmit() { let json = { + passFlag: '1', rh_pageData: this.rh_pageData, roleList: this.roleForm } if (this.taskInfo === '标准法规部主管领导审核') { - json.passFlag = '1', json.manageDepartmentList = this.roleForm.feeUserId } else if (this.taskInfo === '费用管理部门会签') { - json.passFlag = '1', json.manageDepartment = this.$store.getters.userInfo.userId json.president = this.roleForm.engineerUserId } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { - json.passFlag = '1', json.engineerSumDone = this.roleForm.startUser } else { - json = json + json = { + rh_pageData: this.rh_pageData, + roleList: this.roleForm + } } this.$refs['rh_pageData'].validate((valid) => { if (valid) { @@ -498,6 +509,9 @@ export default { padding: 0px; } + /deep/ .el-table__body-wrapper { + height: auto !important; + } .myPart_btn { text-align: right; } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index c3dc1c60a..1f24cea81 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -2,7 +2,7 @@