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 | 111 +++++++++++++++++++++++++++++--------------------------
1 files changed, 58 insertions(+), 53 deletions(-)
diff --git a/admin/src/components/business/OperaWorkorderDetailSheWindow.vue b/admin/src/components/business/OperaWorkorderDetailSheWindow.vue
index 4adb1a4..20d48c9 100644
--- a/admin/src/components/business/OperaWorkorderDetailSheWindow.vue
+++ b/admin/src/components/business/OperaWorkorderDetailSheWindow.vue
@@ -27,8 +27,12 @@
<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.createDate }}</div>
+ <div class="value">{{ info.submitDate +' '}}</div>
</div>
<div class="item">
<div class="label">娑夊強浜哄憳</div>
@@ -41,11 +45,15 @@
<div class="value">{{ info.locationName }}</div>
</div>
<div class="item">
- <div class="label">鏄惁澶栭儴灏卞尰</div>
+ <div class="label">鍏蜂綋浣嶇疆</div>
+ <div class="value">{{ info.remark }}</div>
+ </div>
+ <div class="item">
+ <div class="label">澶栭儴灏卞尰</div>
<div class="value">{{ info.outJiuyi == "0" ? "鍚�" : "鏄�" }}</div>
</div>
<div class="item" v-if="info.outJiuyi == '0'">
- <div class="label">鏄惁鍖诲姟瀹�</div>
+ <div class="label">鍖诲姟瀹�</div>
<div class="value">{{ info.isYiwushi == "0" ? "鍚�" : "鏄�" }}</div>
</div>
<div class="item" v-if="info.isYiwushi == '0'">
@@ -56,39 +64,40 @@
<div class="label">浼ゅ绫诲瀷</div>
<div class="value">{{ info.typeName }}</div>
</div>
- <div class="label">鏄惁鍜屽伐浣滅浉鍏�</div>
- <div class="value">{{ info.workRelated == "0" ? "鍚�" : "鏄�" }}</div>
- </div>
+ <div class="item">
+ <div class="label">鍜屽伐浣滅浉鍏�</div>
+ <div class="value">{{ info.workRelated == "0" ? "鍚�" : "鏄�" }}</div>
+ </div>
<div class="item">
<div class="label">浜嬩欢璇存槑</div>
- <div class="value">{{ info.constructionReason }}</div>
+ <div class="value">{{ info.eventInfo || '-'}}</div>
+ </div>
+ <div class="item" style="width: 100%">
+ <div class="label">鍥剧墖</div>
+ <div class="value" v-if="info.multifileList ==null || !info.multifileList.length">鏃�</div>
+ <div class="value" v-if="info.multifileList !=null && info.multifileList.length">
+ <div v-for="item in info.multifileList" :key="item.id" style="display: inline;margin-right: 20px">
+ <video
+ v-if="item.fileurlFull && item.fileurlFull.endsWith('.mp4')"
+ ref="videoRef"
+ controls
+ preload="auto"
+ style="width: 80px;height: 80px;object-fit: contain;"
+ :src="item.fileurlFull"
+ />
+ <el-image
+ v-else-if="item.fileurlFull"
+ style="width:80px; height: 80px"
+ :src="item.fileurlFull"
+ :preview-src-list="[item.fileurlFull]">
+ </el-image>
</div>
</div>
</div>
- <div class="item" style="width: 100%">
- <div class="label">鍥剧墖</div>
- <div class="value" v-if="info.multifileList ==null || !info.multifileList.length">鏃�</div>
- <div class="value" v-if="info.multifileList !=null && info.multifileList.length">
- <div v-for="item in info.multifileList" :key="item.id" style="display: inline;margin-right: 20px">
- <video
- v-if="item.fileurlFull && item.fileurlFull.endsWith('.mp4')"
- ref="videoRef"
- controls
- preload="auto"
- style="width: 80px;height: 80px;object-fit: contain;"
- :src="item.fileurlFull"
- />
- <el-image
- v-else-if="item.fileurlFull"
- style="width:80px; height: 80px"
- :src="item.fileurlFull"
- :preview-src-list="[item.fileurlFull]">
- </el-image>
</div>
</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
">
@@ -154,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,
@@ -174,9 +184,9 @@
},
cateList: {
0: 'SHE浜嬩欢宸ュ崟',
- 1: '璺岀粖婊戜簨浠跺伐鍗�',
- 2: 'DCA浜嬩欢鎻愪氦璁板綍',
- 3: 'DCA浜嬩欢宸ュ崟'
+ 1: 'DCA浜嬩欢鎻愪氦璁板綍',
+ 2: 'DCA浜嬩欢宸ュ崟',
+ 3: '璺岀粖婊戜簨浠跺伐鍗�'
}
}
},
@@ -185,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 () { },
@@ -281,6 +284,7 @@
.item {
display: flex;
width: 40%;
+ font-size: 14px;
margin-bottom: 20px;
&:nth-of-type(2n) {
@@ -303,6 +307,7 @@
display: flex;
justify-content: space-between;
align-items: center;
+ vertical-align: center;
padding: 20px 30px;
margin: 0 -30px;
border-radius: 8px 8px 0 0;
--
Gitblit v1.9.3