From 6d30bc636d931c5aa53d0336cf67db99649d41a7 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 21 三月 2026 13:31:18 +0800
Subject: [PATCH] 军泰伟业 1.订单分批发货后，对应仓库出库数据有误 2.新增退货单并处理成功后，已退货数量、未退货数量显示有误 3.自制、外购、委外来源需拆分为合格来源、不合格来源 4.规格型号改为图纸编号
---
src/views/procurementManagement/procurementInvoiceLedger/index.vue | 2
src/views/salesManagement/returnOrder/components/detailDia.vue | 20 +++-
src/views/productionManagement/productionDispatching/components/formDia.vue | 4
src/views/qualityManagement/rawMaterialInspection/index.vue | 2
src/views/procurementManagement/paymentEntry/index.vue | 4
src/views/productionManagement/productionDispatching/index.vue | 2
src/views/salesManagement/salesLedger/index.vue | 10 +-
src/views/qualityManagement/finalInspection/index.vue | 2
src/api/salesManagement/deliveryLedger.js | 9 ++
src/views/qualityManagement/processInspection/index.vue | 2
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue | 4
src/views/inventoryManagement/dispatchLog/Record.vue | 34 +++++---
src/views/salesManagement/invoiceLedger/index.vue | 2
src/views/collaborativeApproval/purchaseApproval/index.vue | 2
src/views/salesManagement/returnOrder/components/formDia.vue | 19 ++--
src/views/financialManagement/inventoryAccounting/index.vue | 2
src/views/collaborativeApproval/shipmentReview/index.vue | 2
src/api/salesManagement/returnOrder.js | 1
src/views/inventoryManagement/stockManagement/Unqualified.vue | 2
src/views/procurementManagement/invoiceEntry/components/Modal.vue | 4
src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue | 2
src/views/inventoryManagement/receiptManagement/Record.vue | 32 +++++--
src/views/qualityManagement/processInspection/components/formDia.vue | 2
src/views/inventoryManagement/stockManagement/New.vue | 2
src/views/salesManagement/deliveryLedger/index.vue | 10 ++
src/views/procurementManagement/invoiceEntry/components/ExpandTable.vue | 2
src/views/procurementManagement/procurementReport/index.vue | 2
src/views/salesManagement/receiptPayment/index.vue | 4
src/views/qualityManagement/finalInspection/components/formDia.vue | 2
src/views/salesManagement/strategyControl/index.vue | 6
src/views/inventoryManagement/issueManagement/index.vue | 2
src/views/inventoryManagement/stockManagement/Qualified.vue | 2
src/views/safeProduction/safeWorkApproval/components/approvalDia.vue | 4
src/views/salesManagement/salesQuotation/index.vue | 4
src/views/productionManagement/operationScheduling/index.vue | 2
src/views/procurementManagement/priceManagement/index.vue | 4
src/views/productionManagement/productStructure/StructureEdit.vue | 2
src/views/salesManagement/invoiceRegistration/index.vue | 4
src/views/procurementManagement/procurementLedger/index.vue | 6
src/views/qualityManagement/nonconformingManagement/components/formDia.vue | 2
src/views/productionManagement/productionDispatching/components/autoDispatchDia.vue | 2
src/views/productionManagement/productionReporting/index.vue | 2
src/views/qualityManagement/rawMaterialInspection/components/formDia.vue | 2
src/views/procurementManagement/transferManagement/index.vue | 2
src/views/inventoryManagement/stockReport/index.vue | 2
src/views/qualityManagement/nonconformingManagement/index.vue | 2
46 files changed, 141 insertions(+), 96 deletions(-)
diff --git a/src/api/salesManagement/deliveryLedger.js b/src/api/salesManagement/deliveryLedger.js
index 755395c..f596724 100644
--- a/src/api/salesManagement/deliveryLedger.js
+++ b/src/api/salesManagement/deliveryLedger.js
@@ -84,3 +84,12 @@
});
}
+// 鏍规嵁ID鑾峰彇鍙戣揣淇℃伅
+export function getShippingInfoById(id) {
+ return request({
+ url: "/shippingInfo/getById",
+ method: "get",
+ params: { id },
+ });
+}
+
diff --git a/src/api/salesManagement/returnOrder.js b/src/api/salesManagement/returnOrder.js
index f945fc9..d21c60b 100644
--- a/src/api/salesManagement/returnOrder.js
+++ b/src/api/salesManagement/returnOrder.js
@@ -52,7 +52,6 @@
}
// 閿�鍞��璐�-鏍规嵁鍑哄簱鍗曟煡璇㈤攢鍞鍗曚互鍙婁骇鍝佷俊鎭�
-// /returnManagement/getByShippingId
export function returnManagementGetByShippingId(query) {
return request({
url: "/returnManagement/getByShippingId",
diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index 20a4ee6..3ceacf7 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -104,7 +104,7 @@
<h4>浜у搧鏄庣粏</h4>
<el-table :data="currentQuotation.products || []" border style="width: 100%">
<el-table-column prop="product" label="浜у搧鍚嶇О" />
- <el-table-column prop="specification" label="瑙勬牸鍨嬪彿" />
+ <el-table-column prop="specification" label="鍥剧焊缂栧彿" />
<el-table-column prop="unit" label="鍗曚綅" />
<el-table-column prop="unitPrice" label="鍗曚环">
<template #default="scope">楼{{ Number(scope.row.unitPrice ?? 0).toFixed(2) }}</template>
@@ -152,7 +152,7 @@
<h4>浜у搧鏄庣粏</h4>
<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="specificationModel" label="鍥剧焊缂栧彿" />
<el-table-column prop="unit" label="鍗曚綅" />
<el-table-column prop="quantity" label="鏁伴噺" />
<el-table-column prop="taxInclusiveUnitPrice" label="鍚◣鍗曚环">
diff --git a/src/views/collaborativeApproval/purchaseApproval/index.vue b/src/views/collaborativeApproval/purchaseApproval/index.vue
index af17bbe..c5a2beb 100644
--- a/src/views/collaborativeApproval/purchaseApproval/index.vue
+++ b/src/views/collaborativeApproval/purchaseApproval/index.vue
@@ -66,7 +66,7 @@
width="60"
/>
<el-table-column label="浜у搧澶х被" prop="productCategory" />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
+ <el-table-column label="鍥剧焊缂栧彿" prop="specificationModel" />
<el-table-column label="鍗曚綅" prop="unit" />
<el-table-column label="鏁伴噺" prop="quantity" />
<el-table-column label="绋庣巼(%)" prop="taxRate" />
diff --git a/src/views/collaborativeApproval/shipmentReview/index.vue b/src/views/collaborativeApproval/shipmentReview/index.vue
index ac2b790..b6643c8 100644
--- a/src/views/collaborativeApproval/shipmentReview/index.vue
+++ b/src/views/collaborativeApproval/shipmentReview/index.vue
@@ -125,7 +125,7 @@
width: 200
},
{
- label: "瑙勬牸鍨嬪彿",
+ label: "鍥剧焊缂栧彿",
prop: "specificationModel",
width: 220
},
diff --git a/src/views/financialManagement/inventoryAccounting/index.vue b/src/views/financialManagement/inventoryAccounting/index.vue
index 3acf5d9..6c21f92 100644
--- a/src/views/financialManagement/inventoryAccounting/index.vue
+++ b/src/views/financialManagement/inventoryAccounting/index.vue
@@ -103,7 +103,7 @@
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" width="240" show-overflow-tooltip />
<el-table-column label="浜у搧" prop="productCategory" min-width="100" show-overflow-tooltip />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" min-width="200" show-overflow-tooltip />
+ <el-table-column label="鍥剧焊缂栧彿" prop="specificationModel" min-width="200" show-overflow-tooltip />
<el-table-column label="鍗曚綅" prop="unit" width="70" show-overflow-tooltip />
<el-table-column label="鍏ュ簱鏁伴噺" prop="inboundNum" width="90" show-overflow-tooltip />
<el-table-column label="搴撳瓨鏁伴噺" prop="inboundNum0" width="90" show-overflow-tooltip />
diff --git a/src/views/inventoryManagement/dispatchLog/Record.vue b/src/views/inventoryManagement/dispatchLog/Record.vue
index 7d1f7b5..1acc0a3 100644
--- a/src/views/inventoryManagement/dispatchLog/Record.vue
+++ b/src/views/inventoryManagement/dispatchLog/Record.vue
@@ -71,7 +71,7 @@
show-overflow-tooltip
/>
<el-table-column
- label="瑙勬牸鍨嬪彿"
+ label="鍥剧焊缂栧彿"
prop="model"
show-overflow-tooltip
/>
@@ -216,17 +216,27 @@
// 鑾峰彇鏉ユ簮绫诲瀷閫夐」
const fetchStockRecordTypeOptions = () => {
- if (props.type === 1 || props.type === 2) {
- findAllQualifiedStockOutRecordTypeOptions()
- .then(res => {
- stockRecordTypeOptions.value = res.data;
- })
- } else {
+ Promise.all([
+ findAllQualifiedStockOutRecordTypeOptions(),
findAllUnQualifiedStockOutRecordTypeOptions()
- .then(res => {
- stockRecordTypeOptions.value = res.data;
- })
- }
+ ])
+ .then(([qualifiedRes, unQualifiedRes]) => {
+ const qualifiedData = qualifiedRes.data || [];
+ const unQualifiedData = unQualifiedRes.data || [];
+ const allData = [...qualifiedData, ...unQualifiedData];
+ const uniqueData = [];
+ const valueSet = new Set();
+ allData.forEach(item => {
+ if (!valueSet.has(item.value)) {
+ valueSet.add(item.value);
+ uniqueData.push(item);
+ }
+ });
+ stockRecordTypeOptions.value = uniqueData;
+ })
+ .catch(() => {
+ stockRecordTypeOptions.value = [];
+ });
}
// 琛ㄦ牸閫夋嫨鏁版嵁
@@ -469,7 +479,7 @@
<thead>
<tr>
<th>浜у搧鍚嶇О</th>
- <th>瑙勬牸鍨嬪彿</th>
+ <th>鍥剧焊缂栧彿</th>
<th>鍗曚綅</th>
<th>鍗曚环</th>
<th>闆跺敭鏁伴噺</th>
diff --git a/src/views/inventoryManagement/issueManagement/index.vue b/src/views/inventoryManagement/issueManagement/index.vue
index f5d2ea9..30d05bb 100644
--- a/src/views/inventoryManagement/issueManagement/index.vue
+++ b/src/views/inventoryManagement/issueManagement/index.vue
@@ -33,7 +33,7 @@
<el-table-column label="鍏ュ簱鎵规" prop="inboundBatches" width="160" show-overflow-tooltip />
<el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" width="240" show-overflow-tooltip />
<el-table-column label="浜у搧澶х被" prop="productCategory" width="100" show-overflow-tooltip />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" width="200" show-overflow-tooltip />
+ <el-table-column label="鍥剧焊缂栧彿" prop="specificationModel" width="200" show-overflow-tooltip />
<el-table-column label="鍗曚綅" prop="unit" width="70" show-overflow-tooltip />
<el-table-column label="鍏ュ簱鏁伴噺" prop="inboundNum" width="90" show-overflow-tooltip />
<el-table-column label="搴撳瓨鏁伴噺" prop="inboundNum0" width="90" show-overflow-tooltip />
diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index 0b67f42..b85e79b 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -73,7 +73,7 @@
<el-table-column label="浜у搧澶х被"
prop="productName"
show-overflow-tooltip/>
- <el-table-column label="瑙勬牸鍨嬪彿"
+ <el-table-column label="鍥剧焊缂栧彿"
prop="model"
show-overflow-tooltip/>
<el-table-column label="鍗曚綅"
@@ -212,17 +212,27 @@
// 鑾峰彇鏉ユ簮绫诲瀷閫夐」
const fetchStockRecordTypeOptions = () => {
- if (props.type === 1 || props.type === 2) {
- findAllQualifiedStockInRecordTypeOptions()
- .then(res => {
- stockRecordTypeOptions.value = res.data;
- })
- } else {
+ Promise.all([
+ findAllQualifiedStockInRecordTypeOptions(),
findAllUnQualifiedStockInRecordTypeOptions()
- .then(res => {
- stockRecordTypeOptions.value = res.data;
- })
- }
+ ])
+ .then(([qualifiedRes, unQualifiedRes]) => {
+ const qualifiedData = qualifiedRes.data || [];
+ const unQualifiedData = unQualifiedRes.data || [];
+ const allData = [...qualifiedData, ...unQualifiedData];
+ const uniqueData = [];
+ const valueSet = new Set();
+ allData.forEach(item => {
+ if (!valueSet.has(item.value)) {
+ valueSet.add(item.value);
+ uniqueData.push(item);
+ }
+ });
+ stockRecordTypeOptions.value = uniqueData;
+ })
+ .catch(() => {
+ stockRecordTypeOptions.value = [];
+ });
}
// 琛ㄦ牸閫夋嫨鏁版嵁
diff --git a/src/views/inventoryManagement/stockManagement/New.vue b/src/views/inventoryManagement/stockManagement/New.vue
index 1f86fd6..8640d83 100644
--- a/src/views/inventoryManagement/stockManagement/New.vue
+++ b/src/views/inventoryManagement/stockManagement/New.vue
@@ -24,7 +24,7 @@
</el-form-item>
<el-form-item
- label="瑙勬牸"
+ label="鍥剧焊缂栧彿"
prop="productModelName"
>
<el-input v-model="formState.productModelName" disabled />
diff --git a/src/views/inventoryManagement/stockManagement/Qualified.vue b/src/views/inventoryManagement/stockManagement/Qualified.vue
index 6270262..97e38a7 100644
--- a/src/views/inventoryManagement/stockManagement/Qualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Qualified.vue
@@ -32,7 +32,7 @@
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column label="浜у搧澶х被" prop="productName" show-overflow-tooltip />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="model" show-overflow-tooltip />
+ <el-table-column label="鍥剧焊缂栧彿" prop="model" show-overflow-tooltip />
<el-table-column label="鍗曚綅" prop="unit" show-overflow-tooltip />
<el-table-column label="搴撳瓨鏁伴噺" prop="qualitity" show-overflow-tooltip />
<el-table-column label="璐ㄦ鐘舵��"
diff --git a/src/views/inventoryManagement/stockManagement/Unqualified.vue b/src/views/inventoryManagement/stockManagement/Unqualified.vue
index 9f81143..1a55f33 100644
--- a/src/views/inventoryManagement/stockManagement/Unqualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Unqualified.vue
@@ -30,7 +30,7 @@
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column label="浜у搧澶х被" prop="productName" show-overflow-tooltip />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="model" show-overflow-tooltip />
+ <el-table-column label="鍥剧焊缂栧彿" prop="model" show-overflow-tooltip />
<el-table-column label="鍗曚綅" prop="unit" show-overflow-tooltip />
<el-table-column label="搴撳瓨鏁伴噺" prop="qualitity" show-overflow-tooltip />
<el-table-column label="璐ㄦ鐘舵��"
diff --git a/src/views/inventoryManagement/stockReport/index.vue b/src/views/inventoryManagement/stockReport/index.vue
index 89773cf..d203a34 100644
--- a/src/views/inventoryManagement/stockReport/index.vue
+++ b/src/views/inventoryManagement/stockReport/index.vue
@@ -181,7 +181,7 @@
show-overflow-tooltip
/>
<el-table-column
- label="瑙勬牸鍨嬪彿"
+ label="鍥剧焊缂栧彿"
prop="model"
show-overflow-tooltip
/>
diff --git a/src/views/procurementManagement/invoiceEntry/components/ExpandTable.vue b/src/views/procurementManagement/invoiceEntry/components/ExpandTable.vue
index d329768..7503010 100644
--- a/src/views/procurementManagement/invoiceEntry/components/ExpandTable.vue
+++ b/src/views/procurementManagement/invoiceEntry/components/ExpandTable.vue
@@ -42,7 +42,7 @@
prop: "productCategory",
},
{
- label: "瑙勬牸鍨嬪彿",
+ label: "鍥剧焊缂栧彿",
prop: "specificationModel",
},
{
diff --git a/src/views/procurementManagement/invoiceEntry/components/Modal.vue b/src/views/procurementManagement/invoiceEntry/components/Modal.vue
index b723175..e313982 100644
--- a/src/views/procurementManagement/invoiceEntry/components/Modal.vue
+++ b/src/views/procurementManagement/invoiceEntry/components/Modal.vue
@@ -112,7 +112,7 @@
</template>
</el-table-column>
<el-table-column label="浜у搧澶х被" prop="productCategory" />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" width="150" />
+ <el-table-column label="鍥剧焊缂栧彿" prop="specificationModel" width="150" />
<el-table-column label="鍗曚綅" prop="unit" width="70" />
<el-table-column label="鏁伴噺" prop="quantity" width="70" />
<el-table-column label="绋庣巼(%)" prop="taxRate" width="80" />
@@ -255,7 +255,7 @@
width: 120,
},
{
- label: "瑙勬牸鍨嬪彿",
+ label: "鍥剧焊缂栧彿",
prop: "specificationModel",
width: 120,
},
diff --git a/src/views/procurementManagement/paymentEntry/index.vue b/src/views/procurementManagement/paymentEntry/index.vue
index 3f4512b..3f244c5 100644
--- a/src/views/procurementManagement/paymentEntry/index.vue
+++ b/src/views/procurementManagement/paymentEntry/index.vue
@@ -153,7 +153,7 @@
width="100"
/>
<el-table-column
- label="瑙勬牸鍨嬪彿"
+ label="鍥剧焊缂栧彿"
prop="specificationModel"
show-overflow-tooltip
width="150"
@@ -283,7 +283,7 @@
showOverflowTooltip: true,
},
{
- label: "瑙勬牸鍨嬪彿",
+ label: "鍥剧焊缂栧彿",
prop: "specificationModel",
showOverflowTooltip: true,
width: 150
diff --git a/src/views/procurementManagement/priceManagement/index.vue b/src/views/procurementManagement/priceManagement/index.vue
index 76a39ed..d56f106 100644
--- a/src/views/procurementManagement/priceManagement/index.vue
+++ b/src/views/procurementManagement/priceManagement/index.vue
@@ -31,7 +31,7 @@
<el-table :data="tableData" border v-loading="loading" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="鍟嗗搧鍚嶇О" prop="productName" />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="specification" />
+ <el-table-column label="鍥剧焊缂栧彿" prop="specification" />
<el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" />
<el-table-column label="鍘熶环鏍�" prop="oldPrice" width="120">
<template #default="{ row }">楼{{ row.oldPrice.toFixed(2) }}</template>
@@ -71,7 +71,7 @@
<el-option label="鍟嗗搧C" value="鍟嗗搧C" />
</el-select>
</el-form-item>
- <el-form-item label="瑙勬牸鍨嬪彿">
+ <el-form-item label="鍥剧焊缂栧彿">
<el-input v-model="formData.specification" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
</el-form-item>
<el-form-item label="渚涘簲鍟嗗悕绉�">
diff --git a/src/views/procurementManagement/procurementInvoiceLedger/index.vue b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
index 00ae65a..bbe98ce 100644
--- a/src/views/procurementManagement/procurementInvoiceLedger/index.vue
+++ b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
@@ -171,7 +171,7 @@
width: 150,
},
{
- label: "瑙勬牸鍨嬪彿",
+ label: "鍥剧焊缂栧彿",
prop: "specificationModel",
width: 150,
},
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 6638d9a..54292cf 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -84,7 +84,7 @@
width="60" />
<el-table-column label="浜у搧澶х被"
prop="productCategory" />
- <el-table-column label="瑙勬牸鍨嬪彿"
+ <el-table-column label="鍥剧焊缂栧彿"
prop="specificationModel" />
<el-table-column label="鍗曚綅"
prop="unit" />
@@ -403,7 +403,7 @@
width="60" />
<el-table-column label="浜у搧澶х被"
prop="productCategory" />
- <el-table-column label="瑙勬牸鍨嬪彿"
+ <el-table-column label="鍥剧焊缂栧彿"
prop="specificationModel" />
<el-table-column label="鍗曚綅"
prop="unit"
@@ -555,7 +555,7 @@
</el-row>
<el-row :gutter="30">
<el-col :span="24">
- <el-form-item label="瑙勬牸鍨嬪彿锛�"
+ <el-form-item label="鍥剧焊缂栧彿锛�"
prop="productModelId">
<el-select v-model="productForm.productModelId"
placeholder="璇烽�夋嫨"
diff --git a/src/views/procurementManagement/procurementReport/index.vue b/src/views/procurementManagement/procurementReport/index.vue
index adf554d..d9ae1a2 100644
--- a/src/views/procurementManagement/procurementReport/index.vue
+++ b/src/views/procurementManagement/procurementReport/index.vue
@@ -107,7 +107,7 @@
prop: 'productCategory',
},
{
- label: '瑙勬牸鍨嬪彿',
+ label: '鍥剧焊缂栧彿',
prop: 'specificationModel',
},
{
diff --git a/src/views/procurementManagement/transferManagement/index.vue b/src/views/procurementManagement/transferManagement/index.vue
index 3646449..999a879 100644
--- a/src/views/procurementManagement/transferManagement/index.vue
+++ b/src/views/procurementManagement/transferManagement/index.vue
@@ -90,7 +90,7 @@
width="60"
/>
<el-table-column label="浜у搧澶х被" prop="productCategory" />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
+ <el-table-column label="鍥剧焊缂栧彿" prop="specificationModel" />
<el-table-column label="鍗曚綅" prop="unit" width="70" />
<el-table-column label="渚涘簲鍟�" prop="supplierName" width="100" />
<el-table-column label="閲囪喘鏁伴噺" prop="quantity" width="100" />
diff --git a/src/views/productionManagement/operationScheduling/index.vue b/src/views/productionManagement/operationScheduling/index.vue
index a9c06fb..804f232 100644
--- a/src/views/productionManagement/operationScheduling/index.vue
+++ b/src/views/productionManagement/operationScheduling/index.vue
@@ -133,7 +133,7 @@
width: 150,
},
{
- label: "瑙勬牸鍨嬪彿",
+ label: "鍥剧焊缂栧彿",
prop: "specificationModel",
width: 150,
},
diff --git a/src/views/productionManagement/productStructure/StructureEdit.vue b/src/views/productionManagement/productStructure/StructureEdit.vue
index f610637..2116cf9 100644
--- a/src/views/productionManagement/productStructure/StructureEdit.vue
+++ b/src/views/productionManagement/productStructure/StructureEdit.vue
@@ -159,7 +159,7 @@
</el-table-column>
<el-table-column label="浜у搧缂栫爜" prop="productCode" />
<el-table-column label="浜у搧鍚嶇О" prop="productName" />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="model" />
+ <el-table-column label="鍥剧焊缂栧彿" prop="model" />
<el-table-column label="鍗曚綅" prop="unit" />
</el-table>
diff --git a/src/views/productionManagement/productionDispatching/components/autoDispatchDia.vue b/src/views/productionManagement/productionDispatching/components/autoDispatchDia.vue
index b4a76f6..eaa0247 100644
--- a/src/views/productionManagement/productionDispatching/components/autoDispatchDia.vue
+++ b/src/views/productionManagement/productionDispatching/components/autoDispatchDia.vue
@@ -20,7 +20,7 @@
<el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" width="200" />
<!-- <el-table-column label="椤圭洰鍚嶇О" prop="projectName" width="250" /> -->
<el-table-column label="浜у搧澶х被" prop="productCategory" width="150" />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" width="200" />
+ <el-table-column label="鍥剧焊缂栧彿" prop="specificationModel" width="200" />
<el-table-column label="缁戝畾鏈哄櫒" prop="speculativeTradingName" width="120" />
<el-table-column label="鎬绘暟閲�" prop="quantity" width="100" align="right" />
<el-table-column label="宸叉帓浜�" prop="schedulingNum" width="100" align="right" fixed="right" />
diff --git a/src/views/productionManagement/productionDispatching/components/formDia.vue b/src/views/productionManagement/productionDispatching/components/formDia.vue
index a514d9a..b4e1342 100644
--- a/src/views/productionManagement/productionDispatching/components/formDia.vue
+++ b/src/views/productionManagement/productionDispatching/components/formDia.vue
@@ -21,7 +21,7 @@
</el-row> -->
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="specificationModel">
+ <el-form-item label="鍥剧焊缂栧彿锛�" prop="specificationModel">
<el-input v-model="form.specificationModel" placeholder="璇疯緭鍏�" clearable disabled/>
</el-form-item>
</el-col>
@@ -125,7 +125,7 @@
form: {
projectName: "",
productCategory: "",
- specificationModel: "", // 瑙勬牸鍨嬪彿
+ specificationModel: "", // 鍥剧焊缂栧彿
quantity: "",
schedulingNum: "",
schedulingUserId: "",
diff --git a/src/views/productionManagement/productionDispatching/index.vue b/src/views/productionManagement/productionDispatching/index.vue
index 2d39890..10b859e 100644
--- a/src/views/productionManagement/productionDispatching/index.vue
+++ b/src/views/productionManagement/productionDispatching/index.vue
@@ -128,7 +128,7 @@
width: 160,
},
{
- label: "瑙勬牸鍨嬪彿",
+ label: "鍥剧焊缂栧彿",
prop: "specificationModel",
width: 120,
},
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index 9ad5eee..4e28304 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -179,7 +179,7 @@
},
{
label: "浜у搧鍥剧焊缂栧彿",
- prop: "productModelName"
+ prop: "productModelName",
width: 160,
},
{
diff --git a/src/views/qualityManagement/finalInspection/components/formDia.vue b/src/views/qualityManagement/finalInspection/components/formDia.vue
index 6a3e774..d3f7810 100644
--- a/src/views/qualityManagement/finalInspection/components/formDia.vue
+++ b/src/views/qualityManagement/finalInspection/components/formDia.vue
@@ -24,7 +24,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productModelId">
+ <el-form-item label="鍥剧焊缂栧彿锛�" prop="productModelId">
<el-select v-model="form.productModelId" placeholder="璇烽�夋嫨" clearable :disabled="operationType === 'edit'"
filterable readonly @change="handleChangeModel">
<el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
diff --git a/src/views/qualityManagement/finalInspection/index.vue b/src/views/qualityManagement/finalInspection/index.vue
index db44222..2679fde 100644
--- a/src/views/qualityManagement/finalInspection/index.vue
+++ b/src/views/qualityManagement/finalInspection/index.vue
@@ -109,7 +109,7 @@
prop: "productName",
},
{
- label: "瑙勬牸鍨嬪彿",
+ label: "鍥剧焊缂栧彿",
prop: "model",
},
{
diff --git a/src/views/qualityManagement/nonconformingManagement/components/formDia.vue b/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
index d33ddad..0b82048 100644
--- a/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
+++ b/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
@@ -34,7 +34,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="model">
+ <el-form-item label="鍥剧焊缂栧彿锛�" prop="model">
<el-select v-model="form.model" placeholder="璇烽�夋嫨" clearable :disabled="operationType === 'edit'"
filterable readonly @change="handleChangeModel">
<el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
diff --git a/src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue b/src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue
index 467a0d3..045ada5 100644
--- a/src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue
+++ b/src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue
@@ -35,7 +35,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="model">
+ <el-form-item label="鍥剧焊缂栧彿锛�" prop="model">
<el-input v-model="form.model" placeholder="璇疯緭鍏�" clearable disabled/>
</el-form-item>
</el-col>
diff --git a/src/views/qualityManagement/nonconformingManagement/index.vue b/src/views/qualityManagement/nonconformingManagement/index.vue
index 327fc88..093ff21 100644
--- a/src/views/qualityManagement/nonconformingManagement/index.vue
+++ b/src/views/qualityManagement/nonconformingManagement/index.vue
@@ -140,7 +140,7 @@
prop: "productName",
},
{
- label: "瑙勬牸鍨嬪彿",
+ label: "鍥剧焊缂栧彿",
prop: "model",
},
{
diff --git a/src/views/qualityManagement/processInspection/components/formDia.vue b/src/views/qualityManagement/processInspection/components/formDia.vue
index 1b943e2..22e0a97 100644
--- a/src/views/qualityManagement/processInspection/components/formDia.vue
+++ b/src/views/qualityManagement/processInspection/components/formDia.vue
@@ -31,7 +31,7 @@
</el-row>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productModelId">
+ <el-form-item label="鍥剧焊缂栧彿锛�" prop="productModelId">
<el-select v-model="form.productModelId" placeholder="璇烽�夋嫨" clearable :disabled="operationType === 'edit'"
filterable readonly @change="handleChangeModel">
<el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
diff --git a/src/views/qualityManagement/processInspection/index.vue b/src/views/qualityManagement/processInspection/index.vue
index cbeab71..fe76071 100644
--- a/src/views/qualityManagement/processInspection/index.vue
+++ b/src/views/qualityManagement/processInspection/index.vue
@@ -114,7 +114,7 @@
prop: "productName",
},
{
- label: "瑙勬牸鍨嬪彿",
+ label: "鍥剧焊缂栧彿",
prop: "model",
},
{
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
index 21c4323..2b3654b 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
@@ -42,7 +42,7 @@
</el-row>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productModelId">
+ <el-form-item label="鍥剧焊缂栧彿锛�" prop="productModelId">
<el-select v-model="form.productModelId" placeholder="璇烽�夋嫨" clearable :disabled="operationType === 'edit'"
filterable readonly @change="handleChangeModel">
<el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
diff --git a/src/views/qualityManagement/rawMaterialInspection/index.vue b/src/views/qualityManagement/rawMaterialInspection/index.vue
index 26504b0..ded13ee 100644
--- a/src/views/qualityManagement/rawMaterialInspection/index.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/index.vue
@@ -116,7 +116,7 @@
prop: "productName",
},
{
- label: "瑙勬牸鍨嬪彿",
+ label: "鍥剧焊缂栧彿",
prop: "model",
},
{
diff --git a/src/views/safeProduction/safeWorkApproval/components/approvalDia.vue b/src/views/safeProduction/safeWorkApproval/components/approvalDia.vue
index 8d40a2e..9a4225d 100644
--- a/src/views/safeProduction/safeWorkApproval/components/approvalDia.vue
+++ b/src/views/safeProduction/safeWorkApproval/components/approvalDia.vue
@@ -116,7 +116,7 @@
<el-table-column prop="product"
label="浜у搧鍚嶇О" />
<el-table-column prop="specification"
- label="瑙勬牸鍨嬪彿" />
+ label="鍥剧焊缂栧彿" />
<el-table-column prop="unit"
label="鍗曚綅" />
<el-table-column prop="unitPrice"
@@ -176,7 +176,7 @@
<el-table-column prop="productCategory"
label="浜у搧鍚嶇О" />
<el-table-column prop="specificationModel"
- label="瑙勬牸鍨嬪彿" />
+ label="鍥剧焊缂栧彿" />
<el-table-column prop="unit"
label="鍗曚綅" />
<el-table-column prop="quantity"
diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index efd32a7..4fefc20 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -118,7 +118,7 @@
</div>
<div class="summary-item">
<div class="summary-label">宸查��璐ф暟閲�</div>
- <div class="summary-value returned">{{ currentShippingOrder.returnedQuantity || 0 }}</div>
+ <div class="summary-value returned">{{ currentShippingOrder.returnTotal || 0 }}</div>
</div>
<div class="summary-item">
<div class="summary-label">寰呭彂璐ф暟閲�</div>
@@ -175,7 +175,7 @@
</div>
<div class="info-row">
<span class="info-label">閫�璐ф暟閲�</span>
- <span class="info-value returned">{{ record.returnNum || 0 }}</span>
+ <span class="info-value returned">{{ record.returnTotal || 0 }}</span>
</div>
<div class="info-row" v-if="record.type === '璐ц溅'">
<span class="info-label">杞︾墝鍙�</span>
@@ -343,6 +343,7 @@
addShippingInfoDetail,
updateShippingInfoDetail,
delShippingInfoDetail,
+ getShippingInfoById,
} from "@/api/salesManagement/deliveryLedger.js";
import { delLedgerFile } from "@/api/salesManagement/salesLedger.js";
@@ -588,6 +589,11 @@
addShippingInfoDetail(payload).then((res) => {
proxy.$modal.msgSuccess("鍙戣揣鎴愬姛");
hideAddShippingForm();
+ getShippingInfoById(currentShippingOrder.value.id).then((infoRes) => {
+ if (infoRes.code === 200) {
+ currentShippingOrder.value = infoRes.data;
+ }
+ });
loadShippingRecords(currentShippingOrder.value.id);
getList();
});
diff --git a/src/views/salesManagement/invoiceLedger/index.vue b/src/views/salesManagement/invoiceLedger/index.vue
index b35023f..c18c20a 100644
--- a/src/views/salesManagement/invoiceLedger/index.vue
+++ b/src/views/salesManagement/invoiceLedger/index.vue
@@ -33,7 +33,7 @@
<el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" show-overflow-tooltip width="180" />
<el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" show-overflow-tooltip width="240" />
<el-table-column label="浜у搧澶х被" prop="productCategory" width="200" />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" width="160" show-overflow-tooltip />
+ <el-table-column label="鍥剧焊缂栧彿" prop="specificationModel" width="160" show-overflow-tooltip />
<el-table-column label="鍙戠エ鍙�" prop="invoiceNo" width="200" show-overflow-tooltip />
<el-table-column label="鍙戠エ閲戦(鍏�)" prop="invoiceTotal" show-overflow-tooltip :formatter="formattedNumber"
width="200" />
diff --git a/src/views/salesManagement/invoiceRegistration/index.vue b/src/views/salesManagement/invoiceRegistration/index.vue
index 9cc1d66..6e4d38d 100644
--- a/src/views/salesManagement/invoiceRegistration/index.vue
+++ b/src/views/salesManagement/invoiceRegistration/index.vue
@@ -64,7 +64,7 @@
/>
<el-table-column label="浜у搧澶х被" prop="productCategory" />
<el-table-column
- label="瑙勬牸鍨嬪彿"
+ label="鍥剧焊缂栧彿"
prop="specificationModel"
width="150"
/>
@@ -269,7 +269,7 @@
</el-table-column>
<el-table-column label="浜у搧澶х被" prop="productCategory" />
<el-table-column
- label="瑙勬牸鍨嬪彿"
+ label="鍥剧焊缂栧彿"
prop="specificationModel"
width="150"
/>
diff --git a/src/views/salesManagement/receiptPayment/index.vue b/src/views/salesManagement/receiptPayment/index.vue
index 6ded92b..3638007 100644
--- a/src/views/salesManagement/receiptPayment/index.vue
+++ b/src/views/salesManagement/receiptPayment/index.vue
@@ -157,7 +157,7 @@
width="100"
/>
<el-table-column
- label="瑙勬牸鍨嬪彿"
+ label="鍥剧焊缂栧彿"
prop="specificationModel"
show-overflow-tooltip
width="200"
@@ -217,7 +217,7 @@
width="100"
/>
<el-table-column
- label="瑙勬牸鍨嬪彿"
+ label="鍥剧焊缂栧彿"
prop="specificationModel"
show-overflow-tooltip
width="200"
diff --git a/src/views/salesManagement/returnOrder/components/detailDia.vue b/src/views/salesManagement/returnOrder/components/detailDia.vue
index dedfecc..9c9a73d 100644
--- a/src/views/salesManagement/returnOrder/components/detailDia.vue
+++ b/src/views/salesManagement/returnOrder/components/detailDia.vue
@@ -20,7 +20,11 @@
<div style="padding-top: 20px">
<span class="descriptions">浜у搧鍒楄〃</span>
- <PIMTable :isShowPagination="false" rowKey="id" :column="tableColumn" :tableData="tableData" />
+ <PIMTable :isShowPagination="false" rowKey="id" :column="tableColumn" :tableData="tableData">
+ <template #unQuantity="{ row }">
+ {{ calcAlreadyReturned(row) }}
+ </template>
+ </PIMTable>
</div>
</div>
<template #footer>
@@ -41,13 +45,19 @@
const tableData = ref([]);
const availableProducts = ref([]);
+const calcAlreadyReturned = (row) => {
+ const total = Number(row?.shippingNum ?? row?.totalQuantity ?? 0);
+ const returned = Number(row?.returnQuantity ?? row?.num ?? 0);
+ if (!Number.isFinite(total) || !Number.isFinite(returned)) return 0;
+ return total - returned;
+};
+
const tableColumn = [
{align: "center", label: "浜у搧澶х被", prop: "productCategory"},
- {align: "center", label: "瑙勬牸鍨嬪彿", prop: "specificationModel"},
+ {align: "center", label: "鍥剧焊缂栧彿", prop: "specificationModel"},
{align: "center", label: "鍗曚綅", prop: "unit", width: 80},
{align: "center", label: "鎬绘暟閲�", prop: "shippingNum", width: 120},
- {align: "center", label: "宸查��璐ф暟閲�", prop: "totalReturnNum", width: 120},
- {align: "center", label: "鏈��璐ф暟閲�", prop: "unQuantity", width: 120},
+ {align: "center", label: "鏈��璐ф暟閲�", prop: "unQuantity", width: 120, dataType: "slot", slot: "unQuantity"},
{align: "center", label: "閫�璐ф暟閲�", prop: "returnQuantity", width: 120},
{align: "center", label: "閫�璐т骇鍝佸崟浠�", prop: "price", width: 120},
{align: "center", label: "閫�璐т骇鍝侀噾棰�", prop: "amount", width: 120},
@@ -106,7 +116,7 @@
isQuality: raw?.isQuality ?? 2,
remark: raw?.remark ?? "",
};
- return product ? { ...product, ...normalized } : normalized;
+ return product ? { ...product, ...normalized, returnQuantity: normalized.returnQuantity } : normalized;
}) : [];
} catch (e) {
console.error("Failed to load detail", e);
diff --git a/src/views/salesManagement/returnOrder/components/formDia.vue b/src/views/salesManagement/returnOrder/components/formDia.vue
index bef456c..c7b89eb 100644
--- a/src/views/salesManagement/returnOrder/components/formDia.vue
+++ b/src/views/salesManagement/returnOrder/components/formDia.vue
@@ -82,6 +82,9 @@
<el-button type="primary" @click="openProductSelection" :disabled="!form.shippingId">娣诲姞浜у搧</el-button>
</div>
<PIMTable :isShowPagination="false" rowKey="id" :column="tableColumn" :tableData="tableData">
+ <template #unQuantity="{ row }">
+ {{ calcAlreadyReturned(row) }}
+ </template>
<template #returnQuantity="{ row }">
<el-input
v-model="row.returnQuantity"
@@ -146,7 +149,7 @@
>
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" prop="productCategory" label="浜у搧澶х被" />
- <el-table-column align="center" prop="specificationModel" label="瑙勬牸鍨嬪彿" />
+ <el-table-column align="center" prop="specificationModel" label="鍥剧焊缂栧彿" />
<el-table-column align="center" prop="unit" label="鍗曚綅" />
<el-table-column align="center" prop="shippingNum" label="鎬绘暟閲�" />
<el-table-column align="center" prop="unQuantity" label="鏈��璐ф暟閲�" />
@@ -208,19 +211,18 @@
const { form, rules } = toRefs(data);
const calcAlreadyReturned = (row) => {
- const total = Number(row?.shippingNum ?? row?.totalQuantity ?? row?.totalReturnNum ?? 0);
- const un = Number(row?.unQuantity ?? 0);
- if (!Number.isFinite(total) || !Number.isFinite(un)) return 0;
- return Math.max(total - un, 0);
+ const total = Number(row?.shippingNum ?? row?.totalQuantity ?? 0);
+ const returned = Number(row?.returnQuantity ?? row?.num ?? 0);
+ if (!Number.isFinite(total) || !Number.isFinite(returned)) return 0;
+ return total - returned;
};
const tableColumn = ref([
{align: "center", label: "浜у搧澶х被", prop: "productCategory" },
- {align: "center", label: "瑙勬牸鍨嬪彿", prop: "specificationModel" },
+ {align: "center", label: "鍥剧焊缂栧彿", prop: "specificationModel" },
{align: "center", label: "鍗曚綅", prop: "unit", width: 80 },
{align: "center", label: "鎬绘暟閲�", prop: "shippingNum", width: 120 },
- {align: "center", label: "宸查��璐ф暟閲�", prop: "totalReturnNum", width: 120 },
- {align: "center", label: "鏈��璐ф暟閲�", prop: "unQuantity", width: 120 },
+ {align: "center", label: "鏈��璐ф暟閲�", prop: "unQuantity", width: 120, dataType: "slot", slot: "unQuantity"},
{align: "center", label: "閫�璐ф暟閲�", prop: "returnQuantity", dataType: "slot", slot: "returnQuantity", width: 120 },
{align: "center", label: "閫�璐т骇鍝佸崟浠�", prop: "price", dataType: "slot", slot: "price", width: 120 },
{align: "center", label: "閫�璐т骇鍝侀噾棰�", prop: "amount", dataType: "slot", slot: "amount", width: 120 },
@@ -516,7 +518,6 @@
specificationModel: product.specificationModel,
unit: product.unit,
shippingNum: product.shippingNum,
- totalReturnNum: product.totalReturnNum,
unQuantity: product.unQuantity
});
}
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 05bd78d..9cfa8bf 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -45,7 +45,7 @@
<el-table :data="props.row.children" border show-summary :summary-method="summarizeChildrenTable">
<el-table-column align="center" label="搴忓彿" type="index"/>
<el-table-column label="浜у搧澶х被" prop="productCategory" />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
+ <el-table-column label="鍥剧焊缂栧彿" prop="specificationModel" />
<el-table-column label="鍗曚綅" prop="unit" />
<el-table-column label="浜у搧鐘舵��"
width="100px"
@@ -215,7 +215,7 @@
:selectable="(row) => !isProductShipped(row)" />
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column label="浜у搧澶х被" prop="productCategory" />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
+ <el-table-column label="鍥剧焊缂栧彿" prop="specificationModel" />
<el-table-column label="鍗曚綅" prop="unit" />
<el-table-column label="鏁伴噺" prop="quantity" />
<el-table-column label="绋庣巼(%)" prop="taxRate" />
@@ -334,7 +334,7 @@
</el-row>
<el-row :gutter="30">
<el-col :span="24">
- <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productModelId">
+ <el-form-item label="鍥剧焊缂栧彿锛�" prop="productModelId">
<el-select v-model="productForm.productModelId" placeholder="璇烽�夋嫨" clearable @change="getProductModel" filterable>
<el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
</el-select>
@@ -491,7 +491,7 @@
<thead>
<tr>
<th>浜у搧鍚嶇О</th>
- <th>瑙勬牸鍨嬪彿</th>
+ <th>鍥剧焊缂栧彿</th>
<th>鍗曚綅</th>
<th>鍗曚环</th>
<th>闆跺敭鏁伴噺</th>
@@ -1639,7 +1639,7 @@
<thead>
<tr>
<th>浜у搧鍚嶇О</th>
- <th>瑙勬牸鍨嬪彿</th>
+ <th>鍥剧焊缂栧彿</th>
<th>鍗曚綅</th>
<th>鍗曚环</th>
<th>闆跺敭鏁伴噺</th>
diff --git a/src/views/salesManagement/salesQuotation/index.vue b/src/views/salesManagement/salesQuotation/index.vue
index 666360a..87439ea 100644
--- a/src/views/salesManagement/salesQuotation/index.vue
+++ b/src/views/salesManagement/salesQuotation/index.vue
@@ -245,7 +245,7 @@
</el-form-item>
</template>
</el-table-column>
- <el-table-column prop="specification" label="瑙勬牸鍨嬪彿" width="200">
+ <el-table-column prop="specification" label="鍥剧焊缂栧彿" width="200">
<template #default="scope">
<el-form-item :prop="`products.${scope.$index}.specificationId`" class="product-table-form-item">
<el-select
@@ -335,7 +335,7 @@
<h4>浜у搧鏄庣粏</h4>
<el-table :data="currentQuotation.products" border style="width: 100%">
<el-table-column prop="product" label="浜у搧鍚嶇О" />
- <el-table-column prop="specification" label="瑙勬牸鍨嬪彿" />
+ <el-table-column prop="specification" label="鍥剧焊缂栧彿" />
<el-table-column prop="unit" label="鍗曚綅" />
<el-table-column prop="unitPrice" label="鍗曚环">
<template #default="scope">
diff --git a/src/views/salesManagement/strategyControl/index.vue b/src/views/salesManagement/strategyControl/index.vue
index 629d255..a9efcd0 100644
--- a/src/views/salesManagement/strategyControl/index.vue
+++ b/src/views/salesManagement/strategyControl/index.vue
@@ -48,7 +48,7 @@
</el-table-column>
<el-table-column prop="customerName" label="瀹㈡埛鍚嶇О" width="180"/>
<el-table-column prop="productName" label="浜у搧鍚嶇О" width="200"/>
- <el-table-column prop="specification" label="瑙勬牸鍨嬪彿" width="120"/>
+ <el-table-column prop="specification" label="鍥剧焊缂栧彿" width="120"/>
<el-table-column prop="basePrice" label="鍩虹浠锋牸" width="100">
<template #default="scope">
楼{{ scope.row.basePrice }}/鍚�
@@ -628,8 +628,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="瑙勬牸鍨嬪彿" prop="specification">
- <el-input v-model="priceStrategyForm.specification" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" :disabled="priceStrategyDialogMode === 'view'" />
+ <el-form-item label="鍥剧焊缂栧彿" prop="specification">
+ <el-input v-model="priceStrategyForm.specification" placeholder="璇疯緭鍏ュ浘绾哥紪鍙�" :disabled="priceStrategyDialogMode === 'view'" />
</el-form-item>
</el-col>
</el-row>
--
Gitblit v1.9.3