From ea8dea301e82be074187b10bdbe130c9802bede0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 27 五月 2024 17:18:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/business/OperaHiddenDangerWindow.vue | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/admin/src/components/business/OperaHiddenDangerWindow.vue b/admin/src/components/business/OperaHiddenDangerWindow.vue
index b43e322..4d72830 100644
--- a/admin/src/components/business/OperaHiddenDangerWindow.vue
+++ b/admin/src/components/business/OperaHiddenDangerWindow.vue
@@ -1,7 +1,7 @@
<template>
<GlobalWindow
:title="title"
- :visible.sync="visable"
+ :visible.sync="visible"
@confirm="confirm"
@close="reject"
>
@@ -9,15 +9,15 @@
<div class="modal_content">
<div class="header">
<div class="left">
- <div class="h1">闅愭偅闅忔墜鎷�</div>
+ <div class="h1">闅愭偅鎻愭姤</div>
<div class="time">鎻愭姤鏃堕棿锛歿{model.createDate}}</div>
</div>
- <div class="right" v-if="model.status==0">寰呭鏍�</div>
+ <div class="right" v-if="model.status==0">寰呭鐞�</div>
<div class="right" v-if="model.status==1">宸插鐞�</div>
<div class="right" v-if="model.status==2">宸叉挙閿�</div>
</div>
<div class="info">
- <div class="title">闅愭偅闅忔墜鎷嶈鎯�</div>
+ <div class="title">闅愭偅鎻愭姤璇︽儏</div>
<div class="list">
<div class="item">
<div class="label">鎻愭姤浜�</div>
@@ -99,8 +99,11 @@
</div>
</div>
<!-- -->
- <template #btns>
- <el-button type="primary" plain @click="handleTransfer">杞氦</el-button>
+ <template v-slot:footer>
+ <el-button @click="dealDo" type="primary" v-if="model.status==0" class="status-red">澶勭悊</el-button>
+ <el-button type="primary" plain v-if="model.status==0" @click="handleTransfer">杞氦</el-button>
+ <el-button @click="backDo" v-if="model.status==0" type="danger" >閫�鍥�</el-button>
+ <el-button @click="visible=false">杩斿洖</el-button>
</template>
<!-- 鍚屾剰/鎷掔粷 -->
<el-dialog
@@ -175,13 +178,16 @@
</template>
<script>
+import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
export default {
components: { GlobalWindow },
+ extends: BaseOpera,
data() {
return {
title: '璁垮棰勭害璇︽儏',
- visable: false,
+ visible: false,
+ dataId:null,
model: { },
isShowAppr: false,
apprTitle: '鍚屾剰',
@@ -190,11 +196,26 @@
rules: {}
}
},
+ created () {
+ this.config({
+ api: '/business/hiddenDanger',
+ 'field.id': 'id'
+ })
+ },
methods: {
open(title,target){
this.title =title
- this.visable=true
- this.model = target
+ this.visible=true
+ this.model = {}
+ this.dataId =target.id
+ this.getDetail()
+
+ },
+ getDetail(){
+ this.api.detail(this.dataId)
+ .then(res =>{
+ this.model = res
+ })
},
confirm() {
console.log('--')
--
Gitblit v1.9.3