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

src/components/Hotel/reservation/OrderList.vue

@@ -703,7 +703,7 @@
             ></i>
           </el-tooltip>
         </div>-->
-        <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;">
+        <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
           <div class="row-c justify-sb borderD pb5">
             <span class="fz12 c9e">订单总金额</span>
             <div class="ml">

src/components/Hotel/singleProduct/components/OrderList.vue

@@ -668,7 +668,7 @@
             ></i>
           </el-tooltip>
         </div>
-        <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;">
+        <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
           <div class="row-c justify-sb borderD pb5">
             <span class="fz12 c9e">订单总金额</span>
             <div class="ml">

src/components/SingleAirTicket/components/OrderList.vue

@@ -765,7 +765,7 @@
                 </el-tooltip>
               </div> -->
             </div>
-            <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;">
+            <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
               <div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}">
                 <span class="fz12 c9e">订单总金额</span>
                 <div class="ml">

src/components/busManagement/BookAcar/components/orderList.vue

@@ -421,7 +421,7 @@
             <div class="c9e fz12">
               <span>客人信息：{{ item.SurName }}{{ item.Name }}/{{ item.Mobile }}</span>
               <span v-if="pagesTitle!='销售'">
-                /来源<template v-if="!item.OrderSource&&!item.CustomerId">销售</template>
+                <template v-if="item.SurName||item.Name"> /</template>来源<template v-if="!item.OrderSource&&!item.CustomerId">销售</template>
                 <template v-if="!item.OrderSource&&item.CustomerId>0">B2B</template>
                 <template v-if="item.OrderSource==1">B2C</template>
               </span>
@@ -671,7 +671,7 @@
                 </el-tooltip>
               </div>
             </div>
-            <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;">
+            <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
               <div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}">
                 <span class="fz12 c9e">订单总金额</span>
                 <div class="ml">

src/components/busManagement/BookAcar/components/tripBusOrderList.vue

@@ -371,7 +371,7 @@
                 </template>
                 <span v-if="item.CustomerTel">/{{item.CustomerTel}}</span> </span>
                 <span v-if="pagesTitle!='销售'">
-                  /来源<template v-if="!item.OrderSource&&!item.CustomerId">销售</template>
+                  <template v-if="item.UseCompName||item.CustomerName"> /</template>来源<template v-if="!item.OrderSource&&!item.CustomerId">销售</template>
                   <template v-if="!item.OrderSource&&item.CustomerId>0">B2B</template>
                   <template v-if="item.OrderSource==1">B2C</template>
                 </span>
@@ -625,7 +625,7 @@
                 </el-tooltip>
               </div>
             </div>
-            <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;">
+            <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
               <div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}">
                 <span class="fz12 c9e">订单总金额</span>
                 <div class="ml">

src/components/scenicSpot/reservation/OrderList.vue

@@ -375,9 +375,10 @@
 }
 
 .orderop div {
-  width: 100px;
-  height: 50%;
+  width: auto;
+  height: 30px;
   display: flex;
+  padding: 0 5px;
   justify-content: center;
 }
 
@@ -520,7 +521,7 @@
         <div class="c9e fz12">
           <span v-if="item.Name||item.EName">客人信息：{{ item.Name }}({{ item.EName }})<template v-if="item.Mobile"> /{{ item.Mobile }}</template></span>
           <span v-if="pagesTitle!='销售'">
-            /来源<template v-if="!item.OrderSource&&!item.CustomerId">销售</template>
+            <template v-if="item.Name||item.EName"> /</template>来源<template v-if="!item.OrderSource&&!item.CustomerId">销售</template>
             <template v-if="!item.OrderSource&&item.CustomerId>0">B2B</template>
             <template v-if="item.OrderSource==1">B2C</template>
           </span>
@@ -629,7 +630,7 @@
       </el-table>
       
       <div class="row justify-sb mt mb20">
-        <div class="column px15 bjFFF3E0 radius5 flex-g pa relative" style="max-width: 300px;">
+        <div class="column px15 bjFFF3E0 radius5 flex-g pa relative" style="max-width: 300px;min-width: 150px;">
           <div class="fz12 row justify-sb" v-if="item.MailingState != 4">
             <span>{{ item.MailingState > 1 ? '收货地址：' : '自取地址：' }}</span>
             <div :class="{ 'cF1416C': item.MailingState == 2, 'c02C854': item.MailingState == 3 }">
@@ -750,7 +751,7 @@
           </div>
           
         </div>
-        <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;">
+        <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
           <div class="row-c justify-sb pb5" :class="{'borderD':item.MailingMoney>0||item.DiscountsMoney>0}">
             <span class="fz12 c9e">订单总金额</span>
             <div class="ml">
@@ -781,7 +782,7 @@
           </div>
         </div>
         <div v-if="item.OrderStatus > 0 && item.OrderStatus < 4 && item.OrderStatus != 3"
-          class="column justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s">
+          class="row-c wrap justify-c px15 bgE8F5E9 radius5 ml fz12 orderop flex-s">
           <div v-if="
             item.OrderStatus == 1 &&
             item.IncomeList.length == 0 &&
@@ -1141,15 +1142,15 @@ export default {
   methods: {
     close(){
       this.isShowCorrelation = false
-      this.CorrelationObj.TypeNum=null
+      this.CorrelationObj.TypeNum = null
+      this.CorrelationObj.Money = null
     },
     success(){
-      this.CorrelationObj.TypeNum=null
       this.close()
       this.$emit('success')
     },
     clickCorrelation(item,type){
-      this.CorrelationObj = item
+      this.CorrelationObj = JSON.parse(JSON.stringify(item))
       if(type==2){
         this.CorrelationObj.TypeNum = 4 //编辑总价
       }else{