Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts

@@ -26,6 +26,8 @@ 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";
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
  // id 转str 否则form回显匹配不到
@@ -554,6 +556,28 @@ export const BalanceShow = useCrudSchemas(
       },
       isSearch: false
     },
+    {
+      label: '供应商代码',
+      field: 'supplierCode',
+      sort: 'custom',
+      isSearch: true,
+      table: {
+        width: 150,
+      },
+    },
+    {
+      label: '供应商名称',
+      field: 'supplierName',
+      isForm:true,
+      form:{
+        componentProps:{
+          disabled: true
+        }
+      },
+      table: {
+        width: 180
+      }
+    },
     {
       label: '库存数量',
       field: 'qty',
@@ -1104,6 +1128,41 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isTableForm: false,
     isForm: false,
   },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    isSearch: true,
+    isDetail: true,
+    table: {
+      width: 150,
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择供应商',
+      searchField: 'code',
+      searchTitle: '供应商信息',
+      searchAllSchemas: Supplier.allSchemas,
+      searchPage: SupplierApi.getSupplierPage,
+    }
+  },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    isForm:true,
+    isDetail: true,
+    form:{
+      componentProps:{
+        disabled: true
+      }
+    },
+    table: {
+      width: 180
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
   {
     label: '供应商批次',
     field: 'altBatch',