diff --git a/src/components/CustomFormComponents/DatePickerGroup.vue b/src/components/CustomFormComponents/DatePickerGroup.vue index 78482a555..3cb38c8ea 100644 --- a/src/components/CustomFormComponents/DatePickerGroup.vue +++ b/src/components/CustomFormComponents/DatePickerGroup.vue @@ -144,7 +144,7 @@ export default { }, watch: { value (val) { - this.tagList = val !== '' && val !== null ? val.split(',') : [] + this.tagList = val !== '' && val !== null && val !== undefined? val.split(',') : [] // 把日期的时分秒去掉 this.tagList=this.tagList.map((item)=>item.substring(0,10)) }, diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 54bb42167..85e0aecc1 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -266,10 +266,9 @@

{{ sarStandardsInfoEO.issueTime || '-' }}

- - - - +

{{ + standMap[sarStandardsInfoEO.standNature] || '-' + }}

{{ sarStandardsInfoEO.standSystem || '-' @@ -1315,7 +1314,7 @@ }}

- + {{ diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index 7b1301104..a026d304a 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -184,15 +184,15 @@ - - - + - + - + -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - -
-
-
- {{ item.name }} - - - -
-
-
- - - -
-
-
- - -
-
-
- {{ item.name }} - - - -
-
-
- - - -
-
-
-
- - - -
-
-
- {{ item.name }} - - - -
-
-
- - - -
-
-
- - -
-
-
- {{ item.name }} - - - -
-
-
- - - -
-
-
- -
-
-
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - {{'手动查找'}} - - - -
-
-
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + +
+
+
{{ item.name }} +
+
+
+ + +
-
- - - + + + +
+
+
+ {{ item.name }} + + + +
+
+
+ + + +
-
-
-
- - - - - - - - - - - - - - - - - - - -
-
- + + + + + +
+
+
+ {{ item.name }} + + + +
+
+
+ + + +
+
+
+ + +
+
+
+ {{ item.name }} + + + +
+
+
+ + + +
+
+
+ +
+ +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + {{'手动查找'}} + + + +
+
+
+ {{ item.name }} + + + +
+
+
+ + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + +
+
+ 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 => { }) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index c91987b76..221b2be10 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -12,7 +12,7 @@ > - + - +
- - {{ ch_pageData.meetingName || '-' }} - - {{ ch_pageData.primaryUnit || '-' }} - - - - - {{ ch_pageData.associaName || '-' }} + + {{ item.name || '-'}} + - - {{ ch_pageData.meetingStartTime || '-' }} - - - - {{ ch_pageData.meetingPlace || '-' }} - - {{ ch_pageData.feeStand || '-' }} - - - - {{ ch_pageData.feeKind || '-' }} - - {{ '-' }} {{ item.name }} {{ ';' }} - - - - 计划内 计划外 - - - +
- - {{ ch_pageData.meetingName || '-' }} - - {{ ch_pageData.primaryUnit || '-' }} - - - - - {{ ch_pageData.associaName || '-' }} + + {{ item.name || '-'}} + - - {{ ch_pageData.meetingStartTime || '-' }} - - - - {{ ch_pageData.meetingPlace || '-' }} - - {{ ch_pageData.feeStand || '-' }} - - - - {{ ch_pageData.feeKind || '-' }} - - {{ '-' }} {{ item.name }} {{ ';' }} - - - - 计划内 计划外 - -
- - {{ ch_pageData.meetingName || '-' }} - - {{ ch_pageData.primaryUnit || '-' }} - - - - - {{ ch_pageData.associaName || '-' }} + + {{ item.name || '-'}} + - - {{ ch_pageData.meetingStartTime || '-' }} - - - - {{ ch_pageData.meetingPlace || '-' }} - - {{ ch_pageData.feeStand || '-' }} - - - - {{ ch_pageData.feeKind || '-' }} - - {{ '-' }} {{ item.name }} {{ ';' }} - - - - 计划内 计划外 - -
- - - {{ rh_pageData.comityName || '-' }} + + {{ item.name || '-'}} + - - {{ rh_pageData.comityState || '-' }} - - - - {{ rh_pageData.comityKind || '-' }} - - {{ rh_pageData.comityMake.makeQualification || '-' }} - - - - {{ rh_pageData.comityMake.makeRole || '' }} - - {{ rh_pageData.comityMake.makeCost || '-' }} - - - - {{ rh_pageData.comityMake.makeDuties || '-' }} - - {{ rh_pageData.comityMake.makeTime || '-' }} - - - - {{ '-' }} {{ item.name }} {{ ';' }} - - @@ -95,7 +72,7 @@ - +
- - - {{ rh_pageData.comityName || '-' }} + + {{ item.name || '-'}} + - - {{ rh_pageData.comityState || '-' }} - - - - {{ rh_pageData.comityKind || '-' }} - - {{ rh_pageData.comityMake.makeQualification || '-' }} - - - - {{ rh_pageData.comityMake.makeRole || '' }} - - {{ rh_pageData.comityMake.makeCost || '-' }} - - - - {{ rh_pageData.comityMake.makeDuties || '-' }} - - {{ rh_pageData.comityMake.makeTime || '-' }} - - - - {{ '-' }} {{ item.name }} {{ ';' }} - - @@ -327,6 +304,9 @@ export default { .prc-content-border { overflow: auto; } + /deep/.el-form-item__content { + margin-top: 5px; + } /deep/.prc-content-border .el-form-item__content { width: 270px; } diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue index a962d58c6..d6b40386b 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue @@ -17,64 +17,45 @@
- - - {{ rh_pageData.comityName || '-' }} + + {{ item.name || '-'}} + - - {{ rh_pageData.comityState || '-' }} - - - - + {{ rh_pageData.comityKind || '-' }} - - {{ rh_pageData.comityMake.makeQualification || '-' }} - - - - + {{ rh_pageData.comityMake.makeRole || '' }} - - {{ rh_pageData.comityMake.makeCost || '-' }} - - - - + {{ rh_pageData.comityMake.makeDuties || '-' }} - - {{ rh_pageData.comityMake.makeTime || '-' }} - - - - + {{ '-' }} {{ item.name }} {{ ';' }} - - @@ -340,6 +321,9 @@ export default { .prc-content-border { overflow: auto; } + /deep/.el-form-item__content { + margin-top: 5px; + } /deep/.prc-content-border .el-form-item__content { width: 270px; } diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue index 8a80d95ab..cff7407d4 100644 --- a/src/pages/processCenter/pages/phone/bzrk/step2.vue +++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue @@ -15,484 +15,442 @@ ref="qbkwForm" :model="form" class="label-input-form" - label-width="210px" + label-width="180px" >
- - - - - 国内标准入库 - 海外标准入库 - - + + + 国内标准入库 + 海外标准入库 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +
- - - - - - - - - + + +
+ +
+ + {{ value.name }} +
+
+ - - +
+
+ +
+ {{ value.name }} +
+
+ - - +
+
+ +
+ {{ value.name }} +
+
+ - - +
+
+ +
+ {{ value.name }} +
+
+ - - +
+
+ +
+ {{ value.name }} +
+
+ - - +
+
- - - -
- - {{value.name}} -
-
- - - -
-
- -
- {{value.name}} -
-
- - - -
-
- -
- {{value.name}} -
-
- - - -
-
- -
- {{value.name}} -
-
- - - -
-
- -
- {{value.name}} -
-
- - - -
-
-
- - -
- {{value.name}} -
-
- - - -
-
- - - -
- {{value.name}} -
-
- - - -
-
- -
- {{value.name}} -
-
- - - -
-
- -
- {{value.name}} -
-
- - - -
-
-
-
+ +
+ {{ value.name }} +
+
+ - - +
+
+ + + +
+ {{ value.name }} +
+
+ - - +
+
+ +
+ {{ value.name }} +
+
+ - - +
+
+ +
+ {{ value.name }} +
+
+ - - +
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{form.wssmr}} - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ form.wssmr }} + + + + + + +
- - - - - - - - - - - -
- {{value.name}} -
-
- - - -
-
-
- - - - - - - - - - - -
+ + + + + + + + + +
+ {{ value.name }} +
+
+ - - +
+
+ + + + + + + + +
- +
- - - - - - - - @@ -544,14 +502,19 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process' +import {inboundLiaisonDetail, processCreateStand, changeAssigneeNew} from 'api/process' import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import CusTomDataPickerGroup from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup"; +import Vue from 'vue'; +import { Form } from 'vant'; +import { Field } from 'vant'; +Vue.use(Form); +Vue.use(Field); export default { name: "phoneBzrkStep2", - data () { + data() { return { xgdFileMap: [], fbgbjbdFileMap: [], @@ -568,7 +531,7 @@ export default { drawerModal: false, drawerTitle: '', nodeList: [], - selectPeople:'', + selectPeople: '', xgdFileId: '', fbgbjbdFileId: '', bpgFileId: '', @@ -578,16 +541,16 @@ export default { kwjFileId: '', glwjFileId: '', caFileId: '', - zbjbdFileId:'', + zbjbdFileId: '', rules: { - commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }], - approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }] + commentText: [{required: true, message: '请输入意见', trigger: 'blur'}], + approvalOpinion: [{required: true, message: '请选择审批意见', trigger: 'change'}] }, - activeName:'1', + activeName: '1', // 当前流程类型(1待办/2已办) processType: 1, detailData: [], - userId:this.$store.getters.userInfo.userId, + userId: this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, formTongGuo: { @@ -677,17 +640,17 @@ export default { xglc: '', // 相关流程 chjl: '', // 参会记录 //流程信息 - prcNum:'', - commentText:'', - prcName:'', + prcNum: '', + commentText: '', + prcName: '', standType: '', }, // 标准信息 nodeKeyCode: 'code', nodeKeyModel: 'model', - key:1, - key1:2, - key2:3, - key3:4, + key: 1, + key1: 2, + key2: 3, + key3: 4, defaultCheckedKeys1: [], defaultCheckedKeys2: [], defaultCheckedKeys3: [], @@ -699,7 +662,7 @@ export default { children: 'children', label: 'model' }, - countryOptions:[],//国家地区 + countryOptions: [],//国家地区 busVppsOptions: [], // 车系体系架构 modelOptions: [], // 模块体系架构 standSortOptions: [], // 标准类别 @@ -726,8 +689,8 @@ export default { user4: '', user5: '', // 流程路由信息 - prcNum : this.$route.query.prcNum, - prcName : this.$route.query.prcName, + prcNum: this.$route.query.prcNum, + prcName: this.$route.query.prcName, } }, components: { @@ -738,11 +701,11 @@ export default { TreeSelect }, methods: { - checkedRole (data) { + checkedRole(data) { this.assigneeNewLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id - userId:this.$store.getters.userInfo.userId, // 委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { @@ -752,82 +715,82 @@ export default { this.$message.success('调整成功') this.processNum() this.queryProcess() - this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + this.$router.push({path: '/processCenter?tabsName=ProcessCenter'}) } else { this.$message.warning(res.message) } }) }, - downloadFile (fileType) { + downloadFile(fileType) { //文件id中出现了','字符,去除掉 - if(fileType === 'fbgbjbd'){ - if(this.fbgbjbdFileId.search(',')){ - this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",",""); + if (fileType === 'fbgbjbd') { + if (this.fbgbjbdFileId.search(',')) { + this.fbgbjbdFileId = this.fbgbjbdFileId.replace(",", ""); } let attId = this.fbgbjbdFileId this.$preview(attId) - }else if(fileType === 'xgd'){ + } else if (fileType === 'xgd') { let attId = this.xgdFileId this.$preview(attId) - }else if(fileType === 'bpg'){ + } else if (fileType === 'bpg') { let attId = this.bpgFileId this.$preview(attId) - }else if(fileType === 'ssg'){ + } else if (fileType === 'ssg') { let attId = this.ssgFileId this.$preview(attId) - }else if(fileType === 'zqyjg'){ + } else if (fileType === 'zqyjg') { let attId = this.zqyjgFileId this.$preview(attId) - }else if(fileType === 'jdwj'){ + } else if (fileType === 'jdwj') { let attId = this.jdwjFileId this.$preview(attId) - }else if(fileType === 'kwj'){ + } else if (fileType === 'kwj') { let attId = this.kwjFileId this.$preview(attId) - }else if(fileType === 'glwj'){ + } else if (fileType === 'glwj') { let attId = this.glwjFileId this.$preview(attId) - }else if(fileType === 'ca'){ + } else if (fileType === 'ca') { let attId = this.caFileId this.$preview(attId) - }else if(fileType === 'zbjbd'){ + } else if (fileType === 'zbjbd') { let attId = this.zbjbdFileId this.$preview(attId) } }, - getRule(){ + getRule() { if (this.formTongGuo.approvalOpinion === 0) { this.rules.commentText[0].required = false; this.$refs.formTongGuo.clearValidate('commentText') - }else { + } else { this.rules.commentText[0].required = true; } }, - popoverHide (checkedIds, checkedData) { - if(checkedData) { + popoverHide(checkedIds, checkedData) { + if (checkedData) { this.form.standSystem = checkedData.id this.form.standSystemName = checkedData.menuName } }, - popoverHideBusVs (checkedIds, checkedData) { - if(checkedData){ + popoverHideBusVs(checkedIds, checkedData) { + if (checkedData) { this.form.cycvppsbm = checkedData.code this.form.cycvppscn = checkedData.chineseName } }, - popoverHideCarVs (checkedIds, checkedData) { - if(checkedData){ + popoverHideCarVs(checkedIds, checkedData) { + if (checkedData) { this.form.kccvppsbm = checkedData.code this.form.kccvppscn = checkedData.chineseName } }, - popoverHideModel (checkedIds, checkedData) { - if(checkedData){ + popoverHideModel(checkedIds, checkedData) { + if (checkedData) { this.form.dybxh = checkedData.model this.form.dymc = checkedData.name } }, - busVsFunc(){ + busVsFunc() { this.$http.get('sarVppsTree/list', '', { _this: this }, res => { @@ -836,7 +799,7 @@ export default { this.key2++ }) }, - modelFunc(){ + modelFunc() { this.$http.get('sarModelTree/list', '', { _this: this }, res => { @@ -844,7 +807,7 @@ export default { this.key3++ }) }, - processTable () { + processTable() { this.$http.get('lawss/activiti/get_list_by_instance', { prcNum: this.$route.query.prcNum, sortWord: this.shunxu ? this.paixu : '', @@ -854,20 +817,21 @@ export default { _this: this }, res => { this.detailData = res - }, e => {}) + }, e => { + }) }, - assemble(ids,names){ - let list= new Array(); + assemble(ids, names) { + let list = new Array(); let idArray = [] let nameArray = [] - if(ids.length > 0) { - idArray=ids.split(','); + if (ids.length > 0) { + idArray = ids.split(','); } if (names.length > 0) { nameArray = names.split(','); } - for(var i=0;i { this.form = JSON.parse(JSON.stringify(item)) +/* console.log(this.form) this.defaultCheckedKeys = [this.form.standSystem] this.defaultCheckedKeys1 = [this.form.cycvppsbm] this.defaultCheckedKeys2 = [this.form.kccvppsbm] - this.defaultCheckedKeys3 = [this.form.dybxh] + this.defaultCheckedKeys3 = [this.form.dybxh]*/ this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : '' - if( this.form.country !== undefined && this.form.country !== null && this.form.country !== ''){ - this.form.country=this.form.country.split(","); + if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') { + this.form.country = this.form.country.split(","); } this.form.prcNum = this.prcNum this.form.prcName = this.prcName @@ -959,18 +924,19 @@ export default { this.drawerModal = true this.drawerTitle = '转办处理人' }, - handleSave() {}, - handle1(){ + handleSave() { + }, + handle1() { this.formTongGuo.approvalOpinion = 1 this.handleSubmit() }, - handle2(){ + handle2() { this.formTongGuo.approvalOpinion = 0 this.handleSubmit() }, handleSubmit() { this.getRule() - const val= this.form.country; + const val = this.form.country; if (val !== '' && val !== null && typeof (val) !== 'undefined') { if (val instanceof Array) { this.form.country = val.join(","); @@ -988,26 +954,27 @@ export default { const json = JSON.stringify(this.form); this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, - userId : this.userId, + userId: this.userId, json: json }, { _this: this }, res => { if (res.success) { - console.log("this.formTongGuo.approvalOpinion",this.formTongGuo.approvalOpinion); - if(this.formTongGuo.approvalOpinion == '1'){ + console.log("this.formTongGuo.approvalOpinion", this.formTongGuo.approvalOpinion); + if (this.formTongGuo.approvalOpinion == '1') { console.log("shibai"); this.$message.warning("驳回成功") this.isSubmit = false // 流程提交之后,应该流转至待办任务页面 - this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) - }else{ + this.$router.push({path: '/processCenter?tabsName=ProcessCenter'}) + } else { console.log("hello"); this.processCreateStand(json) } } }) - }}) + } + }) }, /** @@ -1034,15 +1001,15 @@ export default { }) }, }, - created(){ + created() { }, - mounted () { + mounted() { this.getData() this.processTable() this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { - this.countryOptions=res.data.COUNTRY//国家地区 + this.countryOptions = res.data.COUNTRY//国家地区 this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standStateOptions = res.data.WBZTCLASS // 文本状态 @@ -1069,30 +1036,37 @@ export default {