From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug
---
admin/src/components/business/OperaHiddenDangerWindow.vue | 51 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/admin/src/components/business/OperaHiddenDangerWindow.vue b/admin/src/components/business/OperaHiddenDangerWindow.vue
index d2895a6..0f8ca3e 100644
--- a/admin/src/components/business/OperaHiddenDangerWindow.vue
+++ b/admin/src/components/business/OperaHiddenDangerWindow.vue
@@ -10,7 +10,7 @@
<div class="header">
<div class="left">
<div class="h1">闅愭偅鎻愭姤</div>
- <div class="time">鎻愭姤鏃堕棿锛歿{model.createDate}}</div>
+ <div class="time">鎻愭姤鏃堕棿锛歿{model.submitTime}}</div>
</div>
<div class="right" v-if="model.status==0">寰呭鐞�</div>
<div class="right" style="background:#53b76f " v-if="model.status==1">宸插鐞�</div>
@@ -43,7 +43,6 @@
<video
v-if="item.fileurlFull && item.fileurlFull.endsWith('.mp4')"
ref="videoRef"
- autoplay
controls
preload="auto"
style="width: 80px;height: 80px;object-fit: contain;"
@@ -128,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>
@@ -144,9 +143,9 @@
</div>
<!-- -->
<template v-slot:footer>
- <el-button @click="isShowProblem = true" type="primary" v-if="model.status==0&& model.checkUserId == userInfo.memberId" class="status-red">澶勭悊</el-button>
+ <el-button @click="openHandModal" type="primary" v-if="model.status==0&& model.checkUserId == userInfo.memberId" class="status-red">澶勭悊</el-button>
<el-button type="primary" plain v-if="model.status==0 && model.checkUserId == userInfo.memberId" @click="handleTransfer">杞氦</el-button>
- <el-button @click="isBackProblem=true" v-if="model.status==0&& model.checkUserId == userInfo.memberId" type="danger" >閫�鍥�</el-button>
+ <el-button @click="openBackModal" v-if="model.status==0&& model.checkUserId == userInfo.memberId" type="danger" >閫�鍥�</el-button>
<el-button @click="visible=false">杩斿洖</el-button>
</template>
@@ -162,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>
@@ -236,7 +235,7 @@
v-model="backForm.checkDate"
/>
</el-form-item>
- <el-form-item label="鏁存敼鍓�" prop="dealBeforeFileList">
+ <el-form-item label="鍥剧墖/瑙嗛" prop="dealBeforeFileList">
<div class="df_ac">
<upload width="80px" height="80px" :list="backForm.dealBeforeFileList" :tips="'鍥剧墖/瑙嗛'" accept=".png,.jpg,.jpeg,.mp4" folder="hiddendanger" @loading="uploading = true" @dele="dele($event,2)" @success="uploadFileList($event, 2)" />
</div>
@@ -264,8 +263,10 @@
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import upload from '@/components/common/upload'
+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,
@@ -309,7 +310,7 @@
/*,
dealBeforeFileList: [
{ required: true, message: '璇蜂笂浼犳暣鏀瑰墠鎯呭喌' }
- ]*/
+ ] */
},
memberList: [],
transForm: {
@@ -338,6 +339,24 @@
})
},
methods: {
+ openHandModal () {
+ const { model } = this
+ this.isShowProblem = true
+ this.$set(this.dealForm, 'checkDate', dayjs().format('YYYY-MM-DD HH:mm:ss'))
+ if (model.submitFileList && model.submitFileList.length > 0) {
+ this.$set(this.dealForm, 'dealBeforeFileList', model.submitFileList.map(item => {
+ return {
+ fileurl: item.fileurl,
+ name: item.name,
+ url: item.fileurlFull
+ }
+ }))
+ }
+ },
+ openBackModal () {
+ this.isBackProblem = true
+ this.$set(this.backForm, 'checkDate', dayjs().format('YYYY-MM-DD HH:mm:ss'))
+ },
dele (index, type) {
if (type == 0) {
if (this.dealForm.dealBeforeFileList != null && this.dealForm.dealBeforeFileList.length > index) {
@@ -521,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 () { },
@@ -533,6 +556,7 @@
</script>
<style lang="scss" scoped>
+@import "@/assets/style/variables.scss";
.side_title{
font-weight: 600;
font-size: 18px;
@@ -597,6 +621,7 @@
.value {
color: #111111;
+ flex: 1;
}
}
}
@@ -729,7 +754,7 @@
font-size: 13px;
color: #888888;
.status {
- color: #00ba67;
+ color: $primaryColor;
}
}
}
--
Gitblit v1.9.3