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 97c3b1122..40b526665 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue @@ -1,673 +1,701 @@ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index c41f9480e..11262c1ae 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -58,13 +58,6 @@ - - - @@ -109,11 +102,18 @@ clearable > - - + + placeholder="请选择企标实施日期" + value-format="yyyy-MM-dd" + > + + + + + @@ -262,19 +262,25 @@ > + + + + + + + + + - - - @@ -300,8 +306,14 @@ > - - + + + + + + + + @@ -478,7 +490,7 @@

其他起草人

- +
@@ -964,17 +976,44 @@ :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> - + + + @@ -986,6 +1025,8 @@ import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId} from "api/process"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; + import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; + let Base64 = require('js-base64').Base64; export default { @@ -995,7 +1036,8 @@ ProcessFooter, ProcessTitle, TreeSelect, - TreeSelectNew + TreeSelectNew, + treeSelectModule }, data () { const validateZrUserIdName = (rule, value, callback) => { @@ -1225,6 +1267,12 @@ TXLBBUSS: '', VPPSBMBUSS: '', VPPSCNBUSS: '', + KCVPPSBMBUSS: '', + KCVPPSCNBUSS: '', + CYCVPPSBMBUSS: '', + CYCVPPSCNBUSS: '', + DYBXHBUSS: '', + DYMCBUSS: '', // 关联信息 DTQBBHBUSS: '', BDTQBBHBUSS: '', @@ -1433,6 +1481,64 @@ }, }, methods: { + popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { + if (checkedData && checkedData.length != 0) { + if (checkedData.length > 0) { + this.form.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",") + this.form.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") + } else { + this.form.CYCVPPSBMBUSS = checkedData.code + this.form.CYCVPPSCNBUSS = checkedData.chineseName + } + }else { + this.form.CYCVPPSBMBUSS = '' + this.form.CYCVPPSCNBUSS = '' + } + this.modalShowFlag2 = false + this.$forceUpdate() + }, + popoverHideBusVsCancel(){ + this.modalShowFlag2 = false + }, + popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) { + if (checkedData && checkedData.length != 0) { + if (checkedData.length > 0) { + this.form.KCVPPSBMBUSS = checkedData.map(item => item.code).join(",") + this.form.KCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") + } else { + this.form.KCVPPSBMBUSS = checkedData.code + this.form.KCVPPSCNBUSS = checkedData.chineseName + } + }else { + this.form.KCVPPSBMBUSS = '' + this.form.KCVPPSCNBUSS = '' + } + this.modalShowFlag3 = false + this.$forceUpdate() + }, + popoverHideCarVsCancel(){ + this.modalShowFlag3 = false + }, + popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) { + console.log(checkedData) + if (checkedData && checkedData.length != 0) { + if (checkedData.length > 0) { + this.form.DYBXHBUSS = checkedData.map(item => item.model).join(",") + this.form.DYMCBUSS = checkedData.map(item => item.name).join(",") + } else { + this.form.DYBXHBUSS = checkedData.model + this.form.DYMCBUSS = checkedData.name + } + }else { + this.form.DYBXHBUSS = '' + this.form.DYMCBUSS = '' + } + this.modalShowFlag4 = false + this.$forceUpdate() + }, + popoverHideModelCancel(){ + this.modalShowFlag4 = false + }, modelProp(row,index){ console.log(row) console.log(index) @@ -1950,13 +2056,13 @@ }, choiceZRRList (type, title, id) { this.nodeList2 = [] - if(type === 'qcUserId'){ - if ( this.roleForm.qcUserId.length > 0) { - this.nodeList2 = this.roleForm.qcUserId.split(',') + if(type === 'bussUser2'){ + if ( this.roleForm.bussUser2.length > 0) { + this.nodeList2 = this.roleForm.bussUser2.split(',') } - }else if(type === 'hqUserId'){ - if ( this.roleForm.hqUserId.length > 0) { - this.nodeList2 = this.roleForm.hqUserId.split(',') + }else if(type === 'bussUser5'){ + if ( this.roleForm.bussUser5.length > 0) { + this.nodeList2 = this.roleForm.bussUser5.split(',') } }else if(type === 'QCRBUSS'){ if ( this.form.QCRBUSSID.length > 0) { @@ -2027,14 +2133,15 @@ this.modalShowFlag1 = true this.key++ }, - choiceZRR2 (type, title, id) { + choiceZRR2 (type, title, id,flag) { this.drawerTitle = title this.modalShowFlag2 = true + this.multipleFlag2 = flag this.url = '' this.urlChild = '' + this.type = type this.url="sarVppsTree/list" this.urlChild="sarVppsTree/childByList" - this.key1++ }, choiceZRR3 (type, title, id) { this.drawerTitle = title @@ -2043,7 +2150,6 @@ this.urlChild = '' this.url="sarVppsTree/list" this.urlChild="sarVppsTree/childByList" - this.key2++ }, choiceZRR4 (type, title, id) { this.drawerTitle = title @@ -2052,7 +2158,6 @@ this.urlChild = '' this.url="sarModelTree/list" this.urlChild="sarModelTree/childByList" - this.key3++ }, getTree () { this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { @@ -2372,19 +2477,6 @@ this.form.QCDWID = idList }, - popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData) { - if(checkedData.length > 0){ - this.form.VPPSBMBUSS = checkedData.map(item => item.code).join(",") - this.form.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") - }else { - this.form.VPPSBMBUSS = checkedData.code - this.form.VPPSCNBUSS = checkedData.chineseName - } - } - this.modalShowFlag2 = false - this.$forceUpdate() - }, popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData) { if(checkedData.length > 0){ @@ -2399,54 +2491,6 @@ popoverHideCancel(){ this.modalShowFlag1 = false }, - popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData && checkedData.length != 0) { - if(checkedData.length > 0 && checkedData.length != 0){ - this.form.cycvppsbm = checkedData.map(item => item.code).join(",") - this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",") - }else { - this.form.cycvppsbm = checkedData.code - this.form.cycvppscn = checkedData.chineseName - } - this.modalShowFlag2 = false - } - - }, - popoverHideBusVsCancel(){ - this.modalShowFlag2 = false - }, - popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData && checkedData.length != 0) { - if(checkedData.length > 0){ - this.form.kccvppsbm = checkedData.map(item => item.code).join(",") - this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",") - }else { - this.form.kccvppsbm = checkedData.code - this.form.kccvppscn = checkedData.chineseName - } - this.modalShowFlag3 = false - - } - }, - popoverHideCarVsCancel(){ - this.modalShowFlag3 = false - }, - popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData && checkedData.length != 0) { - if(checkedData.length > 0){ - this.form.dybxh = checkedData.map(item => item.model).join(",") - this.form.dymc = checkedData.map(item => item.name).join(",") - }else { - this.form.dybxh = checkedData.model - this.form.dymc = checkedData.name - } - this.modalShowFlag4 = false - } - - }, - popoverHideModelCancel(){ - this.modalShowFlag4 = false - }, closeDrawer() { this.ListModel = false }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue index 3f987bda5..1d1a00bb0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue @@ -2225,7 +2225,6 @@ this.form.footFileName=this.footFileList.map(item => item.name).join(",") this.isSubmit = true this.saveLoading = true - // 会签意见存储 const infoList = [] const info = {} info.footFile = this.form.footFile diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index 73ad99dda..905cf69cd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -1650,8 +1650,20 @@ } }, choiceZRRList (type, title, id) { - this.nodeList = [] - this.nodeList.push(id) + this.nodeList2 = [] + if(type === 'bussUser2'){ + if ( this.roleForm.bussUser2.length > 0) { + this.nodeList2 = this.roleForm.bussUser2.split(',') + } + }else if(type === 'bussUser5'){ + if ( this.roleForm.bussUser5.length > 0) { + this.nodeList2 = this.roleForm.bussUser5.split(',') + } + }else if(type === 'QCRBUSS'){ + if ( this.form.QCRBUSSID.length > 0) { + this.nodeList2 = this.form.QCRBUSSID.split(',') + } + } this.userType = type this.drawerTitle = title this.modalShowRoleFlag = true diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue index 089efc835..15fda4eee 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue @@ -31,11 +31,47 @@
-
+
+ + + + + + + + + + +
+
+
+ {{ item.name }} + + + +
+
+
+ + + +
+
+ @@ -659,6 +695,7 @@ prcName: this.$route.query.prcName, detailData: [], fileList: [], + summaryList: [], FBGBUSSFileList: [], BZSMBUSSFileList: [], LSBBBUSSFileList: [], @@ -1335,6 +1372,7 @@ this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName); + this.summaryList=this.assemble(mes.summary,mes.summaryName); this.roleForm = mes.roleForm this.commentText = mes.commentText }) @@ -1958,22 +1996,33 @@ // this.fileList = fileList.splice(0, 1) // } if (response.ok) { - + const fileObj = {} + fileObj.id = file.response.data.id + fileObj.name = file.response.data.name switch (this.fileType){ case 'FBGBUSS': - this.FBGBUSSFileList = fileList + this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined); + this.FBGBUSSFileList.push(fileObj) break; case 'BZSMBUSS' : - this.BZSMBUSSFileList = fileList + this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined); + this.BZSMBUSSFileList.push(fileObj) break; case 'LSBBBUSS': - this.LSBBBUSSFileList = fileList + this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined); + this.LSBBBUSSFileList.push(fileObj) break; case 'GLWJLAWS': - this.QTWJBUSSFileList = fileList + this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined); + this.GLWJLAWSFileList.push(fileObj) break; case 'GLWJBUSS': - this.GLWJBUSSFileList = fileList + this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined); + this.GLWJBUSSFileList.push(fileObj) + break; + case 'summary': + this.summaryList = this.summaryList.filter ( item => item.response === undefined); + this.summaryList.push(fileObj) break; default : ; } @@ -2010,6 +2059,9 @@ case 'GLWJBUSS': this.fileList=this.GLWJBUSSFileList break; + case 'summary': + this.fileList=this.summaryList + break; default : ; } this.fileMadel = true; @@ -2033,6 +2085,9 @@ case 'GLWJBUSS': this.GLWJBUSSFileList = fileList break; + case 'summary': + this.summaryList = fileList + break; default : ; } }, @@ -2134,6 +2189,8 @@ // if(item.country !== undefined && item.country !== null){ // this.sarStandardsInfoEO.country = item.country.split(","); // } + this.summary=this.summaryList.map(item => item.id).join(",") + this.summaryName=this.summaryList.map(item => item.name).join(",") this.saveLoading = true let _formData = new FormData() @@ -2266,14 +2323,22 @@ 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 infoList = [] + const maryList=this.assemble(this.summary,this.summaryName); const info = {} info.userId = this.userId info.userName = this.userName info.commentText = this.formTongGuo.commentText + info.summary = this.summary + info.summaryName = this.summaryName + info.summaryList = maryList infoList.push(info) this.form.infoList = infoList const json = JSON.stringify(this.form); @@ -2397,6 +2462,8 @@ this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName); this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName); + this.summaryList=this.assemble(processForm.summary,processForm.summaryName); + } }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 1e2d38fcc..0cb23fd01 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -1655,8 +1655,20 @@ } }, choiceZRRList (type, title, id) { - this.nodeList = [] - this.nodeList.push(id) + this.nodeList2 = [] + if(type === 'bussUser2'){ + if ( this.roleForm.bussUser2.length > 0) { + this.nodeList2 = this.roleForm.bussUser2.split(',') + } + }else if(type === 'bussUser5'){ + if ( this.roleForm.bussUser5.length > 0) { + this.nodeList2 = this.roleForm.bussUser5.split(',') + } + }else if(type === 'QCRBUSS'){ + if ( this.form.QCRBUSSID.length > 0) { + this.nodeList2 = this.form.QCRBUSSID.split(',') + } + } this.userType = type this.drawerTitle = title this.modalShowRoleFlag = true diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index db1e618d1..00571932a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -2335,7 +2335,7 @@ let year = date.getFullYear(); this.form.standSn = standSn this.form.standNumber = standSn - this.form.standYear = year + ' X' + this.form.standYear = this.form.reviseStatus === '1' ? year : (year + ' X') // 待带入立项标准 this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) }, e => { })