From 60b5992752011494493d776b2fe6f2006e02a49d Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 27 八月 2025 14:24:11 +0800
Subject: [PATCH] Merge branch 'feature/0826' into dev_JLMY
---
src/views/procureMent/components/ProductionDialog.vue | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 insertions(+), 1 deletions(-)
diff --git a/src/views/procureMent/components/ProductionDialog.vue b/src/views/procureMent/components/ProductionDialog.vue
index 859cbea..dc44a2f 100644
--- a/src/views/procureMent/components/ProductionDialog.vue
+++ b/src/views/procureMent/components/ProductionDialog.vue
@@ -30,6 +30,20 @@
/>
</el-select>
</el-form-item>
+ <el-form-item label="鐓ゆ枡绫诲瀷" prop="type">
+ <el-select
+ v-model="form.type"
+ placeholder="璇烽�夋嫨鐓ょ"
+ :disabled="isViewMode"
+ >
+ <el-option
+ :label="item.label"
+ v-for="item in typeList"
+ :key="item.value"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="鐓ょ" prop="coalId">
<el-select
v-model="form.coalId"
@@ -145,6 +159,20 @@
value-format="YYYY-MM-DD"
/>
</el-form-item>
+ <el-form-item label="绫诲瀷" prop="purchaseType">
+ <el-select
+ v-model="form.purchaseType"
+ placeholder="璇烽�夋嫨绫诲瀷"
+ :disabled="isViewMode"
+ >
+ <el-option
+ v-for="item in purchaseTypeList"
+ :key="item.value"
+ :label="item.label"
+ :value="Number(item.value)"
+ />
+ </el-select>
+ </el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
@@ -171,6 +199,7 @@
import { ElMessage } from "element-plus";
import useUserStore from "@/store/modules/user";
import { addOrEditPR, getSupplyList, getCoalInfoList } from "@/api/procureMent";
+import useDictStore from "@/store/modules/dict"
const props = defineProps({
title: {
@@ -183,6 +212,16 @@
required: true,
type: Boolean,
});
+const typeList = [
+ {
+ value: 1,
+ label: "鎴愬搧",
+ },
+ {
+ value: 2,
+ label: "鍘熸枡",
+ },
+];
const form = defineModel("form", {
required: true,
type: Object,
@@ -193,8 +232,9 @@
});
const supplyList = ref([]);
const coalList = ref([]);
+const purchaseTypeList = ref([])
const isViewMode = computed(() => props.title.includes("鏌ョ湅"));
-// 鑾峰彇渚涘簲鍟嗕笅鎷夊拰鐓ょ涓嬫媺
+// 鑾峰彇渚涘簲鍟嗕笅鎷夊拰鐓ょ涓嬫媺 浠ュ強绫诲瀷
const getDropdownData = async () => {
try {
const [supplyRes, coalRes] = await Promise.all([
@@ -211,6 +251,7 @@
value: item.id,
label: item.coal,
}));
+
} catch (error) {
ElMessage.error("鑾峰彇涓嬫媺鏁版嵁澶辫触锛岃绋嶅悗閲嶈瘯");
}
@@ -333,16 +374,24 @@
};
onMounted(async () => {
+
+ purchaseTypeList.value = useDictStore().getDictTypeList("purchase_type").map((item) => ({
+ value: item.value,
+ label: item.label,
+ }))
+
let res = await userStore.getInfo();
userInfo.value = res.user;
await getDropdownData();
// 缁勪欢鍔犺浇瀹屾垚鍚庤Е鍙戜竴娆¤绠�
calculatePrices();
});
+
const rules = {
supplierName: [
{ required: true, message: "璇疯緭鍏ヤ緵搴斿晢鍚嶇О", trigger: "blur" },
],
+ type: [{ required: true, message: "璇烽�夋嫨绫诲瀷", trigger: "change" }],
coal: [{ required: true, message: "璇疯緭鍏ョ叅绉�", trigger: "blur" }],
purchaseQuantity: [
{ required: true, message: "璇疯緭鍏ラ噰璐暟閲�", trigger: "blur" },
@@ -358,6 +407,9 @@
{ required: true, message: "璇疯緭鍏ョ◣鐜�", trigger: "blur" },
{ type: "number", message: "绋庣巼蹇呴』涓烘暟瀛�", trigger: "blur" },
],
+ purchaseType: [
+ { required: true, message: "璇烽�夋嫨绫诲瀷", trigger: "change" }
+ ]
};
// 鍏抽棴寮圭獥
const handleClose = () => {
--
Gitblit v1.9.3