From 92b11d708a7183f8d74a421537ae85e41eb6a632 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 06 一月 2026 14:28:07 +0800
Subject: [PATCH] 双奇点 1.仓储物流展示字段修改
---
src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue | 42 ++----------------------------------------
1 files changed, 2 insertions(+), 40 deletions(-)
diff --git a/src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue b/src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue
index 07ce74e..016fef6 100644
--- a/src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue
+++ b/src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue
@@ -44,33 +44,11 @@
<el-input v-model="scope.row.specificationModel" placeholder="璇疯緭鍏ヤ骇鍝侀珮搴�" />
</template>
</el-table-column>
- <el-table-column label="楂樺害鍗曚綅" prop="unit" width="100">
- <template #default="scope">
- <el-input v-model="scope.row.unit" placeholder="璇疯緭鍏ラ珮搴﹀崟浣�" />
- </template>
- </el-table-column>
<el-table-column label="绾哥瑙勬牸" prop="cartonSpecifications" width="200">
<template #default="scope">
<el-input v-model="scope.row.cartonSpecifications" placeholder="璇疯緭鍏ョ焊绠辫鏍�" />
</template>
</el-table-column>
- <!-- <el-table-column label="渚涘簲鍟�" prop="supplierName" width="200">
- <template #default="scope">
- <el-input v-model="scope.row.supplierName" placeholder="璇疯緭鍏ヤ緵搴斿晢" />
- </template>
- </el-table-column> -->
- <!-- <el-table-column label="鐗╁搧绫诲瀷" prop="itemType" width="150">
- <template #default="scope">
- <el-select v-model="scope.row.itemType" filterable allow-create placeholder="璇烽�夋嫨鐗╁搧绫诲瀷" style="width: 100%">
- <el-option
- v-for="item in itemTypeOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </template>
- </el-table-column> -->
<el-table-column label="鍏ュ簱鏁伴噺-浠�" prop="inboundNum" width="150">
<template #default="scope">
<el-input-number :step="1" :min="0" style="width: 100%" v-model="scope.row.inboundNum" @change="() => calculateTotalPrice(scope.row)" />
@@ -81,14 +59,9 @@
<el-input-number :step="1" :min="0" style="width: 100%" v-model="scope.row.boxNum" @change="() => calculateTotalPrice(scope.row)" />
</template>
</el-table-column>
- <el-table-column label="鍗曚环(鍏�)/浠�" prop="taxInclusiveUnitPrice" width="150">
+ <el-table-column label="鍗曚环(缇庡厓)/浠�" prop="taxInclusiveUnitPrice" width="150">
<template #default="scope">
<el-input-number :step="0.01" :min="0" style="width: 100%" v-model="scope.row.taxInclusiveUnitPrice" @change="() => calculateTotalPrice(scope.row)" />
- </template>
- </el-table-column>
- <el-table-column label="鍗曚环(缇庡厓)/浠�" prop="dollarPrice" width="150">
- <template #default="scope">
- <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="scope.row.dollarPrice"/>
</template>
</el-table-column>
<el-table-column label="鍏ュ簱鏃ユ湡" prop="inboundDate" width="180">
@@ -214,7 +187,6 @@
productCategory: '',
specificationModel: '',
cartonSpecifications:'',
- unit: '',
supplierName: form.value.supplierName || '',
itemType: '',
inboundNum: 0,
@@ -225,7 +197,6 @@
taxRate: null,
taxExclusiveTotalPrice: 0,
boxNum: 0,
- dollarPrice: 0
});
};
@@ -262,7 +233,7 @@
// 楠岃瘉鑷畾涔夋坊鍔犵殑鏁版嵁蹇呭～瀛楁
for (let i = 0; i < productList.value.length; i++) {
const product = productList.value[i];
- if (!product.productCategory || !product.specificationModel || !product.unit) {
+ if (!product.productCategory || !product.specificationModel) {
proxy.$modal.msgError(`绗�${i + 1}琛屼骇鍝佹暟鎹湭濉啓瀹屾暣锛堜骇鍝併�佷骇鍝侀珮搴︺�侀珮搴﹀崟浣嶄负蹇呭～锛塦)
return
}
@@ -293,11 +264,6 @@
proxy.$modal.msgError(`绗�${i + 1}琛屽崟浠凤紙鍏冿級闇�澶т簬0`)
return
}
- const dollarPrice = Number(product?.dollarPrice ?? 0);
- if (!Number.isFinite(dollarPrice) || dollarPrice <= 0) {
- proxy.$modal.msgError(`绗�${i + 1}琛屽崟浠凤紙缇庡厓锛夐渶澶т簬0`)
- return
- }
if (!product.inboundDate) {
proxy.$modal.msgError(`绗�${i + 1}琛岃閫夋嫨鍏ュ簱鏃ユ湡`)
return
@@ -310,7 +276,6 @@
inboundNum: Number(product.inboundNum),
productCategory: product.productCategory,
specificationModel: product.specificationModel,
- unit: product.unit,
supplierName: product.supplierName || form.value.supplierName,
itemType: product.itemType,
inboundDate: formatDateTime(product.inboundDate, false),
@@ -321,7 +286,6 @@
boxNum:Number(product.boxNum),
cartonSpecifications: product.cartonSpecifications,
url: product.url||'',
- dollarPrice: Number(product.dollarPrice || 0),
}));
loading.value = true
if (operationType.value === 'edit') {
@@ -406,7 +370,6 @@
id: row?.id ?? null,
productCategory: row?.productCategory ?? '',
specificationModel: row?.specificationModel ?? '',
- unit: row?.unit ?? '',
supplierName: row?.supplierName ?? '',
itemType: row?.itemType ?? '',
inboundNum: Number(row?.inboundNum ?? row?.inboundQuantity ?? 0),
@@ -419,7 +382,6 @@
boxNum: Number(row?.boxNum ?? 0),
cartonSpecifications: row?.cartonSpecifications ?? '',
url: row?.url ?? '',
- dollarPrice: Number(row?.dollarPrice ?? 0),
}]
}
}
--
Gitblit v1.9.3