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"