修改执行派工分页

applications/dee-mes/src/views/assemblyPlanManagement/inspectionDispatch/index.vue

@@ -40,13 +40,13 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="AO(号/名称):">
-            <el-input v-model="searchFormData.aoName" clearable placeholder="请输入AO(号/名称)" @clear="getTableData" @keyup.enter.native="getTableData" />
+            <el-input v-model="searchFormData.aoName" clearable placeholder="请输入AO(号/名称)" />
           </el-form-item>
         </el-col>
         <el-col :span="2">
           <el-button
             type="primary"
-            @click="getTableData"
+            @click="searchTableData"
           >查询</el-button>
         </el-col>
       </el-form>
@@ -565,16 +565,20 @@ export default {
     },
     paginationCurrentChange(currentPage) {
       this.pagination.currentPage = currentPage
-      this.getInstructionsIssuedListTo()
+      this.getInstructionsDispatchList()
     },
     handleSizeChange(pageSize) {
       this.pagination.pageSize = pageSize
       this.pagination.currentPage = 1
-      this.getInstructionsIssuedListTo()
+      this.getInstructionsDispatchList()
     },
     selectionChange(val) {
       this.selectionRow = val
     },
+    searchTableData() {
+      this.pagination.currentPage = 1
+      this.getTableData()
+    },
     changeGroupUser(val) {
       val.isSelect = !val.isSelect
     },

applications/dee-mes/src/views/assemblyPlanManagement/instructionsDispatch/index.vue

@@ -46,7 +46,7 @@
         <el-col :span="2">
           <el-button
             type="primary"
-            @click="getTableData"
+            @click="searchTableData"
           >查询</el-button>
         </el-col>
       </el-form>
@@ -511,6 +511,7 @@ export default {
       const group = this.groupList.find(r => r.value === this.searchFormData.group)
       this.$set(this.searchFormData, 'groupName', group && group.label || '')
       this.$set(this.searchFormData, 'group', group && group.value || '')
+      this.pagination.currentPage = 1
       this.getTableData()
     },
     tabClick(tab) {
@@ -523,6 +524,10 @@ export default {
       }
       this.getTableData()
     },
+    searchTableData() {
+      this.pagination.currentPage = 1
+      this.getTableData()
+    },
     getTableData() {
       this.groupUserPage = 1
       this.groupUserTotal = 0
@@ -615,12 +620,12 @@ export default {
     },
     paginationCurrentChange(currentPage) {
       this.pagination.currentPage = currentPage
-      this.getInstructionsIssuedListTo()
+      this.getInstructionsDispatchList()
     },
     handleSizeChange(pageSize) {
       this.pagination.pageSize = pageSize
       this.pagination.currentPage = 1
-      this.getInstructionsIssuedListTo()
+      this.getInstructionsDispatchList()
     },
     selectionChange(val) {
       this.selectionRow = val