From 01967ae36162b9d2396bb282a8e4625388ca3d0c Mon Sep 17 00:00:00 2001
From: "SC-201807051622\\Administrator" <389930087@qq.com>
Date: Fri, 14 Feb 2020 18:19:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8E=86=E5=8F=B2=E5=A4=87?=
=?UTF-8?q?=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../TravelList/RegistrationList.vue | 23 ++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/components/TravelManager/TravelList/RegistrationList.vue b/src/components/TravelManager/TravelList/RegistrationList.vue
index b019bbed8..3a7515e87 100644
--- a/src/components/TravelManager/TravelList/RegistrationList.vue
+++ b/src/components/TravelManager/TravelList/RegistrationList.vue
@@ -2362,10 +2362,26 @@
</div>
</td>
<td colspan="3" style="height: 40px;">
- <div class="clearfix RL-MARK" style="width:75%;float:left;">
- <span class="RL-opremarkTitle">{{$t('Operation.Op_remark')}}:</span>
+ <div class="clearfix RL-MARK" style="width:88%;float:left;">
+ <span class="RL-opremarkTitle" style="width:52px;">{{$t('Operation.Op_remark')}}:</span>
<span class="RL-redType RL-remarkCon"
- style="width:74%;display:inline-block;">{{childItem.OP_Remarks ? childItem.OP_Remarks : 'æ— '}}</span>
+ style="width:73%;display:inline-block;">
+ {{childItem.OP_Remarks ? childItem.OP_Remarks : 'æ— '}}
+ <el-popover width="600" placement="bottom-end" trigger="click">
+ <div class="groupTourOrder_remarks_popover">
+ <div>{{$t('fnc.lsbeizhu')}}</div>
+ <p v-if="childItem.OPRemarksList.length !== 0" v-for="(item2, index2) in childItem.OPRemarksList" :key="index2" style="padding:5px 0;">
+ <span>{{item2.Remarks}}</span>
+ <span>{{item2.CreateByName}} <span
+ style="color: #666666;">{{item2.CreateDate}}</span></span>
+ </p>
+ <span v-if="childItem.OPRemarksList.length === 0">{{$t('system.content_noData')}}</span>
+ </div>
+ <el-button slot="reference" icon="iconfont icon-gengduo"
+ style="padding:0px;border:none;color:#e95252;font-size:12px;" class="groupTourOrder_remarks_btn">
+ </el-button>
+ </el-popover>
+ </span>
<div><span style="display:inline-block;">备注人/时间</span>:{{childItem.OPRemarkUpdateName}} {{childItem.OPRemarkUpdateTimeStr}}</div>
</div>
@@ -5093,6 +5109,7 @@
if (res.data.resultCode == 1) {
this.OrderDataList = res.data.data;
this.IsUpdateOrderMoney = res.data.data.IsUpdateOrderMoney
+ console.log(this.OrderDataList,'this.OrderDataList');
}
},
err => {}
--
2.18.1