diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList-1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList-1.vue index 5ca6258f6..2c1603a59 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList-1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList-1.vue @@ -29,13 +29,13 @@ :editable="false" disabled > - - - + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue index 31419e2d5..418a7fac4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue @@ -29,13 +29,13 @@ :editable="false" > - - - + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue index cfd299649..d7a03d72d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue @@ -27,10 +27,10 @@ :editable="false" > - - - + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue index 79755ec61..854853630 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue @@ -27,10 +27,10 @@ clearable > - - - + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/uploadFile.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/uploadFile.vue new file mode 100644 index 000000000..bc559fbdc --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/uploadFile.vue @@ -0,0 +1,186 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index b2e08633d..7411d23b4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -58,13 +58,13 @@ :editable="false" > - - - + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 323d3fb99..c6982c76b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -232,25 +232,37 @@ > - + + + + + + + + + + + + + + + + + + + -
- -

点击或拖拽上传文件

-
- + + { @@ -2087,7 +2101,7 @@ }, // 文件预览及下载 handleFilePreview(file) { - const attId = file.response.data.id + const attId = file.response ? file.response.data.id : file.id if (this.preview) { if (attId) { window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId @@ -2095,22 +2109,23 @@ this.$message.warning('文件不存在,下载失败') } } else { - this.getBusStandFileByAttId(attId) - .then(res => { - if(res){ - const editFileInfo = res - if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){ - window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl) - }else { - const nowTime = new Date().getTime() - // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))); - window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) - } - } - }).catch(e => { - console.log(e) - this.$message.warning('文件不存在,预览失败') - }) + this.$preview(attId) + // this.getBusStandFileByAttId(attId) + // .then(res => { + // if(res){ + // const editFileInfo = res + // if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){ + // window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl) + // }else { + // const nowTime = new Date().getTime() + // // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))); + // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) + // } + // } + // }).catch(e => { + // console.log(e) + // this.$message.warning('文件不存在,预览失败') + // }) } }, // 导入标准数据成功后执行 @@ -2126,35 +2141,43 @@ switch (this.fileType){ case 'FBGBUSS': this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined); - this.FBGBUSSFileList.push(fileObj) + if(this.FBGBUSSFileList.every(item => item.id !== fileObj.id)) + this.FBGBUSSFileList.push(fileObj) break; case 'BZSMBUSS' : this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined); - this.BZSMBUSSFileList.push(fileObj) + if(this.BZSMBUSSFileList.every(item => item.id !== fileObj.id)) + this.BZSMBUSSFileList.push(fileObj) break; case 'LSBBBUSS': this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined); - this.LSBBBUSSFileList.push(fileObj) + if(this.LSBBBUSSFileList.every(item => item.id !== fileObj.id)) + this.LSBBBUSSFileList.push(fileObj) break; case 'QTWJBUSS': this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined); - this.QTWJBUSSFileList.push(fileObj) + if(this.QTWJBUSSFileList.every(item => item.id !== fileObj.id)) + this.QTWJBUSSFileList.push(fileObj) break; case 'GLWJBUSS': this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined); - this.GLWJBUSSFileList.push(fileObj) + if(this.GLWJBUSSFileList.every(item => item.id !== fileObj.id)) + this.GLWJBUSSFileList.push(fileObj) break; case 'summaryFile': this.summaryFileList = this.summaryFileList.filter ( item => item.response === undefined); - this.summaryFileList.push(fileObj) + if(this.summaryFileList.every(item => item.id !== fileObj.id)) + this.summaryFileList.push(fileObj) break; case 'madelSub': this.madelSubList = this.madelSubList.filter ( item => item.response === undefined); - this.madelSubList.push(fileObj) + if(this.madelSubList.every(item => item.id !== fileObj.id)) + this.madelSubList.push(fileObj) break; case 'XGD': this.XGDFileList = this.XGDFileList.filter ( item => item.response === undefined); - this.XGDFileList.push(fileObj) + if(this.XGDFileList.every(item => item.id !== fileObj.id)) + this.XGDFileList.push(fileObj) break; default : ; } @@ -2164,6 +2187,8 @@ message: response.message, type: 'success' }) + // 关闭上传弹框 + this.fileMadel = false } }, downloadFile (data) { @@ -2235,6 +2260,7 @@ default : ; } this.formKey++ + this.fileMadel = false }, popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData) { @@ -2720,17 +2746,17 @@ if(this.form.standStatus === '2'){ this.form.id = "" this.formKey++ - this.form.standSn = this.form.standNum - this.form.standNumber = this.form.standNum + this.form.standSn = this.form.standNum? this.form.standNum : this.form.standNumber + this.form.standNumber = this.form.standNum? this.form.standNum : this.form.standNumber this.form.standYear = year //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 let judgeFn = new RegExp(/\s+/g); if(judgeFn.test(this.form.standSort)){ - this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + this.form.standCode = this.form.standSort + '' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) }else if(this.form.standSort === 'Q/QCBFC'){ - this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + this.form.standCode = this.form.standSort + '' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) }else { - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + this.form.standCode = this.form.standSort + ' ' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) } this.formKey++ }else if(this.form.standStatus === '1' ){ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index 267666c86..41e302f3e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -1138,17 +1138,17 @@ if(this.form.standStatus === '2'){ this.form.id = "" this.formKey++ - this.form.standSn = this.form.standNum - this.form.standNumber = this.form.standNum + this.form.standSn = this.form.standNum ? this.form.standNum : this.form.standNumber + this.form.standNumber = this.form.standNum ? this.form.standNum : this.form.standNumber this.form.standYear = year //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 var judgeFn = new RegExp(/\s+/g); if(judgeFn.test(this.form.standSort)){ - this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + this.form.standCode = this.form.standSort + '' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) }else if(this.form.standSort === 'Q/QCBFC'){ - this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + this.form.standCode = this.form.standSort + '' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) }else { - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + this.form.standCode = this.form.standSort + ' ' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) } this.formKey++ }else if(this.form.standStatus === '1' ){ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue index 52c1ecfc6..232df3c52 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue @@ -2657,61 +2657,106 @@ this.rules.commentText[0].required = true; } }, - handleSubmit() { - // this.getRule() - // const val= this.form.country; - // if (val !== '' && val !== null && typeof (val) !== 'undefined') { - // if (val instanceof Array) { - // this.form.country = val.join(","); - // } else { - // this.form.country = val - // } - // } else if (val === '') { - // this.form.country = [] - // } - this.$refs['form'].validate((valid) => { - if (valid) { - this.$refs['formTongGuo'].validate((valid) => { - if (valid) { - this.isSubmit = true - this.saveLoading = true - - // this.summary=this.summaryList.map(item => item.id).join(",") - // this.summaryName=this.summaryList.map(item => item.name).join(",") - - this.form.commentText = this.formTongGuo.commentText - // this.form.approvalOpinion = this.formTongGuo.approvalOpinion - // 会签意见存储 - const json = JSON.stringify(this.form); - 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.isSubmit = false - this.saveLoading = false - this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) - // if(this.formTongGuo.approvalOpinion === '1'){ - // this.$message.warning("驳回成功") - // this.isSubmit = false - // // 流程提交之后，应该流转至待办任务页面 - // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) - // }else{ - // this.processCreateLaws(json) - // } - }else { - this.$message.success(res.message) - } - }) - }}) - } + // handleSubmit() { + // // this.getRule() + // // const val= this.form.country; + // // if (val !== '' && val !== null && typeof (val) !== 'undefined') { + // // if (val instanceof Array) { + // // this.form.country = val.join(","); + // // } else { + // // this.form.country = val + // // } + // // } else if (val === '') { + // // this.form.country = [] + // // } + // this.$refs['form'].validate((valid) => { + // if (valid) { + // this.$refs['formTongGuo'].validate((valid) => { + // if (valid) { + // this.isSubmit = true + // this.saveLoading = true + // + // // this.summary=this.summaryList.map(item => item.id).join(",") + // // this.summaryName=this.summaryList.map(item => item.name).join(",") + // + // this.form.commentText = this.formTongGuo.commentText + // // this.form.approvalOpinion = this.formTongGuo.approvalOpinion + // // 会签意见存储 + // const json = JSON.stringify(this.form); + // 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.isSubmit = false + // this.saveLoading = false + // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + // // if(this.formTongGuo.approvalOpinion === '1'){ + // // this.$message.warning("驳回成功") + // // this.isSubmit = false + // // // 流程提交之后，应该流转至待办任务页面 + // // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + // // }else{ + // // this.processCreateLaws(json) + // // } + // }else { + // this.$message.success(res.message) + // } + // }) + // } + // }) + // } + // }) + // }, + verifyHandle(){ + this.$refs['form'].validate((valid) => { + if (valid) { + this.$refs['formTongGuo'].validate((valid) => { + if (valid) { + this.isSubmit = true + this.saveLoading = true + this.form.commentText = this.formTongGuo.commentText + const json = JSON.stringify(this.form); + 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.isSubmit = false + this.saveLoading = false + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + }else { + this.$message.success(res.message) + } + }) + } }) - }, + } + }) + }, + handleSubmit() { + if(this.form.modelData.length>0){ + this.verifyHandle(); + }else{ + this.$confirm('您暂未填写意见，如有意见，请选择取消，如无意见，请选择确认', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.verifyHandle(); + }).catch(() => {}); + } + }, busVsFunc(){ this.$http.get('sarVppsTree/list', '', { _this: this diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index c18f5b8a7..2e9cad37b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -1216,17 +1216,17 @@ if(this.form.standStatus === '2'){ this.form.id = "" this.formKey++ - this.form.standSn = this.form.standNum - this.form.standNumber = this.form.standNum + this.form.standSn = this.form.standNum ? this.form.standNum : this.form.standNumber + this.form.standNumber = this.form.standNum ? this.form.standNum : this.form.standNumber this.form.standYear = year //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 var judgeFn = new RegExp(/\s+/g); if(judgeFn.test(this.form.standSort)){ - this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + this.form.standCode = this.form.standSort + '' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) }else if(this.form.standSort === 'Q/QCBFC'){ - this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + this.form.standCode = this.form.standSort + '' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) }else { - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + this.form.standCode = this.form.standSort + ' ' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) } this.formKey++ }else if(this.form.standStatus === '1' ){ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index 25dddc583..5b51b158a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -1138,17 +1138,17 @@ if(this.form.standStatus === '2'){ this.form.id = "" this.formKey++ - this.form.standSn = this.form.standNum - this.form.standNumber = this.form.standNum + this.form.standSn = this.form.standNum? this.form.standNum : this.form.standNumber + this.form.standNumber = this.form.standNum? this.form.standNum : this.form.standNumber this.form.standYear = year //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 var judgeFn = new RegExp(/\s+/g); if(judgeFn.test(this.form.standSort)){ - this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + this.form.standCode = this.form.standSort + '' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) }else if(this.form.standSort === 'Q/QCBFC'){ - this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + this.form.standCode = this.form.standSort + '' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) }else { - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + this.form.standCode = this.form.standSort + ' ' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) } this.formKey++ }else if(this.form.standStatus === '1' ){ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index e70bc8a2f..4d0d4c99d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -1226,17 +1226,17 @@ if(this.form.standStatus === '2'){ this.form.id = "" this.formKey++ - this.form.standSn = this.form.standNum - this.form.standNumber = this.form.standNum + this.form.standSn = this.form.standNum ? this.form.standNum : this.form.standNumber + this.form.standNumber = this.form.standNum ? this.form.standNum : this.form.standNumber this.form.standYear = year //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 var judgeFn = new RegExp(/\s+/g); if(judgeFn.test(this.form.standSort)){ - this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + this.form.standCode = this.form.standSort + '' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) }else if(this.form.standSort === 'Q/QCBFC'){ - this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + this.form.standCode = this.form.standSort + '' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) }else { - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + this.form.standCode = this.form.standSort + ' ' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) } this.formKey++ }else if(this.form.standStatus === '1' ){ diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 3e09fcd7e..74c30f26f 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -723,7 +723,15 @@ disabled > - - - + + + + + + + + + + + + + + +