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

src/pages/details/otherBussStandardDetails/index.vue

@@ -505,15 +505,15 @@
                   >
                 {{ !child.value || child.value === 'null' ? '-' : child.value }}
               </span>
-                  <span
+                  <template v-else-if="child.attrField === 'DTQBBHBUSS'|| child.attrField === 'BDTQBBHBUSS'">
-                          v-else-if="child.attrField === 'DTQBBHBUSS'"
+                    <p class="modular-content-p-val" v-if="child.value">
-                          class="modular-content-p-val"
+                  <span v-for="(item, index) in child.value.split(',')" :key="index">
-                          :title="child.value || '-'"
+                    <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
-                  >
+                       class="span-line" :title="item">{{ item }}</a>
-                    <span v-if="child.value" @click="showReplaceStandInfo(child.value)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
+                  </span>
-                          class="span-line">{{ child.value }}</span>
+                    </p>
-                    <span v-else>-</span>
+                    <span class="modular-content-p-val" v-else>-</span>
-              </span>
+                  </template>
                   <span
                       v-else-if="child.attrType !== 'FILE'"
                       class="modular-content-p-val"

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -355,6 +355,13 @@
             label="代替企标编号"
             min-width="300"
           >
+            <template slot-scope="scope">
+              <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" >{{scope.row.dtqbbhbuss}}</span>
+              <span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C" class="table-jump">{{scope.row.dtqbbhbuss}}</span>
+              <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" class="table-jump">{{
+                scope.row.dtqbbhbuss
+                }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="issueTime"
@@ -1055,7 +1062,7 @@
       </el-dialog>
     </div>
     <el-drawer
-      title="高级搜索"
+      title="高级检索"
       size="700px"
       :wrapperClosable="false"
       :visible.sync="isAdvancedSearch">
@@ -4206,6 +4213,7 @@ export default {
       this.tableFlag = item
       // item.advanceSearchVOStr = JSON.stringify(advancedSearch) || ''
       this.getBussionStandTable(item, '', type)
+      this.isAdvancedSearch = false
     },
     // 清空搜索框
     clearAllSearch(flag) {
@@ -4378,6 +4386,7 @@ export default {
       }
       this.SarExportSearchEo = formData
       formData.isKU = '1'
+      this.isAdvancedSearch = false
       this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', formData, {
         _this: this, loading: 'loading'
       }, res => {
@@ -4398,7 +4407,6 @@ export default {
         if ((this.standinfoList.length === 0 || this.standinfoList === []) && this.sarBussionessSearch.page !== 1) {
           this.pageChange(1)
         }
-        this.isAdvancedSearch = false
       }, e => {
       })
       // this.$refs.selection.selectAll(false)