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

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -391,8 +391,8 @@
               </el-select>
             </el-form-item>
             <!--            是否纳入标准清单-->
-            <el-form-item title="是否纳入标准清单" label="是否纳入标准清单">
-              <el-select v-model="sarStandardsSearch.isRelateAccess" class="advanced-one" placeholder="根据是否纳入标准清单查找">
+            <el-form-item  label="是否纳入标准清单" class="serch-form-item">
+              <el-select v-model="sarStandardsSearch.isRelateAccess"  placeholder="根据是否纳入标准清单查找">
                 <el-option value="yes" label="是"></el-option>
                 <el-option value="no" label="否"></el-option>
               </el-select>
@@ -437,7 +437,7 @@
             <el-form-item label="我司参与深度">
               <el-select v-model="sarStandardsSearch.nameShow" placeholder="请选择我司参与深度" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in wscysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
 
@@ -530,6 +530,23 @@
                 </el-option>
               </el-select>
             </el-form-item>
+
+<!--            标记-->
+            <!--            标签-->
+            <el-form-item label="标签">
+              <el-input v-model="sarStandardsSearch.tag" clearable
+                        placeholder="根据被标签查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+
+
+            <!--            体系类别-->
+            <el-form-item label="体系类别">
+              <el-select v-model="sarStandardsSearch.txlbOption" placeholder="根据体系类别查找" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
           </el-form>
         </div>
         <div class="demo-drawer-footer">
@@ -1428,7 +1445,10 @@ export default {
         replacedStandNum: '',
         synopsis: '', // 内容摘要
         // category: '', // 所属类别
-        standSort: '' // 标准类别
+        standSort: '', // 标准类别
+        txlbOption:'', //标准体系
+        tag:'' //标签
+
       }, // 分页查询过程中用到的对象
       loading: false,
       isCollapse: true,
@@ -1484,6 +1504,8 @@ export default {
       categoryConfigOptions: [], // 所属类别下拉框
       assemClassOptions: [], // 总成分类下拉框
       standAttributeList: [],
+      qcdwOptions:[],//起草单位
+      wscysdOptions:[], //我司参与深度
       // 树形结构
       // tree function
       MoveTest: '',
@@ -4283,6 +4305,7 @@ export default {
       this.categoryConfigOptions = res.data.CATEGORY
       this.standAttributeList = res.data.RULETYPE
       this.qcdwOptions = res.data.QCDW
+      this.wscysdOptions=res.data.WSCYSD;
       this.getGzzOption()
       this.setMap(this.standStateOptions)
     }, e => {

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -1082,7 +1082,6 @@ export default {
       this.localProTableSearch = { ...this.localProTableSearchDefault };
       this.projectLibrarySearch = { ...this.projectLibrarySearchDefault };
       this.localProTableSearch.page = 1;
-      this.isAdvancedSearch = false;
       this.getLocalProductTable();
     },
     resolveTime(data) {