From ff86c9d5a75a7a99a3e0a3c7f921d87caf87c622 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 29 五月 2024 12:07:41 +0800
Subject: [PATCH] 最新版本
---
admin/src/components/business/OperaCarUseBookWindow.vue | 73 ++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 29 deletions(-)
diff --git a/admin/src/components/business/OperaCarUseBookWindow.vue b/admin/src/components/business/OperaCarUseBookWindow.vue
index 6e1c896..e50d4ef 100644
--- a/admin/src/components/business/OperaCarUseBookWindow.vue
+++ b/admin/src/components/business/OperaCarUseBookWindow.vue
@@ -3,7 +3,6 @@
:title="title"
:visible.sync="visible"
@confirm="confirm"
- @close="reject"
>
<div class="modal_wrap">
<div class="modal_content">
@@ -21,7 +20,7 @@
<div class="info">
<div class="title">鍏姟杞︾敵璇蜂俊鎭�</div>
<div class="list">
- <div class="item">
+ <div class="item" style="width: 100%">
<div class="label">鐢宠浜�</div>
<div class="value">{{model.memberName || ''}} {{model.memberPhone || ''}} ({{model.companyName || ''}})</div>
</div>
@@ -57,26 +56,27 @@
</div>
<div class="item">
<div class="label">鐢ㄨ溅鏃舵</div>
- <div class="value">{{model.startTime || ''}}-{{model.endTime || ''}}</div>
+ <div class="value">濮�:{{model.startTime || ''}}<br>姝�:{{model.endTime || ''}}</div>
</div>
</div>
</div>
</div>
<div class="side">
<div class="side_title">瀹℃壒娴佺▼</div>
- <div class="list">
- <div class="item" v-for="(item,index) in logList" :key="item.id">
- <div class="separate" v-if="index < logList.length-1"></div>
+ <div class="list" v-if="model.approveDateVO !=null && model.approveDateVO.approveList !=null">
+ <div class="item" v-for="(item,index) in model.approveDateVO.approveList" :key="item.id">
+ <div class="separate" v-if="(model.approveDateVO.copyList !=null && model.approveDateVO.copyList.length>0) || (index < logList.length-1)"></div>
<div class="info">
- <i class="el-icon-success icon" v-if="(model.status ==1) || index < logList.length-1"></i>
- <i class="el-icon-question icon1" v-if="(model.status==0) && index == logList.length-1"></i>
- <i class="el-icon-error icon2" v-if="(model.status==2) && index == logList.length-1"></i>
+ <i class="el-icon-success icon1" v-if="(item.status ==0)"></i>
+ <i class="el-icon-question icon" v-if="(item.status==2 || item.status==5)"></i>
+ <i class="el-icon-error icon2" v-if="(item.status==3 ||item.status==4 || item.status==6 ) "></i>
+ <i class="el-icon-question icon3" v-if="(item.status==3 ||item.status==4 || item.status==6 ) "></i>
<img v-if="item.avatar!=null && item.avatar !=''" :src="item.avatar" class="avatar" alt="" />
<img v-if="item.avatar ==null ||item.avatar ==''" src="@/assets/avatar/man.png" class="avatar" alt="" />
<div class="content">
<div class="line">
<div class="name">{{ item.title}}</div>
- <div class="time">{{ item.createDate }}</div>
+ <div class="time">{{ item.createDate }}</div>3
</div>
<div class="line">
<div class="company">
@@ -94,6 +94,27 @@
</div>
</div>
</div>
+ <div class="item" v-if="model.approveDateVO.copyList !=null && model.approveDateVO.copyList.length">
+ <div class="info">
+ <i class="el-icon-question icon3"></i>
+ <img v-if="item.avatar!=null && item.avatar !=''" :src="item.avatar" class="avatar" alt="" />
+ <img v-if="item.avatar ==null ||item.avatar ==''" src="@/assets/avatar/man.png" class="avatar" alt="" />
+ <div class="content">
+ <div class="line">
+ <div class="name">鎶勯��</div>
+ <div class="time"></div>
+ </div>
+ <div class="line">
+ <div class="company">
+ {{ item.createUserName }} {{ item.companyName }}
+ <div style="display: inline">
+ 锛�<span class="status-green">{{stausInfo}}</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -105,9 +126,9 @@
</template>
<el-dialog
append-to-body
- title="杞氦"
+ title="鍚屾剰鐢宠"
class="dialogCl"
- :visible.sync="isShowTransfer"
+ :visible.sync="isShowProblem"
width="480px"
>
<el-form :model="dealForm" ref="dealForm" >
@@ -132,7 +153,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="isShowProblem = false">鍙栨秷</el-button>
- <el-button type="primary" :loading="transfering" @click="dealDo">纭畾</el-button>
+ <el-button type="primary" :loading="dealing" @click="dealDo">纭畾</el-button>
</span>
</el-dialog>
<el-dialog
@@ -154,7 +175,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="isBackProblem= false">鍙栨秷</el-button>
- <el-button type="primary" :loading="transfering" @click="backDo">纭畾</el-button>
+ <el-button type="primary" :loading="dealing" @click="backDo">纭畾</el-button>
</span>
</el-dialog>
</GlobalWindow>
@@ -166,7 +187,7 @@
import { driveList } from '@/api/business/member'
import { mapState } from 'vuex'
export default {
- name:'OperaCarUseBookWindow.vue',
+ name: 'OperaCarUseBookWindow',
components: { GlobalWindow },
extends: BaseOpera,
data () {
@@ -179,8 +200,6 @@
isShowProblem: false,
isBackProblem: false,
memberList: [],
- logList:[],
- copyList:[],
dealForm: {
driveId: null,
checkInfo: null
@@ -195,7 +214,7 @@
},
created () {
this.config({
- api: '/business/carUserBook',
+ api: '/business/carUseBook',
'field.id': 'id'
})
},
@@ -258,8 +277,6 @@
this.dataId = target.id
this.$nextTick(() => {
this.memberList = []
- this.logList = []
- this.copyList = []
this.dealForm = {
driveId: null,
checkInfo: null
@@ -275,14 +292,6 @@
.then(res => {
this.model = res
this.dealForm.driveId = res.driveId
- if(res.approveDateVO){
- if(res.approveDateVO.approveList){
- this.logList = res.approveDateVO.approveList
- }
- if(res.approveDateVO.copyList){
- this.copyList = res.approveDateVO.copyList
- }
- }
})
},
handleTransfer () {
@@ -358,7 +367,7 @@
.label {
color: #888888;
- width: 68px;
+ width: 100px;
}
.value {
@@ -464,6 +473,12 @@
color: #dc362e;
font-size: 24px;
}
+ .icon3 {
+ position: relative;
+ z-index: 11;
+ color:gray;
+ font-size: 24px;
+ }
.avatar {
width: 40px;
height: 40px;
--
Gitblit v1.9.3