From 30dd40378ffd9ec8886bcc9689339761ed0fd604 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, 16 Jul 2021 09:05:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1.vue | 203 ++++++++++++++---- .../pages/creatProcess/bzqdfb/step2.vue | 9 +- .../pages/creatProcess/bzqdfb/step3.vue | 8 +- .../pages/creatProcess/bzqdfb/step4.vue | 9 +- .../pages/details.vue | 8 +- .../pages/rectificationDatabase.vue | 9 +- 6 files changed, 192 insertions(+), 54 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 06705c639..b356531af 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -39,7 +39,7 @@ clearable > - + @@ -48,7 +48,7 @@ - - - + + +
+ {{ listForm.modelName }} +
+
+ 点击上传 - - +
+ + + + + + + + + + + + + + + + + + + + + + 是 @@ -182,7 +202,7 @@ - +

会签人

@@ -195,6 +215,19 @@ + + + +

会签人

+
+ + + +
+ + + @@ -598,6 +631,24 @@ 取消 + + +
+ +

点击或拖拽上传文件

+
+ + @@ -617,6 +668,8 @@ export default { }, data() { return { + fileUrl: 'api/att/attFile/upload', + fileMadel: false, standList: [], //新添加的标准 modalshowflag: false, // drawer开关 drawerTitle: "", //drawer标题 @@ -686,7 +739,9 @@ export default { listName: "", //清单名称 applyRegion: "", //适用区域 descriptionList: "", //清单说明 - fileId: "", //附件 + fileId:'', + model: '', // 上传模板 + modelName: '', standId: "", //选择的清单的id signFlag: "1", //是否会签 1为会签 2为不会签 inforlist: "", //用来存放标准列表的标准id @@ -856,12 +911,12 @@ export default { }, //提交事件 handleSubmit() { - // let json = this.listForm; - let json = Object.assign(this.listForm, this.roleForm) - json.zrUserId = this.$store.getters.userInfo.userId; - json.jlUserId = this.$store.getters.userInfo.userId; + let json = this.listForm; + // let json = Object.assign(this.listForm, this.roleForm) + json.zrUserId = this.roleForm.dockUser; //会签人 + json.jlUserId = this.roleForm.directorUser; //业务经理 // (如果是业务经理应该这样写 后续需要更改 例：json.jlUserId = this.roleForm.directorUser;) - json.applyUpdUserId = this.$store.getters.userInfo.userId; + json.applyUpdUserId = this.roleForm.ministerUser; // 修订人 json.approvalOpinion = ""; json.prcCreateUser = this.$store.getters.userInfo.userId; json.prcCreateUserName = this.$store.getters.userInfo.account; @@ -900,23 +955,81 @@ export default { }, // 删除上传的文件 delFileInfo(file, fileList) { - // this.fileInfoList = fileList + this.fileInfoList = fileList }, - // 上传文件成功回调 - uploadBackSuccess(res, file, fileList) { - // if (res.ok) { - // this.fileInfoList = fileList - // this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id - // this.$message.success('上传成功') - // } else { - // this.$message.error(res.message) - // fileList.pop() - // } + fileUpload () { + this.fileMadel = true }, - //上传之前的钩子 - beforeUpload() { - + // 导入标准数据成功后执行 + importFileSuccess (response, file) { + if (response.ok) { + this.fileMadel = false + this.listForm.model = response.data.id + this.listForm.modelName = response.data.name + this.$message({ + showClose: true, + message: response.message, + type: 'success' + }) + } }, + // 导入按钮 上传之前的钩子 + beginImportFile (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 === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' + || fileSuffix === '.PPTX'|| fileSuffix === '.XLS'|| fileSuffix === '.XLSX' + || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || + fileSuffix === '.pdf' || fileSuffix === '.doc' || fileSuffix === '.docx' || fileSuffix === '.ppt' + || fileSuffix === '.pptx'|| fileSuffix === '.xls'|| fileSuffix === '.xlsx' + || fileSuffix === '.png'|| fileSuffix === '.jpg'|| fileSuffix === '.jpeg') { + return true + } else { + this.spinShow = false + this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件') + 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 + }, + // beginImportFile (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 === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' + // || fileSuffix === '.PPTX'|| fileSuffix === '.XLS'|| fileSuffix === '.XLSX' + // || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG') { + // return true + // } else { + // this.spinShow = false + // this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件') + // 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 + // }, //选择清单取消事件 closeDrawer() { this.ListModel = false; @@ -1123,7 +1236,11 @@ export default { } } } - + .add-form-el-select{ + /deep/ .el-select{ + width: 210px; + } + } .demo-drawer-content { margin-top: 10px; } diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index f6de56f6f..994a198e4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -344,6 +344,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) @@ -363,6 +364,9 @@ export default { this.listForm['id'] = item.id this.listForm.dataList = item.dataList this.dataList = item.dataList + this.listForm.applyUpdUserId = item.applyUpdUserId + this.listForm.jlUserId = item.jlUserId + this.listForm.zrUserId = item.zrUserId }) }, @@ -373,10 +377,11 @@ export default { }, //提交事件 handleSubmit() { + this.listForm.applyUpdUserId = this.listForm.applyUpdUserId; + this.listForm.zrUserId = this.listForm.zrUserId; + this.listForm.jlUserId = this.listForm.jlUserId; this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; - this.listForm.zrUserId = this.$store.getters.userInfo.userId ; this.listForm.commentText = this.commentText; this.listForm.approvalOpinion = ""; this.listForm.standId = this.listForm.standId; diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index f98995dff..eb8d88b53 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -499,6 +499,9 @@ export default { this.listForm['id'] = item.id this.listForm.dataList = item.dataList this.dataList = item.dataList + this.listForm.applyUpdUserId = item.applyUpdUserId + this.listForm.jlUserId = item.jlUserId + this.listForm.zrUserId = item.zrUserId }) }, //保存事件 @@ -515,11 +518,12 @@ export default { }, //提交事件 handleSubmit() { - this.listForm.jlUserId = this.$store.getters.userInfo.userId ; + this.listForm.applyUpdUserId = this.listForm.applyUpdUserId; + this.listForm.zrUserId = this.listForm.zrUserId; + this.listForm.jlUserId = this.listForm.jlUserId; this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; this.listForm.commentText = this.commentText; - this.listForm.zrUserId = this.$store.getters.userInfo.userId ; this.listForm.approvalOpinion = ""; this.listForm.standId = this.listForm.standId; const json = JSON.stringify(this.listForm); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 559444354..e9cadf774 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -335,6 +335,9 @@ export default { this.listForm['id'] = item.id this.listForm.dataList = item.dataList this.dataList = item.dataList + this.listForm.applyUpdUserId = item.applyUpdUserId + this.listForm.jlUserId = item.jlUserId + this.listForm.zrUserId = item.zrUserId }) }, //驳回事件 @@ -344,12 +347,12 @@ export default { }, //提交事件 handleSubmit() { - this.listForm.jlUserId = this.$store.getters.userInfo.userId ; + this.listForm.applyUpdUserId = this.listForm.applyUpdUserId; + this.listForm.zrUserId = this.listForm.zrUserId; + this.listForm.jlUserId = this.listForm.jlUserId; this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; this.listForm.commentText = this.commentText; - this.listForm.zrUserId = this.$store.getters.userInfo.userId ; this.listForm.signflag = ""; this.listForm.standId = this.listForm.standId; const json = JSON.stringify(this.listForm); diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 4783a3960..29bc99cf6 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -281,8 +281,12 @@ export default { exportProducdata() {}, deleteStandLawsForProduct() {}, selectStandLawsForProduct() {}, - pageChangeLaws() {}, - pageSizeChangeLaws() {}, + pageChangeLaws() { + + }, + pageSizeChangeLaws() { + + }, standSelectChange() {},//选项值发生改变 }, diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 2f0b17269..67456cdbd 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -204,7 +204,11 @@
- +