From c1b5f6edeacfa0326931d06de6773b936dbabe27 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 26 八月 2025 15:18:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_JLMY' into dev_JLMY
---
src/views/procureMent/components/ProductionDialog.vue | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/src/views/procureMent/components/ProductionDialog.vue b/src/views/procureMent/components/ProductionDialog.vue
index 859cbea..79b2bac 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"
@@ -183,6 +197,16 @@
required: true,
type: Boolean,
});
+const typeList = [
+ {
+ value: 1,
+ label: "鎴愬搧",
+ },
+ {
+ value: 2,
+ label: "鍘熸枡",
+ },
+];
const form = defineModel("form", {
required: true,
type: Object,
@@ -343,6 +367,7 @@
supplierName: [
{ required: true, message: "璇疯緭鍏ヤ緵搴斿晢鍚嶇О", trigger: "blur" },
],
+ type: [{ required: true, message: "璇烽�夋嫨绫诲瀷", trigger: "change" }],
coal: [{ required: true, message: "璇疯緭鍏ョ叅绉�", trigger: "blur" }],
purchaseQuantity: [
{ required: true, message: "璇疯緭鍏ラ噰璐暟閲�", trigger: "blur" },
--
Gitblit v1.9.3