From 0299e8928340b844552c33751df1ffd2cc34b208 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 29 一月 2026 17:00:44 +0800
Subject: [PATCH] 增加碳立方-磅单页面
---
src/views/salesOutbound/components/formDia.vue | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/src/views/salesOutbound/components/formDia.vue b/src/views/salesOutbound/components/formDia.vue
index b210c91..57a030d 100644
--- a/src/views/salesOutbound/components/formDia.vue
+++ b/src/views/salesOutbound/components/formDia.vue
@@ -20,7 +20,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="瀹㈡埛" prop="customerId">
- <el-select v-model="form.customerId" placeholder="璇烽�夋嫨瀹㈡埛" :disabled="operationType === 'view'">
+ <el-select v-model="form.customerId" placeholder="璇烽�夋嫨瀹㈡埛" :disabled="operationType === 'view'" filterable>
<el-option
v-for="item in customerOptions"
:key="item.value"
@@ -33,13 +33,13 @@
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="鐓ょ" prop="coalId">
- <el-select v-model="form.coalId" placeholder="璇烽�夋嫨鐓ょ" @change="setInfo" :disabled="operationType === 'view'">
+ <el-form-item label="鐓ょ" prop="stockId">
+ <el-select v-model="form.stockId" placeholder="璇烽�夋嫨鐓ょ" @change="setInfo" :disabled="operationType === 'view'" filterable>
<el-option
v-for="item in coalOptions"
- :key="item.coalId"
+ :key="item.id"
:label="item.coal"
- :value="item.coalId"
+ :value="item.id"
/>
</el-select>
</el-form-item>
@@ -53,7 +53,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="搴撳瓨鏁伴噺" prop="inventoryQuantity">
- <el-input v-model="form.inventoryQuantity" placeholder="璇疯緭鍏ラ攢鍞暟閲�" maxlength="30" type="number" :disabled="operationType === 'view'"/>
+ <el-input v-model="form.inventoryQuantity" placeholder="璇疯緭鍏ラ攢鍞暟閲�" maxlength="30" type="number" :disabled="true"/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -117,8 +117,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="娣诲姞鑷冲緟琛ュ簱" prop="isPendingRestock">
- <el-select v-model="form.isPendingRestock" placeholder="">
+ <el-form-item label="娣诲姞鑷冲緟琛ュ簱" prop="isAdd">
+ <el-select v-model="form.isAdd" placeholder="璇烽�夋嫨鏄惁闇�瑕佸緟琛ュ簱" :disabled="operationType === 'view'">
<el-option label="鏄�" :value="true" />
<el-option label="鍚�" :value="false" />
</el-select>
@@ -152,6 +152,7 @@
form: {
saleDate: '',
customerId: '',
+ stockId: '',
coalId: '',
unit: '',
saleQuantity: '',
@@ -165,12 +166,12 @@
inventoryQuantity: '',
priceIncludingTax: '',
salesFreight: '',
- isPendingRestock: false
+ isAdd: false
},
rules: {
saleDate: [{ required: true, message: "璇烽�夋嫨鏃ユ湡", trigger: "change" },],
customerId: [{ required: true, message: "璇烽�夋嫨瀹㈡埛", trigger: "change" },],
- coalId: [{ required: true, message: "璇烽�夋嫨鐓ょ", trigger: "change" },],
+ stockId: [{ required: true, message: "璇烽�夋嫨鐓ょ", trigger: "change" },],
unit: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" },],
saleQuantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" },],
salePrice: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" },],
@@ -182,7 +183,7 @@
netProfit: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" },],
inventoryQuantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" },],
priceIncludingTax: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" },],
- isPendingRestock: [{ required: true, message: "璇烽�夋嫨鏄惁娣诲姞鑷冲緟琛ュ簱", trigger: "change" },],
+ isAdd: [{ required: true, message: "璇烽�夋嫨鏄惁娣诲姞鑷冲緟琛ュ簱", trigger: "change" },],
}
})
@@ -190,6 +191,11 @@
// 鎵撳紑寮规
const openDialog = async (type, row) => {
+ if(type === 'add'){
+ form.value = {}
+ }else{
+ form.value = {...row}
+ }
operationType.value = type
dialogVisitable.value = true
form.value.saleDate = proxy.getCurrentDate()
@@ -203,14 +209,17 @@
value: item.id,
label: item.customerName,
}));
+
let res = await userStore.getInfo()
form.value.registrantId = res.user.userId
form.value.taxCoal = 13
form.value.taxTrans = 9
form.value.purchasingFreight = 20
form.value.salesFreight = 0
+ form.value.isAdd = false
if (type !== 'add') {
- form.value = {...row}
+ form.value = {...row,
+ }
}
}
// 澶嶅埗鐓ょ鐩稿叧淇℃伅
@@ -220,16 +229,18 @@
form.value.inventoryQuantity = coalOptions.value[index].inventoryQuantity
form.value.priceIncludingTax = coalOptions.value[index].priceIncludingTax
form.value.unit = coalOptions.value[index].unit
+ form.value.coalId = coalOptions.value[index].coalId
}
if (!val) {
form.value.inventoryQuantity = ''
form.value.priceIncludingTax = ''
form.value.unit = ''
+ form.value.coalId = ''
}
}
// 璁＄畻
const mathProfit = () => {
- form.value.totalAmount = form.value.saleQuantity * form.value.salePrice
+ form.value.totalAmount = Math.round(form.value.saleQuantity * form.value.salePrice)
// 杈撳叆鏁版嵁
const purchaseTons = form.value.inventoryQuantity; // 搴撳瓨鏁伴噺
const saleTons = form.value.saleQuantity; // 閿�鍞暟閲�
--
Gitblit v1.9.3