库存事务页面 默认事务类型不等于 结算出库、客户ASN、隔离

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: '报废'

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>