Commit 7d100707 authored by 王启林's avatar 王启林

合并冲突

parent 82cfb71c
<template>
<div>
<a-drawer
:title="title"
placement="right"
width="700px"
:visible="Visible"
@close="onClose"
>
<a-drawer :title="title" placement="right" width="700px" :visible="Visible" @close="onClose">
<!-- 评价 -->
<div v-if="type == 1">
<a-steps direction="vertical" :current="1">
......@@ -15,129 +9,87 @@
<div slot="description" class="transact-step">
<a-row :gutter="[0, 10]">
<a-col :span="12">
<span
><span class="lable">评价人:</span
>{{
detailsInfo.idcard_Name ? detailsInfo.idcard_Name : "--"
}}</span
>
<span><span class="lable">评价人:</span>{{
detailsInfo.idcard_Name ? detailsInfo.idcard_Name : "--"
}}</span>
</a-col>
<a-col :span="12">
<span
><span class="lable">手机号:</span
>{{ detailsInfo.phone ? detailsInfo.phone : "--" }}</span
>
<span><span class="lable">手机号:</span>{{ detailsInfo.phone ? detailsInfo.phone : "--" }}</span>
</a-col>
</a-row>
<a-row :gutter="[0, 10]">
<a-col :span="12">
<span
><span class="lable">身份证号:</span
>{{
detailsInfo.idcard_IDCardNo
? detailsInfo.idcard_IDCardNo
: "--"
}}</span
>
<span><span class="lable">身份证号:</span>{{
detailsInfo.idcard_IDCardNo
? detailsInfo.idcard_IDCardNo
: "--"
}}</span>
</a-col>
<a-col :span="12">
<span
><span class="lable">窗口编号:</span
>{{
detailsInfo.window_fronum
? detailsInfo.window_fronum
: "--"
}}</span
>
<span><span class="lable">窗口编号:</span>{{
detailsInfo.window_fronum
? detailsInfo.window_fronum
: "--"
}}</span>
</a-col>
</a-row>
<a-row :gutter="[0, 10]">
<a-col :span="12">
<span
><span class="lable">评价选项:</span
>{{
detailsInfo.option_id ? detailsInfo.option_id : "--"
}}</span
>
<span><span class="lable">评价选项:</span>{{
detailsInfo.option_id ? detailsInfo.option_id : "--"
}}</span>
</a-col>
<a-col :span="12">
<span
><span class="lable">评价时间:</span
>{{
detailsInfo.create_time ? detailsInfo.create_time : "--"
}}</span
>
<span><span class="lable">评价时间:</span>{{
detailsInfo.create_time ? detailsInfo.create_time : "--"
}}</span>
</a-col>
</a-row>
<a-row :gutter="[0, 10]">
<a-col :span="24">
<span class="lable">评价指标:</span>
<a-tag
color="blue"
class="mb-1"
v-for="(item, index) in detailsInfo.content"
:key="index"
>
<a-tag color="blue" class="mb-1" v-for="(item, index) in detailsInfo.content" :key="index">
{{ item }}
</a-tag>
</a-col>
</a-row>
<a-row :gutter="[0, 10]">
<a-col :span="12">
<span
><span class="lable">评价来源:</span
>{{ detailsInfo.source ? detailsInfo.source : "--" }}</span
>
<span><span class="lable">评价来源:</span>{{ detailsInfo.source ? detailsInfo.source : "--" }}</span>
</a-col>
<a-col :span="12">
<span
><span class="lable">评价设备:</span
>{{
detailsInfo.devicenum ? detailsInfo.devicenum : "--"
}}</span
>
<span><span class="lable">评价设备:</span>{{
detailsInfo.devicenum ? detailsInfo.devicenum : "--"
}}</span>
</a-col>
</a-row>
<a-row :gutter="[0, 10]">
<a-col :span="12">
<span
><span class="lable">评价状态:</span
>{{
!detailsInfo.evaluatestatus
? "--"
: detailsInfo.evaluatestatus == 1
<span><span class="lable">评价状态:</span>{{
!detailsInfo.evaluatestatus
? "--"
: detailsInfo.evaluatestatus == 1
? "等待评价"
: detailsInfo.evaluatestatus == 2
? "完成"
: detailsInfo.evaluatestatus == 3
? "截图有误"
: detailsInfo.evaluatestatus == 4
? "用户截图签名超时"
: detailsInfo.evaluatestatus == 5
? "用户评价超时"
: "收到图片等待签名"
}}</span
>
? "完成"
: detailsInfo.evaluatestatus == 3
? "截图有误"
: detailsInfo.evaluatestatus == 4
? "用户截图签名超时"
: detailsInfo.evaluatestatus == 5
? "用户评价超时"
: "收到图片等待签名"
}}</span>
</a-col>
<a-col :span="12">
<span>
<span class="lable">评价人照片:</span>
<a-avatar
v-if="!detailsInfo.picture"
shape="square"
:size="40"
icon="user"
/>
<img
v-else
:src="baseurl + '/' + detailsInfo.picture"
@click="
$viewerApi({
images: [baseurl + '/' + detailsInfo.picture],
})
"
class="cursor-pointer w-[50px] max-h-[50px] rounded-[4px]"
/>
<a-avatar v-if="!detailsInfo.picture" shape="square" :size="40" icon="user" />
<img v-else :src="baseurl + '/' + detailsInfo.picture" @click="
$viewerApi({
images: [baseurl + '/' + detailsInfo.picture],
})
" class="cursor-pointer w-[50px] max-h-[50px] rounded-[4px]" />
</span>
</a-col>
</a-row>
......@@ -152,16 +104,11 @@
<div class="elapsed-time">
<p class="elapsed-time-title">
<span>总耗时:</span>
<span
>{{ detailsInfo.alltime ? detailsInfo.alltime : "--" }}
<span>{{ detailsInfo.alltime ? detailsInfo.alltime : "--" }}
<span v-if="detailsInfo.alltime">
<a-icon
v-if="
compareTime(detailsInfo.alltime, detailsInfo.p_alltime)
"
type="arrow-up"
style="color: #ff4d4f"
/>
<a-icon v-if="
compareTime(detailsInfo.alltime, detailsInfo.p_alltime)
" type="arrow-up" style="color: #ff4d4f" />
<a-icon v-else type="arrow-down" style="color: #1bbc9b" />
</span>
</span>
......@@ -180,13 +127,9 @@
detailsInfo.waittime ? detailsInfo.waittime : "--"
}}</span>
<span v-if="detailsInfo.waittime">
<a-icon
v-if="
compareTime(detailsInfo.waittime, detailsInfo.p_waittime)
"
type="arrow-up"
style="color: #ff4d4f"
/>
<a-icon v-if="
compareTime(detailsInfo.waittime, detailsInfo.p_waittime)
" type="arrow-up" style="color: #ff4d4f" />
<a-icon v-else type="arrow-down" style="color: #1bbc9b" />
</span>
</p>
......@@ -202,11 +145,8 @@
<span>办理时间:</span>
<span>{{ detailsInfo.bltime ? detailsInfo.bltime : "--" }}</span>
<span v-if="detailsInfo.bltime">
<a-icon
v-if="compareTime(detailsInfo.bltime, detailsInfo.p_bltime)"
type="arrow-up"
style="color: #ff4d4f"
/>
<a-icon v-if="compareTime(detailsInfo.bltime, detailsInfo.p_bltime)" type="arrow-up"
style="color: #ff4d4f" />
<a-icon v-else type="arrow-down" style="color: #1bbc9b" />
</span>
</p>
......@@ -233,12 +173,10 @@
</a-row>
<a-row :gutter="[0, 8]">
<a-col :span="12">
<span>排队编号:</span
>{{ detailsInfo.flownum ? detailsInfo.flownum : "--" }}
<span>排队编号:</span>{{ detailsInfo.flownum ? detailsInfo.flownum : "--" }}
</a-col>
<a-col :span="12">
<span>取号方式:</span
>{{ detailsInfo.wy_signin === 0 ? "现场取号" : "线上取号" }}
<span>取号方式:</span>{{ detailsInfo.wy_signin === 0 ? "现场取号" : "线上取号" }}
</a-col>
</a-row>
<a-row :gutter="[0, 8]">
......@@ -262,17 +200,12 @@
</div>
</div>
</a-step>
<a-step
title="办理中"
v-if="detailsInfo.style === 1 || detailsInfo.style === 4"
>
<a-step title="办理中" v-if="detailsInfo.style === 1 || detailsInfo.style === 4">
<a-icon type="environment" slot="icon" />
<div slot="description">
<a-row :gutter="[0, 8]">
<a-col :span="12">
<span>办理窗口:</span>{{ detailsInfo.window_name }}-{{
detailsInfo.window_fromnum
}}
<span>办理窗口:</span>{{ detailsInfo.window_name }}-{{ detailsInfo.window_fromnum }}
</a-col>
<a-col :span="12">
<span>开始办理时间:</span>{{ detailsInfo.calltime }}
......@@ -304,79 +237,54 @@
</a-row>
<a-row :gutter="[0, 8]">
<a-col :span="12">
<span>评价时间:</span
>{{ detailsInfo.pj_time ? detailsInfo.pj_time : "--" }}
<span>评价时间:</span>{{ detailsInfo.pj_time ? detailsInfo.pj_time : "--" }}
</a-col>
</a-row>
<a-row :gutter="[0, 8]">
<a-col :span="24">
<span>评价指标:</span>
<a-tag
color="blue"
class="mb-1"
v-for="(item, index) in detailsInfo.content"
:key="index"
>
<a-tag color="blue" class="mb-1" v-for="(item, index) in detailsInfo.content" :key="index">
{{ item }}
</a-tag>
</a-col>
</a-row>
<a-row :gutter="[0, 10]">
<a-col :span="12">
<span
><span class="lable">评价来源:</span
>{{ detailsInfo.source ? detailsInfo.source : "--" }}</span
>
<span><span class="lable">评价来源:</span>{{ detailsInfo.source ? detailsInfo.source : "--" }}</span>
</a-col>
<a-col :span="12">
<span
><span class="lable">评价设备:</span
>{{
detailsInfo.devicenum ? detailsInfo.devicenum : "--"
}}</span
>
<span><span class="lable">评价设备:</span>{{
detailsInfo.devicenum ? detailsInfo.devicenum : "--"
}}</span>
</a-col>
</a-row>
<a-row :gutter="[0, 10]">
<a-col :span="12">
<span
><span class="lable">评价状态:</span
>{{
!detailsInfo.evaluatestatus
? "--"
: detailsInfo.evaluatestatus == 1
<span><span class="lable">评价状态:</span>{{
!detailsInfo.evaluatestatus
? "--"
: detailsInfo.evaluatestatus == 1
? "等待评价"
: detailsInfo.evaluatestatus == 2
? "完成"
: detailsInfo.evaluatestatus == 3
? "截图有误"
: detailsInfo.evaluatestatus == 4
? "用户截图签名超时"
: detailsInfo.evaluatestatus == 5
? "用户评价超时"
: "收到图片等待签名"
}}</span
>
? "完成"
: detailsInfo.evaluatestatus == 3
? "截图有误"
: detailsInfo.evaluatestatus == 4
? "用户截图签名超时"
: detailsInfo.evaluatestatus == 5
? "用户评价超时"
: "收到图片等待签名"
}}</span>
</a-col>
<a-col :span="12">
<span>
<span class="lable">评价人照片:</span>
<a-avatar
v-if="!detailsInfo.picture"
shape="square"
:size="40"
icon="user"
/>
<img
v-else
:src="baseurl + '/' + detailsInfo.picture"
@click="
$viewerApi({
images: [baseurl + '/' + detailsInfo.picture],
})
"
class="cursor-pointer w-[50px] max-h-[50px] rounded-[4px]"
/>
<a-avatar v-if="!detailsInfo.picture" shape="square" :size="40" icon="user" />
<img v-else :src="baseurl + '/' + detailsInfo.picture" @click="
$viewerApi({
images: [baseurl + '/' + detailsInfo.picture],
})
" class="cursor-pointer w-[50px] max-h-[50px] rounded-[4px]" />
</span>
</a-col>
</a-row>
......@@ -439,7 +347,7 @@ export default {
return 1;
},
},
created() {},
created() { },
methods: {
onClose() {
this.Visible = false;
......@@ -472,6 +380,7 @@ export default {
:deep(.ant-steps-item-title) {
color: #1890ff !important;
}
.header {
height: 90px;
margin-bottom: 20px;
......@@ -481,15 +390,19 @@ export default {
display: flex;
justify-content: space-around;
align-items: center;
.elapsed-time-title {
font-size: 16px;
}
.time {
color: #1890ff;
}
}
.transact-step {
position: relative;
.transact-tips1,
.transact-tips2,
.transact-tips3 {
......@@ -506,14 +419,17 @@ export default {
right: 0px;
transform: rotate(45deg);
}
.transact-tips1 {
border: 8px solid rgba(0, 168, 112, 0.1);
color: #00a870;
}
.transact-tips2 {
border: 8px solid rgba(8, 87, 232, 0.1);
color: #0857e8;
}
.transact-tips3 {
border: 8px solid rgba(101, 101, 101, 0.1);
color: #656565;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment