From cd17315666ec8099678c55329d3e5889efb23c1e Mon Sep 17 00:00:00 2001
From: 周宾 <2802492122@qq.com>
Date: 星期五, 26 十二月 2025 17:01:53 +0800
Subject: [PATCH] 天津双奇点-仓储物流相关问题修复
---
src/views/inventoryManagement/receiptManagement/components/formDia.vue | 67 ++++++++++++++++++++++++++++-----
1 files changed, 57 insertions(+), 10 deletions(-)
diff --git a/src/views/inventoryManagement/receiptManagement/components/formDia.vue b/src/views/inventoryManagement/receiptManagement/components/formDia.vue
index 3bd3390..332fd50 100644
--- a/src/views/inventoryManagement/receiptManagement/components/formDia.vue
+++ b/src/views/inventoryManagement/receiptManagement/components/formDia.vue
@@ -34,21 +34,40 @@
type="index"
width="60"
/>
- <el-table-column label="浜у搧澶х被" prop="productCategory" />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
- <el-table-column label="鍗曚綅" prop="unit" width="70" />
+ <el-table-column label="浜у搧" prop="productCategory" />
+ <el-table-column label="浜у搧楂樺害" prop="specificationModel" >
+ <template #default="scope">
+ <div>{{ scope.row.specificationModel }}{{ scope.row.unit }}</div>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column label="楂樺害鍗曚綅" prop="unit" width="70" /> -->
<!-- <el-table-column label="渚涘簲鍟�" prop="supplierName" width="100" /> -->
- <el-table-column label="閲囪喘鏁伴噺" prop="quantity" width="100" />
- <el-table-column label="寰呭叆搴撴暟閲�" prop="quantity0" width="100" />
- <el-table-column label="鏈鍏ュ簱鏁伴噺" prop="quantityStock" width="150">
+ <el-table-column label="閲囪喘鏁伴噺/浠�" prop="quantity" width="100" />
+ <el-table-column label="姣忎欢鏁伴噺/鏀�" prop="boxNum" width="150">
+ <template #default="scope">
+ <el-input-number :step="1" :min="0" style="width: 100%" v-model="scope.row.boxNum"/>
+ </template>
+ </el-table-column>
+ <el-table-column label="寰呭叆搴撴暟閲�/浠�" prop="quantity0" width="150" />
+ <el-table-column label="鏈鍏ュ簱鏁伴噺/浠�" prop="quantityStock" width="150">
<template #default="scope">
<el-input-number :step="0.01" :min="0" style="width: 100%" v-model="scope.row.quantityStock" @change="() => calculateTotalPrice(scope.row)" />
</template>
</el-table-column>
<el-table-column label="绋庣巼(%)" prop="taxRate" width="120" />
- <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)" :disabled="operationType === 'edit'"/>
+ </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" :disabled="operationType === 'edit'"/>
+ </template>
+ </el-table-column>
+ <el-table-column label="绾哥瑙勬牸" prop="cartonSpecifications" width="150">
+ <template #default="scope">
+ <el-input v-model="scope.row.cartonSpecifications" placeholder="璇疯緭鍏ョ焊绠辫鏍�" style="width: 100%" />
</template>
</el-table-column>
<el-table-column
@@ -224,6 +243,9 @@
taxInclusiveUnitPrice: Number(item?.taxInclusiveUnitPrice ?? 0),
taxInclusiveTotalPrice: 0,
originalQuantityStock: Number(item.quantityStock ?? item.inboundQuantity ?? 0),
+ boxNum: item.boxNum || 0,
+ dollarPrice: item.dollarPrice || 0,
+
}))
} catch (error) {
console.error('鏌ヨ浜у搧璁板綍澶辫触:', error)
@@ -282,16 +304,41 @@
proxy.$modal.msgError('鏈鍏ュ簱鏁伴噺闇�澶т簬0锛屼笖涓嶈兘瓒呰繃寰呭叆搴撴暟閲�')
return
}
+ let isVerify = true
+ selectedRows.value.some((product) => {
+ if(!product.boxNum){
+ proxy.$modal.msgError('璇峰～鍐欐瘡浠舵暟閲�/鏀�')
+ isVerify = false
+ return true
+ }
+ if(!product.cartonSpecifications){
+ proxy.$modal.msgError('璇峰～鍐欑焊绠辫鏍�')
+ isVerify = false
+ return true
+ }
+ if(!product.dollarPrice){
+ proxy.$modal.msgError('璇峰～鍐欏崟浠�(缇庡厓)/浠�')
+ isVerify = false
+ return true
+
+ }
+ return false
+ })
+ if(!isVerify)return
const stockInData = {
...form.value,
- inboundTime: formatDateTime(form.value.inboundTime),
+ inboundTime: formatDateTime(),
nickName: userStore.nickName,
details: selectedRows.value.map(product => ({
id: product.id,
inboundQuantity: Number(product.quantityStock),
- taxInclusiveUnitPrice: Number(product.taxInclusiveUnitPrice),
- taxInclusiveTotalPrice: Number(product.taxInclusiveTotalPrice)
+ unitPrice: Number(product.taxInclusiveUnitPrice),
+ taxInclusiveTotalPrice: Number(product.taxInclusiveTotalPrice),
+ boxNum: Number(product.boxNum),
+ cartonSpecifications: product.cartonSpecifications,
+ dollarPrice: Number(product.dollarPrice)
+
})),
};
loading.value = true
--
Gitblit v1.9.3