Merge remote-tracking branch 'origin/ww' into orderChange

src/api/inout/stockOrder.js

@@ -316,13 +316,13 @@ export function submitStockOrderToThirdSys(params) {
     })
 }
 
-export function findOrderByStockOrder(query) {
-    return axios({
-        url: "/udiwms/inout/order/findOrderByStockOrder",
-        method: 'get',
-        params: query
-    });
-}
+// export function findOrderByStockOrder(query) {
+//     return axios({
+//         url: "/udiwms/inout/order/findOrderByStockOrder",
+//         method: 'get',
+//         params: query
+//     });
+// }
 
 export function rollbackOrder(params) {
     return axios({
@@ -343,3 +343,5 @@ export function rollUnReceivebackOrder(params) {
 
 
 
+
+

src/views/inventory/invMAOrderAudit.vue

@@ -190,6 +190,7 @@ export default {
                 1: "未审核",
                 2: "已完成"
             },
+
         };
     },
     methods: {
@@ -213,6 +214,11 @@ export default {
         handleCurrentChange(val) {
             this.filterQuery.page = val;
             this.getList();
+            if(val==2){
+                 this.getList1();
+            }
+
+
         },
         getList() {
             this.loading = true
@@ -229,6 +235,24 @@ export default {
                 }
             });
         },
+        getList1() {
+            this.filterQuery.page = 1;
+            this.loading = true
+            this.detailList = [];
+            this.detailTotal = 0;
+            getMAOrderList(this.filterQuery).then((res) => {
+                this.loading = false;
+                if (res.code === 20000) {
+                    this.list = res.data.list || [];
+                    this.total = res.data.total || 0;
+                } else {
+                    this.list = [];
+                    this.total = 0;
+                }
+            });
+        },
+
+
         handleChange(row) {
             this.detailQuery.orderIdFk = row.orderId;
             this.detailQuery.page = 1;