From 8f8dcdae7e40ba4e94a363aa8eb91c7665810bc3 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 31 八月 2026 15:29:17 +0800
Subject: [PATCH] fix: 新疆-绿能 1.报工自动生成产品入库单 + 勾选入库 + 不合格仓库兜底
---
src/views/wls/materialstock/components/stock-adjust-modal.vue | 60 +++++++++++++++++++++++++++++++-----------------------------
1 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/src/views/wls/materialstock/components/stock-adjust-modal.vue b/src/views/wls/materialstock/components/stock-adjust-modal.vue
index aeb5883..2fec79f 100644
--- a/src/views/wls/materialstock/components/stock-adjust-modal.vue
+++ b/src/views/wls/materialstock/components/stock-adjust-modal.vue
@@ -20,7 +20,7 @@
} from '#/api/mes/wm/materialstock';
import { getItem } from '#/api/mdm/item';
import { MdmItemSelect } from '#/views/basicData/mdm/components';
-import { ErpSupplierSelect } from '#/views/erp/purchase/supplier/components';
+import { SrmSupplierSelect } from '#/views/srm/supplier/components';
import BatchConfigDisplay from './batch-config-display.vue';
import {
WmWarehouseAreaSelect,
@@ -55,15 +55,15 @@
if (!enabled) {
formApi.updateSchema([
- { fieldName: 'batchCode', dependencies: { show: () => false } },
- { fieldName: 'manualBatchEntry', dependencies: { show: () => false } },
- { fieldName: 'produceDate', dependencies: { show: () => false } },
- { fieldName: 'expireDate', dependencies: { show: () => false } },
- { fieldName: 'receiptDate', dependencies: { show: () => false } },
- { fieldName: 'vendorId', dependencies: { show: () => true } },
- { fieldName: 'purchaseOrderCode', dependencies: { show: () => false } },
- { fieldName: 'lotNumber', dependencies: { show: () => false } },
- { fieldName: 'qualityStatus', dependencies: { show: () => false } },
+ { fieldName: 'batchCode', dependencies: { show: () => false, triggerFields: [''] } },
+ { fieldName: 'manualBatchEntry', dependencies: { show: () => false, triggerFields: [''] } },
+ { fieldName: 'produceDate', dependencies: { show: () => false, triggerFields: [''] } },
+ { fieldName: 'expireDate', dependencies: { show: () => false, triggerFields: [''] } },
+ { fieldName: 'receiptDate', dependencies: { show: () => false, triggerFields: [''] } },
+ { fieldName: 'vendorId', dependencies: { show: () => true, triggerFields: [''] } },
+ { fieldName: 'purchaseOrderCode', dependencies: { show: () => false, triggerFields: [''] } },
+ { fieldName: 'lotNumber', dependencies: { show: () => false, triggerFields: [''] } },
+ { fieldName: 'qualityStatus', dependencies: { show: () => false, triggerFields: [''] } },
]);
return;
}
@@ -72,15 +72,15 @@
const isIn = operateType.value === 1;
formApi.updateSchema([
- { fieldName: 'batchCode', dependencies: { show: () => manualBatchEntry.value } },
- { fieldName: 'manualBatchEntry', dependencies: { show: () => true } },
- { fieldName: 'produceDate', dependencies: { show: () => isIn && !!item?.produceDateFlag } },
- { fieldName: 'expireDate', dependencies: { show: () => isIn && !!item?.expireDateFlag } },
- { fieldName: 'receiptDate', dependencies: { show: () => isIn && !!item?.receiptDateFlag } },
- { fieldName: 'vendorId', dependencies: { show: () => !isIn || !!item?.vendorFlag } },
- { fieldName: 'purchaseOrderCode', dependencies: { show: () => isIn && !!item?.purchaseOrderCodeFlag } },
- { fieldName: 'lotNumber', dependencies: { show: () => isIn && !!item?.lotNumberFlag } },
- { fieldName: 'qualityStatus', dependencies: { show: () => isIn && !!item?.qualityStatusFlag } },
+ { fieldName: 'batchCode', dependencies: { show: () => manualBatchEntry.value, triggerFields: [''] } },
+ { fieldName: 'manualBatchEntry', dependencies: { show: () => true, triggerFields: [''] } },
+ { fieldName: 'produceDate', dependencies: { show: () => isIn && !!item?.produceDateFlag, triggerFields: [''] } },
+ { fieldName: 'expireDate', dependencies: { show: () => isIn && !!item?.expireDateFlag, triggerFields: [''] } },
+ { fieldName: 'receiptDate', dependencies: { show: () => isIn && !!item?.receiptDateFlag, triggerFields: [''] } },
+ { fieldName: 'vendorId', dependencies: { show: () => !isIn || !!item?.vendorFlag, triggerFields: [''] } },
+ { fieldName: 'purchaseOrderCode', dependencies: { show: () => isIn && !!item?.purchaseOrderCodeFlag, triggerFields: [''] } },
+ { fieldName: 'lotNumber', dependencies: { show: () => isIn && !!item?.lotNumberFlag, triggerFields: [''] } },
+ { fieldName: 'qualityStatus', dependencies: { show: () => isIn && !!item?.qualityStatusFlag, triggerFields: [''] } },
]);
}
@@ -127,6 +127,7 @@
async function handleOperateTypeChange(type: 1 | 2) {
operateType.value = type;
modalTitle.value = type === 1 ? '搴撳瓨鍏ュ簱' : '搴撳瓨鍑哄簱';
+ modalApi.setState({ title: modalTitle.value });
await formApi.setFieldValue('operateType', type);
// 鏇存柊鎵规瀛楁鏄剧ず
await updateBatchFields();
@@ -297,7 +298,7 @@
{
fieldName: 'vendorId',
label: '渚涘簲鍟�',
- component: markRaw(ErpSupplierSelect),
+ component: markRaw(SrmSupplierSelect),
componentProps: {
placeholder: '璇烽�夋嫨渚涘簲鍟�',
},
@@ -403,20 +404,21 @@
batchEnabled.value = false;
operateType.value = 1;
modalTitle.value = '搴撳瓨璋冩暣';
+ modalApi.setState({ title: modalTitle.value });
return;
}
// 閲嶇疆琛ㄥ崟
await formApi.resetForm();
// 榛樿闅愯棌鎵规鐩稿叧瀛楁
formApi.updateSchema([
- { fieldName: 'batchCode', dependencies: { show: () => false } },
- { fieldName: 'manualBatchEntry', dependencies: { show: () => false } },
- { fieldName: 'produceDate', dependencies: { show: () => false } },
- { fieldName: 'expireDate', dependencies: { show: () => false } },
- { fieldName: 'receiptDate', dependencies: { show: () => false } },
- { fieldName: 'purchaseOrderCode', dependencies: { show: () => false } },
- { fieldName: 'lotNumber', dependencies: { show: () => false } },
- { fieldName: 'qualityStatus', dependencies: { show: () => false } },
+ { fieldName: 'batchCode', dependencies: { show: () => false, triggerFields: [''] } },
+ { fieldName: 'manualBatchEntry', dependencies: { show: () => false, triggerFields: [''] } },
+ { fieldName: 'produceDate', dependencies: { show: () => false, triggerFields: [''] } },
+ { fieldName: 'expireDate', dependencies: { show: () => false, triggerFields: [''] } },
+ { fieldName: 'receiptDate', dependencies: { show: () => false, triggerFields: [''] } },
+ { fieldName: 'purchaseOrderCode', dependencies: { show: () => false, triggerFields: [''] } },
+ { fieldName: 'lotNumber', dependencies: { show: () => false, triggerFields: [''] } },
+ { fieldName: 'qualityStatus', dependencies: { show: () => false, triggerFields: [''] } },
]);
// 閲嶇疆鎵嬪姩濉啓鎵规鍙风姸鎬�
manualBatchEntry.value = false;
@@ -436,7 +438,7 @@
}
}
},
- title: modalTitle,
+ title: '搴撳瓨璋冩暣',
});
/** 鎻愪氦琛ㄥ崟 */
--
Gitblit v1.9.3