From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/meeting/components/OperaBookingsWindow.vue | 35 ++++++++++++++---------------------
1 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/admin/src/views/meeting/components/OperaBookingsWindow.vue b/admin/src/views/meeting/components/OperaBookingsWindow.vue
index 133272d..70f7c03 100644
--- a/admin/src/views/meeting/components/OperaBookingsWindow.vue
+++ b/admin/src/views/meeting/components/OperaBookingsWindow.vue
@@ -1,10 +1,10 @@
<template>
<GlobalAlertWindow :title="title" :visible.sync="visible" :confirm-working="isWorking" @confirm="confirm"
- width="840px">
+ width="880px">
<el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�">
<el-form-item label="鍏宠仈浼氳瀹�" prop="roomId">
- <el-select v-model="form.roomId" filterable clearable :disabled="isEdit" placeholder="璇烽�夋嫨鍏宠仈浼氳瀹�"
- @change="selectRoom">
+ <el-select v-model="form.roomId" @change="selectRoom" filterable clearable :disabled="isEdit" placeholder="璇烽�夋嫨鍏宠仈浼氳瀹�"
+ >
<el-option v-for="item in rooms()" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
@@ -24,20 +24,17 @@
<el-form-item label="浼氳涓婚" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ヤ細璁富棰�" :maxlength="30" v-trim />
</el-form-item>
-
- <div class="df_ac">
<el-form-item label="鍙備細浜哄憳">
- <el-select v-model="form.sysList" filterable clearable multiple placeholder="閫夋嫨閮ㄩ棬鎴愬憳">
+ <el-select style="width: 100%" v-model="form.sysList" filterable clearable multiple placeholder="閫夋嫨閮ㄩ棬鎴愬憳">
<el-option v-for="item in sysList" :key="item.id" :value="item.id"
- :label="item.department ? `${item.department.name}-${item.realname}` : item.realname"></el-option>
+ :label="item.companyName ? `${item.realname}-${item.companyName}` : item.realname"></el-option>
<!-- <el-option :key="1" :value="1" label="绂佺敤" /> -->
</el-select>
</el-form-item>
- <el-form-item class="ml10" label-width="140px" label="鏄惁閫氱煡鍙備細浜哄憳">
- <el-radio v-model="form.joinNotice" :label="1">涓嶉�氱煡</el-radio>
- <el-radio v-model="form.joinNotice" :label="0">閫氱煡</el-radio>
- </el-form-item>
- </div>
+ <el-form-item label-width="140px" label="鏄惁閫氱煡鍙備細浜哄憳">
+ <el-radio v-model="form.joinNotice" :label="1">涓嶉�氱煡</el-radio>
+ <el-radio v-model="form.joinNotice" :label="0">閫氱煡</el-radio>
+ </el-form-item>
<el-form-item label="浼氳鍐呭" prop="content">
<el-input type="textarea" v-model="form.content" :maxlength="300" show-word-limit
:autosize="{ minRows: 4, maxRows: 12 }" placeholder="璇疯緭鍏ヤ細璁唴瀹�" v-trim />
@@ -56,8 +53,8 @@
<FileLink :links="form.fileList" linkName="fileFullUrl" />
</div>
</el-form-item>
- <el-form-item label="浼氳澶囨敞" prop="remark">
- <el-input type="textarea" v-model="form.remark" placeholder="璇疯緭鍏ヤ細璁娉�" v-trim />
+ <el-form-item label="浼氳闇�姹�" prop="remark">
+ <el-input type="textarea" v-model="form.remark" placeholder="璇疯緭鍏ヤ細璁渶姹�" v-trim />
</el-form-item>
<input type="file" @change="upFiles" ref="upFile" style="display: none;" />
</el-form>
@@ -90,7 +87,7 @@
import GlobalAlertWindow from '@/components/common/GlobalAlertWindow'
import FileLink from '@/views/meeting/components/common/FileLink'
import { upload } from '@/api/system/common'
-import { fetchList as userList } from '@/api/system/user'
+import { findAllList as userList } from '@/api/system/user'
import { findListByObjId } from '@/api/meeting/projects'
import { BookDetailById } from '@/api/meeting/bookings'
import { findList } from '@/api/meeting/roomTime'
@@ -154,14 +151,10 @@
api: '/meeting/bookings',
'field.id': 'id'
})
- userList({
- page: 1,
- capacity: 9999,
- model: { realname: this.filterText,querySpecial: 1, memberType: 2, companyType: 1 }
- })
+ userList({queryParam: this.filterText,querySpecial: 1, type: 2, companyType: 1,workStatus:0})
.then(res => {
console.log('userList', res)
- this.sysList = res.records
+ this.sysList = res
})
},
methods: {
--
Gitblit v1.9.3