From cd197acb8e9263f6b91db02d63d887c04699ce6b Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 31 十月 2024 12:03:08 +0800
Subject: [PATCH] ll
---
admin/src/components/operation/OperCarUseBookParamWindow.vue | 3 ++-
admin/src/components/operation/HiddenDangerParam.vue | 8 ++++----
admin/.env.development | 6 +++---
admin/src/components/business/OperaHiddenDangerParamWindow.vue | 2 +-
admin/src/views/meeting/components/OperaBookingsWindow.vue | 2 +-
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index 97a811c..445ce04 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -2,7 +2,7 @@
NODE_ENV = 'development'
VUE_APP_API_URL = 'http://localhost:10010'
-# VUE_APP_API_URL = 'http://192.168.0.108:10010'
-VUE_APP_API_URL = 'http://192.168.0.173/gateway_interface'
-# VUE_APP_API_URL = 'https://dmtest.ahapp.net/antai_admin_interface/'
+# VUE_APP_API_URL = 'http://192.168.0.103:10010'
+# VUE_APP_API_URL = 'http://192.168.0.173/gateway_interface'
+VUE_APP_API_URL = 'http://10.50.250.253:8088/gateway_interface'
diff --git a/admin/src/components/business/OperaHiddenDangerParamWindow.vue b/admin/src/components/business/OperaHiddenDangerParamWindow.vue
index a7a8128..b645c86 100644
--- a/admin/src/components/business/OperaHiddenDangerParamWindow.vue
+++ b/admin/src/components/business/OperaHiddenDangerParamWindow.vue
@@ -5,7 +5,7 @@
<el-input v-model="form.name" placeholder="璇疯緭鍏ュ悕绉�" v-trim />
</el-form-item>
<el-form-item label="璐ｄ换閮ㄩ棬" prop="companyId">
- <el-select @change="loadMember" v-model="form.companyId">
+ <el-select filterable clearable @change="loadMember" v-model="form.companyId">
<el-option v-for="op in department" :key="op.id" :label="op.name" :value="op.id"></el-option>
</el-select>
</el-form-item>
diff --git a/admin/src/components/operation/HiddenDangerParam.vue b/admin/src/components/operation/HiddenDangerParam.vue
index f3e73ea..30386b0 100644
--- a/admin/src/components/operation/HiddenDangerParam.vue
+++ b/admin/src/components/operation/HiddenDangerParam.vue
@@ -23,7 +23,7 @@
/>
</el-form-item>
<el-form-item label="璐ｄ换閮ㄩ棬" prop="companyId">
- <el-select @change="getAddrList" v-model="param.companyId">
+ <el-select @change="getAddrList" clearable filterable v-model="param.companyId">
<el-option v-for="op in department" :key="op.id" :label="op.name" :value="op.id"></el-option>
</el-select>
</el-form-item>
@@ -155,9 +155,9 @@
allList({ type: 1 }).then(res => { // 绫诲瀷
this.typeList = res || []
})
- memberList({}).then(res => {
- this.memberList = res || []
- })
+ // memberList({}).then(res => {
+ // this.memberList = res || []
+ // })
this.getfindCompanyTreePage()
},
getfindCompanyTreePage() {
diff --git a/admin/src/components/operation/OperCarUseBookParamWindow.vue b/admin/src/components/operation/OperCarUseBookParamWindow.vue
index eb60a54..fddb479 100644
--- a/admin/src/components/operation/OperCarUseBookParamWindow.vue
+++ b/admin/src/components/operation/OperCarUseBookParamWindow.vue
@@ -541,7 +541,8 @@
})
findTypeMemberInfo({
type: '2',
- companyType: 1
+ companyType: 1,
+ querySpecial: 1
}).then(res => {
this.memberList = res || []
})
diff --git a/admin/src/views/meeting/components/OperaBookingsWindow.vue b/admin/src/views/meeting/components/OperaBookingsWindow.vue
index 39adf61..133272d 100644
--- a/admin/src/views/meeting/components/OperaBookingsWindow.vue
+++ b/admin/src/views/meeting/components/OperaBookingsWindow.vue
@@ -157,7 +157,7 @@
userList({
page: 1,
capacity: 9999,
- model: { realname: this.filterText, memberType: 2, companyType: 1 }
+ model: { realname: this.filterText,querySpecial: 1, memberType: 2, companyType: 1 }
})
.then(res => {
console.log('userList', res)
--
Gitblit v1.9.3