From 77d8f6ccb72cb64c29e77c39fcc8298781d008bb Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 02 一月 2025 15:22:22 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
admin/src/views/workorder/components/detail.vue | 72 ++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 24 deletions(-)
diff --git a/admin/src/views/workorder/components/detail.vue b/admin/src/views/workorder/components/detail.vue
index a6908d4..f2e7d5f 100644
--- a/admin/src/views/workorder/components/detail.vue
+++ b/admin/src/views/workorder/components/detail.vue
@@ -49,11 +49,21 @@
<div class="value" v-if="info.fileList == null || !info.fileList.length">鏃�</div>
<div class="value" v-if="info.fileList != null && info.fileList.length">
<div v-for="item in info.fileList" :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"
+ <!-- <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-if="item.type == 0" style="width:80px; height: 80px" :src="item.fileurlFull"
:preview-src-list="[item.fileurlFull]">
</el-image>
+ </div>
+ </div>
+ </div>
+ <div v-if="info.fileList && info.fileList.length > 0 && info.fileList.filter(i => i.type == 1).length > 0"
+ class="item max">
+ <div class="la">闂瑙嗛</div>
+ <div class="value">
+ <div v-for="item in info.fileList" :key="item.id" style="display: inline;margin-right: 20px">
+ <video v-if="item.type == 1" ref="videoRef" controls preload="auto"
+ style="width: 240px;height: 160px;object-fit: contain;" :src="item.fileurlFull" />
</div>
</div>
</div>
@@ -61,7 +71,7 @@
<div class="side">
<div class="title">宸ュ崟娴佽浆璁板綍</div>
<div class="flow_list">
- <div class="item" v-for="item,i in info.logList">
+ <div class="item" v-for="item, i in info.logList">
<div class="icon">
<div class="dian"></div>
<div v-if="i < info.logList.length - 1" class="line"></div>
@@ -76,7 +86,9 @@
</div>
</div>
</div>
- <div class="title">{{ info.dealStatus == 0 || info.dealStatus == 1 ? '宸ュ崟澶勭悊' : '澶勭悊缁撴灉' }}</div>
+ <div class="title"
+ v-if="info.dealStatus == 2 || info.dealStatus == 0 || (info.dealStatus == 1 && info.dealUserId === userInfo.id)">
+ {{ info.dealStatus == 0 || info.dealStatus == 1 ? '宸ュ崟澶勭悊' : '澶勭悊缁撴灉' }}</div>
<el-form :model="param" ref="form" :rules="rules">
<template v-if="info.dealStatus == 0 || info.dealStatus == null">
<el-form-item label="澶勭悊鏂瑰紡" prop="dealType">
@@ -84,7 +96,7 @@
<el-radio v-model="param.dealType" :label="0">鎸囨淳</el-radio>
<el-radio v-model="param.dealType" :label="1">鐩存帴鍥炲</el-radio>
</div>
- </el-form-item>
+ </el-form-item>
<el-form-item v-if="param.dealType == 0" label="鎸囨淳缁�" prop="dealUserId">
<el-select v-model="param.dealUserId" clearable filterable class="w400">
<el-option v-for="item in staffList" :label="item.realname" :value="item.id"></el-option>
@@ -104,8 +116,8 @@
</el-form-item>
<el-form-item label="鐜板満鍥剧墖">
<div class="file_list">
- <el-upload class="avatar-uploader" :data="uploadData" :auto-upload="true"
- :action="uploadImgUrl" :show-file-list="false" :on-success="uploadAvatarSuccess" :on-error="uploadError"
+ <el-upload class="avatar-uploader" :data="uploadData" :auto-upload="true" :action="uploadImgUrl"
+ :show-file-list="false" :on-success="uploadAvatarSuccess" :on-error="uploadError"
:before-upload="beforeUpload">
<div class="upload_wrap">
<i class="el-icon-plus avatar-uploader-icon"></i>
@@ -223,8 +235,8 @@
const { id } = this
detailById(id).then(res => {
this.info = res
- if(this.info.dealStatus == 1){
- this.$set(this.param, 'getDate',dayjs().format('YYYY-MM-DD HH:mm:ss') )
+ if (this.info.dealStatus == 1) {
+ this.$set(this.param, 'getDate', dayjs().format('YYYY-MM-DD HH:mm:ss'))
}
})
},
@@ -316,13 +328,15 @@
}
.primaryColor {
- border: 1px solid rgba(63, 126, 239,.2);
- background-color: rgba(63, 126, 239,.2);
+ border: 1px solid rgba(63, 126, 239, .2);
+ background-color: rgba(63, 126, 239, .2);
}
- .green{
+
+ .green {
background-color: rgba(83, 183, 148, .2);
border: 1px solid rgba(83, 183, 148, .2);
}
+
.gray {
color: #333333;
background-color: rgba(128, 128, 128, .2);
@@ -352,7 +366,8 @@
width: 100%;
display: flex;
align-items: center;
- .la{
+
+ .la {
margin-bottom: 0;
width: 72px;
}
@@ -362,38 +377,47 @@
width: 100%;
}
}
- .main_content{
+
+ .main_content {
display: flex;
- .side{
+
+ .side {
width: 370px;
- .title{
+
+ .title {
font-size: 14px;
}
- .flow_list{
- .item{
+
+ .flow_list {
+ .item {
display: flex;
- .icon{
+
+ .icon {
width: 28px;
display: flex;
flex-direction: column;
align-items: center;
- .dian{
+
+ .dian {
width: 12px;
height: 12px;
border-radius: 50%;
background-color: #e89e42;
}
- .line{
+
+ .line {
width: 1px;
height: 100%;
background-color: #e89e42;
}
}
- .content{
+
+ .content {
font-size: 12px;
color: #999999;
padding-bottom: 12px;
- .name{
+
+ .name {
font-size: 13px;
color: #333333;
}
--
Gitblit v1.9.3