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

src/pages/regulatoryRepository/systemSearch/components/DialogTable.vue

@@ -3,10 +3,11 @@
     <div class="search-area">
       <el-form :modal="searchForm" :inline="true" class="label-input-form">
         <el-form-item label="体系结构" class="search-item">
-          <el-input v-model="searchForm.standSystem"
+          <el-input :value="searchForm.standSystem"
                     placeholder="请选择体系结构"
-                    readonly
                     @click.native="choice"
+                    clearable
+                    @clear="handleClearStandSystem"
           ></el-input>
         </el-form-item>
         <el-form-item label="标准编号" class="search-item">
@@ -25,7 +26,7 @@
         </el-form-item>
         <el-form-item label="标准状态" class="search-item">
           <el-select v-model="searchForm.standState"
-                     placeholder="请选择标准状态">
+                     placeholder="请选择标准状态" clearable>
             <el-option v-for="item in dict.commonState" :value="item.value" :label="item.label"></el-option>
           </el-select>
         </el-form-item>
@@ -78,7 +79,7 @@
         </el-form-item>
         <el-form-item label="数据来源" class="search-item">
           <el-select v-model="searchForm.dataSource"
-                     placeholder="请选择数据来源">
+                     placeholder="请选择数据来源" clearable>
             <el-option value="INLAND" label="国内标准库"></el-option>
             <el-option value="FOREIGN" label="海外标准库"></el-option>
             <el-option value="ENTERPRISE" label="企业标准库"></el-option>
@@ -304,6 +305,7 @@ export default {
       api: {
         getListStandLimit: "lawss/sarMenuStandardLimit/getListStandLimit",
       },
+      iconShow: false,
     }
   },
   created() {
@@ -425,7 +427,10 @@ export default {
         this.standSystemData = res.data
       }
     },
-    choice () {
+    choice (e) {
+      if (e.target.className === "el-input__icon el-icon-circle-close el-input__clear") {
+        return;
+      }
       this.modalShowFlag = true
     },
     popoverHideCancel() {
@@ -436,6 +441,10 @@ export default {
       this.searchForm.standSystemId = checkedIds
       this.modalShowFlag = false
     },
+    handleClearStandSystem (e) {
+      this.searchForm.standSystem = ''
+      this.searchForm.standSystemId = ''
+    },
     getDicTypeListCode () {
       this.$http._getData('sys/dictype/getDicTypeListCode').then(res => {
         this.dict = { ...res.data }