From a0285d19d00697757f99fc75a4e45778854f5af9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 07 三月 2025 10:39:15 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/components/business/OperaHiddenDangerWindow.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/admin/src/components/business/OperaHiddenDangerWindow.vue b/admin/src/components/business/OperaHiddenDangerWindow.vue
index 694ad5b..8595d0c 100644
--- a/admin/src/components/business/OperaHiddenDangerWindow.vue
+++ b/admin/src/components/business/OperaHiddenDangerWindow.vue
@@ -127,7 +127,7 @@
</div>
<div class="line">
<div class="company">
- {{ item.createUserName }} {{ item.companyName }}
+ {{ item.createUserName }}
<div style="display: inline" v-if="index == logList.length-1">
锛�<span class="status-green" v-if="model.status==1">宸插鐞�</span>
<span class="status-blue" v-if="model.status==0">寰呭鐞�</span>
@@ -161,9 +161,9 @@
<el-select v-model="transForm.memberId" style="width: 300px" filterable clearable placeholder="璇烽�夋嫨杞氦瀹夊叏鍛�">
<el-option
v-for="item in memberList"
- :key="item.id"
- :label="item.name"
- :value="item.id">
+ :key="item.memberId"
+ :label="item.companyName ? `${item.realname}-${item.companyName}` : item.realname"
+ :value="item.memberId">
</el-option>
</el-select>
</el-form-item>
@@ -266,6 +266,7 @@
import dayjs from 'dayjs'
import { memberList } from '@/api/business/hiddenDangerParam'
import { mapState } from 'vuex'
+import {findAllList as userList} from "@/api/system/user";
export default {
components: { GlobalWindow, upload },
extends: BaseOpera,
@@ -539,9 +540,13 @@
this.loadMemberList()
},
loadMemberList () {
- memberList({}).then(res => {
+ userList({ queryParam: this.filterText, querySpecial: 1, type: 2, companyType: 1, workStatus: 0 })
+ .then(res => {
+ this.memberList = res || []
+ })
+ /*memberList({}).then(res => {
this.memberList = res
- })
+ })*/
},
reject () { },
handleAvatarSuccess () { },
--
Gitblit v1.9.3