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/mes/qc/iqc/data.ts | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/src/views/mes/qc/iqc/data.ts b/src/views/mes/qc/iqc/data.ts
index 0a77b97..253d1e6 100644
--- a/src/views/mes/qc/iqc/data.ts
+++ b/src/views/mes/qc/iqc/data.ts
@@ -11,10 +11,12 @@
import { Button } from 'ant-design-vue';
import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getTemplateItemOptionList } from '#/api/mes/qc/template/item';
+import { getSupplierSimpleList } from '#/api/srm/supplier';
import { getSimpleUserList } from '#/api/system/user';
import { getRangePickerDefaultProps } from '#/utils';
import { MdmItemSelect } from '#/views/basicData/mdm/components';
-import { MdVendorSelect } from '#/views/mes/md/vendor/components';
+
/** 琛ㄥ崟绫诲瀷 */
export type FormType = 'create' | 'detail' | 'update';
@@ -134,18 +136,39 @@
},
},
{
- fieldName: 'vendorId',
- label: '渚涘簲鍟�',
- component: markRaw(MdVendorSelect),
+ fieldName: 'templateId',
+ label: '璐ㄦ鏂规',
+ component: 'ApiSelect',
componentProps: {
- placeholder: '璇烽�夋嫨渚涘簲鍟�',
+ api: getTemplateItemOptionList,
+ labelField: 'templateName',
+ valueField: 'templateId',
+ placeholder: '璇烽�夋嫨璐ㄦ鏂规',
+ params: { qcType: 1 },
+ disabled: formType !== 'create',
},
rules: 'selectRequired',
+ },
+ {
+ fieldName: 'vendorId',
+ label: '渚涘簲鍟�',
+ component: 'ApiSelect',
+ componentProps: {
+ allowClear: true,
+ api: getSupplierSimpleList,
+ labelField: 'name',
+ placeholder: '璇烽�夋嫨渚涘簲鍟�',
+ valueField: 'id',
+ },
dependencies: {
triggerFields: ['sourceDocId'],
componentProps: (values) => ({
disabled: !!values.sourceDocId,
+ allowClear: true,
+ api: getSupplierSimpleList,
+ labelField: 'name',
placeholder: '璇烽�夋嫨渚涘簲鍟�',
+ valueField: 'id',
}),
},
},
@@ -200,6 +223,7 @@
placeholder: '璇疯緭鍏ヤ笉鍚堟牸鍝佹暟閲�',
},
rules: 'required',
+ help: '涓嶅悎鏍煎搧鏁伴噺澶т簬0鏃讹紝淇濆瓨鍚庡皢鑷姩鐢熸垚涓嶅悎鏍煎鐞嗗崟',
},
{
fieldName: 'receiveDate',
@@ -208,7 +232,7 @@
componentProps: {
format: 'YYYY-MM-DD',
placeholder: '璇烽�夋嫨鏉ユ枡鏃ユ湡',
- valueFormat: 'x',
+ valueFormat: 'YYYY-MM-DD',
},
rules: 'required',
},
@@ -232,7 +256,7 @@
componentProps: {
format: 'YYYY-MM-DD',
placeholder: '璇烽�夋嫨妫�娴嬫棩鏈�',
- valueFormat: 'x',
+ valueFormat: 'YYYY-MM-DD',
},
rules: 'required',
},
@@ -274,9 +298,13 @@
{
fieldName: 'vendorId',
label: '渚涘簲鍟�',
- component: markRaw(MdVendorSelect),
+ component: 'ApiSelect',
componentProps: {
+ allowClear: true,
+ api: getSupplierSimpleList,
+ labelField: 'name',
placeholder: '璇烽�夋嫨渚涘簲鍟�',
+ valueField: 'id',
},
},
{
@@ -396,6 +424,12 @@
},
},
{
+ field: 'indicatorResultSummary',
+ title: '妫�娴嬬粨鏋滐紙妫�楠岄」锛�',
+ minWidth: 200,
+ showOverflow: 'tooltip',
+ },
+ {
field: 'receiveDate',
title: '鏉ユ枡鏃ユ湡',
width: 120,
--
Gitblit v1.9.3