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

src/components/SalesModule/groupTourOrder.vue

@@ -1156,7 +1156,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item :label="$t('salesModule.SSPT')" prop="BrandId" v-show="addMsg.ClientSource == 1|| addMsg.ClientSource == 4">
+            <el-form-item :label="$t('salesModule.SSPT')" prop="BrandId"
+              v-show="addMsg.ClientSource == 1|| addMsg.ClientSource == 4">
               <el-select v-model="addMsg.BrandId" :disabled="false" filterable :placeholder="$t('pub.pleaseSel')">
                 <el-option v-for="item in ssptList" :label="item.brandName" :value="item.dictId" :key="item.dictId">
                 </el-option>
@@ -1164,7 +1165,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item :label="$t('tips.jiaoyifangshi')" prop="TradeWay" v-show="addMsg.ClientSource == 1|| addMsg.ClientSource == 4">
+            <el-form-item :label="$t('tips.jiaoyifangshi')" prop="TradeWay"
+              v-show="addMsg.ClientSource == 1|| addMsg.ClientSource == 4">
               <el-select v-model="addMsg.TradeWay" :disabled="addMsg.OrderForm !== 4 ? true : false" filterable
                 :placeholder="$t('pub.pleaseSel')">
                 <el-option v-for="item in jyfsList" :label="item.Name" :value="item.Id" :key="item.Id">
@@ -1540,7 +1542,7 @@
               <span>已收小费：{{ countData.CompensationMoney?countData.CompensationMoney:'0' }};</span>
               <span>未收小费：{{ countData.PreferTipAmount-countData.CompensationMoney }};</span>
               <span>{{ $t("fnc.ztjine") }}：{{ countData.ZaiTu }};</span>
-              
+
             </p>
           </div>
         </el-col>
@@ -1646,7 +1648,7 @@
           <th width="60">{{ $t("Airticket.Air_Number") }}</th>
           <th width="80">{{ $t("fnc.danjia") }}</th>
           <th width="80">{{ $t("fnc.cjdanjia") }}</th>
-          
+
           <th width="80">{{ $t("fnc.yszonge") }}</th>
           <th width="80">{{ $t("fnc.shishou") }}</th>
           <th width="80">人头小费</th>
@@ -1668,8 +1670,9 @@
         <tbody v-for="(item, index) in list" :key="index">
           <tr>
             <td rowspan="3" style="position: relative;">
-              <span class="TC_neibu" style="float: inherit;margin-left: 5px;margin-right: 5px;position: absolute;top: 10px;left:3px" v-if="item.standardCurrencyName"
-              :class="{'TCneibu':item.standardCurrencyName=='人民币','TCb2b':item.standardCurrencyName=='日元',
+              <span class="TC_neibu"
+                style="float: inherit;margin-left: 5px;margin-right: 5px;position: absolute;top: 10px;left:3px"
+                v-if="item.standardCurrencyName" :class="{'TCneibu':item.standardCurrencyName=='人民币','TCb2b':item.standardCurrencyName=='日元',
               'TCb2c':item.standardCurrencyName=='新台币','AppPlat':item.standardCurrencyName=='',
               'otherPlat':item.standardCurrencyName=='',}">{{item.standardCurrencyName}}结算</span>
               <p v-if="item.isChargeLossOrders == 1" style="color: red">
@@ -1800,7 +1803,7 @@
             </td>
             <td style="color: #ff9c00">{{ item.tC_Price }}</td>
             <td style="color: #ff9c00">{{ item.unit_Price }}</td>
-            
+
             <td>
               <p style="color: #ff9c00">{{ item.preferPrice }}</p>
             </td>
@@ -2432,7 +2435,7 @@
   export default {
     data() {
       return {
-        pagesTitle:'跟团游订单',
+        pagesTitle: '跟团游订单',
         SpecialAppShow: false,
         SpecialAppMsg: {
           ApplyReason: "",
@@ -2893,12 +2896,17 @@
       },
       //跳转至领取合同
       goContract(item, sItem) {
+        let cid = 0;
+        if (sItem && sItem.id) {
+          cid = sItem.id;
+        }
         let routeData = this.$router.resolve({
           name: "TravelContractNew",
           query: {
             TCID: item.tcid,
             guestId: sItem.guestId,
             orderID: item.orderId,
+            Id: cid,
             blank: "y",
           },
         });
@@ -4797,11 +4805,11 @@
       this.userId = this.getLocalStorage().EmployeeId;
       if (this.$route.query.id) {
         this.msg.tempOrderId = this.$route.query.id;
-      }else if(this.$route.query.crmOrderObj){
-          let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
-          this.msg.tempOrderId = crmOrderObj.OrderId
-      }else if(this.$route.query.OrderId){
-          this.msg.tempOrderId = this.$route.query.OrderId
+      } else if (this.$route.query.crmOrderObj) {
+        let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
+        this.msg.tempOrderId = crmOrderObj.OrderId
+      } else if (this.$route.query.OrderId) {
+        this.msg.tempOrderId = this.$route.query.OrderId
       } else {
         this.msg.QStartDate = new Date().Format("yyyy-MM-dd");
       }

src/components/SalesVisa/VisaProductOrder.vue

@@ -877,10 +877,11 @@
         <th width="7%">出发日期</th>
         <th width="7%">报名日期</th>
         <th width="7%">应收总额</th>
-        <th width="7%">成本</th>
+        
         <th width="7%">实收</th>
         <th width="5%">退款</th>
         <th width="5%">平台税金</th>
+        <th width="7%">成本</th>
         <th width="5%">优惠</th>
         <th width="5%">待收</th>
         <th width="5%">在途</th>
@@ -909,9 +910,6 @@
           <td>
             <span class="totalPrice">￥{{moneyFormat(item.TotalPrice)}}</span>
           </td>
-          <td>
-            <span class="income">￥{{moneyFormat(item.CostMoney)}}</span>
-          </td>
           <td>
             <span class="income">￥{{moneyFormat(item.Income)}}</span>
           </td>
@@ -921,6 +919,9 @@
           <td>
             <span>￥{{moneyFormat(item.PlatformTax)}}</span>
           </td>
+          <td>
+            <span>￥{{moneyFormat(item.CostMoney)}}</span>
+          </td>
           <td>
             <span>￥{{moneyFormat(item.DiscountMoney)}}</span>
           </td>

src/components/confirmationOrderDownLoad.vue

@@ -1587,9 +1587,6 @@
           if (jin.length > 0) {
             details = jin
           }
-          // else if (jiu.length > 0) {
-          //  // details = jiu
-          // } 
           else if (dadian.length > 0) {
             details = dadian
           } else if (jiao.length > 0) {
@@ -1649,9 +1646,7 @@
           this.$set(this.tripList, j, x)
           x.dateTime = this.setDate(j);
         })
-
       },
-
       //上移下移(IsUp:0上移，1下移)
       MoveItem(item, subIndex, IsUp) {
         var currentItem = this.editForm.travelOrderFlightList[subIndex];

src/components/scenicSpot/reservation/OrderList.vue

@@ -614,7 +614,10 @@
         </el-table-column>
         <el-table-column label="待收" min-width="100">
           <template slot-scope="scope">
-            <span class="fz15 fbold" :class="{'cF1416C':(item.Money-scope.row.Income-scope.row.PlatformTax+scope.row.Refund).toFixed(2)!=0}">{{ (item.Money-scope.row.Income-scope.row.PlatformTax+scope.row.Refund).toFixed(2)}}</span>
+            <span class="fz15 fbold" 
+            :class="{'cF1416C':item.DaiShou>0}">
+            {{item.DaiShou}}
+          </span>
           </template>
         </el-table-column>
         <el-table-column label="利润" min-width="100">
@@ -755,7 +758,7 @@
           <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>
+              <span class="fz15 fbold">{{ (item.Money+item.MailingMoney).toFixed(2) }}</span>
               <span class="fz12">{{ item.CurrencyName }}</span>
             </div>
           </div>

src/components/scenicSpot/reservation/ReservationOrder.vue

@@ -420,11 +420,13 @@ export default {
             let addList = function(arr){
               arr.forEach(x=>{
                 x.list = []
+                x.DaiShou = 0
               })
             }
             addList(data)
             data.forEach((x) => {
               // x.Money = 0
+              
               let Money = 0
               x.DetailList.forEach((y) => {
                 Money+=y.Money
@@ -440,6 +442,9 @@ export default {
                   PlatformTax: item.PlatformTax,
                   Refund: item.Refund
                 }
+                let DaiShou
+                DaiShou = Number(item.Money+item.MailingMoney-item.Income-item.PlatformTax+item.Refund)
+                item.DaiShou = DaiShou.toFixed(2)==='-0.00'?'0.00':DaiShou.toFixed(2)
                 item.list.push(datas)
               })
             this.total = res.data.data.count;