From 9bb7f70aa43fd413086f196efeea9c8926c6a8b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 30 Jul 2021 17:39:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localTool/standardRecognition/index.vue | 2 +- .../pages/creatProcess/bzqdfb/step1-1.vue | 1 - .../pages/creatProcess/bzqdfb/step1-3.vue | 871 ++++++++++++++++++ .../pages/creatProcess/bzqdfb/step1.vue | 12 +- .../pages/creatProcess/bzqdfb/step2.vue | 37 +- .../pages/creatProcess/bzqdfb/step3.vue | 138 ++- .../tabComponents/taskDraft/index.vue | 28 +- src/router/index.js | 9 + 8 files changed, 1037 insertions(+), 61 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue index 47590915f..9504629bc 100644 --- a/src/pages/localTool/standardRecognition/index.vue +++ b/src/pages/localTool/standardRecognition/index.vue @@ -640,7 +640,7 @@ export default { this.getTableData(); } else { this.isSubmit = false; - this.$message.error(res.message); + // this.$message.error(res.message); } }, (e) => { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index fdee3c148..7e0edac2e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -847,7 +847,6 @@ export default { queryTaskFirst({ bpnId: this.$route.query.bpnId }).then(res => { - console.log(res.mes); let mes = JSON.parse(res.mes); this.listForm = mes.form; this.dataList = mes.form.dataList; diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue new file mode 100644 index 000000000..36d403f36 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue @@ -0,0 +1,871 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 5b66cb677..03351cc87 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -722,8 +722,8 @@ export default { label: "name" }, roleForm: { - startUserName: this.$store.getters.userInfo.userName, - startUser: this.$store.getters.userInfo.userId, + prcCreateUserName: this.$store.getters.userInfo.userName, + prcCreateUser: this.$store.getters.userInfo.userId, dockUser: "", ministerUser: "", directorUser: "", @@ -1005,6 +1005,7 @@ export default { _formData.append("createUserName", this.$store.getters.userInfo.userName); _formData.append("prcType", "4"); _formData.append("json", JSON.stringify({ + taskInfo: '引入法规标准清单', form: this.listForm, roleForm: this.roleForm, commentText: this.commentText @@ -1023,6 +1024,7 @@ export default { this.$message.warning("标准不能为空"); } else { var json = Object.assign(this.listForm, this.roleForm); + console.log(json) this.$refs["qdfbForm"].validate((valid) => { if (valid) { this.$refs["Form"].validate((valid) => { @@ -1080,12 +1082,12 @@ export default { this.fileIds.push(file.response.data.id); // this.listForm.fileName = this.fileListName.join(','); // this.listForm.fileId = this.fileIds.join(','); - if (this.listForm.fileName === null || this.listForm.fileName === undefined) { + if (this.listForm.fileName === null || this.listForm.fileName === undefined || this.listForm.fileName === '') { this.listForm.fileName = this.fileListName.join(","); } else { this.listForm.fileName = this.listForm.fileName + "," + this.fileListName.join(","); } - if (this.listForm.fileId === null || this.listForm.fileId === undefined) { + if (this.listForm.fileId === null || this.listForm.fileId === undefined || this.listForm.fileName === '') { this.listForm.fileId = this.fileIds.join(","); } else { this.listForm.fileId = this.listForm.fileId + "," + this.fileIds.join(","); @@ -1256,7 +1258,7 @@ export default { this.$set(item, "ZCCSSRQ", item.zccssrqgj); } }) - this.listForm.dataList = res.data; + this.listForm.dataList = res.data.records; let formId = []; this.dataList.map(item => { formId.push(item.id); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index a72213d18..1b18f1766 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -389,25 +389,26 @@ export default { handleSubmit() { if (this.commentText === null || this.commentText === undefined || this.commentText === "") { this.$message.warning("请填写会签意见"); - } - this.listForm.commentText = this.commentText; - this.listForm.approvalOpinion = ""; - this.listForm.signFlag = ""; - const json = JSON.stringify(this.listForm); - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - }, e => { + }else{ + this.listForm.commentText = this.commentText; + this.listForm.approvalOpinion = ""; + this.listForm.signFlag = ""; + const json = JSON.stringify(this.listForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }, e => { - }); + }); + } }, //选择标准取消事件 closeDrawer() { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 936c44f14..6c3a57486 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -51,27 +51,27 @@ clearable > - - - - 点击上传 - - - + +
+

{{ item.name }} + + +

+
+
+ 暂无数据 +
@@ -416,6 +416,7 @@ export default { taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, uploadFileListPath: 'api/att/attFile/upload', // 上传的地址 + fileList:[], fileInfoList: [], // 上传的附件 dataList: [],//清单里的标准数据 standardData: [], //添加标准数据 @@ -587,6 +588,49 @@ export default { }); } }, + // 请求上传的文件信息 + getFileInfo() { + this.$http.get("att/attFile/getMultiFileInfos", { + fileIds: this.fileIds + }, { + _this: this + }, res => { + this.$nextTick(() => { + res.data.map(item => { + // 赋值要回显的上传文件内容 + this.fileList.push({ + name: item.oldFileName, + uid: item.uid, + status: item.status, + id: item.id + }); + }); + }); + }, e => { + }); + }, + /** + * @Description: 点击下载 + */ + downloadFile(attId) { + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } else { + this.$message.error("请选择要下载的文件"); + } + }, + downloadFileByWater(attId, fileSuffix) { + let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); + if (fileExtension !== "pdf" && fileExtension !== "PDF") { + this.$message.error("水印下载仅支持PDF,pdf格式文件"); + } else { + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId; + } else { + this.$message.error("请选择要下载的文件"); + } + } + }, // 删除上传的文件 delFileInfo (file, fileList) { this.fileInfoList = fileList @@ -634,19 +678,33 @@ export default { this.listForm.applyUpdUserId = item.applyUpdUserId this.listForm.jlUserId = item.jlUserId this.listForm.zrUserId = item.zrUserId + this.fileIds = item.fileId; + this.getFileInfo(); }) }, //保存事件 handleSave() { - let _formData = new FormData() - _formData.append('createUser', this.$store.getters.userInfo.userId) - _formData.append('createUserName', this.$store.getters.userInfo.uName) - _formData.append('prcType', this.$route.query.type) + 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", "4"); + _formData.append("json", JSON.stringify({ + taskInfo: '根据会签意见修订', + form: this.listForm, + detailData: this.detailData, + commentText: this.commentText + })); + console.log(_formData); saveTaskFirst(_formData).then(res => { - this.$message.success('保存成功') + this.saveLoading = false; + this.$message.success("保存成功"); + this.bpnId = res.result; + this.$router.push('/processCenter') }).catch(e => { - }) - + this.saveLoading = false; + }); }, //提交事件 handleSubmit() { @@ -726,7 +784,31 @@ export default { padding: 0 20px 0; } } + p { + & > a { + cursor: pointer; + } + & > i { + display: inline-block; + margin-left: 3px; + width: 18px; + height: 16px; + background-repeat: no-repeat; + background-size: 100% 100%; + background-position: center center; + vertical-align: sub; + cursor: pointer; + } + + .icon-download { + background-image: url("~assets/images/shangqi/img/download.png"); + } + + .icon-download2 { + background-image: url("~assets/images/shangqi/img/download2.png"); + } + } .choiceBtn { .el-button--primary { width: 150px; diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index fd95d9787..280ae1e1c 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -262,14 +262,26 @@ export default { }) break case '4': - this.$router.push({ - name: 'bzqdfbStep1-1', - query: { - type: '4', - processName: '标准清单发布更新流程', - bpnId: id - } - }) + if (mes.taskInfo === '引入法规标准清单') { + this.$router.push({ + name: 'bzqdfbStep1-1', + query: { + type: '4', + processName: '标准清单发布流程', + bpnId: id, + verifySarStandard: true, + } + }) + } else if (mes.taskInfo === '根据会签意见修订') { + this.$router.push({ + name: 'bzqdfbStep1-3', + query: { + type: '4', + processName: '申请人修订流程', + bpnId: id + } + }) + } break case '5': this.$router.push({ diff --git a/src/router/index.js b/src/router/index.js index b437ec15b..4a5e76c2d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -258,6 +258,15 @@ const routes = [ title: '标准清单发布/更新流程' } }, + { + path: '/bzqdfbStep1-3', + name: 'bzqdfbStep1-3', + component: () => import('@/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue'), + meta: { + requireAuth: true, + title: '标准清单发布/更新流程' + } + }, { path: '/bzqdfbStep2', name: 'bzqdfbStep2',