From 08e38ede28f7cf8c971f84bff3a03102882a8a4b Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 01 四月 2026 11:32:13 +0800
Subject: [PATCH] 增加料号显示
---
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue | 11 ++++-
src/views/inventoryManagement/stockManagement/New.vue | 9 ++++
src/views/qualityManagement/nonconformingManagement/components/formDia.vue | 25 +++++++++---
src/views/basicData/product/index.vue | 6 +-
src/views/inventoryManagement/stockManagement/Subtract.vue | 9 ++++
src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue | 7 +++
6 files changed, 56 insertions(+), 11 deletions(-)
diff --git a/src/views/basicData/product/index.vue b/src/views/basicData/product/index.vue
index fcf4bc5..d934b08 100644
--- a/src/views/basicData/product/index.vue
+++ b/src/views/basicData/product/index.vue
@@ -140,10 +140,10 @@
>
<el-row>
<el-col :span="24">
- <el-form-item label="鐗╂枡缂栧彿锛�" prop="materialCode">
+ <el-form-item label="鏂欏彿锛�" prop="materialCode">
<el-input
v-model="modelForm.materialCode"
- placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�"
+ placeholder="璇疯緭鍏ユ枡鍙�"
clearable
@keydown.enter.prevent
/>
@@ -214,7 +214,7 @@
const expandedKeys = ref([]);
const tableColumn = ref([
{
- label: "鐗╂枡缂栧彿",
+ label: "鏂欏彿",
prop: "materialCode",
},
{
diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index 323953c..5a79c02 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -83,8 +83,14 @@
</el-col>
</el-row>
<el-row v-if="isInventoryApproval">
-
- <el-col :span="24">
+ <el-col :span="12">
+ <el-form-item label="鏂欏彿锛�">
+ <el-tag type="info">
+ {{ currentStockIn.materialCode || '-' }}
+ </el-tag>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="鐢熶骇璁㈠崟鍙凤細">
<el-tag type="info">
{{ currentStockIn.npsNo || '-' }}
@@ -206,6 +212,7 @@
<el-table :data="currentPurchase.productData || []" border style="width: 100%">
<el-table-column prop="productCategory" label="浜у搧鍚嶇О" />
<el-table-column prop="specificationModel" label="瑙勬牸鍨嬪彿" />
+ <el-table-column prop="materialCode" label="鏂欏彿" />
<el-table-column prop="unit" label="鍗曚綅" />
<el-table-column prop="quantity" label="鏁伴噺" />
<el-table-column prop="taxInclusiveUnitPrice" label="鍚◣鍗曚环">
diff --git a/src/views/inventoryManagement/stockManagement/New.vue b/src/views/inventoryManagement/stockManagement/New.vue
index 1f86fd6..21a36fe 100644
--- a/src/views/inventoryManagement/stockManagement/New.vue
+++ b/src/views/inventoryManagement/stockManagement/New.vue
@@ -31,6 +31,13 @@
</el-form-item>
<el-form-item
+ label="鏂欏彿"
+ prop="materialCode"
+ >
+ <el-input v-model="formState.materialCode" disabled />
+ </el-form-item>
+
+ <el-form-item
label="鍗曚綅"
prop="unit"
>
@@ -100,6 +107,7 @@
productModelId: undefined,
productName: "",
productModelName: "",
+ materialCode: "",
unit: "",
qualitity: 0,
warnNum: 0,
@@ -140,6 +148,7 @@
formState.value.productModelName = product.model;
formState.value.productModelId = product.id;
formState.value.unit = product.unit;
+ formState.value.materialCode = product.materialCode;
showProductSelectDialog.value = false;
// 瑙﹀彂琛ㄥ崟楠岃瘉鏇存柊
proxy.$refs["formRef"]?.validateField('productModelId');
diff --git a/src/views/inventoryManagement/stockManagement/Subtract.vue b/src/views/inventoryManagement/stockManagement/Subtract.vue
index a277a00..62988d1 100644
--- a/src/views/inventoryManagement/stockManagement/Subtract.vue
+++ b/src/views/inventoryManagement/stockManagement/Subtract.vue
@@ -31,6 +31,13 @@
</el-form-item>
<el-form-item
+ label="鏂欏彿"
+ prop="materialCode"
+ >
+ <el-input v-model="formState.materialCode" disabled />
+ </el-form-item>
+
+ <el-form-item
label="鍗曚綅"
prop="unit"
>
@@ -111,6 +118,7 @@
productModelId: undefined,
productName: "",
model: "",
+ materialCode: "",
unit: "",
qualitity: 0,
remark: '',
@@ -151,6 +159,7 @@
formState.value.productModelName = product.model;
formState.value.productModelId = product.id;
formState.value.unit = product.unit;
+ formState.value.materialCode = product.materialCode;
showProductSelectDialog.value = false;
// 瑙﹀彂琛ㄥ崟楠岃瘉鏇存柊
proxy.$refs["formRef"]?.validateField('productModelId');
diff --git a/src/views/qualityManagement/nonconformingManagement/components/formDia.vue b/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
index c668c9c..0351f5c 100644
--- a/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
+++ b/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
@@ -43,6 +43,11 @@
</el-row>
<el-row :gutter="30">
<el-col :span="12">
+ <el-form-item label="鏂欏彿锛�" prop="materialCode">
+ <el-input v-model="form.materialCode" placeholder="璇疯緭鍏�" disabled/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="鍗曚綅锛�" prop="unit">
<el-input v-model="form.unit" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
@@ -52,8 +57,7 @@
<el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="璇疯緭鍏�" clearable :precision="2"/>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
+
<el-col :span="12">
<el-form-item label="妫�楠屽憳锛�" prop="checkName">
<el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable style="width: 100%">
@@ -74,8 +78,7 @@
/>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
+
<el-col :span="12">
<el-form-item label="涓嶅悎鏍肩幇璞★細" prop="defectivePhenomena">
<el-input v-model="form.defectivePhenomena" placeholder="璇疯緭鍏�" clearable/>
@@ -88,8 +91,7 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
+
<el-col :span="12">
<el-form-item label="澶勭悊浜猴細" prop="dealName">
<el-select v-model="form.dealName" placeholder="璇烽�夋嫨" clearable style="width: 100%">
@@ -148,6 +150,7 @@
productId: "",
model: "",
unit: "",
+ materialCode: "",
quantity: "",
checkCompany: "",
checkResult: "",
@@ -198,6 +201,7 @@
productId: '',
model: '',
unit: '',
+ materialCode: '',
quantity: '',
productName: '',
};
@@ -251,12 +255,21 @@
return newItem;
});
}
+
+const handleChangeModel = (value) => {
+ form.value.materialCode = modelOptions.value.find(item => item.id == value)?.materialCode || '';
+}
+
// 鎻愪氦浜у搧琛ㄥ崟
const submitForm = () => {
proxy.$refs.formRef.validate(valid => {
if (valid) {
// 鐘舵�佸瓧娈典笉鍦ㄨ〃鍗曞～鍐欙紝涔熶笉浼犵粰鍚庣
const { inspectState, ...payload } = (form.value || {})
+ const selectedModel = modelOptions.value.find(item =>
+ String(item.id) === String(payload.model)
+ );
+ payload.model = selectedModel ? selectedModel.model : '';
if (operationType.value === "add") {
qualityUnqualifiedAdd(payload).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
diff --git a/src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue b/src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue
index 903042d..3876f7e 100644
--- a/src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue
+++ b/src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue
@@ -41,6 +41,12 @@
</el-row>
<el-row :gutter="30">
<el-col :span="12">
+ <el-form-item label="鏂欏彿锛�" prop="materialCode">
+ <el-input v-model="form.materialCode" placeholder="璇疯緭鍏�" clearable disabled/>
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="12">
<el-form-item label="鍗曚綅锛�" prop="unit">
<el-input v-model="form.unit" placeholder="璇疯緭鍏�" clearable disabled/>
</el-form-item>
@@ -149,6 +155,7 @@
productId: "",
model: "",
unit: "",
+ materialCode: "",
quantity: "",
checkCompany: "",
checkResult: "",
--
Gitblit v1.9.3