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

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -30,7 +30,7 @@
         </div>
       </el-card>
       <div class="action-bar">
-        <el-button plain class="common-button-primary" size="mini" @click="addList">添加</el-button>
+        <el-button plain class="common-button-primary" size="mini" @click="addList">调取</el-button>
         <el-button plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button>
         <el-button class="common-button-default export-button"
                    size="mini" @click="exportStandard"
@@ -143,6 +143,42 @@
       <div class="demo-drawer-content">
         <div style="position: absolute;bottom: 48px;top:16px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <!-- 顶部工具栏 -->
+            <table-tools-bar>
+              <div slot="left">
+                <div class="search-area">
+                  <el-form :model="standCommonlySearch" inline class="label-input-form">
+                    <el-formItem label="标准号/名称" prop="standNumber" class="search-item">
+                      <el-input v-model="standCommonlySearch.standNumber" placeholder="根据标准号/名称查找" clearable/>
+                    </el-formItem>
+                    <el-formItem label="标准类别" prop="standSort" class="search-item">
+                      <el-select v-model="standCommonlySearch.standSort" placeholder="根据标准类别查找" clearable>
+                        <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }}
+                        </el-option>
+                      </el-select>
+                    </el-formItem>
+                    <el-formItem label="标准来源" prop="standType" class="search-item">
+                      <el-select v-model="standCommonlySearch.standType" placeholder="根据标准来源查找" clearable>
+                        <el-option value="INLAND" key="1" label="国内标准"></el-option>
+                        <el-option value="FOREIGN" key="2" label="海外标准"></el-option>
+                      </el-select>
+                    </el-formItem>
+                    <el-formItem class="search-item btn-box">
+                      <el-button
+                        type="primary"
+                        size="mini"
+                        class="common-button-primary"
+
+                        @click="search">查询</el-button>
+                      <el-button
+                        class="common-button-default"
+                        size="mini"
+                        @click="clearSearch">清空</el-button>
+                    </el-formItem>
+                  </el-form>
+                </div>
+              </div>
+            </table-tools-bar>
             <el-table
                 :data="standardData"
                 tooltip-effect="dark"
@@ -233,6 +269,12 @@ export default {
   },
   data () {
     return {
+      standSortOptions: [],
+      standCommonlySearch: {
+        standSort: '',
+        standNumber: '',
+        standType: ''
+      },
       size: this.$store.getters.userInfo.configContent,
       pageSizeNo: this.$store.getters.userInfo.configContent,
       pageSize: this.$store.getters.userInfo.configContent,
@@ -260,6 +302,19 @@ export default {
     }
   },
   methods: {
+    // 搜索
+    search() {
+      this.pageNo = 1
+      this.pageSizeNo = this.$store.getters.userInfo.configContent;
+      this.addList()
+    },
+    clearSearch() {
+      this.pageNo = 1
+      this.standCommonlySearch.standSort = ''
+      this.standCommonlySearch.standNumber = ''
+      this.standCommonlySearch.standType = ''
+      this.addList()
+    },
     pageChange(page) {
       this.page = page;
       this.selectionList();
@@ -285,7 +340,10 @@ export default {
     addList() {
       this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
         page:this.pageNo,
-        pageSize:this.pageSizeNo
+        pageSize:this.pageSizeNo,
+        standSort: this.standCommonlySearch.standSort,
+        standNumber: this.standCommonlySearch.standNumber,
+        standType: this.standCommonlySearch.standType
       }, {
         _this:this,
       }, res => {
@@ -555,6 +613,7 @@ export default {
         _this: this,
         loading: 'loading'
       }, res => {
+        this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
         this.showLocalProductData(this.getLocalPro)
       }, e => {
       })
@@ -750,4 +809,4 @@ export default {
 .demo-drawer-content {
      margin-top: 10px;
 }
-</style>
+</style>