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/warehouseManagement/index.vue | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/src/views/warehouseManagement/index.vue b/src/views/warehouseManagement/index.vue
index 32946d7..a7d612c 100644
--- a/src/views/warehouseManagement/index.vue
+++ b/src/views/warehouseManagement/index.vue
@@ -82,6 +82,11 @@
width="180"
sortable
/>
+ <el-table-column prop="type" label="鐓ゆ枡绫诲瀷">
+ <template #default="scope">
+ {{scope.row.type === 1 ? '鎴愬搧' : '鍘熸枡'}}
+ </template>
+ </el-table-column>
<el-table-column prop="coal" label="鐓ょ" sortable />
<el-table-column prop="unit" label="鍗曚綅" width="70" />
<el-table-column
@@ -440,6 +445,22 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="鐓ゆ枡绫诲瀷" prop="type">
+ <el-select
+ v-model="mergeForm.type"
+ placeholder="璇烽�夋嫨鐓ゆ枡绫诲瀷"
+ :disabled="operationType === 'view'"
+ >
+ <el-option
+ :label="item.label"
+ v-for="item in typeList"
+ :key="item.value"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
</el-row>
<el-divider></el-divider>
<el-row>
@@ -499,6 +520,16 @@
// 鍚堝苟寮规
const mergeVisible = ref(false);
const operationType = ref("");
+const typeList = ref([
+ {
+ label: "鎴愬搧",
+ value: 1,
+ },
+ {
+ label: "鍘熸枡",
+ value: 2,
+ },
+]);
const data = reactive({
form: {
supplierName: "",
--
Gitblit v1.9.3