Merge remote-tracking branch 'origin/develop' into develop

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"
       >
         <div style="padding: 20px 0">
@@ -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'){
+      //拼接文件名和id 提交到流程Activity
-        this.FBGBJBDFileList=fileList;
+      this.form.fbgbjbd=this.FBGBJBDFileList.map(item => item.response.data.id).join(",")
-        this.form.fbgbjbd += response.data.id+',';
+      this.form.fbgbjbdName=this.FBGBJBDFileList.map(item => item.name).join(",")
-        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)
 
-        this.form.xgd += response.data.id+',';
+      this.form.xgd=this.xgdFileList.map(item => item.response.data.id).join(",")
-        if( this.form.xgdName=== undefined){
+      this.form.xgdName=this.xgdFileList.map(item => item.name).join(",")
-          this.form.xgdName=''
+
-        }
+      this.form.bpg=this.bpgFileList.map(item => item.response.data.id).join(",")
-        this.form.xgdName += response.data.name+',';
+      this.form.bpgName=this.bpgFileList.map(item => item.name).join(",")
-      }else if(this.fileType === 'bpg'){
+
-        this.bpgFileList=fileList;
+      this.form.ssg=this.ssgFileList.map(item => item.response.data.id).join(",")
-        this.form.bpg += response.data.id+',';
+      this.form.ssgName=this.ssgFileList.map(item => item.name).join(",")
-        if( this.form.bpgName=== undefined){
+
-          this.form.bpgName=''
+      this.form.zqyjg=this.zqyjgFileList.map(item => item.response.data.id).join(",")
-        }
+      this.form.zqyjgName=this.zqyjgFileList.map(item => item.name).join(",")
-        this.form.bpgName += response.data.name+',';
+
-      }else if(this.fileType === 'ssg'){
+      this.form.jdwj=this.jdwjFileList.map(item => item.response.data.id).join(",")
-        this.ssgFileList=fileList;
+      this.form.jdwjName=this.jdwjFileList.map(item => item.name).join(",")
-        this.form.ssg += response.data.id+',';
+
-        if( this.form.ssgName=== undefined){
+      this.form.kwj=this.kwjFileList.map(item => item.response.data.id).join(",")
-          this.form.ssgName=''
+      this.form.kwjName=this.kwjFileList.map(item => item.name).join(",")
-        }
+
-        this.form.ssgName += response.data.name+',';
+      this.form.ca=this.caFileList.map(item => item.response.data.id).join(",")
-      }else if(this.fileType === 'zqyjg'){
+      this.form.caName=this.caFileList.map(item => item.name).join(",")
-        this.zqyjgFileList=fileList;
+
-        this.form.zqyjg += response.data.id+',';
+      this.form.zbjbd=this.zbjbdFileList.map(item => item.response.data.id).join(",")
-        if( this.form.zqyjgName=== undefined){
+      this.form.zbjbdName=this.zbjbdFileList.map(item => item.name).join(",")
-          this.form.zqyjgName=''
+
-        }
+      this.form.glwj=this.glwjFileList.map(item => item.response.data.id).join(",")
-        this.form.zqyjgName += response.data.name+',';
+      this.form.glwjName=this.glwjFileList.map(item => item.name).join(",")
-      }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+',';
-      }
     },
     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

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -73,19 +73,27 @@
             <div class="left">
               <el-form :modal="standCommonlySearch" :inline="true" class="label-input-form"
                        @keyup.enter.native="searchBtnClick(standCommonlySearch)">
-                <el-form-item label="标准类别" class="search-item" style="margin-top:1px;">
+<!--                <el-form-item label="标准==类别" class="search-item" style="margin-top:1px;">-->
-                  <el-select v-model="standCommonlySearch.standSort" filterable>
+<!--                  <el-select v-model="standCommonlySearch.standSort" filterable>-->
-                    <el-option
+<!--                    <el-option-->
-                      v-for="item in standSortOptions"
+<!--                      v-for="item in standSortOptions"-->
-                      :key="item.value"
+<!--                      :key="item.value"-->
-                      :value="item.value"
+<!--                      :value="item.value"-->
-                      :label="item.label"
+<!--                      :label="item.label"-->
-                    ></el-option>
+<!--                    ></el-option>-->
-                  </el-select>
+<!--                  </el-select>-->
-                </el-form-item>
+<!--                </el-form-item>-->
-                <el-form-item label="标准号/名称" class="search-item search-item-last">
+                <el-form-item label="标准号" class="search-item search-item-last">
                   <el-input v-model="standCommonlySearch.standNumber"
-                            placeholder="请输入"
+                            placeholder="请输入标准号"
+                            clearable
+                            @keyup.enter="searchBtnClick(standCommonlySearch)"
+                            :maxlength="100"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="标准名称" class="search-item search-item-last">
+                  <el-input v-model="standCommonlySearch.standName"
+                            placeholder="请输入标准名称"
                             clearable
                             @keyup.enter="searchBtnClick(standCommonlySearch)"
                             :maxlength="100"
@@ -1843,7 +1851,8 @@ export default {
         standType: 'INLAND',
         validFlag: '0',
         standSort: '',
-        standNumber: ''
+        standNumber: '',
+        standName:''
       },
       defaultCheckedKeys1: [],
       defaultCheckedKeys2: [],

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -70,19 +70,27 @@
           <div class="search-area">
             <div class="left">
               <el-form :modal="standCommonlySearch" inline class="label-input-form" @keyup.enter.native="searchBtnClick(standCommonlySearch)">
-                <el-form-item label="标准类别" class="search-item">
+<!--                <el-form-item label="标准类别" class="search-item">-->
-                  <el-select v-model="standCommonlySearch.standSort" filterable>
+<!--                  <el-select v-model="standCommonlySearch.standSort" filterable>-->
-                    <el-option
+<!--                    <el-option-->
-                      v-for="item in standSortOptions"
+<!--                      v-for="item in standSortOptions"-->
-                      :key="item.value"
+<!--                      :key="item.value"-->
-                      :value="item.value"
+<!--                      :value="item.value"-->
-                      :label="item.label"
+<!--                      :label="item.label"-->
-                    ></el-option>
+<!--                    ></el-option>-->
-                  </el-select>
+<!--                  </el-select>-->
-                </el-form-item>
+<!--                </el-form-item>-->
-                <el-form-item label="标准号/名称" class="search-item search-item-last">
+                <el-form-item label="标准号" class="search-item search-item-last">
                   <el-input v-model="standCommonlySearch.standNumber"
-                            placeholder="请输入"
+                            placeholder="请输入标准号"
+                            clearable
+                            @keyup.enter="searchBtnClick(standCommonlySearch)"
+                            :maxlength="100"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="标准名称" class="search-item search-item-last">
+                  <el-input v-model="standCommonlySearch.standName"
+                            placeholder="请输入标准名称"
                             clearable
                             @keyup.enter="searchBtnClick(standCommonlySearch)"
                             :maxlength="100"
@@ -1730,6 +1738,7 @@ export default {
         validFlag: '0',
         standSort: '',
         standNumber: '',
+        standName:'',
         menuId: '',
         sarStandardsSearch: ''
       },

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -882,7 +882,7 @@ export default {
         this.probaseOptions = res.data.PROBASE;
         this.productTypeOptions = res.data.XMLB;
         this.targetMarketOptions = res.data.SCXX;
-      });
+      })
     },
     // 更多
     handleCommand(command) {
@@ -1541,6 +1541,7 @@ export default {
     }
   },
   created() {
+    console.log(this.productTypeOptions)
     this.getDept().then(res => {
       this.getUser(res);
     }, e => {
@@ -1590,7 +1591,7 @@ export default {
   }
 
   /deep/ .pagination {
-    position: relative;
+    position: absolute;
   }
 
   .row-col-box {

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -453,7 +453,7 @@
       </div>
     </el-drawer>
     <!--导出-->
-    <el-dialog :visible.sync="exportModelFlag" title="导出文件" width="700" :show-close="false">
+    <el-dialog :visible.sync="exportModelFlag" title="导出文件" width="500px" :show-close="false">
       <label-input v-model="exportName" placeholder="请输入导出文件名" clearable label="导出名称"/>
       <div slot="footer">
         <el-button class="common-button-primary" icon="el-icon-check" type="primary"

src/pages/searchCenter/pages/standardSearch.vue

@@ -34,10 +34,10 @@
                                 <div class="condition-item" v-for="(condition, key) of searchOptions" :key="condition.index + key" v-if="condition.index < 5 || conditionBtnOpen">
                                     <div class="condition-item-title">{{ condition.title }}</div>
                                     <ul :class="[key, {'is-close': condition.isClose}]">
-                                        <li v-for="(conditionOpt, optIndex) in condition.options" :key="optIndex + condition.title">
+                                        <li v-for="(conditionOpt, optIndex) in optionsFun(condition.options)" :key="optIndex + condition.title">
-                      <span :class="{ 'selected': searchCondition[key].indexOf(conditionOpt.value) !== -1 }" @click="optChecked(key, conditionOpt.value)">{{ conditionOpt.label }}
+                                          <span :class="{ 'selected': searchCondition[key].indexOf(conditionOpt.value) !== -1 }" @click="optChecked(key, conditionOpt.value)">{{ conditionOpt.label }}
-                        <span v-if="conditionOpt.number !== null && conditionOpt.number !== undefined">(<font style="color: red">{{ conditionOpt.number}}</font>)</span>
+                                            <span v-if="conditionOpt.number !== null && conditionOpt.number !== undefined">(<font style="color: red">{{ conditionOpt.number}}</font>)</span>
-                      </span>
+                                          </span>
                                         </li>
                                     </ul>
                                     <div class="open-btn" v-if="condition.showOpenBtn" @click="condition.isClose = !condition.isClose">{{ condition.isClose ? '展开' : '收缩' }}</div>
@@ -366,11 +366,11 @@
                     module: ['all']
                 },
                 seniortypeAll: ['selectIndex'],
-                seniortypeStand: ['selectIndex', 'standSort', 'category', 'nature', 'standState', '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'],
+                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') {
+                                }else{
-                                    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 {
                                     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.NYLXCLASS = originOptions.NYLXCLASS
-                            filterOptions.CYSD.title = '我司参与深度'
+                            filterOptions.NYLXCLASS.title = '能源类型'
-                            filterOptions.CYSD.index = 2
+                            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.NYLXCLASS = originOptions.NYLXCLASS
-                            filterOptions.standState.title = '文本状态'
+                            filterOptions.NYLXCLASS.title = '能源类型'
-                            filterOptions.standState.index = 2
+                            filterOptions.NYLXCLASS.index = 2
                             // 我司参与状态
                             // filterOptions.CYSD = originOptions.CYSD
                             // filterOptions.CYSD.title = '我司参与深度'
@@ -1162,14 +1213,16 @@
                             break
                         // 企业标准
                         case 'enterprise':
-                            //标准状态
+                            //  标准类别
-                            filterOptions.BUSSSTATE = originOptions.TEXTSTATUSBUSS
+                            filterOptions.standSort = originOptions.standSort
-                            filterOptions.BUSSSTATE.title = '文本状态'
+                            filterOptions.standSort.index = 1
-                            filterOptions.BUSSSTATE.index = 1
+                            // 我司参与状态
-                            //主起草部门
+                            filterOptions.NYLXCLASS = originOptions.NYLXCLASS
-                            filterOptions.ORGLIST = originOptions.QCDW
+                            filterOptions.NYLXCLASS.title = '能源类型'
-                            filterOptions.ORGLIST.title = '主起草部门'
+                            filterOptions.NYLXCLASS.index = 2
-                            filterOptions.ORGLIST.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 () {