From b8de520fa696d8a95393aa3ff544c5a6f5c36001 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期三, 30 九月 2026 15:33:41 +0800
Subject: [PATCH] 宁夏万通需求：出库单行支持主/辅单位录入；物料型号维护；考勤节假日配置时间段；设备批量删除；质检导出按筛选条件

---
 src/views/wls/productsales/data.ts |   45 +++++++++++++++++++++++++++++++--------------
 1 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/views/wls/productsales/data.ts b/src/views/wls/productsales/data.ts
index 9522d75..6099512 100644
--- a/src/views/wls/productsales/data.ts
+++ b/src/views/wls/productsales/data.ts
@@ -1,5 +1,6 @@
 import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesMdItemApi } from '#/api/mes/md/item';
 import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
 import type { MesWmProductSalesApi } from '#/api/mes/wm/productsales';
 import type { MesWmProductSalesDetailApi } from '#/api/mes/wm/productsales/detail';
@@ -25,6 +26,10 @@
 import { getRangePickerDefaultProps } from '#/utils';
 import { MdItemSelect } from '#/views/mes/md/item/components';
 import { WmMaterialStockSelect } from '#/views/wls/materialstock/components';
+import {
+  buildItemUnitSchema,
+  useLineUnitHandlers,
+} from '#/views/wls/utils/item-unit-convert';
 import {
   WmSalesNoticeLineSelect,
   WmSalesNoticeSelect,
@@ -426,9 +431,24 @@
       minWidth: 120,
     },
     {
+      field: 'itemModel',
+      title: '鐗╂枡鍨嬪彿',
+      minWidth: 120,
+    },
+    {
       field: 'unitMeasureName',
-      title: '鍗曚綅',
-      width: 80,
+      title: '涓昏閲忓崟浣�',
+      width: 100,
+    },
+    {
+      field: 'enterUnitMeasureName',
+      title: '褰曞叆鍗曚綅',
+      width: 90,
+    },
+    {
+      field: 'enterQuantity',
+      title: '褰曞叆鏁伴噺',
+      width: 100,
     },
     {
       field: 'quantity',
@@ -472,6 +492,7 @@
   hasNotice: boolean,
   formApi?: VbenFormApi,
 ): VbenFormSchema[] {
+  const unitHandlers = useLineUnitHandlers(formApi);
   return [
     {
       fieldName: 'noticeId',
@@ -488,6 +509,8 @@
       componentProps: {
         // 閫夋嫨鍙戣揣閫氱煡鍗曡鍚庯紝鑷姩鍥炲～鐗╂枡銆佹暟閲忋�佹壒娆°�佹槸鍚︽楠�
         onChange: async (line?: MesWmSalesNoticeLineApi.SalesNoticeLine) => {
+          // 鍒囨崲閫氱煡琛岀瓑浜庡垏鎹骇鍝侊紝鍏堥噸缃瀷鍙蜂笌鍗曚綅鍙ｅ緞锛堜細娓呯┖鏁伴噺锛夛紝鍐嶆寜閫氱煡琛屽洖濉�
+          await unitHandlers.handleItemChange(line?.itemId);
           await formApi?.setValues({
             batchCode: line?.batchCode,
             itemId: line?.itemId,
@@ -510,6 +533,10 @@
       component: markRaw(MdItemSelect),
       componentProps: {
         placeholder: '璇烽�夋嫨浜у搧',
+        // 鍒囨崲浜у搧鍚庯紝閲嶆柊璁板綍鐗╂枡涓诲崟浣嶅苟娓呯┖鍨嬪彿銆佸綍鍏ュ崟浣嶅彛寰�
+        onChange: async (item?: MesMdItemApi.Item) => {
+          await unitHandlers.handleItemChange(item?.id);
+        },
       },
       rules: 'selectRequired',
       dependencies: {
@@ -520,6 +547,8 @@
         }),
       },
     },
+    // 鐗╂枡鍨嬪彿 / 褰曞叆鍗曚綅 / 褰曞叆鏁伴噺 / 鍑哄簱鏁伴噺锛堢墿鏂欎富鍗曚綅鍙ｅ緞锛�
+    ...buildItemUnitSchema(formApi),
     {
       fieldName: 'batchCode',
       label: '鎵规鍙�',
@@ -527,18 +556,6 @@
       componentProps: {
         placeholder: '璇疯緭鍏ユ壒娆″彿',
       },
-    },
-    {
-      fieldName: 'quantity',
-      label: '鍑哄簱鏁伴噺',
-      component: 'InputNumber',
-      componentProps: {
-        class: '!w-full',
-        min: 0,
-        placeholder: '璇疯緭鍏ュ嚭搴撴暟閲�',
-        precision: 2,
-      },
-      rules: 'required',
     },
     {
       fieldName: 'oqcCheckFlag',

--
Gitblit v1.9.3