From e4994fccfb49ebfb108ba62cbd82aea4e004f6d8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 15 十月 2026 10:02:46 +0800
Subject: [PATCH] fix(mes/qc): 不合格品处理单的不合格物料改查 MDM 物料

---
 src/views/erp/purchase/request/data.ts |   72 +++++++++++++++++++++++++++---------
 1 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/src/views/erp/purchase/request/data.ts b/src/views/erp/purchase/request/data.ts
index eb869d1..b712a17 100644
--- a/src/views/erp/purchase/request/data.ts
+++ b/src/views/erp/purchase/request/data.ts
@@ -4,7 +4,7 @@
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
-import { getSupplierSimpleList } from '#/api/erp/purchase/supplier';
+import { getSupplierSimpleList } from '#/api/srm/supplier';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
@@ -35,9 +35,14 @@
       fieldName: 'no',
       label: '鐢宠缂栧彿',
       component: 'Input',
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['id'],
+        disabled: (values) => !!values.id,
+      },
       componentProps: {
-        placeholder: '绯荤粺鑷姩鐢熸垚',
-        disabled: true,
+        placeholder: '璇疯緭鍏ョ敵璇风紪鍙�',
+        maxLength: 32,
       },
     },
     {
@@ -48,7 +53,7 @@
         placeholder: '閫夋嫨鐢宠鏃堕棿',
         showTime: true,
         format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
         disabled: formType === 'detail',
       },
       rules: 'required',
@@ -103,11 +108,13 @@
       formItemClass: 'col-span-2',
     },
     {
-      fieldName: 'fileUrl',
+      fieldName: 'blobIds',
       label: '闄勪欢',
       component: 'FileUpload',
       componentProps: {
-        placeholder: '璇蜂笂浼犻檮浠�',
+        valueKey: 'id',
+        maxNumber: 10,
+        multiple: true,
         disabled: formType === 'detail',
       },
       formItemClass: 'col-span-2',
@@ -161,21 +168,14 @@
       title: '鍏ュ簱鏁伴噺',
       minWidth: 100,
       fixed: 'right',
-      formatter: 'formatAmount6',
+      formatter: 'formatAmount3',
     },
     {
       field: 'productPrice',
-      title: '鍗曚环锛堝弬鑰冧环锛�',
+      title: '鍚◣鍗曚环(鍏�)',
       minWidth: 120,
       fixed: 'right',
       slots: { default: 'productPrice' },
-    },
-    {
-      field: 'totalPrice',
-      title: '棰勪及閲戦',
-      minWidth: 120,
-      fixed: 'right',
-      formatter: 'formatAmount2',
     },
     {
       field: 'taxPercent',
@@ -183,6 +183,26 @@
       minWidth: 100,
       fixed: 'right',
       slots: { default: 'taxPercent' },
+    },
+    {
+      field: 'totalPrice',
+      title: '涓嶅惈绋庨噾棰�(鍏�)',
+      minWidth: 120,
+      fixed: 'right',
+      formatter: 'formatAmount2',
+    },
+    {
+      field: 'taxPrice',
+      title: '绋庨(鍏�)',
+      minWidth: 120,
+      fixed: 'right',
+      formatter: 'formatAmount2',
+    },
+    {
+      title: '鍚◣鍚堣(鍏�)',
+      minWidth: 120,
+      fixed: 'right',
+      slots: { default: 'totalTaxInclusivePrice' },
     },
     {
       field: 'demandTime',
@@ -269,11 +289,25 @@
         options: [
           { label: '鏈彁浜�', value: 0 },
           { label: '瀹℃壒涓�', value: 10 },
-          { label: '瀹℃牳閫氳繃', value: 20 },
-          { label: '瀹℃牳涓嶉�氳繃', value: 30 },
+          { label: '瀹℃壒閫氳繃', value: 20 },
+          { label: '瀹℃壒涓嶉�氳繃', value: 30 },
           { label: '宸插彇娑�', value: 40 },
         ],
         placeholder: '璇烽�夋嫨鐘舵��',
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'inStatus',
+      label: '鍏ュ簱鐘舵��',
+      component: 'Select',
+      componentProps: {
+        options: [
+          { label: '鏈叆搴�', value: 0 },
+          { label: '閮ㄥ垎鍏ュ簱', value: 1 },
+          { label: '鍏ㄩ儴鍏ュ簱', value: 2 },
+        ],
+        placeholder: '璇烽�夋嫨鍏ュ簱鐘舵��',
         allowClear: true,
       },
     },
@@ -323,7 +357,7 @@
     },
     {
       field: 'totalPrice',
-      title: '棰勪及閲戦',
+      title: '鍚◣閲戦',
       formatter: 'formatAmount2',
       minWidth: 120,
     },
@@ -348,12 +382,14 @@
       field: 'status',
       title: '鐘舵��',
       minWidth: 120,
+      fixed: 'right',
       slots: { default: 'status' },
     },
     {
       field: 'inStatus',
       title: '鍏ュ簱鐘舵��',
       minWidth: 100,
+      fixed: 'right',
       slots: { default: 'inStatus' },
     },
     {

--
Gitblit v1.9.3