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

src/components/TravelContractConfirm.vue

@@ -2327,8 +2327,8 @@
                   = <font>{{CtObj.C_TotalPrice}}</font>元
                 </p>
                 <p>
-                  含：景点第一道门票、<font>{{CtObj.C_IncludeRemark}}</font>午（晚）餐费、往返车费、
-                  导游服务费:<font>{{CtObj.C_IncludeFee}}</font>；
+                  含：<font>{{CtObj.C_IncludeRemark}}</font>
+                  费用:<font>{{CtObj.C_IncludeFee}}</font>；
                   不含:<font>{{CtObj.C_NonIncludeRemark}}</font>
                 </p>
                 <p>支付时间：<font>{{getDate(CtObj.C_PayDate)}}</font>

src/components/TravelContractView.vue

@@ -1648,8 +1648,8 @@
                   = <font>{{CtObj.C_TotalPrice}}</font>元。
                 </p>
                 <p>
-                  含：景点第一道门票、<font>{{CtObj.C_IncludeRemark}}</font>午（晚）餐费、往返车费、
-                  导游服务费:<font>{{CtObj.C_IncludeFee}}</font>；
+                  含：<font>{{CtObj.C_IncludeRemark}}</font>
+                  费用:<font>{{CtObj.C_IncludeFee}}</font>；
                   不含:<font>{{CtObj.C_NonIncludeRemark}}</font>。
                 </p>
                 <p>支付时间：<font>{{getDate(CtObj.C_PayDate)}}</font>。</p>

src/components/myOrdersAllType/components/allList.vue

@@ -214,72 +214,41 @@
               </ul>
           </div>
           <!-- 统计版块 -->
-    <div class="groupTourOrder_count" v-if="TotalMsg">
+    <div class="groupTourOrder_count">
       <el-row :gutter="20">
-        <el-col :span="5" class="groupTourOrder_count_col">
+        <template v-for="(item,index) in SummaryList">
+          <!-- groupTourOrder_count_col -->
+        <el-col :span="6" class="">
           <div class="groupTourOrder_count_item HT_total">
             <div>
-              <i class="iconfont icon-qian groupTourOrder_count_green"></i>
-              <span>{{$t('op.TotalMoney')}}</span>
+              <span>{{item.CurrencyName}}</span>
             </div>
             <p>
-              <span class="groupTourOrder_count_green">{{$t('op.TotalMoney')}}：
-                {{TotalMsg.Money.toFixed(2)}}
+              <span class="groupTourOrder_count_green">应收：
+                {{item.Money.toFixed(2)}}
               </span>
-              <span class="groupTourOrder_count_green">{{$t('salesModule.TotalIncome')}}：
-                {{(TotalMsg.Money-TotalMsg.PayMoney).toFixed(2)}}
+              <span class="groupTourOrder_count_green">实收：
+                {{item.Income.toFixed(2)}}
               </span>
-              <span class="color_red_order">{{$t('op.Tocollected')}}：
-                {{TotalMsg.DueinMoney.toFixed(2)}}
+              <span class="color_red_order">退款：
+                {{item.Refund.toFixed(2)}}
               </span>
-            </p>
-          </div>
-        </el-col>
-        <el-col :span="5" class="groupTourOrder_count_col">
-          <div class="groupTourOrder_count_item HT_total">
-            <div>
-              <i class="iconfont icon-tongji1 groupTourOrder_count_blue"></i>
-              <span>{{$t('restaurant.res_Number')}}</span>
-            </div>
-            <p>
-              <span class="groupTourOrder_count_green">报名数：
-                {{TotalMsg.NorNumber}}
+              <span class="color_red_order">手续费：
+                {{item.PlatformTax.toFixed(2)}}
               </span>
-              <span class="color_red_order">取消数：
-                {{TotalMsg.CancelNum}}
+              <span class="color_red_order">成本：
+                {{item.CostMoney.toFixed(2)}}
               </span>
-            </p>
-          </div>
-        </el-col>
-        <!-- <el-col :span="5" class="groupTourOrder_count_col">
-          <div class="groupTourOrder_count_item HT_total">
-            <div>
-              <i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
-              <span>{{$t('fnc.qtxtongji')}}</span>
-            </div>
-            <p>
-              <span class="groupTourOrder_count_green">{{$t('fnc.nbbaoming')}}：
-                {{TotalMsg.totalERP}}
+              <span class="color_red_order">待收：
+                {{item.DueInMoney.toFixed(2)}}
               </span>
-              <span class="color_red_order">{{$t('fnc.B2BWAP')}}：
-                {{TotalMsg.totalB2B}}
+              <span class="color_red_order">报名数：
+                {{item.GuestNum}}人
               </span>
             </p>
           </div>
-        </el-col> -->
-        <el-col :span="5" class="groupTourOrder_count_col">
-          <div class="groupTourOrder_count_item HT_totalFinacel">
-            <div>
-              <i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
-              <span>{{$t('fnc.cwdjshuoming')}}</span>
-            </div>
-            <p>
-              <p><span class="groupTourOrderByTuan_ico"><i style="background-color:#3FC4FF"></i><span>{{$t('fnc.yidadan')}}</span></span>
-                <span class="groupTourOrderByTuan_ico"><i style="background-color:#F1416C"></i><span>{{$t('fnc.yhcnyshenhe')}}</span></span>
-                <span class="groupTourOrderByTuan_ico"><i style="background-color:#ff9800"></i><span>{{$t('fnc.ytongguo')}}</span></span></p>
-            </p>
-          </div>
         </el-col>
+      </template>
   
       </el-row>
     </div>
@@ -387,7 +356,8 @@
                 { Name: "未出签", Id: "1" },
                 { Name: "已出签", Id: "2" },
               ],
-              LineList: []
+              LineList: [],
+              SummaryList: [],
           };
         },
         watch: {
@@ -530,6 +500,7 @@
             this.apipost(url, this.msg,
               res => {
                 if (res.data.resultCode == 1) {
+                  this.getSummaryData()
                   let data = res.data.data.pageData
                   this.OrderList = data;
                   this.total = res.data.data.count;
@@ -542,6 +513,20 @@
               err => {this.loading = false}
             );
           },
+          getSummaryData(){
+            this.apipost(
+              "CarSingle_post_GetGuestOrderStatistics",
+              this.msg,
+              (res) => {
+                if (res.data.resultCode == 1) {
+                  let data = res.data.data;
+                  this.SummaryList = data
+                } else {
+                  this.$message.error(res.data.message);
+                }
+              }
+            );
+          },
           handleCurrentChange(val) {
               this.msg.pageIndex = val;
               this.GetList();

src/components/onedayTripContract.vue

@@ -726,10 +726,10 @@
               </tr>
               <tr>
                 <td>
-                  <el-form-item label="含：景点第一道门票、" style="display:inline-block;">
+                  <el-form-item label="含：" style="display:inline-block;">
                     <el-input type="text" class="w150" v-model="CtObj.C_IncludeRemark"></el-input>
                   </el-form-item>
-                  <el-form-item label="午(晚)餐费、往返车费、导游服务费" label-width="250px" style="display:inline-block;">
+                  <el-form-item label="费用" label-width="250px" style="display:inline-block;">
                     <el-input type="text" class="w150" @keyup.native="checkPrice(CtObj,'C_IncludeFee')"
                       v-model="CtObj.C_IncludeFee"></el-input>
                   </el-form-item>

src/components/orderCommon/order-form.vue

@@ -61,7 +61,7 @@
                 addMsg.CustomerType == 2 ||
                 addMsg.CustomerType == ''
               ">
-            <el-select v-model="addMsg.CustomerId" filterable :placeholder="$t('pub.pleaseSel')" @change="getSspt">
+            <el-select v-model="addMsg.CustomerId" filterable :placeholder="$t('pub.pleaseSel')" @change="changeCustomer">
               <el-option v-for="item in customerList" :label="item.customerName + '-' + item.contact"
                 :value="item.customerId" :key="item.customerId">
               </el-option>
@@ -1573,8 +1573,7 @@
             if (res.data.resultCode == 1) {
               this.ScenicRefundList = res.data.data;
               this.ScenicRefundList.forEach((item) => {
-                item["ScenicName"] =
-                  item.CouponsName + " -￥" + this.moneyFormat(item.RefundMoney);
+                item["ScenicName"] = item.CouponsName + " -￥" + this.moneyFormat(item.RefundMoney);
               });
             }
           },
@@ -1592,7 +1591,7 @@
         );
       },
       //客户品牌
-      getSspt() {
+      changeCustomer() {
         //给非直客  隐藏电话姓名赋值
         let obj = this.customerList.find(
           (item) => item.customerId == this.addMsg.CustomerId