From 8ae6ddc493d800a3cb5e637fbcadd5f22089b945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Fri, 2 Jun 2023 16:45:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BA=8B=E5=8A=A1=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=20=E9=BB=98=E8=AE=A4=E4=BA=8B=E5=8A=A1=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=B8=8D=E7=AD=89=E4=BA=8E=20=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E3=80=81=E5=AE=A2=E6=88=B7ASN=E3=80=81?=
 =?UTF-8?q?=E9=9A=94=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/filters/status.js                   | 50 ++++++++---------
 .../InventoryTransaction-Query.vue            | 53 +++++++++++++++++++
 2 files changed, 79 insertions(+), 24 deletions(-)

diff --git a/fe/PC/src/filters/status.js b/fe/PC/src/filters/status.js
index 623b852dd..50ba7541a 100644
--- a/fe/PC/src/filters/status.js
+++ b/fe/PC/src/filters/status.js
@@ -1643,6 +1643,7 @@ export function SupplierAsnCtypeStaBack(name){
 
 
 // 事务类型（string类型，基础数据-文档信息维护）
+// InventoryTransaction页面需求暂时去掉 结算出库、客户ASN、隔离 （20230602）更改时候确定一下此业务
 /**
  * 
  * @param {Boolean}  
@@ -1698,14 +1699,14 @@ export function SupplierAsnCtypeStaBack(name){
       value: '24',
       label: '客户退货'
     },
-    '25': {
-      value: '25',
-      label: '结算出库'
-    },
-    '26': {
-      value: '26',
-      label: '客户ASN'
-    },
+    // '25': {
+    //   value: '25',
+    //   label: '结算出库'
+    // },
+    // '26': {
+    //   value: '26',
+    //   label: '客户ASN'
+    // },
     '31': {
       value: '31',
       label: '库内转移'
@@ -1722,10 +1723,10 @@ export function SupplierAsnCtypeStaBack(name){
       value: '34',
       label: '计划外出库'
     },
-    '35': {
-      value: '35',
-      label: '隔离'
-    },
+    // '35': {
+    //   value: '35',
+    //   label: '隔离'
+    // },
     '36': {
       value: '36',
       label: '报废'
@@ -1751,6 +1752,7 @@ export function SupplierAsnCtypeStaBack(name){
 }
 
 // 事务类型 （修改枚举时候把【TransTypeBaseForStr】也修改了）
+// InventoryTransaction页面需求暂时去掉 结算出库、客户ASN、隔离 （20230602）更改时候确定一下此业务
 /**
  * 
  * @param {Boolean}  
@@ -1806,14 +1808,14 @@ export function SupplierAsnCtypeStaBack(name){
       value: 24,
       label: '客户退货'
     },
-    25: {
-      value: 25,
-      label: '结算出库'
-    },
-    26: {
-      value: 26,
-      label: '客户ASN'
-    },
+    // 25: {
+    //   value: 25,
+    //   label: '结算出库'
+    // },
+    // 26: {
+    //   value: 26,
+    //   label: '客户ASN'
+    // },
     31: {
       value: 31,
       label: '库内转移'
@@ -1830,10 +1832,10 @@ export function SupplierAsnCtypeStaBack(name){
       value: 34,
       label: '计划外出库'
     },
-    35: {
-      value: 35,
-      label: '隔离'
-    },
+    // 35: {
+    //   value: 35,
+    //   label: '隔离'
+    // },
     36: {
       value: 36,
       label: '报废'
diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransaction-Query.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransaction-Query.vue
index 6bdda3c3b..e799635b7 100644
--- a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransaction-Query.vue
+++ b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransaction-Query.vue
@@ -39,6 +39,7 @@
   </div>
 </template>
 <script>
+import { getPageList } from "@/api/wms-api"
 import { tableMixins } from "@/mixins/TableMixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
@@ -68,6 +69,58 @@ export default {
   mounted () {
     this.paging();
   },
+  methods: {
+    //渲染数据
+    paging(callback) {
+      this.Loading.tableLoading = true;
+      this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
+      let _type25 = {
+        "logic": "And",
+        "column": "transType",
+        "action": "!=",
+        "value": "25"
+      }
+      let _type26 = {
+        "logic": "And",
+        "column": "transType",
+        "action": "!=",
+        "value": "26"
+      }
+      let _type35 = {
+        "logic": "And",
+        "column": "transType",
+        "action": "!=",
+        "value": "35"
+      }
+      // 默认事务类型不等于 结算出库、客户ASN、隔离
+      if(this.PageListParams.condition.filters.length <= 0){
+        this.PageListParams.condition.filters.push(_type25,_type26,_type35)
+      }else{
+        let _number = []
+        this.PageListParams.condition.filters.forEach(element => {
+          if(element.column == 'transType'){
+            _number.push(element.value)
+          }
+        });
+        if(_number.indexOf('25') < 0){
+          this.PageListParams.condition.filters.push(_type25)
+        }
+        if(_number.indexOf('26') < 0){
+          this.PageListParams.condition.filters.push(_type26)
+        }
+        if(_number.indexOf('35') < 0){
+          this.PageListParams.condition.filters.push(_type35)
+        }
+      }
+      getPageList(this.PageListParams, this.URL).then(res => {
+        this.tableData = res.items
+        this.totalCount = res.totalCount
+        this.pagingCallback(callback)
+      }).catch(err => {
+        this.Loading.tableLoading = false
+      })
+    },
+  }
 };
 </script>
 <style lang="scss" scoped>