From 77946261ec663aa1fe7f6f97e550532ed879f982 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 13:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/workorder/components/problemReportingDetails.vue | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/admin/src/views/workorder/components/problemReportingDetails.vue b/admin/src/views/workorder/components/problemReportingDetails.vue
index cbdcbbb..83379bb 100644
--- a/admin/src/views/workorder/components/problemReportingDetails.vue
+++ b/admin/src/views/workorder/components/problemReportingDetails.vue
@@ -3,6 +3,7 @@
:title="title"
:showConfirm="false"
:visible.sync="visible"
+ @close="closeView"
width="100%">
<div class="wt">
<div class="wt_head">
@@ -10,9 +11,9 @@
<div class="title">闂璇︽儏</div>
<el-tag style="margin-left: 10px;" v-if="form.dealStatus === 0">寰呭鐞�</el-tag>
<el-tag style="margin-left: 10px;" v-if="form.dealStatus === 1">宸茶浆宸ュ崟</el-tag>
- <el-tag style="margin-left: 10px;" v-if="form.dealStatus === 2">宸插叧闂�</el-tag>
+ <el-tag style="margin-left: 10px;" type="info" v-if="form.dealStatus === 2">宸插叧闂�</el-tag>
</div>
- <el-button @click="handleDetail" v-if="form.dealStatus === 1">鏌ョ湅宸ュ崟</el-button>
+ <el-button @click="handleDetail" v-if="form.dealStatus === 1 && isShow">鏌ョ湅宸ュ崟</el-button>
</div>
<div class="wt_content">
<div class="wt_content_row" style="width: 25%;">
@@ -45,7 +46,7 @@
</div>
<div class="wt_head">
<div class="wt_head_title">
- <div class="title">闂璇︽儏</div>
+ <div class="title">澶勭悊缁撴灉</div>
</div>
</div>
<div class="wt_content">
@@ -62,31 +63,46 @@
鍏抽棴璇存槑锛歿{form.dealInfo}}
</div>
</div>
+ <!-- 宸ュ崟璇︽儏 -->
+ <GDDetail ref="GD_Detail" @close="closeDetails" />
</div>
- <!-- 宸ュ崟璇︽儏 -->
- <Detail v-if="showDetail" ref="DetailRef" @close="showDetail = false" />
</GlobalWindow>
</template>
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
- import Detail from './detail'
+ // import GDDetail from './detail'
+ // import GDDetail from '@/views/workorder/components/detail'
import { getById } from '@/api/ywProblem'
export default {
name: "problemReportingDetails",
extends: BaseOpera,
- components: { GlobalWindow, Detail },
+ components: {
+ GlobalWindow,
+ GDDetail: () => import('./detail')
+ },
data() {
return {
form: {},
showDetail: false,
+ isShow: true,
+ test: false
}
},
methods: {
- open (title, target) {
+ closeView() {
+ this.$emit('close')
+ this.visible = false
+ },
+ closeDetails() {
+ console.log('1')
+ this.test = false
+ },
+ open (title, target, show) {
this.title = title
this.form = target
+ this.isShow = show
getById(target.id)
.then(res => {
this.form = res
@@ -94,11 +110,13 @@
})
},
handleDetail() {
- this.showDetail = true
+ this.test = true
this.$nextTick(() => {
- this.$refs.DetailRef.visible = true
- this.$refs.DetailRef.id = this.form.workorderId
- this.$refs.DetailRef.getDetail()
+ this.$refs.GD_Detail.open('宸ュ崟璇︽儏', { workorderId: this.form.workorderId }, false)
+ // this.$refs.GD_Detail.isShow = false
+ // this.$refs.GD_Detail.visible = true
+ // this.$refs.GD_Detail.id = this.form.workorderId
+ // this.$refs.GD_Detail.getDetail()
})
},
returnText(status) {
--
Gitblit v1.9.3