From 93018f06e4fe7e76d15cb032ab37768fd4cf1617 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 03 六月 2024 09:50:35 +0800
Subject: [PATCH] 最新版本
---
admin/src/components/business/OperaCarUseBookWindow.vue | 75 ++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/admin/src/components/business/OperaCarUseBookWindow.vue b/admin/src/components/business/OperaCarUseBookWindow.vue
index 894234c..1eedd79 100644
--- a/admin/src/components/business/OperaCarUseBookWindow.vue
+++ b/admin/src/components/business/OperaCarUseBookWindow.vue
@@ -12,7 +12,7 @@
<div class="time">鎻愪氦鏃堕棿锛歿{model.createDate}}</div>
</div>
<span class="right" v-if="model.status === 0">鐢宠涓�</span>
- <span class="right" v-if="model.status === 1">寰呭鎵�</span>
+ <span class="right" v-if="model.status === 1">瀹℃壒涓�</span>
<span class="right" style="background:#53b76f " v-if="model.status === 2">瀹℃壒閫氳繃</span>
<span class="right" style="background:#dc362e " v-if="model.status === 3">瀹℃壒涓嶉�氳繃</span>
<span class="right" style="background:#dc362e " v-if="model.status === 4">宸插彇娑�</span>
@@ -67,17 +67,17 @@
<div class="item" v-for="(item,index) in model.approveDateVO.approveList" :key="item.id">
<div class="separate" v-if=" (index < model.approveDateVO.approveList.length-1)"></div>
<div class="info">
- <img src="@/assets/icons/ic_tongguo.png" class="iconnew" v-if="(item.type !=1 &&item.status ==2)"/>
- <img src="@/assets/icons/ic_dangqian.png" class="iconnew" v-if="(item.type !=1 &&item.status==1)"/>
- <img src="@/assets/icons/ic_jujue.png" class="iconnew" v-if="(item.type !=1 &&item.status==3)"/>
- <img src="@/assets/icons/ic_grey.png" class="iconnew" v-if="item.type ==1 || (item.status==null || item.status==0 )"/>
+ <img src="@/assets/icons/ic_tongguo.png" class="iconnew" v-if="( item.status ==2)"/>
+ <img src="@/assets/icons/ic_dangqian.png" class="iconnew" v-if="( item.status==1)"/>
+ <img src="@/assets/icons/ic_jujue.png" class="iconnew" v-if="( item.status==3)"/>
+ <img src="@/assets/icons/ic_grey.png" class="iconnew" v-if=" (item.status==null || item.status==0 )"/>
<div style="display: inline" v-if="item.approveType !=1">
<img v-if="item.faceImg!=null && item.faceImg !=''" :src="item.faceImg" class="avatar" alt="" />
<img v-if="item.faceImg ==null ||item.faceImg ==''" src="@/assets/avatar/man.png" class="avatar" alt="" />
</div>
- <div style="display: inline" v-if="item.approveType ==1">
- <img v-if="item.status == 1" src="@/assets/icons/ic_chaosong.png" class="avatar" alt="" />
- <img v-if="item.status != 1" src="@/assets/icons/ic_duoren.png" class="avatar" alt="" />
+ <div style="display: inline" v-if="item.approveType == 1">
+ <img v-if="item.type !=1" src="@/assets/icons/ic_duoren.png" class="avatar" alt="" />
+ <img v-if="item.type == 1" src="@/assets/icons/ic_chaosong.png" class="avatar" alt="" />
</div>
<div class="content">
<div class="line">
@@ -98,7 +98,7 @@
{{ item.checkInfo || '' }}
</div>
<div v-if="item.approveType == 1 " class="childList">
- <div class="m_content" v-for="item1 in item.approveList" :key="item1.id">
+ <div class="m_content company" v-for="item1 in item.approveList" :key="item1.id">
<img v-if="item1.faceImg!=null && item1.faceImg !=''" :src="item1.faceImg" class="avatar" alt="" />
<img v-if="item1.faceImg ==null ||item1.faceImg ==''" src="@/assets/avatar/man.png" class="avatar" alt="" />
<span > {{item1.memberName}}</span>
@@ -177,6 +177,7 @@
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import { driveList } from '@/api/business/member'
+import { approveDo } from '@/api/business/approve'
import { mapState } from 'vuex'
export default {
name: 'OperaCarUseBookWindow',
@@ -216,12 +217,13 @@
if (!valid) {
return
}
- this.$dialog.actionConfirm('鎿嶄綔纭', '鎮ㄧ‘璁ゆ彁浜よ闅愭偅澶勭悊鎯呭喌鍚楋紵')
+ this.$dialog.actionConfirm('鎿嶄綔纭', '鎮ㄧ‘璁ゅ悓鎰忚鐢宠鍚楋紵')
.then(() => {
this.dealing = true
- this.api.dealHiddenDanger({
- id: this.dataId,
- status: 1,
+ approveDo({
+ objId: this.dataId,
+ objType: this.model.type == 1?4:3,
+ status: 2,
driverId: this.dealForm.driveId,
checkInfo: this.dealForm.checkInfo
})
@@ -241,24 +243,21 @@
if (!valid) {
return
}
- this.$dialog.actionConfirm('鎿嶄綔纭', '鎮ㄧ‘璁ら��鍥炶闅愭偅澶勭悊鎯呭喌鍚楋紵')
- .then(() => {
- this.dealing = true
- this.api.dealHiddenDanger({
- id: this.dataId,
- status: 2,
- checkInfo: this.backForm.checkInfo
+ approveDo({
+ objId: this.dataId,
+ objType: this.model.type == 1?4:3,
+ status: 3,
+ checkInfo: this.dealForm.checkInfo
+ }).then(res => {
+ this.$tip.apiSuccess('閫�鍥炴垚鍔�')
+ this.getDetail()
+ this.isBackProblem = false
})
- .then(res => {
- this.$tip.apiSuccess('閫�鍥炴垚鍔�')
- this.getDetail()
- this.isBackProblem = false
- })
- .catch(e => {
- })
- .finally(() => {
- this.dealing = false
- })
+ .catch(e => {
+ })
+ .finally(() => {
+ this.dealing = false
+ })
})
})
},
@@ -455,6 +454,13 @@
flex-wrap: wrap;
margin-left: 100px;
}
+ .company {
+ font-size: 13px;
+ color: #888888;
+ .status {
+ color: #00ba67;
+ }
+ }
.m_content{
display: flex;
flex-direction: column;
@@ -509,13 +515,6 @@
.time {
color: #888888;
}
- .company {
- font-size: 13px;
- color: #888888;
- .status {
- color: #00ba67;
- }
- }
}
}
}
@@ -524,7 +523,7 @@
border-radius: 4px;
padding: 13px 15px;
color: #666666;
- margin-left: 120px;
+ margin-left: 100px;
}
}
--
Gitblit v1.9.3