From d7883e48e483a517132b2ad04d3a133f1b791e5d Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Wed, 25 Sep 2024 13:46:37 +0800
Subject: [PATCH] =?UTF-8?q?WMS=20=E9=9C=80=E6=B1=82=EF=BC=9AHL-6059=20?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E9=9A=94=E7=A6=BB=E7=94=B3=E8=AF=B7=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=97=B6=E6=B2=A1=E6=9C=89=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=88=96=E8=80=85=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorymoveJobMain.data.ts              | 19 ++++++++++++++++
 .../inventorymoveRecordMainOKHOLD.data.ts     | 17 ++++++++++++++
 .../inventorymoveRequestMain.data.ts          | 22 ++++++++++++++-----
 3 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
index 589131ff1..058c95482 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
@@ -1,5 +1,7 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import {Supplier} from "@/views/wms/basicDataManage/supplierManage/supplier/supplier.data";
+import * as SupplierApi from "@/api/wms/supplier";
 
 /**
  * @returns {Array} 库存转移任务主表
@@ -680,6 +682,23 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    isDetail: true,
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    isDetail: true,
+    table: {
+      width: 180
+    },
+  },
   {
     label: '供应商批次',
     field: 'altBatch',
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts
index b0d75482a..07a03471a 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts
@@ -487,6 +487,23 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    isDetail: true,
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    isDetail: true,
+    table: {
+      width: 180
+    },
+  },
   {
     label: '供应商批次',
     field: 'altBatch',
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
index d3b81dfd5..5f0e09256 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
@@ -25,9 +25,11 @@ const queryParams = {
 
  // 获取当前操作人的部门
  import { useUserStore } from '@/store/modules/user'
- import { TableColumn } from '@/types/table'
-import {Supplier} from "@/views/wms/basicDataManage/supplierManage/supplier/supplier.data";
-import * as SupplierApi from "@/api/wms/supplier";
+import * as SupplierItemApi from "@/api/wms/supplieritem";
+import {
+  Supplieritem
+} from "@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data";
+import {getSupplieritemPage} from "@/api/wms/supplieritem";
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
  // id 转str 否则form回显匹配不到
@@ -1142,8 +1144,18 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       searchListPlaceholder: '请选择供应商',
       searchField: 'code',
       searchTitle: '供应商信息',
-      searchAllSchemas: Supplier.allSchemas,
-      searchPage: SupplierApi.getSupplierPage,
+      searchAllSchemas: Supplieritem.allSchemas,
+      searchPage: SupplierItemApi.getSupplieritemPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'costcentreType',
+        value: 'costCenterType',
+        message: '成本中心类型不能为空!',
+        isMainValue: true
+      }]
     }
   },
   {