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

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -106,7 +106,7 @@
                     size="mini"
                     class="common-button-primary"
                     v-btn-permission="'967c8b1402459951b5f75fcd1c548665'"
-                    @click="searchBtnClick(standCommonlySearch)">
+                    @click="searchBtnClick(standCommonlySearch, 1)">
                     查询
                   </el-button>
                   <el-button
@@ -829,17 +829,18 @@
                     >
                       <template slot="label">起草单位</template>
                       <div style="display: flex;justify-content: space-between;align-items: center;">
-                        <el-tooltip v-if="sarStandardsInfoEO['QCDW']" class="item" effect="dark" :content="sarStandardsInfoEO['QCDW']" placement="top-start">
-                          <el-input
-                            :config="field"
-                            clearable
-                            @input="change($event)"
-                            v-model="sarStandardsInfoEO['QCDW']"
-                            :disabled="formdisableflag" placeholder="选择或输入起草单位">
-                          </el-input>
-                        </el-tooltip>
-                        <div v-else>
+<!--                        <el-tooltip v-if="sarStandardsInfoEO['QCDW']" :class="sarStandardsInfoEO['QCDW'] ? 'item' : ''" effect="dark" :content="sarStandardsInfoEO['QCDW']" placement="top-start">-->
+<!--                          <el-input-->
+<!--                            :config="field"-->
+<!--                            clearable-->
+<!--                            @input="change($event)"-->
+<!--                            v-model="sarStandardsInfoEO['QCDW']"-->
+<!--                            :disabled="formdisableflag" placeholder="选择或输入起草单位">-->
+<!--                          </el-input>-->
+<!--                        </el-tooltip>-->
+                        <div>
                           <el-input
+                            :title="sarStandardsInfoEO['QCDW']"
                             :config="field"
                             clearable
                             @input="change($event)"
@@ -1636,7 +1637,7 @@
                   </el-form-item>
                   <!--            文本状态-->
                   <el-form-item :label="$t('m.standStateShow')" class="add-form-item form-item-disabled">
-                    <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')"
+                    <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatusText')"
                                clearable>
                       <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value"
                                  :key="opt.value" :label="opt.label">{{ opt.label }}
@@ -1978,6 +1979,10 @@
                               :placeholder="$t('m.lookUpByAlternativeCriteria')"
                               clearable :maxlength="100"></el-input>
                   </el-form-item>
+                  <!--            部分代替标准号-->
+                  <el-form-item label="部分代替标准号" class="add-form-item form-item-disabled">
+                    <el-input v-model="advanceSearchMapping.BFDTBZ" clearable placeholder="根据部分代替标准号查找"></el-input>
+                  </el-form-item>
                   <!--            采标编号-->
                   <el-form-item label="采标编号" prop="nameShow" class="add-form-item form-item-disabled">
                     <el-input v-model="advanceSearchMapping.CBBH" clearable placeholder="根据采标编号查找"></el-input>
@@ -2424,6 +2429,7 @@ export default {
 
       //高级搜索映射
       advanceSearchMapping: {
+        BFDTBZ: '',
         txlbOption: '', //标准体系
         GXHBQ: '', //标签
         CYSD: '', //我司参与深度
@@ -3718,9 +3724,9 @@ export default {
       this.getDomesticStandardTable(this.standCommonlySearch)
     },
     // 点击搜索按钮
-    searchBtnClick(standCommonlySearch) {
+    searchBtnClick(standCommonlySearch, type) {
       let item = this.standCommonlySearch
-      this.getDomesticStandardTable(item)
+      this.getDomesticStandardTable(item, type)
     },
     // 搜索
     getDomesticStandardTableBtn(item) {
@@ -3818,7 +3824,7 @@ export default {
     // 高级检索
     selectMoreBtn() {
       this.isAdvancedSearch = true
-      this.sarStandardsSearch = {}
+      // this.sarStandardsSearch = {}
     },
     treeCollapse() {
       this.sideClose = !this.sideClose
@@ -4542,7 +4548,7 @@ export default {
       // 此处需要调用接口，修改个人配置
     },
     // 分页查询国内标准
-    getDomesticStandardTable(item) {
+    getDomesticStandardTable(item, type) {
       if (item !== '' && item !== null && item !== undefined) {
         item.pageSize = this.$store.getters.userInfo.configContent
       }
@@ -4619,13 +4625,15 @@ export default {
         }
       }
      if(item){
-       if(item.advanceSearchVOStr.length){
-         advanceSearchVOList.push({
-           connect: item.advanceSearchVOStr[0].connect,
-           field: item.advanceSearchVOStr[0].field,
-           type: item.advanceSearchVOStr[0].type,
-           value: item.advanceSearchVOStr[0].value,
-         })
+       if(item.advanceSearchVOStr){
+         if(item.advanceSearchVOStr.length){
+           advanceSearchVOList.push({
+             connect: item.advanceSearchVOStr[0].connect,
+             field: item.advanceSearchVOStr[0].field,
+             type: item.advanceSearchVOStr[0].type,
+             value: item.advanceSearchVOStr[0].value,
+           })
+         }
        }
      }
       formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList)
@@ -4663,6 +4671,9 @@ export default {
           if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarStandardsSearch.page !== 1) {
             this.pageChange(1)
           }
+          if (type === 1) {
+            this.sarStandardsSearch = {}
+          }
         } else {
           this.$message.error(res.message)
         }