From a2dabfa065257464961046598061d61f274b640b Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期二, 15 七月 2025 09:21:45 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region
---
src/views/reservation/reservations/index.vue | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index 76e2459..806b615 100644
--- a/src/views/reservation/reservations/index.vue
+++ b/src/views/reservation/reservations/index.vue
@@ -141,7 +141,7 @@
<i class="el-icon-circle-plus-outline" @click="handleAdd1"></i>
</el-form-item>
- <el-form-item label="濂楅鍚嶇О" prop="dwDeptName">
+ <!-- <el-form-item label="濂楅鍚嶇О" prop="dwDeptName">
<el-select v-model="queryParams.dwDeptName" placeholder="璇烽�夋嫨濂楅鍚嶇О" clearable style="width: 100%"
@change="idFn2">
<el-option v-for="dict in deptList" :key="dict.id" :label="dict.dwDeptName" :value="dict.id" />
@@ -152,7 +152,7 @@
<el-select v-model="queryParams.groupingName" placeholder="璇烽�夋嫨鍒嗙粍鍚嶇О" clearable style="width: 100%">
<el-option v-for="dict in groupingList" :key="dict.id" :label="dict.pacName" :value="dict.id" />
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="棰勭害鏃堕棿">
<el-date-picker
clearable
@@ -409,14 +409,21 @@
<el-table-column
label="濂楅鍚嶇О"
align="center"
- prop="tcmc"
+ prop="dwDeptName"
:show-overflow-tooltip="true"
width="160px"
/>
<el-table-column
label="鍒嗙粍鍚嶇О"
align="center"
- prop="fzmc"
+ prop="groupingName"
+ :show-overflow-tooltip="true"
+ width="160px"
+ />
+ <el-table-column
+ label="鍒嗙粍鍚嶇О"
+ align="center"
+ prop="department"
:show-overflow-tooltip="true"
width="160px"
/>
--
Gitblit v1.8.0