no message

src/components/busManagement/BookAcar/components/BookAcarOrder.vue

@@ -58,7 +58,7 @@
               <li v-if="Title!='销售'">
                 <span>
                   <em>业务员</em>
-                  <el-select  filterable  v-model='msg.EnterID'  class="w200">
+                  <el-select filterable  v-model='msg.EnterID' class="w200">
                       <el-option :value="0" label="不限"></el-option>
                       <el-option v-for='item in EmployeeList'
                           :label='item.EmName'
@@ -170,7 +170,7 @@
             OrderETime: '',
             ProductName: '',
             Mobile: '',//电话
-            EnterID: '',//业务员
+            EnterID: 0,//业务员
           },
           total: 0,
           currentPage: 1,
@@ -318,7 +318,7 @@
         }
         let userInfo=this.getLocalStorage();
         this.employeeMsg.GroupId = userInfo.RB_Group_id;    //集团ID
-        this.msg.EnterID = userInfo.EmployeeId;
+        // this.msg.EnterID = userInfo.EmployeeId;
       },
       mounted() {
         this.Title = this.pagesTitle

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

@@ -420,6 +420,11 @@
             </div>
             <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.OrderSource&&item.CustomerId>0">B2B</template>
+                <template v-if="item.OrderSource==1">B2C</template>
+              </span>
             </div>
             <div class="row c9e fz12">
               <span>销售：</span>
@@ -643,7 +648,7 @@
               </el-tooltip>
             </div>
             <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20">
-              <div class="row-c justify-sb pb5">
+              <div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}">
                 <span class="fz12 c9e">订单总金额</span>
                 <div class="ml">
                   <span class="fz15 fbold">{{ item.Money.toFixed(2) }}</span>
@@ -652,6 +657,16 @@
                   </span>
                 </div>
               </div>
+              <div
+                class="row-c justify-sb py5"
+                v-if="item.DiscountsMoney>0"
+              >
+                <span class="fz12 c9e">优惠金额</span>
+                <div class="ml">
+                  <span class="fz14">{{ item.DiscountsMoney.toFixed(2) }}</span>
+                  <span class="fz12">{{ item.CurrencyName }}</span>
+                </div>
+              </div>
             </div>
             <div
               v-if="item.OrderStatus > 0 && item.OrderStatus < 4 && item.OrderStatus!=3"
@@ -662,7 +677,7 @@
                   item.OrderStatus == 1 &&
                     item.IncomeList.length == 0 &&
                       item.RefundList.length == 0 &&
-                      item.CostList.length == 0
+                      item.CostList.length == 0 && item.OrderSource!=1
                 "
                 class="row-c cursor-pointer radius5 cancel py5"
                 @click="clickRightButtom(item, 0)"
@@ -671,7 +686,7 @@
                 <span class="cF1416C">取消订单</span>
               </div>
               <div
-                v-if="item.OrderStatus == 1&&pagesTitle!='销售'"
+                v-if="item.OrderStatus == 1&&pagesTitle!='销售'&&item.OrderSource!=1"
                 class="row-c cursor-pointer radius5 confirm py5"
                 @click="clickRightButtom(item, 1)"
               >

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

@@ -361,8 +361,8 @@
                 >
               </div>
             </div>
-            <div class="c9e fz12" v-if="item.UseCompName||item.CustomerName">
-              <span>客人信息：
+            <div class="c9e fz12">
+              <span v-if="item.UseCompName||item.CustomerName">客人信息：
                 <template v-if="item.EmpId>0">
                   {{ item.UseCompName }}({{ item.UseName }})
                 </template> 
@@ -370,6 +370,11 @@
                   {{ item.CustomerName }}({{ item.CustomerContact }})
                 </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.OrderSource&&item.CustomerId>0">B2B</template>
+                  <template v-if="item.OrderSource==1">B2C</template>
+                </span>
             </div>
             <div class="row c9e fz12">
               <template v-if="item.EmName">
@@ -611,7 +616,7 @@
               </el-tooltip>
             </div>
             <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20">
-              <div class="row-c justify-sb pb5">
+              <div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}">
                 <span class="fz12 c9e">订单总金额</span>
                 <div class="ml">
                   <span class="fz15 fbold">{{ item.totalMoney.toFixed(2) }}</span>
@@ -620,6 +625,16 @@
                   </span>
                 </div>
               </div>
+              <div
+                class="row-c justify-sb py5"
+                v-if="item.DiscountsMoney>0"
+              >
+                <span class="fz12 c9e">优惠金额</span>
+                <div class="ml">
+                  <span class="fz14">{{ item.DiscountsMoney.toFixed(2) }}</span>
+                  <span class="fz12">{{ item.CurrencyName }}</span>
+                </div>
+              </div>
             </div>
             <div
               v-if="item.OfferState!=3"
@@ -630,7 +645,7 @@
                   item.OfferState == 1 &&
                     item.IncomeList.length == 0 &&
                       item.RefundList.length == 0 &&
-                      item.CostList.length == 0
+                      item.CostList.length == 0 && item.OrderSource!=1
                 "
                 class="row-c cursor-pointer radius5 cancel py5"
                 @click="clickRightButtom(item, 0)"
@@ -639,7 +654,7 @@
                 <span class="cF1416C">取消订单</span>
               </div>
               <div
-                v-if="item.OfferState == 1&&pagesTitle!='销售'"
+                v-if="item.OfferState == 1&&pagesTitle!='销售'&&item.OrderSource!=1"
                 class="row-c cursor-pointer radius5 confirm py5"
                 @click="clickRightButtom(item, 1)"
               >

src/components/scenicSpot/reservation/OrderList.vue

@@ -519,6 +519,11 @@
         </div>
         <div class="c9e fz12">
           <span>客人信息：{{ item.Name }}({{ item.EName }})/{{ item.Mobile }}</span>
+          <span v-if="pagesTitle!='销售'">
+            /来源<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>
         </div>
         <div class="row c9e fz12">
           <span>销售：</span>
@@ -721,7 +726,7 @@
           </el-tooltip>
         </div>
         <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20">
-          <div class="row-c justify-sb pb5" :class="{'borderD':item.MailingMoney>0}">
+          <div class="row-c justify-sb pb5" :class="{'borderD':item.MailingMoney>0||item.DiscountsMoney>0}">
             <span class="fz12 c9e">订单总金额</span>
             <div class="ml">
               <span class="fz15 fbold">{{ item.Money.toFixed(2) }}</span>
@@ -731,6 +736,7 @@
           <div
             class="row-c justify-sb py5"
             v-if="item.MailingMoney>0"
+            :class="{'borderD':item.DiscountsMoney>0}"
           >
             <span class="fz12 c9e">邮寄费</span>
             <div class="ml">
@@ -738,6 +744,16 @@
               <span class="fz12 ml">{{ item.CurrencyName }}</span>
             </div>
           </div>
+          <div
+            class="row-c justify-sb py5"
+            v-if="item.DiscountsMoney>0"
+            >
+              <span class="fz12 c9e">优惠金额</span>
+              <div class="ml">
+                <span class="fz14">{{ item.DiscountsMoney.toFixed(2) }}</span>
+                <span class="fz12">{{ item.CurrencyName }}</span>
+              </div>
+          </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">
@@ -745,12 +761,12 @@
             item.OrderStatus == 1 &&
             item.IncomeList.length == 0 &&
             item.RefundList.length == 0 &&
-            item.CostList.length == 0
+            item.CostList.length == 0 && item.OrderSource!=1
           " class="row-c cursor-pointer radius5 cancel py5" @click="clickRightButtom(item, 0)">
             <i v-loading="msg.OrderId == item.OrderId && loading0"></i>
             <span class="cF1416C">取消订单</span>
           </div>
-          <div v-if="item.OrderStatus == 1 && pagesTitle != '销售'" class="row-c cursor-pointer radius5 confirm py5"
+          <div v-if="item.OrderStatus == 1 && pagesTitle != '销售' && item.OrderSource!=1" class="row-c cursor-pointer radius5 confirm py5"
             @click="clickRightButtom(item, 1)">
             <i v-loading="msg.OrderId == item.OrderId && loading1"></i>
             <span class="c20C997">确认订单</span>