From 48b050b0a19fba8a1cadaef30cd87582f0f11dce Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 7 Jan 2022 17:35:36 +0800 Subject: [PATCH] feat: There is no way the,ddd --- .../creatProcess/qbrk/common/formList.vue | 106 +- .../pages/creatProcess/qbrk/step1.vue | 2 +- .../pages/creatProcess/qbrk/step10.vue | 3 + .../pages/creatProcess/qbrk/step11.vue | 3 + .../pages/creatProcess/qbrk/step12.vue | 142 +- .../pages/creatProcess/qbrk/step13.vue | 2619 +++++++++++++++++ .../pages/creatProcess/qbrk/step2.vue | 3 + .../pages/creatProcess/qbrk/step3.vue | 13 +- .../pages/creatProcess/qbrk/step4.vue | 3 + .../pages/creatProcess/qbrk/step5.vue | 214 +- .../pages/creatProcess/qbrk/step6.vue | 12 +- .../pages/creatProcess/qbrk/step7.vue | 3 + .../pages/creatProcess/qbrk/step8.vue | 3 + .../pages/creatProcess/qbrk/step9.vue | 3 + .../pages/creatProcess/qbrk/stepC3.vue | 15 +- .../tabComponents/processCenter/index.vue | 2 +- src/router/index.js | 10 +- 17 files changed, 3047 insertions(+), 109 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/step13.vue diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue index 1a31c7f96..1bd37e3f7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue @@ -32,10 +32,7 @@ - - - + @@ -62,6 +59,10 @@ + + + -
- - {{value.name}} -
-
- - - +
+ {{ item.name }} + + +
+ + + + -
- - {{value.name}} -
-
- - - +
+ {{ item.name }} + + +
+ + + + -
- - {{value.name}} -
-
- - - +
+ {{ item.name }} + + +
+ + + + -
- - {{value.name}} -
-
- - - +
+ {{ item.name }} + + +
+ + + + @@ -258,13 +271,16 @@ -
- - {{value.name}} -
-
- - - +
+ {{ item.name }} + + +
+ + + + @@ -410,6 +426,10 @@ export default { type: Boolean, default: false }, + fileShow: { + type: Boolean, + default: false + }, }, filters: { ellipsis (value) { @@ -464,6 +484,24 @@ export default { ...mapGetters(['userInfo']) }, methods: { + // 文件预览及下载 + handleFilePreview(file,type) { + let attId = "" + if(file && file.id){ + attId = file.id + }else { + attId = file.response.data.id + } + if (type === 'down') { + if (attId) { + window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId) + } else { + this.$message.warning('文件不存在,下载失败') + } + } else { + this.$preview(attId) + } + }, downloadFile (data) { //文件id中出现了','字符,去除掉 window.open('/api/att/attFile/downloadFileForSar?fileId=' + data.id) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index e9c47b61b..a65fd2c8d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -1492,7 +1492,7 @@ { required: false, message: '请选择企标发布日期', trigger: 'change' } ], putTime: [ - { required: false, message: '请选择企标实施日期', trigger: 'change' } + { required: true, message: '请选择企标实施日期', trigger: 'change' } ], FBGBUSSName: [ { required: false, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue index f16b90d2a..6492bb7ab 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue @@ -962,6 +962,9 @@ issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], + putTime: [ + { required: true, message: '请选择企标实施日期', trigger: 'change' } + ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue index 3ab0c4714..431bf1126 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue @@ -961,6 +961,9 @@ issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], + putTime: [ + { required: true, message: '请选择企标实施日期', trigger: 'change' } + ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index 13ca1f384..3915e44b1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -18,18 +18,27 @@ label-width="210px" >
- + :fileMadelSub = "fileMadel" + :fbgDown = "false" + @formCancel="formCancel" + @formSelectLawsCancel = "formSelectLawsCancel" + @formChoiceZRRListCancel = "formChoiceZRRListCancel" + @formChoiceQCDW = "formChoiceQCDW" + @formChoiceZRR1 = "formChoiceZRR1" + @formChoiceZRR2 = "formChoiceZRR2" + @formChoiceZRR3 = "formChoiceZRR3" + @formChoiceZRR4 = "formChoiceZRR4" + />
@@ -357,6 +366,12 @@ @checkedRole="checkedRole" :nodeList="nodeList" > + @@ -561,7 +576,7 @@ + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue index c35fd6eac..e3386c8e9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -952,6 +952,9 @@ issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change' } ], + putTime: [ + { required: true, message: '请选择企标实施日期', trigger: 'change' } + ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index 2fd189adf..7b5ce1fd6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -1019,7 +1019,7 @@ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], putTime: [ - { required: false, message: '请选择企标实施日期', trigger: 'change' } + { required: true, message: '请选择企标实施日期', trigger: 'change' } ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } @@ -1975,11 +1975,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined); - if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){ - this.$message.error('文件限制只可上传一个') - return false - } + // this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined); + // if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){ + // this.$message.error('文件限制只可上传一个') + // return false + // } if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { @@ -2533,7 +2533,6 @@ this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName); this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName); this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName); - console.log(this.LSBBBUSSFileList) this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName); this.formKey++ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue index bab22e13a..570cb2108 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue @@ -957,6 +957,9 @@ issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], + putTime: [ + { required: true, message: '请选择企标实施日期', trigger: 'change' } + ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index 4bbee0e44..bfc3831b0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -7,8 +7,8 @@
会签评分
基础信息
- -
审批历史
+
会签意见
+
审批历史
- +
--> - - -
-
-
- {{ item.name }} - - - -
-
-
- - - -
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -185,7 +185,128 @@ :disabledState = "disabledState" :verifySarStandard = "verifySarStandard">
- +
+ + + + +
+ @@ -264,7 +385,7 @@ -
+
item.response === undefined && item.raw === undefined); - if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){ - this.$message.error('文件限制只可上传一个') - return false - } + // this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined); + // if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){ + // this.$message.error('文件限制只可上传一个') + // return false + // } if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue index b6f30ab4c..8a1ee1e07 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue @@ -1089,6 +1089,9 @@ issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], + putTime: [ + { required: true, message: '请选择企标实施日期', trigger: 'change' } + ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue index 8fdd3e678..11f460fc1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue @@ -883,6 +883,9 @@ issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], + putTime: [ + { required: true, message: '请选择企标实施日期', trigger: 'change' } + ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue index 10c0623b9..46b4062d4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue @@ -1091,6 +1091,9 @@ issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], + putTime: [ + { required: true, message: '请选择企标实施日期', trigger: 'change' } + ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index 1fdafaf7c..3a1756c5a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -921,6 +921,8 @@ xdUserName: this.$store.getters.userInfo.userName, pxUserId: this.$store.getters.userInfo.userId, pxUserName: this.$store.getters.userInfo.userName, + fbUserId: '', + fbUserName: '', qcUserId: '', // 多实例 qcUserName:'', // 多实例 bzhUserId:'', @@ -1017,7 +1019,7 @@ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], putTime: [ - { required: false, message: '请选择企标实施日期', trigger: 'change' } + { required: true, message: '请选择企标实施日期', trigger: 'change' } ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } @@ -1973,11 +1975,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined); - if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){ - this.$message.error('文件限制只可上传一个') - return false - } + // this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined); + // if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){ + // this.$message.error('文件限制只可上传一个') + // return false + // } if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { @@ -2531,7 +2533,6 @@ this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName); this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName); this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName); - console.log(this.LSBBBUSSFileList) this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName); this.formKey++ diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 882d3509e..c11ae9fa3 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -352,7 +352,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '重新企标汇总修订'){ + }else if (row.taskInfo === '重新企标编写汇总修订'){ this.$router.push({ name: 'bussLibraryC3', query: { diff --git a/src/router/index.js b/src/router/index.js index 0f5a22d51..b12ff7caa 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1067,7 +1067,15 @@ const routes = [ requireAuth: true, title: '企标制修订流程及企业标准库流程' } - }, + },{ + path: '/bussLibrary13', + name: 'bussLibrary13', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step13.vue'), + meta: { + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + }, { path: '/bussLibraryDetail', name: 'bussLibraryDetail',