From c84585667006302e6a72a42261bad9c432dbd1e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Wed, 5 Jul 2023 09:35:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=B0=83=E6=95=B4=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/router/index.js                     | 10 +-
 fe/PC/src/utils/detailsTableColumns/index.js  |  6 +-
 fe/PC/src/views/interfaceBoard/TestSchool.vue | 95 +++++++++++++++++++
 3 files changed, 103 insertions(+), 8 deletions(-)
 create mode 100644 fe/PC/src/views/interfaceBoard/TestSchool.vue

diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js
index 0e36587c5..347489245 100644
--- a/fe/PC/src/router/index.js
+++ b/fe/PC/src/router/index.js
@@ -140,14 +140,14 @@ export const constantRoutes = [
   // {
   //   path: '/',
   //   component: Layout,
-  //   redirect: '/splitPackingList',
+  //   redirect: '/TestSchool',
   //   hidden: true,
   //   children: [{
-  //     path: 'splitPackingList',
-  //     component: () => import('@/views/inventoryManage/InventoryQuery/splitPackingList.vue'),
-  //     name: 'splitPackingList',
+  //     path: 'TestSchool',
+  //     component: () => import('@/views/interfaceBoard/TestSchool.vue'),
+  //     name: 'TestSchool',
   //     meta: {
-  //       title: 'splitPackingList',
+  //       title: 'TestSchool',
   //       icon: '拆分记录',
   //     }
   //   }]
diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index 9df6c5a7a..e23da28d4 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -3061,10 +3061,10 @@ export const CountPlanAdjust =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "库存数量", prop: "inventoryQty" },
-  { label: "盘点差异数量", prop: "diffQty" },
+  // { label: "库存数量", prop: "inventoryQty" },
+  { label: "库存数量", prop: "diffQty" },//20230705
   { label: "盘点数量", prop: "countQty" },
-  { label: "调整数量", prop: "adjustQty" },
+  { label: "盘点差异数量", prop: "adjustQty" },
   { label: "单位", prop: "uom" },
   { label: "库存状态", prop: "status",type: "filter",  filters:"inventoryStage" },
   { label: "箱码", prop: "packingCode" },
diff --git a/fe/PC/src/views/interfaceBoard/TestSchool.vue b/fe/PC/src/views/interfaceBoard/TestSchool.vue
new file mode 100644
index 000000000..9a2edd9f3
--- /dev/null
+++ b/fe/PC/src/views/interfaceBoard/TestSchool.vue
@@ -0,0 +1,95 @@
+<template>
+    <div class="page-box" v-loading="Loading.appMainLoading">
+      <tablePagination
+        :currenButtonData="currenButtonData"
+        :tableData="tableData"
+        :tableLoading="Loading.tableLoading"
+        :tableColumns="tableColumns"
+        @rowDrop="rowDrop"
+        :totalCount="totalCount"
+        :multipleSelection="multipleSelection"
+        :MaxResultCount="PageListParams.MaxResultCount"
+        @topbutton="topbutton"
+        @inlineDialog="inlineDialog"
+        @sortChange="sortChange"
+        @alertoldSkipCount="alertoldSkipCount"
+        @alterResultCount="alterResultCount"
+        @handleSelectionChange="handleSelectionChange"
+        :currentPageProps="oldSkipCount"
+        :quicklySearchOption="quicklySearchOption"
+        @quicklySearchClick="quicklySearchClick"
+        @quicklySearchClear="quicklySearchClear"
+        :primarySearchOption="primarySearchOption"
+        @overallSearchFormClick="overallSearchFormClick"
+        :httpOverallSearchData="httpOverallSearchData"
+      >
+      </tablePagination>
+    </div>
+  </template>
+  <script>
+  import { tableMixins } from "@/mixins/TableMixins";
+  import { LoadingMixins } from "@/mixins/LoadingMixins";
+  import { drawerMixins } from "@/mixins/drawerMixins"
+  import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
+  import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
+  import { mixins } from "@/mixins/mixins";
+  import { filterSelectMixins } from '@/mixins/filter-Select'
+  import { getInterfaceBoard,dataExchangeFromOut,dataExchangeFromOut_save,dataExchangeFromOut_delete } from "@/api/wms-interface"
+  import { getToken } from '@/utils/auth'
+  
+  export default {
+    name: "dataExchangeFromOut",
+    mixins: [
+      tableMixins,
+      LoadingMixins,
+      drawerMixins,
+      TableHeaderMixins,
+      mixins,
+      filterSelectMixins,
+      newAndEdiDialogMixins
+    ],
+    computed: {
+      editDialog: {
+        get: function () {
+          return this.displayDialog.newDialog || this.displayDialog.editDialog;
+        },
+      },
+    },
+    data() {
+      let _this = this
+      return {
+        tableLoading:false,
+        //常用按钮数据
+        currenButtonData: [
+          // this.defaultAddBtn(),//新增
+          this.defaultFieldSettingBtn(),//字段设置
+          this.defaultFreshBtn(),//刷新
+          // this.defaultFilterBtn(),//筛选
+        ],
+      };
+    },
+    mounted() {
+      this.paging();
+    },
+    methods: {
+      //渲染数据
+      paging(callback) {
+        this.Loading.tableLoading = true;
+        this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
+        dataExchangeFromOut(this.PageListParams)
+          .then(result => {
+            let res = result.data
+            this.tableData = res.items
+            this.totalCount = res.totalCount
+            this.pagingCallback(callback)
+          })
+          .catch(err => {
+              this.Loading.tableLoading = false
+          })
+      },
+    }
+  }
+  </script>
+<style lang="scss" scoped>
+@import "@/styles/basicData.scss";
+</style>
\ No newline at end of file