From e200b8192f3c9d34645faec0013518f6b70722df Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 05 一月 2026 11:47:17 +0800
Subject: [PATCH] 海川开心： 1.销售管理、仓储物流一些字段赋默认值 2.生产报工改成可以多个报工
---
src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue | 44 ++++++++++++++++++--------------------------
1 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue b/src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue
index 682c5c9..43a7760 100644
--- a/src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue
+++ b/src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue
@@ -65,22 +65,17 @@
/>
</template>
</el-table-column>
-<!-- <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="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="taxInclusiveTotalPrice" -->
-<!-- width="150" -->
-<!-- >-->
-<!-- </el-table-column>-->
+ <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="taxInclusiveTotalPrice"
+ width="150"
+ >
+ </el-table-column>
<el-table-column label="鎿嶄綔" width="80" v-if="operationType === 'add'">
<template #default="scope">
<el-button type="danger" size="small" @click="removeProductRow(scope.$index)">鍒犻櫎</el-button>
@@ -104,6 +99,7 @@
addStockInCustom,
updateStockInCustom,
} from "@/api/inventoryManagement/stockIn.js";
+import { getCurrentDate } from "@/utils/index.js";
const userStore = useUserStore()
const { proxy } = getCurrentInstance()
@@ -132,9 +128,6 @@
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
}
-function getCurrentDate() {
- return formatDateTime(new Date(), false);
-}
const itemTypeOptions = [
{ label: '鐗╂枡', value: '鐗╂枡' },
@@ -171,12 +164,12 @@
id: null,
productCategory: '',
specificationModel: '',
- unit: '',
+ unit: '涓�',
supplierName: form.value.supplierName || '',
- itemType: '',
+ itemType: '鐗╂枡',
inboundNum: 0,
- inboundDate: '',
- quantityStock: 0,
+ inboundDate: getCurrentDate(), // 榛樿褰撳ぉ鏃ユ湡
+ // quantityStock: 0,
taxInclusiveUnitPrice: 0,
taxInclusiveTotalPrice: 0,
taxRate: null,
@@ -191,8 +184,8 @@
// 璁＄畻鎬讳环锛堟牴鎹暟閲忋�佸崟浠峰拰鍚◣鍗曚环锛�
const calculateTotalPrice = (row) => {
- // 璁＄畻鏅�氭�讳环锛歲uantityStock * taxInclusiveUnitPrice
- const quantity = Number(row.quantityStock || 0);
+ // 璁＄畻鏅�氭�讳环锛歩nboundNum * taxInclusiveUnitPrice
+ const quantity = Number(row.inboundNum || 0);
const taxInclusiveUnitPrice = Number(row.taxInclusiveUnitPrice || 0);
row.taxInclusiveTotalPrice = quantity * taxInclusiveUnitPrice;
calculateExclusivePrice(row);
@@ -314,7 +307,6 @@
itemType: row?.itemType ?? '',
inboundNum: Number(row?.inboundNum ?? row?.inboundQuantity ?? 0),
inboundDate: row?.inboundDate ?? row?.createTime ?? '',
- quantityStock: Number(row?.quantityStock ?? 0),
taxRate: Number(row?.taxRate ?? 0),
taxInclusiveUnitPrice: Number(row?.taxInclusiveUnitPrice ?? 0),
taxInclusiveTotalPrice: Number(row?.taxInclusiveTotalPrice ?? 0),
--
Gitblit v1.9.3