Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2362,11 +2362,29 @@
                 </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:100%;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>
-                  <div><span style="display:inline-block;">备注人/时间</span>:{{childItem.OPRemarkUpdateName}}&nbsp;&nbsp;{{childItem.OPRemarkUpdateTimeStr}}</div>
+                    style="width:73%;display:inline-block;">
+                    {{childItem.OP_Remarks ? childItem.OP_Remarks : '无'}}
+                  </span>
+                  <div style="text-align:right;">
+                    {{childItem.OPRemarkUpdateName}}&nbsp;&nbsp;{{childItem.OPRemarkUpdateTimeStr}}
+                    <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;margin-bottom:5px;">
+                            <span>{{item2.Remarks}}</span>
+                            <span>{{item2.CreateByName}}&ensp;<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>
+                  </div>
                 </div>
               
               </td>
@@ -5093,6 +5111,7 @@
             if (res.data.resultCode == 1) {
               this.OrderDataList = res.data.data;
               this.IsUpdateOrderMoney = res.data.data.IsUpdateOrderMoney
+              console.log(this.OrderDataList,'this.OrderDataList');
             }
           },
           err => {}