diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index b4173dcee..4a1f06106 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -833,6 +833,7 @@ export default { sarAccessListDatas: [], //国家地区清单表格 uploadFileListPath: "api/att/attFile/upload", // 上传的地址 fileInfoList: [], // 上传的附件 + fileListName: [], //上传的附件名称 standardData: [], //添加标准数据 standardData1: [], //添加标准数据 ListModel: false, //选择清单抽屉状态 @@ -1063,6 +1064,8 @@ export default { //提交事件 handleSubmit() { let json = this.listForm; + this.listForm.fileId = this.fileInfoList.join(',') + this.listForm.fileName = this.fileListName.join(',') // let json = Object.assign(this.listForm, this.roleForm) json.zrUserId = this.roleForm.dockUser; //会签人 json.jlUserId = this.roleForm.directorUser; //业务经理 @@ -1107,15 +1110,19 @@ export default { // 删除上传的文件 delFileInfo(file, fileList) { this.fileInfoList = fileList + fileList.forEach(item => { + this.fileListName = item.name + }) }, fileUpload () { this.fileMadel = true }, // 上传文件成功回调 uploadBackSuccess (res, file, fileList) { - console.log(file); - console.log(fileList) if (res.ok) { + fileList.forEach(item => { + this.fileListName = item.name + }) this.fileInfoList = fileList this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id this.$message.success('上传成功') diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 3ed3e478d..8a50ed5d3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -373,6 +373,28 @@ export default { }, selectThree() { + }, + // 请求上传的文件信息 + getFileInfo() { + // this.$http.get("att/attFile/getMultiFileInfos", { + // fileIds: this.sarAccessEO.fileIds + // }, { + // _this: this + // }, res => { + // console.log(res); + // this.$nextTick(() => { + // res.data.map(item => { + // // 赋值要回显的上传文件内容 + // this.fileInfoList.push({ + // name: item.oldFileName, + // uid: item.uid, + // status: item.status, + // id: item.id + // }); + // }); + // }); + // }, e => { + // }); }, pageChange(page) { this.page = page; @@ -391,6 +413,7 @@ export default { mounted() { this.processTable() this.getData() + this.getFileInfo() // console.log(this.$store.getters.getHandleInfo); } }; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 99f9a2305..b09a5622e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -227,7 +227,7 @@ export default { total: 0, pageSize: this.$store.getters.userInfo.configContent, listForm: { - passFlag: "1", //1为审批通过 2 为驳回 + passFlag: " ", //空为审批通过 1 为驳回 standNumber: "", //标准编号 standName: "",//标准名称 certifiedEngineer: "", //认证工程师 @@ -330,7 +330,7 @@ export default { //驳回事件 beforeBack () { - this.listForm.passFlag = '2' + this.listForm.passFlag = '1' this.handleSubmit() }, //提交事件 @@ -341,8 +341,6 @@ export default { this.listForm.zrUserId = this.$store.getters.userInfo.userId ; this.listForm.commentText = this.commentText; this.listForm.standId = this.listForm.standId; - this.listForm.passFlag = '1'; - this.listForm.signFlag = ""; this.listForm.breakdownList = this.listForm.breakdownList const json = JSON.stringify(this.listForm); this.$http.post('lawss/activiti/completeTask', { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 188a4aa17..4844aa217 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -398,8 +398,8 @@ export default { distributePersonId: item.pepdtos[i].distributePersonId, uname: item.pepdtos[i].uname, projectManager: item.pepdtos[i].projectManager, - certifiedEngineer: item.pepdtos[i].certifiedEngineer, - qualityEngineer: item.pepdtos[i].qualityEngineer, + certifiedEngineerName: item.pepdtos[i].certifiedEngineerName, + qualityEngineerName: item.pepdtos[i].qualityEngineerName, standNumber: item.pepdtos[i].standNumber, standName: item.pepdtos[i].standName, xCXSSRQ: item.pepdtos[i].xCXSSRQ, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 86f172357..2807b8dcb 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -35,16 +35,16 @@ clearable > - + - + @@ -390,8 +390,8 @@ export default { listForm: { standNumber: "", //标准编号 standName: "",//标准名称 - certifiedEngineer: "", //认证工程师 - qualityEngineer: "", //质量工程师 + certifiedEngineerName: "", //认证工程师 + qualityEngineerName: "", //质量工程师 dataList: [{ projectManager: '', itemsName: '', @@ -477,6 +477,7 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { + console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg) this.getFormFieldList(processForm) @@ -497,8 +498,8 @@ export default { this.dataList = item.step3DTOS this.listForm.standName = item.step3DTOS[0].standName this.listForm.standNumber = item.step3DTOS[0].standNumber - this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer - this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer + this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName + this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName this.listForm.itemsName = item.step3DTOS[0].itemsName this.listForm.itemNum = item.step3DTOS[0].itemNum this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 148f74c19..c07965369 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -35,16 +35,16 @@ clearable > - + - + @@ -348,8 +348,8 @@ export default { fenFlag: '1', //1为通过 其他为驳回 standNumber: "", //标准编号 standName: "",//标准名称 - certifiedEngineer: "", //认证工程师 - qualityEngineer: "", //质量工程师 + certifiedEngineerName: "", //认证工程师 + qualityEngineerName: "", //质量工程师 breakdownList: [{ //分解单数据 implementer: "", applyArctic: "", @@ -439,14 +439,12 @@ export default { this.dataList = item.dataList this.listForm.standName = item.standName this.listForm.standNumber = item.standNumber - this.listForm.qualityEngineer = item.qualityEngineer - this.listForm.certifiedEngineer = item.certifiedEngineer + this.listForm.qualityEngineerName = item.qualityEngineerName + this.listForm.certifiedEngineerName = item.certifiedEngineerName this.listForm.responsibleUnit = item.responsibleUnit this.listForm.responsibleEngineer = item.responsibleEngineer }) }, - - //驳回事件 beforeBack () { this.listForm.fenFlag = '2' @@ -456,7 +454,6 @@ export default { handleSubmit() { this.listForm.applyUpdUserId = this.dataList[0].distributePersonId this.listForm.commentText = this.commentText; - this.listForm.fenFlag = "1"; this.listForm.dataList = this.dataList const json = JSON.stringify(this.listForm); this.$http.post('lawss/activiti/completeTask', { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index 7673280e2..284d243f7 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -35,16 +35,16 @@ clearable > - + - + @@ -296,7 +296,6 @@ - + - + @@ -296,7 +296,6 @@ + label="条款号"> + label="条款名称"> diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 67456cdbd..d664ec02e 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -167,17 +167,17 @@ label="责任部门">