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

src/pages/localTool/standardWarning.vue

@@ -11,25 +11,51 @@
                 <h5>实施预警</h5>
                 <div class="more">
                   <el-form :inline="true" :model="dynamic" class="demo-form-inline">
+                    <el-form-item label="标准编号">
+                      <el-input clearable size="small"
+                                v-model="dynamic.standCode"
+                                placeholder="根据标准编号查找">
+                      </el-input>
+                    </el-form-item>
+                    <el-form-item label="标准名称">
+                      <el-input clearable size="small"
+                                v-model="dynamic.standName"
+                                placeholder="根据标准名称查找">
+                      </el-input>
+                    </el-form-item>
+                    <el-form-item label="实施日期" class="choose-time-area">
+                      <el-datePicker
+                                clearable size="small"
+                                v-model="dynamic.putTime"
+                                value-format="yyyy-MM-dd"
+                                placeholder="根据实施日期查找">
+                      </el-datePicker>
+                    </el-form-item>
                     <el-form-item label="适用车型">
                       <el-input clearable size="small"
-                                v-model="dynamic.keyword"
+                                v-model="dynamic.applyType"
                                 placeholder="根据适用车型查找">
                       </el-input>
                     </el-form-item>
                     <el-form-item>
                       <el-button
-                        icon="el-icon-search"
                         type="primary"
                         size="small"
                         @click="searchBtnClick"
                         class="common-button-primary">
+                        查询
+                      </el-button>
+                      <el-button
+                          size="small"
+                          @click="clearBtnClick"
+                          class="common-button-primary">
+                        清空
                       </el-button>
                     </el-form-item>
                   </el-form>
                 </div>
                 <div class="content" style="height: 100%; padding-top: 5px; ">
-                  <el-divider content-position="left" class="dynamic-child-title"></el-divider>
+                  <el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>
                   <el-table
                     :data="newItems"
                     :height="height"
@@ -410,7 +436,14 @@ export default {
       activeName: "STANDARD",   //tab 默认选中值
       // 头部搜索框
       dynamic: {
-        keyWord: "",
+        //标准编号
+        standCode: "",
+        //标准名称
+        standName: "",
+        //实施日期
+        putTime: "",
+        //适用车型
+        applyType: "",
       },
       height: null,
       // 新车型实施日期预警
@@ -549,7 +582,14 @@ export default {
     searchBtnClick() {
         this.$http.get('sys/EarlyWarning/StandWarning', {
           ...this.pageConfig,
-          applyType: this.dynamic.keyword
+          //标准编号
+          standCode: this.dynamic.standCode,
+          //标准名称
+          standName: this.dynamic.standName,
+          //实施日期
+          putTime: this.dynamic.putTime,
+          //适用车型
+          applyType: this.dynamic.applyType
         },{
            _this: this,
         }, res => {
@@ -567,6 +607,19 @@ export default {
           console.log(e)
         })
     },
+    clearBtnClick() {
+      this.dynamic = {
+        //标准编号
+        standCode: "",
+        //标准名称
+        standName: "",
+        //实施日期
+        putTime: "",
+        //适用车型
+        applyType: "",
+      }
+      this.searchBtnClick()
+    },
     //取消预警
     cancelWarning (index, row) {
       console.log(index, row)
@@ -882,6 +935,16 @@ export default {
         }
 
         .more {
+
+          /deep/ .el-input__inner {
+            width: 155px;
+          }
+          .choose-time-area {
+            /deep/ .el-input__inner {
+              width: 220px;
+            }
+          }
+
           cursor: pointer;
           color: #12508e;
           position: absolute;

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -2613,6 +2613,13 @@ export default {
     },
     // 清空搜索框
     clearAllSearch (flag) {
+      if (flag==='standCommonlySearch'){
+        this.standCommonlySearch.standNumber='';
+        this.standCommonlySearch.standSort='';
+        this.standCommonlySearch.page=1;
+
+      }
+      this.getDomesticStandardTable(this.standCommonlySearch)
 
       if (flag === 'sarStandardsSearch') {
         this.sarStandardsSearch.standSort = ''

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="transfer">调取</el-button>-->
-        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="deleteList">批量删除
+<!--        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="deleteList">批量删除-->
-        </el-button>
+<!--        </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="search-area-detail">
-            <div class="left">
+            <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"
+                      v-model="sarProStateEO.standNumber"
-                      placeholder="根据项目名称查找"
+                      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>