From 2c9fbc6f1a3ccd1418efa9c348ec12faf1ab3258 Mon Sep 17 00:00:00 2001
From: zhang_12370 <z2864490065@outlook.com>
Date: 星期三, 23 七月 2025 16:33:06 +0800
Subject: [PATCH] 1、完善表格逻辑 2、完善配煤计算器 3、完善设备管理 4、完善采购管理
---
src/views/procureMent/components/ProductionDialog.vue | 382 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 240 insertions(+), 142 deletions(-)
diff --git a/src/views/procureMent/components/ProductionDialog.vue b/src/views/procureMent/components/ProductionDialog.vue
index 5a0f8a9..859cbea 100644
--- a/src/views/procureMent/components/ProductionDialog.vue
+++ b/src/views/procureMent/components/ProductionDialog.vue
@@ -16,86 +16,124 @@
label-position="right"
style="max-width: 400px; margin: 0 auto"
>
- <el-form-item label="渚涘簲鍟嗗悕绉�" prop="supplierName">
- <el-input v-model="form.supplierName" placeholder="璇疯緭鍏�" />
+ <el-form-item label="渚涘簲鍟嗗悕绉�" prop="supplierId">
+ <el-select
+ v-model="form.supplierId"
+ placeholder="璇烽�夋嫨渚涘簲鍟�"
+ :disabled="isViewMode"
+ >
+ <el-option
+ :label="item.label"
+ v-for="item in supplyList"
+ :key="item.value"
+ :value="item.value"
+ />
+ </el-select>
</el-form-item>
- <el-form-item label="鐓ょ" prop="coal">
- <el-select v-model="form.coal" placeholder="璇烽�夋嫨鐓ょ" clearable style="width: 100%">
- <el-option label="鐦︾叅" value="鐦︾叅" />
- <el-option label="姘旂叅" value="姘旂叅" />
- <el-option label="鏃犵儫鐓�" value="鏃犵儫鐓�" />
- <el-option label="闀跨劙鐓�" value="闀跨劙鐓�" />
- <el-option label="璐叅" value="璐叅" />
- </el-select>
- </el-form-item>
- <el-form-item label="鍗曚綅" prop="unit">
- <el-select v-model="form.unit" placeholder="璇烽�夋嫨鍗曚綅" clearable style="width: 100%">
- <el-option label="鍚�" value="鍚�" />
- <el-option label="鍗冨厠" value="鍗冨厠" />
- </el-select>
- </el-form-item> <el-form-item label="閲囪喘鏁伴噺" prop="purchaseQuantity">
- <el-input
- v-model.number="form.purchaseQuantity"
+ <el-form-item label="鐓ょ" prop="coalId">
+ <el-select
+ v-model="form.coalId"
+ placeholder="璇烽�夋嫨鐓ょ"
+ :disabled="isViewMode"
+ >
+ <el-option
+ :label="item.label"
+ v-for="item in coalList"
+ :key="item.value"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="閲囪喘鏁伴噺" prop="purchaseQuantity">
+ <el-input
+ v-model.number="form.purchaseQuantity"
placeholder="璇疯緭鍏�"
@blur="handleQuantityBlur"
+ :disabled="isViewMode"
>
<template v-slot:suffix>
- <i style="font-style:normal;">{{form.unit?form.unit:''}}</i>
- </template>
+ <i style="font-style: normal">鍚�</i>
+ </template>
</el-input>
- </el-form-item><el-form-item label="绋庣巼" prop="taxRate">
- <el-input
- v-model.number="form.taxRate"
+ </el-form-item>
+ <el-form-item label="绋庣巼" prop="taxRate">
+ <el-input
+ v-model.number="form.taxRate"
placeholder="璇疯緭鍏ョ◣鐜�"
@blur="handleTaxRateBlur"
+ :disabled="isViewMode"
>
<template v-slot:suffix>
- <i style="font-style:normal;">%</i>
- </template>
- </el-input>
+ <i style="font-style: normal">%</i>
+ </template>
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鍗曚环(鍚◣)" prop="priceIncludingTax">
+ <el-input
+ v-model.number="form.priceIncludingTax"
+ placeholder="璇疯緭鍏ュ惈绋庡崟浠�"
+ @blur="handlePriceBlur"
+ :disabled="isViewMode"
+ >
+ <template v-slot:suffix>
+ <i style="font-style: normal">鍏�</i>
+ </template>
+ </el-input>
</el-form-item>
<el-form-item label="鍗曚环(涓嶅惈绋�)" prop="priceExcludingTax">
- <el-input
- v-model.number="form.priceExcludingTax"
- placeholder="璇疯緭鍏�"
- @blur="handlePriceBlur"
+ <el-input
+ v-model.number="form.priceExcludingTax"
+ placeholder="鑷姩璁＄畻"
+ disabled
>
<template v-slot:suffix>
- <i style="font-style:normal;">鍏�</i>
- </template>
- </el-input>
- </el-form-item> <el-form-item label="鍗曚环(鍚◣)" prop="priceIncludingTax">
- <el-input
- v-model.number="form.priceIncludingTax"
- placeholder="鑷姩璁＄畻"
- >
- <template v-slot:suffix>
- <i style="font-style:normal;">鍏�</i>
- </template>
+ <i style="font-style: normal">鍏�</i>
+ </template>
</el-input>
</el-form-item>
<el-form-item label="鎬讳环(涓嶅惈绋�)" prop="totalPriceExcludingTax">
- <el-input
+ <el-input
v-model.number="form.totalPriceExcludingTax"
- placeholder="鑷姩璁＄畻"
+ placeholder="鑷姩璁＄畻"
+ disabled
>
<template v-slot:suffix>
- <i style="font-style:normal;">鍏�</i>
- </template>
+ <i style="font-style: normal">鍏�</i>
+ </template>
</el-input>
</el-form-item>
<el-form-item label="鎬讳环(鍚◣)" prop="totalPriceIncludingTax">
- <el-input
+ <el-input
v-model.number="form.totalPriceIncludingTax"
- placeholder="鑷姩璁＄畻"
+ placeholder="鑷姩璁＄畻"
+ disabled
>
<template v-slot:suffix>
- <i style="font-style:normal;">鍏�</i>
- </template>
+ <i style="font-style: normal">鍏�</i>
+ </template>
+ </el-input>
+ </el-form-item>
+ <el-form-item label="杩愯垂" prop="freight">
+ <!-- 榛樿涓�0 -->
+ <el-input
+ type="number"
+ :precision="2"
+ v-model.number="form.freight"
+ placeholder="璇疯緭鍏ヨ繍璐�"
+ :disabled="isViewMode"
+ >
+ <template v-slot:suffix>
+ <i style="font-style: normal">鍏�</i>
+ </template>
</el-input>
</el-form-item>
<el-form-item label="鐧昏浜�" prop="registrantId">
- <el-input v-model="form.registrantId" disabled placeholder="璇疯緭鍏�" />
+ <el-input
+ :value="match(form.registrantId)"
+ v-model.number="form.registrantId"
+ disabled
+ placeholder="璇疯緭鍏�"
+ />
</el-form-item>
<el-form-item label="鐧昏鏃ユ湡" prop="registrationDate">
<el-date-picker
@@ -113,15 +151,15 @@
<!-- 閲嶇疆鍜屽彇娑� -->
<el-button
@click="handleClose"
- v-if="title.includes('鏂板')"
- >鍙栨秷</el-button
+ v-if="title.includes('鏂板') || title.includes('鏌ョ湅')"
+ >鍙栨秷
+ </el-button>
+ <el-button @click="handleReset" v-if="title.includes('缂栬緫')"
+ >閲嶇疆
+ </el-button>
+ <el-button type="primary" v-if="!isViewMode" @click="handleSubmit"
+ >纭</el-button
>
- <el-button
- @click="handleReset"
- v-if="title.includes('缂栬緫')"
- >閲嶇疆</el-button
- >
- <el-button type="primary" @click="handleSubmit">纭</el-button>
</div>
</template>
</el-dialog>
@@ -129,10 +167,11 @@
</template>
<script setup name="ProductionDialog">
-import { ref, defineProps, watch, onMounted, nextTick, computed } from "vue";
+import { ref, defineProps, watch, onMounted, nextTick, computed } from "vue";
import { ElMessage } from "element-plus";
-import useUserStore from '@/store/modules/user'
-import {addOrEditPR} from "@/api/procureMent";
+import useUserStore from "@/store/modules/user";
+import { addOrEditPR, getSupplyList, getCoalInfoList } from "@/api/procureMent";
+
const props = defineProps({
title: {
type: String,
@@ -152,111 +191,172 @@
required: true,
type: Object,
});
+const supplyList = ref([]);
+const coalList = ref([]);
+const isViewMode = computed(() => props.title.includes("鏌ョ湅"));
+// 鑾峰彇渚涘簲鍟嗕笅鎷夊拰鐓ょ涓嬫媺
+const getDropdownData = async () => {
+ try {
+ const [supplyRes, coalRes] = await Promise.all([
+ getSupplyList(),
+ getCoalInfoList(),
+ ]);
+ let supplyData = supplyRes.data;
+ let coalData = coalRes.data;
+ supplyList.value = supplyData.map((item) => ({
+ value: item.id,
+ label: item.supplierName,
+ }));
+ coalList.value = coalData.map((item) => ({
+ value: item.id,
+ label: item.coal,
+ }));
+ } catch (error) {
+ ElMessage.error("鑾峰彇涓嬫媺鏁版嵁澶辫触锛岃绋嶅悗閲嶈瘯");
+ }
+};
+defineExpose({
+ getDropdownData,
+});
+// 鏁板�兼牸寮忓寲宸ュ叿鍑芥暟
const toFixed = (num, precision = 2) => {
- if (isNaN(num) || num === null || num === undefined || num === '') {
+ if (isNaN(num) || num === null || num === undefined || num === "") {
return 0;
}
- return Math.floor(parseFloat(num) * Math.pow(10, precision)) / Math.pow(10, precision);
+ return Number(
+ (
+ Math.floor(parseFloat(num) * Math.pow(10, precision)) /
+ Math.pow(10, precision)
+ ).toFixed(precision)
+ );
};
-// 鍚◣鍗曚环璁＄畻
-const unitPriceWithTax = computed(() => {
- const priceExcludingTax = parseFloat(form.value.priceExcludingTax) || 0;
- const taxRate = parseFloat(form.value.taxRate) || 0;
- if (!priceExcludingTax || !taxRate) {
- return 0;
- }
- const result = priceExcludingTax * (1 + taxRate / 100);
- return toFixed(result, 2);
-});
-// 鍚◣鎬讳环璁＄畻
-const totalUnitPriceWithTax = computed(() => {
- const priceExcludingTax = parseFloat(form.value.priceExcludingTax) || 0;
- const taxRate = parseFloat(form.value.taxRate) || 0;
- const purchaseQuantity = parseFloat(form.value.purchaseQuantity) || 0;
-
- if (!priceExcludingTax || !taxRate || !purchaseQuantity) {
- return 0;
- }
-
- const unitPriceWithTaxValue = priceExcludingTax * (1 + taxRate / 100);
- const result = unitPriceWithTaxValue * purchaseQuantity;
- return toFixed(result, 2);
-});
+// 瀹夊叏鑾峰彇鏁板��
+const safeNumber = (value) => {
+ const num = parseFloat(value);
+ return isNaN(num) ? 0 : num;
+};
-// 涓嶅惈绋庢�讳环璁＄畻
-const taxExclusiveTotalPrice = computed(() => {
- const purchaseQuantity = parseFloat(form.value.purchaseQuantity) || 0;
- const priceExcludingTax = parseFloat(form.value.priceExcludingTax) || 0;
-
- if (!purchaseQuantity || !priceExcludingTax) {
- return 0;
- }
-
- const result = purchaseQuantity * priceExcludingTax;
- return toFixed(result, 2);
-});
+// 璁＄畻閫昏緫 - 鍩轰簬鍚◣鍗曚环璁＄畻涓嶅惈绋庝环鏍�
+const calculatePrices = () => {
+ const priceIncludingTax = safeNumber(form.value.priceIncludingTax); // 鍚◣鍗曚环
+ const taxRate = safeNumber(form.value.taxRate); // 绋庣巼
+ const quantity = safeNumber(form.value.purchaseQuantity); // 閲囪喘鏁伴噺
-// 鐩戝惉璁＄畻鍊煎彉鍖栵紝鍚屾鍒� form 瀵硅薄涓�
-watch(unitPriceWithTax, (newValue) => {
- form.value.priceIncludingTax = newValue;
-});
+ // 1. 鏍规嵁鍚◣鍗曚环鍜岀◣鐜囪绠椾笉鍚◣鍗曚环
+ // 涓嶅惈绋庡崟浠� = 鍚◣鍗曚环 / (1 + 绋庣巼/100)
+ const priceExcludingTax =
+ priceIncludingTax && taxRate
+ ? parseFloat((priceIncludingTax / (1 + taxRate / 100)).toFixed(2))
+ : 0;
-watch(totalUnitPriceWithTax, (newValue) => {
- form.value.totalPriceIncludingTax = newValue;
-});
+ // 2. 璁＄畻涓嶅惈绋庢�讳环 = 涓嶅惈绋庡崟浠� 脳 鏁伴噺
+ const totalPriceExcludingTax =
+ priceExcludingTax && quantity
+ ? toFixed(priceExcludingTax * quantity, 2)
+ : 0;
-watch(taxExclusiveTotalPrice, (newValue) => {
- form.value.totalPriceExcludingTax = newValue;
-});
+ // 3. 璁＄畻鍚◣鎬讳环 = 鍚◣鍗曚环 脳 鏁伴噺
+ const totalPriceIncludingTax =
+ priceIncludingTax && quantity
+ ? toFixed(priceIncludingTax * quantity, 2)
+ : 0;
-const userStore = useUserStore()
+ // 淇濊瘉鏄剧ず涓轰袱浣嶅皬鏁帮紙濡�88.5鏄剧ず涓�88.50锛�
+ form.value.priceExcludingTax = priceExcludingTax.toFixed(2);
+ form.value.totalPriceExcludingTax = totalPriceExcludingTax;
+ form.value.totalPriceIncludingTax = totalPriceIncludingTax;
+};
+
+// 鐩戝惉琛ㄥ崟瀵硅薄鍙樺寲锛岀敤浜庡鐞嗙紪杈戞ā寮忎笅鐨勬暟鎹姞杞藉拰瀹炴椂璁＄畻
+watch(
+ () => [
+ form.value.priceIncludingTax,
+ form.value.taxRate,
+ form.value.purchaseQuantity,
+ ],
+ () => {
+ // 闃叉姈澶勭悊锛岄伩鍏嶉绻佽绠�
+ nextTick(() => {
+ calculatePrices();
+ });
+ },
+ { deep: true }
+);
+
+const userStore = useUserStore();
const userInfo = ref({});
-
-// 澶勭悊绋庣巼杈撳叆妗嗗け鐒︼紝纭繚绮惧害
+const match = () => {
+ return userInfo.value.nickName || "鏈煡鐢ㄦ埛";
+};
+// 澶勭悊绋庣巼杈撳叆妗嗗け鐒︿簨浠�
const handleTaxRateBlur = () => {
- if (form.value.taxRate !== null && form.value.taxRate !== undefined && form.value.taxRate !== '') {
+ if (
+ form.value.taxRate !== null &&
+ form.value.taxRate !== undefined &&
+ form.value.taxRate !== ""
+ ) {
form.value.taxRate = toFixed(parseFloat(form.value.taxRate), 2);
+ // watch 浼氳嚜鍔ㄨЕ鍙� calculatePrices锛屼笉闇�瑕佹墜鍔ㄨ皟鐢�
}
};
-// 澶勭悊涓嶅惈绋庡崟浠疯緭鍏ユ澶辩劍锛岀‘淇濈簿搴�
+// 澶勭悊鍚◣鍗曚环杈撳叆妗嗗け鐒︿簨浠�
const handlePriceBlur = () => {
- if (form.value.priceExcludingTax !== null && form.value.priceExcludingTax !== undefined && form.value.priceExcludingTax !== '') {
- form.value.priceExcludingTax = toFixed(parseFloat(form.value.priceExcludingTax), 2);
+ if (
+ form.value.priceIncludingTax !== null &&
+ form.value.priceIncludingTax !== undefined &&
+ form.value.priceIncludingTax !== ""
+ ) {
+ form.value.priceIncludingTax = toFixed(
+ parseFloat(form.value.priceIncludingTax),
+ 2
+ );
+ // watch 浼氳嚜鍔ㄨЕ鍙� calculatePrices锛屼笉闇�瑕佹墜鍔ㄨ皟鐢�
}
};
-// 澶勭悊閲囪喘鏁伴噺杈撳叆妗嗗け鐒︼紝纭繚绮惧害
+// 澶勭悊閲囪喘鏁伴噺杈撳叆妗嗗け鐒︿簨浠�
const handleQuantityBlur = () => {
- if (form.value.purchaseQuantity !== null && form.value.purchaseQuantity !== undefined && form.value.purchaseQuantity !== '') {
- form.value.purchaseQuantity = toFixed(parseFloat(form.value.purchaseQuantity), 3); // 鏁伴噺淇濈暀3浣嶅皬鏁�
+ if (
+ form.value.purchaseQuantity !== null &&
+ form.value.purchaseQuantity !== undefined &&
+ form.value.purchaseQuantity !== ""
+ ) {
+ form.value.purchaseQuantity = toFixed(
+ parseFloat(form.value.purchaseQuantity),
+ 3
+ ); // 鏁伴噺淇濈暀3浣嶅皬鏁�
+ // watch 浼氳嚜鍔ㄨЕ鍙� calculatePrices锛屼笉闇�瑕佹墜鍔ㄨ皟鐢�
}
};
onMounted(async () => {
- let res = await userStore.getInfo()
- userInfo.value = res;
-})
+ let res = await userStore.getInfo();
+ userInfo.value = res.user;
+ await getDropdownData();
+ // 缁勪欢鍔犺浇瀹屾垚鍚庤Е鍙戜竴娆¤绠�
+ calculatePrices();
+});
const rules = {
supplierName: [
{ required: true, message: "璇疯緭鍏ヤ緵搴斿晢鍚嶇О", trigger: "blur" },
],
coal: [{ required: true, message: "璇疯緭鍏ョ叅绉�", trigger: "blur" }],
- unit: [{ required: true, message: "璇疯緭鍏ュ崟浣�", trigger: "blur" }],
purchaseQuantity: [
{ required: true, message: "璇疯緭鍏ラ噰璐暟閲�", trigger: "blur" },
{ type: "number", message: "閲囪喘鏁伴噺蹇呴』涓烘暟瀛�", trigger: "blur" },
],
- priceExcludingTax: [{ required: true, message: "璇疯緭鍏ュ崟浠�", trigger: "blur" }],
- totalPriceExcludingTax: [{ required: true, message: "璇疯緭鍏ユ�讳环", trigger: "blur" }],
- priceIncludingTax: [{ required: true, message: "璇疯緭鍏ュ惈绋庡崟浠�", trigger: "blur" }],
- totalPriceIncludingTax: [{ required: true, message: "璇疯緭鍏ュ惈绋庢�讳环", trigger: "blur" }],
- taxRate: [{ required: true, message: "璇疯緭鍏ョ◣鐜�", trigger: "blur" }],
- registrantId: [{ required: true, message: "璇疯緭鍏ョ櫥璁颁汉", trigger: "blur" }],
- registrationDate: [
- { required: true, message: "璇烽�夋嫨鐧昏鏃ユ湡", trigger: "change" },
+ priceExcludingTax: [
+ { required: true, message: "璇疯緭鍏ュ崟浠�", trigger: "blur" },
+ ],
+ priceIncludingTax: [
+ { required: true, message: "璇疯緭鍏ュ惈绋庡崟浠�", trigger: "blur" },
+ ],
+ taxRate: [
+ { required: true, message: "璇疯緭鍏ョ◣鐜�", trigger: "blur" },
+ { type: "number", message: "绋庣巼蹇呴』涓烘暟瀛�", trigger: "blur" },
],
};
// 鍏抽棴寮圭獥
@@ -275,30 +375,29 @@
const formRef = ref(null);
// 鎻愪氦琛ㄥ崟
const handleSubmit = async () => {
- console.log("鎻愪氦琛ㄥ崟", form.value);
if (!formRef.value) return;
await formRef.value.validate(async (valid) => {
if (valid) {
const obj = ref({});
- if (props.title.includes('鏂板')) {
+ if (props.title.includes("鏂板")) {
let result = await addOrEditPR({
...form.value,
- })
+ });
obj.value = {
title: "鏂板",
...form.value,
- result
+ result,
};
} else {
- delete form.value.updateTime
- delete form.value.createTime
+ delete form.value.updateTime;
+ delete form.value.createTime;
let result = await addOrEditPR({
...form.value,
- })
+ });
obj.value = {
title: "缂栬緫",
...form.value,
- result
+ result,
};
}
emit("submit", obj.value);
@@ -307,5 +406,4 @@
};
</script>
-<style lang="sass" scoped>
-</style>
\ No newline at end of file
+<style lang="scss" scoped></style>
--
Gitblit v1.9.3