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

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

@@ -39,9 +39,9 @@
         </div>
       </el-card>
       <div class="action-bar">
-        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="transfer">调取</el-button>
-        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="deleteList">批量删除
-        </el-button>
+<!--        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="transfer">调取</el-button>-->
+<!--        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="deleteList">批量删除-->
+<!--        </el-button>-->
         <el-button class="common-button-default export-button"
                    size="mini" @click="exportStandard"
                    v-btn-permission="''"

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue

@@ -108,13 +108,27 @@
     >
       <div class="demo-drawer-content">
         <div class="el-drawer-form">
-          <div class="search-area">
-            <div class="left">
+          <div class="search-area-detail">
+            <div class="left" id="detailSearch">
               <el-form :inline="true" :model="sarProStateEO" class="label-input-form">
-                <el-form-item label="项目名称" class="search-item search-item-last">
+                <el-form-item label="标准编号" class="search-item search-item-last">
                   <el-input
-                      v-model="sarProStateEO.productName"
-                      placeholder="根据项目名称查找"
+                      v-model="sarProStateEO.standNumber"
+                      placeholder="根据标准编号查找"
+                      :maxlength="100"
+                      clearable></el-input>
+                </el-form-item>
+                <el-form-item label="标准名称" class="search-item search-item-last">
+                  <el-input
+                      v-model="sarProStateEO.standName"
+                      placeholder="根据标准名称查找"
+                      :maxlength="100"
+                      clearable></el-input>
+                </el-form-item>
+                <el-form-item label="具体章条" class="search-item search-item-last">
+                  <el-input
+                      v-model="sarProStateEO.specificItem"
+                      placeholder="根据具体章条查找"
                       :maxlength="100"
                       clearable></el-input>
                 </el-form-item>
@@ -230,7 +244,12 @@ name: "technologyInvolveProject",
       pageSize: this.$store.getters.userInfo.configContent,
       showSarProStateModal: false,
       sarProStateEO: {
-        productName: ''
+        //标准编号
+        standNumber: '',
+        //标准名称
+        standName: '',
+        //具体章条
+        specificItem: '',
       },
       sarProStateTotal: 0,
       sarProStateTotalPage: 1,
@@ -306,11 +325,15 @@ name: "technologyInvolveProject",
       this.showSarProStateModal = true
     }, // 查询项目数据
       clearSearchProState () {
-          this.sarProStateEO.productName = ''
+          this.sarProStateEO.standNumber = ''
+          this.sarProStateEO.standName = ''
+          this.sarProStateEO.specificItem = ''
           this.querySarProStateZero()
       }, // 清空条件查询
       clearSearchPro () {
-          this.sarProStateEO.productName = ''
+          this.sarProStateEO.standNumber = ''
+          this.sarProStateEO.standName = ''
+          this.sarProStateEO.specificItem = ''
           this.showSarProStateModal = false
       }, // 关闭查看事件
       pageProStateChange (page) {
@@ -368,5 +391,8 @@ name: "technologyInvolveProject",
   .search-area .search-item .el-input--suffix .el-input__inner{
     padding-right: 15px;
   }
+  .search-area-detail .el-input__inner{
+    width: 150px;
+  }
 }
 </style>