From 09da100729793848bc01b51f7b05ca3f1e7ec64f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 六月 2024 14:05:35 +0800
Subject: [PATCH] 提交一把
---
company/src/components/enterprise/dispatchUnitDetails.vue | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/company/src/components/enterprise/dispatchUnitDetails.vue b/company/src/components/enterprise/dispatchUnitDetails.vue
index 33c07bd..6428d6c 100644
--- a/company/src/components/enterprise/dispatchUnitDetails.vue
+++ b/company/src/components/enterprise/dispatchUnitDetails.vue
@@ -12,18 +12,22 @@
<div class="info_list_item_label">娲鹃仯鍗曚綅锛�</div>
<div class="info_list_item_val">{{form.name}}</div>
</div>
- <div class="info_list_item">
- <div class="info_list_item_label">娲鹃仯鍗曚綅淇＄敤浠ｇ爜锛�</div>
- <div class="info_list_item_val">{{form.code}}</div>
- </div>
+<!-- <div class="info_list_item">-->
+<!-- <div class="info_list_item_label">娲鹃仯鍗曚綅淇＄敤浠ｇ爜锛�</div>-->
+<!-- <div class="info_list_item_val">{{form.code}}</div>-->
+<!-- </div>-->
<div class="info_list_item">
<div class="info_list_item_label">娲鹃仯鍗曚綅鐘舵�侊細</div>
- <div class="info_list_item_val" v-if="form.unitStatus === 0">寰呭鏍�</div>
- <div class="info_list_item_val" style="color: green;" v-if="form.unitStatus === 1">瀹℃牳閫氳繃</div>
- <div class="info_list_item_val" style="color: red;" v-if="form.unitStatus === 2">瀹℃牳涓嶉�氳繃</div>
+ <div class="info_list_item_val" style="color:#2E68EC;" v-if="form.unitStatus === 0">寰呭鏍�</div>
+ <div class="info_list_item_val" v-if="form.unitStatus === 1">
+ <span :class="'du-status'+ form.worktypeStatus" v-if="form.worktypeStatus == null || form.worktypeStatus === 0">宸ョ寰呭</span>
+ <span :class="'du-status'+ form.worktypeStatus" v-if="form.worktypeStatus === 1">瀹℃牳閫氳繃</span>
+ <span :class="'du-status'+ form.worktypeStatus" v-if="form.worktypeStatus === 2">宸ョ瀹℃牳涓嶉�氳繃</span>
+ </div>
+ <div class="info_list_item_val" style="color: red;" v-if="form.unitStatus === 2">瀹℃牳涓嶉�氳繃</div>
</div>
<div class="info_list_item">
- <div class="info_list_item_label">娲鹃仯鍗曚綅璇﹁堪锛�</div>
+ <div class="info_list_item_label">宸ョ璇﹁堪锛�</div>
<div class="info_list_item_val">{{form.content}}</div>
</div>
</div>
@@ -52,12 +56,16 @@
prop="name"
label="鎿嶄綔瑙嗛">
<template slot-scope="{row}">
- <video loop controls width="150px" height="150px" :src="row.videoUrlFull"></video>
+ <video v-if="row.videoUrlFull" loop controls width="150px" height="150px" :src="row.videoUrlFull"></video>
+ <span v-else>-</span>
</template>
</el-table-column>
<el-table-column
- prop="checkDate"
label="瀹℃牳閫氳繃鏃ユ湡">
+ <template slot-scope="{row}">
+ <span v-if="row.status === 2">-</span>
+ <span v-else>{{row.checkDate}}</span>
+ </template>
</el-table-column>
<el-table-column
label="鐘舵��">
@@ -78,7 +86,7 @@
</div>
</div>
<div class="info_status">
- <div class="info_status_label">瀹℃牳娴佺▼</div>
+ <div class="info_status_label">鎿嶄綔璁板綍</div>
<div class="info_status_list">
<el-timeline :reverse="reverse">
<el-timeline-item
@@ -88,7 +96,7 @@
<span style="font-size: 16px; font-weight: 400; color: black;">
{{activity.title}}
<span style="font-size: 16px; font-weight: 400; color: black; margin-left: 10px;" v-if="activity.objType === 5 || activity.objType === 6 || activity.objType === 1 || activity.objType === 2">
- 鎻愪氦鎰忚: -
+ 鎻愪氦鎰忚: - {{activity.content}}
</span>
</span>
<span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
@@ -104,6 +112,10 @@
<addJobType ref="addJobType" @success="callback" />
<!-- 缂栬緫 -->
<OperaDispatchUnitWindow ref="OperaDispatchUnitWindow" @success="callback" />
+
+ <template v-slot:footer>
+ <el-button @click="visible=false">杩斿洖</el-button>
+ </template>
</GlobalWindow>
</template>
@@ -127,6 +139,7 @@
code: '',
content: '',
unitStatus: '',
+ worktypeStatus: '',
duLogList: [],
duSolutionList: [],
saveDuSolutionDTOList: [
@@ -149,7 +162,7 @@
},
tableData: [],
insuranceScheme: [],
- reverse: true,
+ reverse: false,
activities: []
}
},
@@ -227,7 +240,7 @@
margin-bottom: 15px;
.info_list_item_label {
flex-shrink: 0;
- width: 150px;
+ /*width: 150px;*/
font-size: 14px;
color: black;
}
--
Gitblit v1.9.3