diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 95668c70b..ad5702bcb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -1217,6 +1217,7 @@ :before-upload="beginImportFile" :on-success="importFileSuccess" :on-change="fileChange" + :on-remove="removeOneFile" :show-file-list="true" >
@@ -2007,6 +2008,7 @@ export default { } },removeOneFile(file, fileList) { + switch (this.fileType){ case 'fbgbjbd': this.FBGBJBDFileList=fileList; @@ -2032,6 +2034,12 @@ export default { case 'ca': this.caFileList=fileList; break; + case 'zbjbd': + this.zbjbdFileList=fileList + break; + case 'glwj': + this.glwjFileList=fileList + break default : ; } }, @@ -2324,70 +2332,42 @@ export default { }, fileInfoHandle(){ - if(this.fileType === 'fbgbjbd'){ - this.FBGBJBDFileList=fileList; - this.form.fbgbjbd += response.data.id+','; - if( this.form.fbgbjbdName=== undefined){ - this.form.fbgbjbdName='' - } - this.form.fbgbjbdName += response.data.name+','; - }else if(this.fileType === 'xgd'){ - this.xgdFileList=fileList; - console.log(this.xgdFileList) + //拼接文件名和id 提交到流程Activity + this.form.fbgbjbd=this.FBGBJBDFileList.map(item => item.response.data.id).join(",") + this.form.fbgbjbdName=this.FBGBJBDFileList.map(item => item.name).join(",") - this.form.xgd += response.data.id+','; - if( this.form.xgdName=== undefined){ - this.form.xgdName='' - } - this.form.xgdName += response.data.name+','; - }else if(this.fileType === 'bpg'){ - this.bpgFileList=fileList; - this.form.bpg += response.data.id+','; - if( this.form.bpgName=== undefined){ - this.form.bpgName='' - } - this.form.bpgName += response.data.name+','; - }else if(this.fileType === 'ssg'){ - this.ssgFileList=fileList; - this.form.ssg += response.data.id+','; - if( this.form.ssgName=== undefined){ - this.form.ssgName='' - } - this.form.ssgName += response.data.name+','; - }else if(this.fileType === 'zqyjg'){ - this.zqyjgFileList=fileList; - this.form.zqyjg += response.data.id+','; - if( this.form.zqyjgName=== undefined){ - this.form.zqyjgName='' - } - this.form.zqyjgName += response.data.name+','; - }else if(this.fileType === 'jdwj'){ - this.jdwjFileList=fileList; - this.form.jdwj += response.data.id+','; - if( this.form.jdwjName=== undefined){ - this.form.jdwjName='' - } - this.form.jdwjName += response.data.name+','; - }else if(this.fileType === 'kwj'){ - this.kwjFileList=fileList; - this.form.kwj += response.data.id+','; - if( this.form.kwjName=== undefined){ - this.form.kwjName='' - } - this.form.kwjName += response.data.name+','; - }else if(this.fileType === 'ca'){ - this.caFileList=fileList; - this.form.ca += response.data.id+','; - if( this.form.caName=== undefined){ - this.form.caName='' - } - this.form.caName += response.data.name+','; - } + this.form.xgd=this.xgdFileList.map(item => item.response.data.id).join(",") + this.form.xgdName=this.xgdFileList.map(item => item.name).join(",") + + this.form.bpg=this.bpgFileList.map(item => item.response.data.id).join(",") + this.form.bpgName=this.bpgFileList.map(item => item.name).join(",") + + this.form.ssg=this.ssgFileList.map(item => item.response.data.id).join(",") + this.form.ssgName=this.ssgFileList.map(item => item.name).join(",") + + this.form.zqyjg=this.zqyjgFileList.map(item => item.response.data.id).join(",") + this.form.zqyjgName=this.zqyjgFileList.map(item => item.name).join(",") + + this.form.jdwj=this.jdwjFileList.map(item => item.response.data.id).join(",") + this.form.jdwjName=this.jdwjFileList.map(item => item.name).join(",") + + this.form.kwj=this.kwjFileList.map(item => item.response.data.id).join(",") + this.form.kwjName=this.kwjFileList.map(item => item.name).join(",") + + this.form.ca=this.caFileList.map(item => item.response.data.id).join(",") + this.form.caName=this.caFileList.map(item => item.name).join(",") + + this.form.zbjbd=this.zbjbdFileList.map(item => item.response.data.id).join(",") + this.form.zbjbdName=this.zbjbdFileList.map(item => item.name).join(",") + + this.form.glwj=this.glwjFileList.map(item => item.response.data.id).join(",") + this.form.glwjName=this.glwjFileList.map(item => item.name).join(",") }, handleSubmit() { this.form.country=this.countryArr; this.$refs['form'].validate((valid) => { if (valid) { + this.fileInfoHandle(); this.isSubmit = true this.form.commentText = this.commentText this.form.approvalOpinion = this.approvalOpinion diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index efdb5d22c..614be7aaf 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -73,19 +73,27 @@
- - - - - - + + + + + + + + + + + + + +
- - - - - - + + + + + + + + + + + + + + { this.getUser(res); }, e => { @@ -1590,7 +1591,7 @@ export default { } /deep/ .pagination { - position: relative; + position: absolute; } .row-col-box { diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 6a1a49764..06c924df7 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -453,7 +453,7 @@
- +
{{ condition.title }}
    -
  • - {{ conditionOpt.label }} - ({{ conditionOpt.number}}) - +
  • + {{ conditionOpt.label }} + ({{ conditionOpt.number}}) +
{{ condition.isClose ? '展开' : '收缩' }}
@@ -366,11 +366,11 @@ module: ['all'] }, seniortypeAll: ['selectIndex'], - seniortypeStand: ['selectIndex', 'standSort', 'category', 'nature', 'standState', 'applyArctic', 'applyAuth', 'CLLX', 'CBCD', 'ZRLX', 'CYSD'], - seniortypeBuss: ['selectIndex', 'country', 'standSort', 'category', 'nature', 'standState', 'textStatus', 'applyArctic', 'applyAuth', 'CLLX', 'CBCD', 'ZRLX', 'CYSD'], + seniortypeStand: ['selectIndex', 'standSort', 'category', 'nature', 'standState', 'applyArctic', 'applyAuth', 'CLLX', 'CBCD', 'ZRLX', 'CYSD','NYLX','NYLXCLASS'], + seniortypeBuss: ['selectIndex', 'country', 'standSort', 'category', 'nature', 'standState', 'textStatus', 'applyArctic', 'applyAuth', 'CLLX', 'CBCD', 'ZRLX', 'CYSD','NYLX','NYLXCLASS'], // seniortypeLaws: ['selectIndex', 'country', 'SYCLLX', 'ZRLX', 'WSSFCY'], // 政策的适用车辆类型、我司是否参与 和 国内的字段不一样 seniortypeLaws: ['selectIndex', 'lawsSyqy', 'lawsSycx', 'CYSDLAWS'], // 政策的适用车辆类型、我司是否参与 和 国内的字段不一样 - seniortypeEnterprise : ['selectIndex','BUSSSTATE','ORGLIST'], + seniortypeEnterprise : ['selectIndex','standSort','CLLX','BUSSSTATE','ORGLIST','NYLXCLASS','NYLX'], seniortypeMsg: ['selectIndex', 'module'], // 检索选项 searchOptions: { @@ -405,6 +405,38 @@ index: 0 } }, + searchOptions2: { + selectIndex: { + title: '资源类型', + options: [ + { + label: '全部', + value: 'All' + }, + { + label: '国内标准法规', + value: 'stand' + }, + { + label: '海外标准法规', // value没改 + value: 'bussstand' + }, + { + label: '国内外政策', + value: 'laws' + }, + { + label: '企业标准', + value: 'enterprise' + } + // { + // label: '资料中心', + // value: 'msgdyinfo' + // } + ], + index: 0 + } + }, // 展开条件 conditionBtnOpen: false, saveRoleBuss: [], @@ -433,6 +465,13 @@ } }, methods: { + optionsFun(items){ + if(Object.prototype.toString.call(items) === '[object Object]'){ + return items; + } + const list = items.filter ( item => !item.type || item.type === this.selectIndex); + return list + }, checkItems (item) { this.itermsConditionsFlag = true this.itermsConditionsTitle1 = item.textContent @@ -878,30 +917,12 @@ // 检索栏每一项回显数字 if (seniortype[i] === 'standSort') { renameType = 'standSort' - }else if (seniortype[i] === 'applyArctic') { - renameType = 'apply_arctic' - } else if (seniortype[i] === 'energyKind') { - renameType = 'energy_kind' - } else if (seniortype[i] === 'applyAuth') { - renameType = 'apply_auth' - } else if (this.selectIndex === 'laws' && seniortype[i] === 'CLLX') { - renameType = 'SYCLLX' - } else if (this.selectIndex === 'laws' && seniortype[i] === 'CYSD') { - renameType = 'WSSFCY' - } else if (this.selectIndex === 'enterprise' && seniortype[i] === 'ORGLIST'){ - renameType = 'QCDW' - } else if (this.selectIndex === 'enterprise' && seniortype[i] === 'BUSSSTATE'){ - renameType = 'textStatusBuss' - }else if (this.selectIndex === 'bussstand' && seniortype[i] === 'standState'){ - renameType = 'textStatus' - }else { + }else{ renameType = seniortype[i] } - console.log(renameType) let resultsubdata = resultdata[renameType] || {} let countAll = 0 if (nowdata) { - console.log(nowdata) for (let ji = 0; ji < nowdata.length; ji++) { if (resultsubdata[nowdata[ji].value] === undefined) { nowdata[ji].number = 0 @@ -1055,6 +1076,36 @@ case 'CYSDLAWS': option.title = '我司参与深度' option.index = 18 + case 'NYLXCLASS': + option.title = '能源类型' + option.index = 19 + } + if(key === 'STANDCLASSIFY'){ + const standVerify = ["GB","GB/T","QC/T","JT","JB","GA","GJB","HJ"]; + const standEnVerify = ["ECE","EU","EC","EEC","ISO","IEC","GTR","CFR", + "JASO","JIS","GSO","GOST","ΓOCT","TP","SASO","UAE","CONTRAN","DENATRAN", + "ABNT NBR","NBR","INMETRO","CONAMA","Normative Instruction","ADR"]; + const bussStandVerify = ["Q/FT A","Q/FT B","Q/FT E","Q/FT F","Q/FT G","Q/FT M", + "Q/FT Q","Q/FT R","Q/FT S","Q/FT T","Q/FT V","Q/FT X","Q/FT Y","Q/FT Z","Q/QCBFC"]; + if(data[key]){ + console.log(data[key]) + const list = [] + data[key].forEach( data => { + const listFilter1 = standVerify.filter ( item => item === data.label); + if(listFilter1 && listFilter1.length > 0){ + list.push({label:data.label,value:data.value,type:'stand'}); + } + const listFilter2 = standEnVerify.filter ( item => item === data.label); + if(listFilter2 && listFilter2.length > 0){ + list.push({label:data.label,value:data.value,type:'bussstand'}); + } + const listFilter3 = bussStandVerify.filter ( item => item === data.label); + if(listFilter3 && listFilter3.length > 0){ + list.push({label:data.label,value:data.value,type:'enterprise'}); + } + }) + data[key] = list + } } option.showOpenBtn = false option.options = data[key] @@ -1102,9 +1153,9 @@ // filterOptions.standState.title = '标准状态' // filterOptions.standState.index = 2 // 我司参与状态 - filterOptions.CYSD = originOptions.CYSD - filterOptions.CYSD.title = '我司参与深度' - filterOptions.CYSD.index = 2 + filterOptions.NYLXCLASS = originOptions.NYLXCLASS + filterOptions.NYLXCLASS.title = '能源类型' + filterOptions.NYLXCLASS.index = 2 // 监管类型 // filterOptions.ZRLX = originOptions.ZRLX // filterOptions.ZRLX.title = '监管类型' @@ -1142,9 +1193,9 @@ // filterOptions.standSort.options = [{label: '全部', value: 'all'}] filterOptions.standSort.index = 1 // 标准状态 - filterOptions.standState = originOptions.WBZTCLASS - filterOptions.standState.title = '文本状态' - filterOptions.standState.index = 2 + filterOptions.NYLXCLASS = originOptions.NYLXCLASS + filterOptions.NYLXCLASS.title = '能源类型' + filterOptions.NYLXCLASS.index = 2 // 我司参与状态 // filterOptions.CYSD = originOptions.CYSD // filterOptions.CYSD.title = '我司参与深度' @@ -1162,14 +1213,16 @@ break // 企业标准 case 'enterprise': - //标准状态 - filterOptions.BUSSSTATE = originOptions.TEXTSTATUSBUSS - filterOptions.BUSSSTATE.title = '文本状态' - filterOptions.BUSSSTATE.index = 1 - //主起草部门 - filterOptions.ORGLIST = originOptions.QCDW - filterOptions.ORGLIST.title = '主起草部门' - filterOptions.ORGLIST.index = 2 + // 标准类别 + filterOptions.standSort = originOptions.standSort + filterOptions.standSort.index = 1 + // 我司参与状态 + filterOptions.NYLXCLASS = originOptions.NYLXCLASS + filterOptions.NYLXCLASS.title = '能源类型' + filterOptions.NYLXCLASS.index = 2 + // 适用车辆类型 + filterOptions.CLLX = originOptions.CLLX + filterOptions.CLLX.index = 3 break // 资料中心 case 'msgdyinfo': @@ -1265,6 +1318,7 @@ } }, searchSarBykey () { + console.log(this.searchOptions) let searchCondition = this.searchCondition let condition = {} let searchKeys = Object.keys(this.searchOptions) @@ -1282,15 +1336,12 @@ if (condition.selectIndex === 'bussstand') { condition.selectIndex = 'stand' condition.standType = 'FOREIGN' - condition.textStatus = condition.standState } else if (condition.selectIndex === 'stand') { condition.standType = 'INLAND' } if(condition.selectIndex === 'enterprise'){ condition.selectIndex='bussstand' condition.standType = 'bussstand' - condition.textStatusBuss = condition.BUSSSTATE - condition.QCDW = condition.ORGLIST } // 查询为国内外政策时，改变查询参数名 if (condition.selectIndex === 'laws') { @@ -2500,7 +2551,7 @@ this.filterOptions(val).then(() => { this.resultColumns = this.getResultColumns() this.$nextTick(() => { - let options = this.searchOptions + let options = this.optionsFun(this.searchOptions) for (let key in options) { let dom = document.getElementsByClassName(key) if ($(dom).height() > 38) { @@ -2510,6 +2561,7 @@ } }) }) + this.searchCondition['standSort'].splice(0, 1, 'all') } }, mounted () {