From a076d1914c5877ddfc64ac69fb665a53a57dfc9e Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 11 Jan 2022 22:56:01 +0800 Subject: [PATCH] feat: There is no way the, buss2 --- src/pages/home2/components/todoList/index.vue | 2 +- .../qbrk-product/common/formEditList.vue | 320 ++++++-- .../qbrk-product/common/formList.vue | 328 +++++--- .../pages/creatProcess/qbrk-product/step1.vue | 75 +- .../creatProcess/qbrk-product/step13.vue | 730 +++++++++--------- .../pages/creatProcess/qbrk-product/step3.vue | 18 +- .../pages/creatProcess/qbrk-product/step5.vue | 500 +++++++----- .../pages/creatProcess/qbrk-product/step6.vue | 156 ++-- .../pages/creatProcess/qbrk/step13.vue | 4 +- .../pages/creatProcess/qbrk/step5.vue | 2 +- .../tabComponents/processCenter/index.vue | 2 +- .../tabComponents/taskDraft/index.vue | 20 + 12 files changed, 1370 insertions(+), 787 deletions(-) diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 8ec8b9542..1a8af79fd 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -398,7 +398,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '总院标准法规部产品标准工程师/各事业部标准化员发布'){ + }else if (row.taskInfo === '总院标准法规部产品标准工程师发布'){ this.$router.push({ name: 'bussLibraryProduct13', query: { 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 2f846802e..eb41d0d72 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue @@ -17,6 +17,11 @@ > + + + - + @@ -82,6 +86,13 @@ value-format="yyyy-MM-dd" > + + + @@ -114,7 +125,7 @@
{{ item.name }} - +
@@ -142,7 +153,7 @@
{{ item.name }} - +
@@ -172,7 +183,7 @@
{{ item.name }} - +
@@ -200,7 +211,7 @@
{{ item.name }} - +
@@ -254,15 +265,15 @@ > - - - - - - - - - + + + + + + + + + @@ -298,15 +309,15 @@ > - - - - - - - - - + + + + + + + + +
@@ -330,33 +341,33 @@ @click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'" >{{'手动查找'}} - + -
-
-
- {{ item.name }} - - - -
-
-
- - - -
-
+ {{'手动查找'}} + + + + {{'手动查找'}} @@ -382,9 +393,178 @@ :disabled="true" > + + + + + + + +
+
+
+ {{ item.name }} + + + +
+
+
+ + + +
+
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -423,6 +603,14 @@ type: Array, required: true }, + summaryFileListSub: { + type: Array, + required: false + }, + madelSubListSub: { + type: Array, + required: false + }, disabledState: { type: Boolean, default: false @@ -431,10 +619,18 @@ type: Boolean, default: false }, + fbNode: { + type: Boolean, + default: false + }, fileMadelSub: { type: Boolean, default: false }, + opinionsShow: { + type: Boolean, + default: false + }, fbgDown: { type: Boolean, default: false @@ -476,6 +672,8 @@ LSBBBUSSFileList: [], QTWJBUSSFileList: [], GLWJBUSSFileList: [], + summaryFileList: [], + madelSubList: [], countryOptions:[],//国家地区 standSortOptions: [], // 标准类别 standNatureOptions: [], // 标准性质 @@ -514,6 +712,16 @@ ...mapGetters(['userInfo']) }, methods: { + filterOp(data){ + if(!data){ + return "" + } + const map = new Map(); + map.set("1","采纳"); + map.set("2","部分采纳"); + map.set("3","不采纳"); + return map.get(data) + }, choiceZRR1(type, title, id) { this.$emit('formChoiceZRR1',type,title,id) }, @@ -587,10 +795,14 @@ case 'GLWJBUSS': this.fileList=this.GLWJBUSSFileList break; + case 'madelSub': + this.fileList=this.madelSubList + break; default : ; } this.fileMadel = true; - this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,fileType); + console.log(this.madelSubList) + this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,fileType,this.madelSubList); }, filePreview(){ this.$preview(this.fileId) @@ -647,11 +859,14 @@ }, mounted () { this.form = this.formSub, - this.FBGBUSSFileList= this.FBGBUSSFileListSub, + console.log(this.form) + this.FBGBUSSFileList= this.FBGBUSSFileListSub, this.BZSMBUSSFileList= this.BZSMBUSSFileListSub, this.LSBBBUSSFileList= this.LSBBBUSSFileListSub, this.QTWJBUSSFileList= this.QTWJBUSSFileListSub, this.GLWJBUSSFileList= this.GLWJBUSSFileListSub, + this.summaryFileList= this.summaryFileListSub, + this.madelSubList= this.madelSubListSub, this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { @@ -680,6 +895,7 @@ this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 + this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度 this.setMap(this.standStateOptions) }) this.busVsFunc() @@ -689,7 +905,7 @@ form: { handler: function (val) { if(val){ - this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel); + this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,'',this.madelSubList); } }, deep: true //对象的深度验证 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 92b39e425..4dbc3dcfa 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue @@ -32,6 +32,7 @@ + @@ -58,16 +59,16 @@ + + + - - - @@ -93,42 +94,54 @@ -
- - {{value.name}} -
-
- - - +
+ {{ item.name }} + + +
+ + + + -
- - {{value.name}} -
-
- - - +
+ {{ item.name }} + + +
+ + + + -
- - {{value.name}} -
-
- - - +
+ {{ item.name }} + + +
+ + + + -
- - {{value.name}} -
-
- - - +
+ {{ item.name }} + + +
+ + + + @@ -159,22 +172,22 @@ > - - - - - - - - - + + + + + + + + + - + @@ -196,15 +209,15 @@ > - - - - - - - - - + + + + + + + + +
@@ -220,14 +233,17 @@ clearable > - -
- - {{value.name}} -
-
- - - -
+ + + + + @@ -244,6 +260,28 @@ :disabled="true" > + + + + + + +
+ {{ item.name }} + + + +
+ + + + +
@@ -263,76 +301,118 @@ default-expand-all> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - -
@@ -388,6 +468,10 @@ type: Boolean, default: false }, + fileShow: { + type: Boolean, + default: false + }, }, filters: { ellipsis (value) { @@ -402,7 +486,8 @@ return { opinionsAdoptedOptions:[ {value: '1',label: '采纳'}, - {value: '2',label: '不采纳'}, + {value: '2',label: '部分采纳'}, + {value: '3',label: '不采纳'}, ], countryOptions:[],//国家地区 standSortOptions: [], // 标准类别 @@ -442,6 +527,34 @@ ...mapGetters(['userInfo']) }, methods: { + filterOp(data){ + if(!data){ + return "" + } + const map = new Map(); + map.set("1","采纳"); + map.set("2","部分采纳"); + map.set("3","不采纳"); + return map.get(data) + }, + // 文件预览及下载 + 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) @@ -470,6 +583,8 @@ }, }, mounted () { + console.log(this.form.infoList) + console.log(this.form) this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { @@ -498,6 +613,7 @@ this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 + this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度 this.setMap(this.standStateOptions) }) this.busVsFunc() diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 6ba7e71be..77f990e9e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -179,7 +179,7 @@ - + - - - - - - - - - + + + + + + + + + @@ -306,15 +306,15 @@ > - - - - - - - - - + + + + + + + + +
@@ -598,23 +598,23 @@ -

总院标准法规部产品标准工程师/各事业部标准化员

+

总院标准法规部产品标准工程师

- -
- - - - - - -

抄送人员

-
- +
+ + + + + + + + + +
@@ -968,6 +968,7 @@ /> !res.has(newArr) && res.set(newArr, 1)); + }, checkedRole2 (data) { let idList = '' let nameList = '' @@ -1691,6 +1696,13 @@ this.form.QCRBUSSID=idList; this.form.QCRBUSS=nameList; } + + if(data && data.length > 0){ + const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",") + const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",") + this.form.QCDWID = institutionIdList + this.form.QCDW = institutionNameList + } }, checkedRole (data) { if (this.type === 0) { @@ -2643,7 +2655,6 @@ this.isSubmit = true this.saveLoading = true this.form.country=this.countryArr; - this.form.standCode = this.form.standSort + ' ' + this.form.standNumber + ( this.form.standYear === '' ? '' : '-' + this.form.standYear) +' X' var json = Object.assign(this.form, this.roleForm) json.zrUserId = this.form.zrUserId json.jlUserId = this.form.jlUserId diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 81327f6f9..43a7b4d9a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -2,12 +2,11 @@ - +
-
基础信息
- +
审批历史
@@ -19,17 +18,31 @@ label-width="210px" >
- + :fbNode = "true" + @formCancel="formCancel" + @formSelectLawsCancel = "formSelectLawsCancel" + @formChoiceZRRListCancel = "formChoiceZRRListCancel" + @formChoiceQCDW = "formChoiceQCDW" + @formChoiceZRR1 = "formChoiceZRR1" + @formChoiceZRR2 = "formChoiceZRR2" + @formChoiceZRR3 = "formChoiceZRR3" + @formChoiceZRR4 = "formChoiceZRR4" + />
@@ -38,6 +51,14 @@ ref="formTongGuo" :model="formTongGuo" :rules="rules"> + + + + + + + + @@ -55,85 +76,85 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -349,6 +373,12 @@ @checkedRole="checkedRole" :nodeList="nodeList" > + @@ -553,12 +583,11 @@