From df1406d0f571972d033dffd6a93fb4b94febeb56 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 24 六月 2025 16:46:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/procureMent/components/ProductionDialog.vue | 160 +++++++++++++++++++++++++----------------------------
1 files changed, 75 insertions(+), 85 deletions(-)
diff --git a/src/views/procureMent/components/ProductionDialog.vue b/src/views/procureMent/components/ProductionDialog.vue
index e420fbe..3c03cbb 100644
--- a/src/views/procureMent/components/ProductionDialog.vue
+++ b/src/views/procureMent/components/ProductionDialog.vue
@@ -1,57 +1,48 @@
<template>
<div>
<el-dialog
- v-model="dialogFormVisible"
- :title="title"
- width="600"
- :close-on-click-modal="false"
- @close="handleClose"
+ v-model="dialogFormVisible"
+ :title="title"
+ width="600"
+ :close-on-click-modal="false"
+ @close="handleClose"
>
<el-form
- ref="formRef"
- :model="form"
- :rules="rules"
- label-width="auto"
- class="production-form"
- label-position="right"
- style="max-width: 400px; margin: 0 auto"
+ ref="formRef"
+ :model="form"
+ :rules="rules"
+ label-width="auto"
+ class="production-form"
+ label-position="right"
+ style="max-width: 400px; margin: 0 auto"
>
<el-form-item label="渚涘簲鍟嗗悕绉�" prop="supplierId">
<el-select v-model="form.supplierId" placeholder="璇烽�夋嫨渚涘簲鍟�">
- <el-option :label="item.label" v-for="item in supplyList" :key="item.value" :value="item.value" />
+ <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="coalId">
<el-select v-model="form.coalId" placeholder="璇烽�夋嫨鐓ょ">
- <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="unit">
- <el-select
- v-model="form.unit"
- placeholder="璇烽�夋嫨鍗曚綅"
- clearable
- style="width: 100%"
- >
- <el-option label="鍚�" value="鍚�" />
- <el-option label="鍗冨厠" value="鍗冨厠" />
+ <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"
+ v-model.number="form.purchaseQuantity"
+ placeholder="璇疯緭鍏�"
+ @blur="handleQuantityBlur"
>
<template v-slot:suffix>
- <i style="font-style: normal">{{ form.unit ? form.unit : "" }}</i>
+ <i style="font-style: normal">鍚�</i>
</template>
- </el-input> </el-form-item
- ><el-form-item label="绋庣巼" prop="taxRate">
+ </el-input>
+ </el-form-item
+ >
+ <el-form-item label="绋庣巼" prop="taxRate">
<el-input
- v-model.number="form.taxRate"
- placeholder="璇疯緭鍏ョ◣鐜�"
- @blur="handleTaxRateBlur"
+ v-model.number="form.taxRate"
+ placeholder="璇疯緭鍏ョ◣鐜�"
+ @blur="handleTaxRateBlur"
>
<template v-slot:suffix>
<i style="font-style: normal">%</i>
@@ -60,9 +51,9 @@
</el-form-item>
<el-form-item label="鍗曚环(涓嶅惈绋�)" prop="priceExcludingTax">
<el-input
- v-model.number="form.priceExcludingTax"
- placeholder="璇疯緭鍏�"
- @blur="handlePriceBlur"
+ v-model.number="form.priceExcludingTax"
+ placeholder="璇疯緭鍏�"
+ @blur="handlePriceBlur"
>
<template v-slot:suffix>
<i style="font-style: normal">鍏�</i>
@@ -71,8 +62,8 @@
</el-form-item>
<el-form-item label="鍗曚环(鍚◣)" prop="priceIncludingTax">
<el-input
- v-model.number="form.priceIncludingTax"
- placeholder="鑷姩璁＄畻"
+ v-model.number="form.priceIncludingTax"
+ placeholder="鑷姩璁＄畻"
>
<template v-slot:suffix>
<i style="font-style: normal">鍏�</i>
@@ -81,8 +72,8 @@
</el-form-item>
<el-form-item label="鎬讳环(涓嶅惈绋�)" prop="totalPriceExcludingTax">
<el-input
- v-model.number="form.totalPriceExcludingTax"
- placeholder="鑷姩璁＄畻"
+ v-model.number="form.totalPriceExcludingTax"
+ placeholder="鑷姩璁＄畻"
>
<template v-slot:suffix>
<i style="font-style: normal">鍏�</i>
@@ -91,8 +82,8 @@
</el-form-item>
<el-form-item label="鎬讳环(鍚◣)" prop="totalPriceIncludingTax">
<el-input
- v-model.number="form.totalPriceIncludingTax"
- placeholder="鑷姩璁＄畻"
+ v-model.number="form.totalPriceIncludingTax"
+ placeholder="鑷姩璁＄畻"
>
<template v-slot:suffix>
<i style="font-style: normal">鍏�</i>
@@ -100,16 +91,16 @@
</el-input>
</el-form-item>
<el-form-item label="鐧昏浜�" prop="registrantId">
- <el-input v-model="form.registrantId" disabled placeholder="璇疯緭鍏�" />
+ <el-input v-model="form.registrantId" disabled placeholder="璇疯緭鍏�"/>
</el-form-item>
<el-form-item label="鐧昏鏃ユ湡" prop="registrationDate">
<el-date-picker
- disabled
- v-model="form.registrationDate"
- type="date"
- placeholder="YYYY-MM-DD"
- style="width: 100%"
- value-format="YYYY-MM-DD"
+ disabled
+ v-model="form.registrationDate"
+ type="date"
+ placeholder="YYYY-MM-DD"
+ style="width: 100%"
+ value-format="YYYY-MM-DD"
/>
</el-form-item>
</el-form>
@@ -117,10 +108,12 @@
<div class="dialog-footer">
<!-- 閲嶇疆鍜屽彇娑� -->
<el-button @click="handleClose" v-if="title.includes('鏂板')"
- >鍙栨秷</el-button
+ >鍙栨秷
+ </el-button
>
<el-button @click="handleReset" v-if="title.includes('缂栬緫')"
- >閲嶇疆</el-button
+ >閲嶇疆
+ </el-button
>
<el-button type="primary" @click="handleSubmit">纭</el-button>
</div>
@@ -130,12 +123,11 @@
</template>
<script setup name="ProductionDialog">
-import { ref, defineProps, watch, onMounted, nextTick, computed } from "vue";
-import { ElMessage } from "element-plus";
+import {ref, defineProps, watch, onMounted, nextTick, computed} from "vue";
+import {ElMessage} from "element-plus";
import useUserStore from "@/store/modules/user";
-import { addOrEditPR,getSupplyList, getCoalInfoList } from "@/api/procureMent";
-import { getSupply } from "@/api/basicInformation/supplier";
-import { getCoalInfo } from "@/api/basicInformation/coal";
+import {addOrEditPR, getSupplyList, getCoalInfoList} from "@/api/procureMent";
+
const props = defineProps({
title: {
type: String,
@@ -164,7 +156,6 @@
getSupplyList(),
getCoalInfoList(),
]);
- console.log(supplyRes, coalRes);
let supplyData = supplyRes.data;
let coalData = coalRes.data;
supplyList.value = supplyData.map((item) => ({
@@ -188,8 +179,8 @@
return 0;
}
return (
- Math.floor(parseFloat(num) * Math.pow(10, precision)) /
- Math.pow(10, precision)
+ Math.floor(parseFloat(num) * Math.pow(10, precision)) /
+ Math.pow(10, precision)
);
};
// 鍚◣鍗曚环璁＄畻
@@ -250,9 +241,9 @@
// 澶勭悊绋庣巼杈撳叆妗嗗け鐒︼紝纭繚绮惧害
const handleTaxRateBlur = () => {
if (
- form.value.taxRate !== null &&
- form.value.taxRate !== undefined &&
- form.value.taxRate !== ""
+ form.value.taxRate !== null &&
+ form.value.taxRate !== undefined &&
+ form.value.taxRate !== ""
) {
form.value.taxRate = toFixed(parseFloat(form.value.taxRate), 2);
}
@@ -261,13 +252,13 @@
// 澶勭悊涓嶅惈绋庡崟浠疯緭鍏ユ澶辩劍锛岀‘淇濈簿搴�
const handlePriceBlur = () => {
if (
- form.value.priceExcludingTax !== null &&
- form.value.priceExcludingTax !== undefined &&
- form.value.priceExcludingTax !== ""
+ form.value.priceExcludingTax !== null &&
+ form.value.priceExcludingTax !== undefined &&
+ form.value.priceExcludingTax !== ""
) {
form.value.priceExcludingTax = toFixed(
- parseFloat(form.value.priceExcludingTax),
- 2
+ parseFloat(form.value.priceExcludingTax),
+ 2
);
}
};
@@ -275,13 +266,13 @@
// 澶勭悊閲囪喘鏁伴噺杈撳叆妗嗗け鐒︼紝纭繚绮惧害
const handleQuantityBlur = () => {
if (
- form.value.purchaseQuantity !== null &&
- form.value.purchaseQuantity !== undefined &&
- form.value.purchaseQuantity !== ""
+ form.value.purchaseQuantity !== null &&
+ form.value.purchaseQuantity !== undefined &&
+ form.value.purchaseQuantity !== ""
) {
form.value.purchaseQuantity = toFixed(
- parseFloat(form.value.purchaseQuantity),
- 3
+ parseFloat(form.value.purchaseQuantity),
+ 3
); // 鏁伴噺淇濈暀3浣嶅皬鏁�
}
};
@@ -293,30 +284,29 @@
});
const rules = {
supplierName: [
- { required: true, message: "璇疯緭鍏ヤ緵搴斿晢鍚嶇О", trigger: "blur" },
+ {required: true, message: "璇疯緭鍏ヤ緵搴斿晢鍚嶇О", trigger: "blur"},
],
- coal: [{ required: true, message: "璇疯緭鍏ョ叅绉�", trigger: "blur" }],
- unit: [{ required: true, message: "璇疯緭鍏ュ崟浣�", trigger: "blur" }],
+ coal: [{required: true, message: "璇疯緭鍏ョ叅绉�", trigger: "blur"}],
purchaseQuantity: [
- { required: true, message: "璇疯緭鍏ラ噰璐暟閲�", trigger: "blur" },
- { type: "number", message: "閲囪喘鏁伴噺蹇呴』涓烘暟瀛�", trigger: "blur" },
+ {required: true, message: "璇疯緭鍏ラ噰璐暟閲�", trigger: "blur"},
+ {type: "number", message: "閲囪喘鏁伴噺蹇呴』涓烘暟瀛�", trigger: "blur"},
],
priceExcludingTax: [
- { required: true, message: "璇疯緭鍏ュ崟浠�", trigger: "blur" },
+ {required: true, message: "璇疯緭鍏ュ崟浠�", trigger: "blur"},
],
totalPriceExcludingTax: [
- { required: true, message: "璇疯緭鍏ユ�讳环", trigger: "blur" },
+ {required: true, message: "璇疯緭鍏ユ�讳环", trigger: "blur"},
],
priceIncludingTax: [
- { required: true, message: "璇疯緭鍏ュ惈绋庡崟浠�", trigger: "blur" },
+ {required: true, message: "璇疯緭鍏ュ惈绋庡崟浠�", trigger: "blur"},
],
totalPriceIncludingTax: [
- { required: true, message: "璇疯緭鍏ュ惈绋庢�讳环", trigger: "blur" },
+ {required: true, message: "璇疯緭鍏ュ惈绋庢�讳环", trigger: "blur"},
],
- taxRate: [{ required: true, message: "璇疯緭鍏ョ◣鐜�", trigger: "blur" }],
- registrantId: [{ required: true, message: "璇疯緭鍏ョ櫥璁颁汉", trigger: "blur" }],
+ taxRate: [{required: true, message: "璇疯緭鍏ョ◣鐜�", trigger: "blur"}],
+ registrantId: [{required: true, message: "璇疯緭鍏ョ櫥璁颁汉", trigger: "blur"}],
registrationDate: [
- { required: true, message: "璇烽�夋嫨鐧昏鏃ユ湡", trigger: "change" },
+ {required: true, message: "璇烽�夋嫨鐧昏鏃ユ湡", trigger: "change"},
],
};
// 鍏抽棴寮圭獥
--
Gitblit v1.9.3