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

src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue

@@ -563,7 +563,7 @@
                     class="common-button-primary"
                     size="small"
                     v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
-                    @click="getStandData">
+                    @click="getStandDataBtn">
                     查询
                   </el-button>
                 </el-form-item>
@@ -998,6 +998,10 @@ export default {
       };
       this.getStandData();
     },
+    getStandDataBtn(){
+      this.pageNo =1;
+      this.getStandData();
+    },
     //查询项目下的标准
     getStandData() {
       this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {

src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue

@@ -305,7 +305,7 @@
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectListChange"
-              ref="selection"
+              ref="listSelection"
             >
               <el-table-column
                 type="selection"
@@ -535,8 +535,8 @@ export default {
     selectListChange(data) {
       // 单选
       if (data.length > 1) {
-        this.$refs.selection.clearSelection()
+        this.$refs.listSelection.clearSelection()
-        this.$refs.selection.toggleRowSelection(data.pop())
+        this.$refs.listSelection.toggleRowSelection(data.pop())
       }
       this.multipleSelection = data
 

src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue

@@ -179,7 +179,7 @@
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectProjectChange"
-              ref="selection"
+              ref="projectSelection"
             >
               <el-table-column
                 type="selection"
@@ -282,7 +282,7 @@
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectListChange"
-              ref="selection"
+              ref="listSelection"
             >
               <el-table-column
                 type="selection"
@@ -594,8 +594,8 @@ export default {
     selectListChange(data) {
       // 单选
       if (data.length > 1) {
-        this.$refs.selection.clearSelection()
+        this.$refs.listSelection.clearSelection()
-        this.$refs.selection.toggleRowSelection(data.pop())
+        this.$refs.listSelection.toggleRowSelection(data.pop())
       }
       this.multipleSelection = data
 
@@ -605,8 +605,8 @@ export default {
     selectProjectChange(data) {
       // 单选
       if (data.length > 1) {
-        this.$refs.selection.clearSelection()
+        this.$refs.projectSelection.clearSelection()
-        this.$refs.selection.toggleRowSelection(data.pop())
+        this.$refs.projectSelection.toggleRowSelection(data.pop())
       }
       this.multipleSelection = data
 

src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue

@@ -178,7 +178,7 @@
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectProjectChange"
-              ref="selection"
+              ref="projectSelection"
             >
               <el-table-column
                 type="selection"
@@ -281,7 +281,7 @@
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectListChange"
-              ref="selection"
+              ref="listSelection"
             >
               <el-table-column
                 type="selection"
@@ -593,8 +593,8 @@ export default {
     selectListChange(data) {
       // 单选
       if (data.length > 1) {
-        this.$refs.selection.clearSelection()
+        this.$refs.listSelection.clearSelection()
-        this.$refs.selection.toggleRowSelection(data.pop())
+        this.$refs.listSelection.toggleRowSelection(data.pop())
       }
       this.multipleSelection = data
 
@@ -604,8 +604,8 @@ export default {
     selectProjectChange(data) {
       // 单选
       if (data.length > 1) {
-        this.$refs.selection.clearSelection()
+        this.$refs.projectSelection.clearSelection()
-        this.$refs.selection.toggleRowSelection(data.pop())
+        this.$refs.projectSelection.toggleRowSelection(data.pop())
       }
       this.multipleSelection = data
 

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

@@ -138,7 +138,7 @@
                       class="common-button-primary"
                       size="mini"
                       v-btn-permission="'0bdf3aecef5161bb66256ebcbbd4bdaa'"
-                      @click="querySarProStateZero">查询</el-button>
+                      @click="querySarProStateZeroBtn">查询</el-button>
                 </el-form-item>
                 <el-form-item class="search-item btn-box">
                   <el-button
@@ -306,7 +306,12 @@ name: "technologyInvolveProject",
       handleProjectCompliance (row) {
         this.standId = row.standId
         this.querySarProStateZero()
-      }, // 查看项目符合性
+      },
+    querySarProStateZeroBtn(){
+      this.sarProStateTotalPage = 1
+      this.querySarProStateZero()
+    },
+    // 查看项目符合性
     querySarProStateZero () {
       var form = this.sarProStateEO
       form.position = this.sarProject.position
@@ -328,7 +333,7 @@ name: "technologyInvolveProject",
           this.sarProStateEO.standNumber = ''
           this.sarProStateEO.standName = ''
           this.sarProStateEO.specificItem = ''
-          this.querySarProStateZero()
+          this.querySarProStateZeroBtn()
       }, // 清空条件查询
       clearSearchPro () {
           this.sarProStateEO.standNumber = ''

src/pages/regulatoryRepository/partCodeApply/index.vue

@@ -21,7 +21,7 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary" size="mini" v-btn-permission="'02424c2bc370ee846aa5a6d60c49a6a5'"
-                     class="common-button-primary" @click="getTableByPage('')">
+                     class="common-button-primary" @click="getTableByPageBtn">
             查询
           </el-button>
         </el-form-item>
@@ -203,6 +203,11 @@ export default {
         })
       }
     },
+    // 查询之后跳回第一页
+    getTableByPageBtn(){
+      this.pageNo = 1
+      this.getTableByPage()
+    },
     // 查询零部件table列表
     getTableByPage() {
       this.tableLoading.loadData = true
@@ -231,7 +236,7 @@ export default {
         //零件分类号
         partCategoryCode: ""
       }
-      this.getTableByPage()
+      this.getTableByPageBtn()
     },
     // 分页事件
     pageChange(page) {