From 4d4394311a96e15ea204e2cae03dda00750d0fdd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 11 四月 2025 17:37:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/business/OperaWorkorderDetailSheWindow.vue | 54 ++++++++++++++++++++++++++++--------------------------
1 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/admin/src/components/business/OperaWorkorderDetailSheWindow.vue b/admin/src/components/business/OperaWorkorderDetailSheWindow.vue
index fb1b6db..20d48c9 100644
--- a/admin/src/components/business/OperaWorkorderDetailSheWindow.vue
+++ b/admin/src/components/business/OperaWorkorderDetailSheWindow.vue
@@ -27,6 +27,10 @@
<div class="value">{{ info.memberName }} - {{ info.memberPhone || '[鏃犳墜鏈哄彿]' }}</div>
</div>
<div class="item">
+ <div class="label">鎵�灞為儴闂�</div>
+ <div class="value">{{ info.companyName }} </div>
+ </div>
+ <div class="item">
<div class="label">涓婃姤鏃堕棿</div>
<div class="value">{{ info.submitDate +' '}}</div>
</div>
@@ -39,6 +43,10 @@
<div class="item">
<div class="label">鍙戠敓鍦扮偣</div>
<div class="value">{{ info.locationName }}</div>
+ </div>
+ <div class="item">
+ <div class="label">鍏蜂綋浣嶇疆</div>
+ <div class="value">{{ info.remark }}</div>
</div>
<div class="item">
<div class="label">澶栭儴灏卞尰</div>
@@ -89,7 +97,7 @@
</div>
</div>
</div>
- <div class="side">
+ <div class="side" v-if="false">
<div class="side_title">鎿嶄綔鍘嗗彶</div>
<div class="list" v-if=" info.logList != null && info.logList.length != 0
">
@@ -155,6 +163,7 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
+import {getById } from '@/api/business/workorder'
export default {
name: 'OperaWorkorderWindow',
extends: BaseOpera,
@@ -175,9 +184,9 @@
},
cateList: {
0: 'SHE浜嬩欢宸ュ崟',
- 1: '璺岀粖婊戜簨浠跺伐鍗�',
- 2: 'DCA浜嬩欢鎻愪氦璁板綍',
- 3: 'DCA浜嬩欢宸ュ崟'
+ 1: 'DCA浜嬩欢鎻愪氦璁板綍',
+ 2: 'DCA浜嬩欢宸ュ崟',
+ 3: '璺岀粖婊戜簨浠跺伐鍗�'
}
}
},
@@ -186,34 +195,27 @@
this.title = title
this.visible = true
this.info = target
+ this.getDetail()
this.type = this.info.type
},
close () {
this.visible = false
},
getDetail () {
- const { id, type } = this
- switch (type) {
- case 0:
- getVisitedDetail({ id }).then(res => {
- this.info = res
- if (this.info.approveDateVO && this.info.approveDateVO.approveList.length > 0) {
- this.info.approveDateVO.approveList.forEach(item => {
- if (item.approveList && item.approveList.length == 1 && item.type !== 1) {
- item.title = item.approveList[0].title
- item.faceImg = item.approveList[0].faceImg
- item.memberName = item.approveList[0].memberName
- item.statusInfo = item.approveList[0].statusInfo
- item.approveList = []
- }
- })
- }
- })
- break
-
- default:
- break
- }
+ getById(this.info.id).then(res => {
+ this.info = res
+ if (this.info.logList && this.info.logList.length > 0) {
+ this.info.logList.forEach(item => {
+ if (item.approveList && item.approveList.length == 1 && item.type !== 1) {
+ item.title = item.approveList[0].title
+ item.faceImg = item.approveList[0].faceImg
+ item.memberName = item.approveList[0].memberName
+ item.statusInfo = item.approveList[0].statusInfo
+ item.approveList = []
+ }
+ })
+ }
+ })
},
reject () { },
handleAvatarSuccess () { },
--
Gitblit v1.9.3