互斥关联订单添加分页

src/views/ecw/order/addAssociatedOrder.vue

@@ -5,7 +5,7 @@
     <el-form inline label-width="85px" label-position="left">
       <el-form-item label="订单号">
         <div class="content">
-          <el-input v-model="relateOrderId"></el-input>
+          <el-input v-model="params.relateOrderNo"></el-input>
         </div>
       </el-form-item>
       <el-form-item>
@@ -49,6 +49,8 @@
         </template>
       </el-table-column>
     </el-table>
+    <pagination v-show="total > 0" :total="total" :page.sync="params.page" :limit.sync="params.rows"
+                @pagination="getUnassociatedOrder" />
     <el-row style="margin-top: 40px">
       <el-col>
         <el-button type="primary" @click="batchJoin(multipleSelection.map(e => e.orderId))"
@@ -78,9 +80,13 @@ export default {
   data() {
     return {
       orderDetails: {},
-      relateOrderId: '',
       list: [],
       multipleSelection: [],
+      params:{
+        page:1,
+        rows:10
+      },
+      total:0
     }
   },
   created() {
@@ -97,10 +103,11 @@ export default {
     getUnassociatedOrder() {
       getUnGuanlianOrderByOrderId({
           orderId: this.orderId,
-        relateOrderId: this.relateOrderId ? this.relateOrderId : 0
+         ...this.params
       }).then(r => {
         if (r.code === 0) {
-          this.list = r.data
+          this.list = r.data.list;
+          this.total = r.data.total;
         }
       })
     },

src/views/ecw/order/associatedOrder.vue

@@ -59,7 +59,7 @@
      </el-table-column>
      <el-table-column label="操作人" prop="creator">
        <template v-slot="{row}">
-         {{userList.find( i => row.creator == i.id).nickname}}
+         {{(userList.find( i => row.creator == i.id) || {}).nickname}}
        </template>
      </el-table-column>
      <el-table-column label="操作时间">
@@ -75,6 +75,8 @@
        </template>
      </el-table-column>
    </el-table>
+  <pagination v-show="total > 0" :total="total" :page.sync="params.page" :limit.sync="params.rows"
+              @pagination="getList" />
 </div>
 </template>
 
@@ -114,13 +116,16 @@ export default {
       orderDetails:{},
       params:{
         orderId:undefined,
-        relateOrderId:undefined
+        relateOrderNo:undefined,
+        page:1,
+        rows:10
       },
       list:[],
       DICT_TYPE,
       getDictDatas,
       multipleSelection:[],
-      userList:[]
+      userList:[],
+      total:0,
     }
   },
   created() {
@@ -137,7 +142,8 @@ export default {
     getList(){
       guanlianList(this.params).then(r => {
         if(r.code === 0){
-          this.list = r.data
+          this.list = r.data.list;
+          this.total = r.data.total;
         }
       })
     },

src/views/ecw/order/mutexOrder.vue

@@ -8,7 +8,7 @@
     <el-divider></el-divider>
     <el-form inline label-width="100px">
       <el-form-item label="订单号"><div class="content">
-        <el-input v-model="params.relateOrderId"></el-input>
+        <el-input v-model="params.relateOrderNo"></el-input>
       </div></el-form-item>
       <el-form-item><div class="content">
         <el-button @click="getList">查询</el-button>
@@ -75,6 +75,8 @@
         </template>
       </el-table-column>
     </el-table>
+    <pagination v-show="total > 0" :total="total" :page.sync="params.page" :limit.sync="params.rows"
+                @pagination="getList" />
   </div>
 </template>
 
@@ -104,8 +106,10 @@ export default {
       orderDetails:{},
       params:{
         orderId:undefined,
-        mutualOrderId:undefined
+        page:1,
+        rows:10,
       },
+      total:0,
       list:[],
       DICT_TYPE,
       getDictDatas,
@@ -127,7 +131,8 @@ export default {
     getList(){
       guanlianList(this.params).then(r => {
         if(r.code === 0){
-          this.list = r.data
+          this.list = r.data.list;
+          this.total = r.data.total;
         }
       })
     },

src/views/ecw/order/notMutexOrder.vue

@@ -5,7 +5,7 @@
     <el-form inline label-width="85px" label-position="left">
       <el-form-item label="订单号">
         <div class="content">
-          <el-input v-model="mutualOrderId"></el-input>
+          <el-input v-model="params.relateOrderNo"></el-input>
         </div>
       </el-form-item>
       <el-form-item>
@@ -53,6 +53,8 @@
         </template>
       </el-table-column>
     </el-table>
+    <pagination v-show="total > 0" :total="total" :page.sync="params.page" :limit.sync="params.rows"
+                @pagination="getUnassociatedOrder" />
     <el-row style="margin-top: 40px">
       <el-col>
         <el-button type="primary" @click="batchJoin(multipleSelection.map(e => e.orderId))"
@@ -85,6 +87,11 @@ export default {
       mutualOrderId: '',
       list: [],
       multipleSelection: [],
+      total:0,
+      params:{
+        page:1,
+        rows:10,
+      }
     }
   },
   created() {
@@ -101,11 +108,11 @@ export default {
     getUnassociatedOrder() {
       getUnGuanlianOrderByOrderId({
         orderId: this.orderId,
-        mutualOrderId: this.mutualOrderId ? this.mutualOrderId : 0
+        ...this.params,
       }).then(r => {
         if (r.code === 0) {
-          this.list = r.data
-          console.log(this.list[0])
+          this.list = r.data.list;
+          this.total = r.data.total;
         }
       })
     },