From c094e5e5faa592c376da10cab23cf3637c887c5f Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Mon, 25 Nov 2024 15:20:57 +0800
Subject: [PATCH] =?UTF-8?q?YT-831:=20=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerreturnRequestMain.data.ts         | 62 +++++++++++++++++++
 .../customerreturnRequestMain/index.vue       |  6 +-
 2 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index 3a58640c4..84123c145 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -1616,3 +1616,65 @@ export const CustomerReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSche
     isForm: true
   },
 ]))
+
+
+
+export const DeliverReturnRequestPackage = useCrudSchemas(reactive<CrudSchema[]>([
+
+{
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+{
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    tableForm: {
+      type: 'FormDate',
+      format: 'YYYYMMDD',
+      valueFormat: 'YYYYMMDD',
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '标包数量',
+    field: 'packQty',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'Select'
+    },
+    table: {
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    }
+  },
+
+]))
+
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index 665592790..0257fed81 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -113,8 +113,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { DeliverRecordMain,DeliverRecordDetail } from '../../deliver/deliverRecordMain/deliverRecordMain.data'
 import * as DeliverRecordDetailApi from '@/api/wms/deliverRecordDetail'
 import {
-  SupplierdeliverRequestPackage
-} from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data'
+  DeliverReturnRequestPackage
+} from './customerreturnRequestMain.data'
 import * as PackageApi from '@/api/wms/package'
 import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
@@ -548,7 +548,7 @@ const labelPrint = async (row) => {
   const { getList:getListPrint } = tableMethods
   getListPrint()
   tableObject.loading = false
-  const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
+  const tableColumns = DeliverReturnRequestPackage.allSchemas.tableFormColumns
   tableColumns.forEach((item) => {
     item.width = item.table?.width || 150
   })