From b830ee1db51a418a73e511f64118a76d0228a77c Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 8 May 2023 16:45:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=20=E5=AF=84=E5=94=AE=20?=
 =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=20=E5=B8=A6=E7=A5=A8=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E8=AF=A6=E6=83=85=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/InvPreInProductsDetail.vue | 16 +++++++++++++++-
 src/views/inventory/InvPreProductsDetail.vue   | 16 +++++++++++++++-
 src/views/inventory/InvProductsDetail.vue      | 15 ++++++++++++++-
 src/views/inventory/InvSupPreInProducts.vue    |  7 ++++++-
 src/views/inventory/InvSupPreProducts.vue      |  8 +++++++-
 src/views/purchase/purOrder/purOrderSearch.vue | 16 ++++++++--------
 6 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/src/views/inventory/InvPreInProductsDetail.vue b/src/views/inventory/InvPreInProductsDetail.vue
index 05b999b..68cbcb8 100644
--- a/src/views/inventory/InvPreInProductsDetail.vue
+++ b/src/views/inventory/InvPreInProductsDetail.vue
@@ -58,7 +58,8 @@
         </el-button-group>
       </el-form-item>
     </el-form>
-    <el-table v-loading="loading" :data="list" style="width: 100%" border>
+    <el-table v-loading="loading" :data="list" style="width: 100%"
+              :default-sort="defaultSort"     @sort-change="handleSortChange"  border>
       <el-table-column label="序号" type="index"></el-table-column>
       <el-table-column
         label="UDI码"
@@ -106,6 +107,7 @@
         prop="orderTime"
         width="150"
         show-overflow-tooltip
+        :sort-orders="['ascending', 'descending']"
       ></el-table-column>
     </el-table>
 
@@ -147,6 +149,7 @@ export default {
       list: [],
       total: 0,
       loading: false,
+      defaultSort: {prop: 'orderTime', order: 'desc'},
     };
   },
   methods: {
@@ -176,6 +179,17 @@ export default {
       this.invPreProductDetailQuery.page = val;
       this.getList();
     },
+
+    handleSortChange(column, prop, order) {
+      if (column.order === 'descending') {
+        this.invPreProductDetailQuery.sort = 'desc'
+      } else {
+        this.invPreProductDetailQuery.sort = 'asc'
+      }
+      this.invPreProductDetailQuery.orderBy = column.prop;
+      this.getList();
+    },
+
     getList() {
       this.loading = true;
       this.invPreProductDetailQuery.relId = this.inputQuery.relId;
diff --git a/src/views/inventory/InvPreProductsDetail.vue b/src/views/inventory/InvPreProductsDetail.vue
index 8b71bf4..ae17320 100644
--- a/src/views/inventory/InvPreProductsDetail.vue
+++ b/src/views/inventory/InvPreProductsDetail.vue
@@ -58,7 +58,8 @@
         </el-button-group>
       </el-form-item>
     </el-form>
-    <el-table v-loading="loading" :data="list" style="width: 100%">
+    <el-table v-loading="loading" :data="list" style="width: 100%"
+              :default-sort="defaultSort"  @sort-change="handleSortChange"  >
       <el-table-column label="序号" type="index"></el-table-column>
       <el-table-column
         label="UDI码"
@@ -106,6 +107,7 @@
         prop="orderTime"
         width="150"
         show-overflow-tooltip
+        :sort-orders="['ascending', 'descending']"
       ></el-table-column>
     </el-table>
 
@@ -147,6 +149,7 @@ export default {
       list: [],
       total: 0,
       loading: false,
+      defaultSort: {prop: 'orderTime', order: 'desc'},
     };
   },
   methods: {
@@ -176,6 +179,17 @@ export default {
       this.invPreProductDetailQuery.page = val;
       this.getList();
     },
+    handleSortChange(column, prop, order) {
+      if (column.order === 'descending') {
+        this.invPreProductDetailQuery.sort = 'desc'
+      } else {
+        this.invPreProductDetailQuery.sort = 'asc'
+      }
+      this.invPreProductDetailQuery.orderBy = column.prop;
+      this.getList();
+    },
+
+
     getList() {
       this.loading = true;
       this.invPreProductDetailQuery.relId = this.inputQuery.relId;
diff --git a/src/views/inventory/InvProductsDetail.vue b/src/views/inventory/InvProductsDetail.vue
index b639c6a..f94d4f0 100644
--- a/src/views/inventory/InvProductsDetail.vue
+++ b/src/views/inventory/InvProductsDetail.vue
@@ -56,7 +56,8 @@
         </el-button-group>
       </el-form-item>
     </el-form>
-    <el-table v-loading="loading" :data="list" style="width: 100%" border>
+    <el-table v-loading="loading" :data="list" style="width: 100%"  :default-sort="defaultSort"
+              @sort-change="handleSortChange"    border>
       <el-table-column label="序号" type="index"></el-table-column>
       <el-table-column
         label="UDI码"
@@ -104,6 +105,7 @@
         prop="orderTime"
         width="150"
         show-overflow-tooltip
+        :sort-orders="['ascending', 'descending']"
       ></el-table-column>
     </el-table>
     <pagination
@@ -144,6 +146,7 @@ export default {
       list: [],
       total: 0,
       loading: false,
+      defaultSort: {prop: 'orderTime', order: 'desc'},
     };
   },
   methods: {
@@ -173,6 +176,16 @@ export default {
       this.invProductDetailQuery.page = val;
       this.getList();
     },
+    handleSortChange(column, prop, order) {
+      if (column.order === 'descending') {
+        this.invProductDetailQuery.sort = 'desc'
+      } else {
+        this.invProductDetailQuery.sort = 'asc'
+      }
+      this.invProductDetailQuery.orderBy = column.prop;
+      this.getList();
+    },
+
     getList() {
       this.loading = true;
       this.invProductDetailQuery.relId = this.inputQuery.relId;
diff --git a/src/views/inventory/InvSupPreInProducts.vue b/src/views/inventory/InvSupPreInProducts.vue
index a0e5fe9..c5a83c9 100644
--- a/src/views/inventory/InvSupPreInProducts.vue
+++ b/src/views/inventory/InvSupPreInProducts.vue
@@ -305,6 +305,11 @@ export default {
       getInvListByUser(query)
         .then((response) => {
           this.invList = response.data || [];
+          for(var i=0;i< this.invList.length;i++){
+            if(this.invList[i].advanceType == 2){
+              this.filterQuery.invCode=this.invList[i].code;
+            }
+          }
           this.getList();
         })
         .catch(() => {
@@ -389,7 +394,7 @@ export default {
     }
     this.findMethod();
     this.getInvList();
-    this.getList();
+  //  this.getList();
   },
 };
 </script>
diff --git a/src/views/inventory/InvSupPreProducts.vue b/src/views/inventory/InvSupPreProducts.vue
index e073fb9..6c4e818 100644
--- a/src/views/inventory/InvSupPreProducts.vue
+++ b/src/views/inventory/InvSupPreProducts.vue
@@ -302,6 +302,12 @@ export default {
       getInvListByUser(query)
         .then((response) => {
           this.invList = response.data || [];
+          for(var i=0;i< this.invList.length;i++){
+            if(this.invList[i].advanceType == 3){
+              this.filterQuery.invCode=this.invList[i].code;
+            }
+          }
+
           this.getList();
         })
         .catch(() => {
@@ -386,7 +392,7 @@ export default {
     }
     this.findMethod();
     this.getInvList();
-    this.getList();
+    //this.getList();
   },
 };
 </script>
diff --git a/src/views/purchase/purOrder/purOrderSearch.vue b/src/views/purchase/purOrder/purOrderSearch.vue
index 25b285e..ac31f41 100644
--- a/src/views/purchase/purOrder/purOrderSearch.vue
+++ b/src/views/purchase/purOrder/purOrderSearch.vue
@@ -22,14 +22,14 @@
           <el-col :span="8">
             <el-form-item label="采购部门">
               <el-select
-                v-model="filterQuery.invCode"
+                v-model="filterQuery.deptCode"
+                placeholder="请选择收货仓库"
                 style="width: 90%"
-                placeholder="请选择采购部门"
                 clearable
               >
                 <el-option
-                  v-for="item in invList"
-                  :key="item.name"
+                  v-for="item in deptList"
+                  :key="item.code"
                   :label="item.name"
                   :value="item.code"
                 >
@@ -41,14 +41,14 @@
           <el-col :span="8">
             <el-form-item label="收货仓库">
               <el-select
-                v-model="filterQuery.deptCode"
-                placeholder="请选择收货仓库"
+                v-model="filterQuery.invCode"
                 style="width: 90%"
+                placeholder="请选择采购部门"
                 clearable
               >
                 <el-option
-                  v-for="item in deptList"
-                  :key="item.code"
+                  v-for="item in invList"
+                  :key="item.name"
                   :label="item.name"
                   :value="item.code"
                 >