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

src/components/Hotel/reservation/HotelOrderList.vue

@@ -337,7 +337,8 @@
                     PlatformMoney:item.PlatformMoney,
                     HandFittingIncome: item.HandFittingIncome,
                     HandFittingTax: item.HandFittingTax,
-                    DueInMoney:item.DueInMoney
+                    DueInMoney:item.DueInMoney,
+                    ...item
                   }
                   item.list.push(datas)
                 })

src/components/Hotel/reservation/OrderList.vue

@@ -562,7 +562,8 @@
             <span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column v-if="(scope.row.SellCommission&&scope.row.SellCommission>0)||(scope.row.OPCommission&&scope.row.OPCommission>0)" label="提成" style="background:#EAEAEA">
+        <el-table-column v-if="(scope.row.SellCommission&&scope.row.SellCommission>0)||(scope.row.OPCommission&&scope.row.OPCommission>0)"
+          label="提成" style="background:#EAEAEA">
           <template slot-scope="scope">
             <div class="width100-float-l" v-if="scope.row.SellCommission&&scope.row.SellCommission>0"><span class="float-l">销售：</span>
               <commissionDialog :objNew="scope.row" :OP="0"></commissionDialog>

src/components/SalesVisa/components/visaOrderList.vue

@@ -650,7 +650,8 @@
                 </template>
               </el-table-column>
               <el-table-column label="提成" style="background:#EAEAEA"
-                v-if="(scope.row.commissionMoney&&scope.row.commissionMoney>0)||(scope.row.opCommission&&scope.row.opCommission>0)">
+                v-if="(scope.row.commissionMoney&&scope.row.commissionMoney>0)||(scope.row.opCommission&&scope.row.opCommission>0)"
+                min-width="100">
                 <template slot-scope="scope">
                   <div class="width100-float-l" v-if="scope.row.commissionMoney&&scope.row.commissionMoney>0">
                     <span class="float-l">销售：<span class="cF1416C">￥</span></span>

src/components/confirmationOrderDownLoadNew.vue

@@ -533,16 +533,15 @@
       // 生成pdf
       toPDF_2023: function () {
         this.pdfLoading = true;
+        var that = this;
         let urlObj = this.domainManager();
         let msg = this.getPostMsg();
-        var title = this.orderMsg.startDate + this.orderMsg.lineteamName+this.orderMsg.dayNum+'日游';
+        var title = this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游';
         //欧洲
-        if(this.dataAll.lineId==168||this.dataAll.lineId==119)
-        {
-          title =this.orderMsg.startDate+ this.dataAll.title;
+        if (this.dataAll.lineId == 168 || this.dataAll.lineId == 119) {
+          title = this.orderMsg.startDate + this.dataAll.title;
         }
         var fileName = title + ".pdf";
-        console.log("fileNmae",fileName);
         if (this.orderId && this.orderId > 0) {
           //出团通知书下载
           this.pdfDownLoad(fileName, msg);
@@ -554,12 +553,12 @@
           var objFileKey = "TripDownLoad"
           objFileKey += "/" + msg.configId + "_" + msg.tcid;
           objFileKey += "/" + msg.configId + "_" + msg.tcid + ".pdf";
-          this.downloadChengDuFileRename(objFileKey, fileName, res => {
+          that.downloadChengDuFileRename(objFileKey, fileName, res => {
             console.log("ali_doanload", res)
             if (res.resultCode == 0) {
-              this.pdfDownLoad(fileName, msg);
+              that.pdfDownLoad(fileName, msg);
             } else {
-              this.pdfLoading = false;
+              that.pdfLoading = false;
             }
           })
         }

src/components/myOrdersAllType/components/OrderList.vue

@@ -19,7 +19,7 @@
       ]"
     >
       <el-table-column
-        width="140"
+        width="130"
         prop="CreateTimeStr"
         label="订单Id"
         fixed="left"
@@ -41,7 +41,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        width="170"
+        width="180"
         prop="CreateTimeStr"
         label="团号"
         show-overflow-tooltip
@@ -223,7 +223,7 @@
         prop="StateName"
         label="状态"
         show-overflow-tooltip
-        min-width="80"
+        min-width="70"
       >
         <template slot-scope="scope">
           <span>{{ scope.row.StateName }}</span>
@@ -356,7 +356,7 @@
       ]"
     >
       <el-table-column
-        width="140"
+        width="130"
         prop="CreateTimeStr"
         label="订单Id"
         fixed="left"
@@ -378,7 +378,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        width="170"
+        width="180"
         prop="CreateTimeStr"
         label="团号"
         show-overflow-tooltip
@@ -560,7 +560,7 @@
         prop="StateName"
         label="状态"
         show-overflow-tooltip
-        min-width="80"
+        min-width="70"
       >
         <template slot-scope="scope">
           <span>{{ scope.row.StateName }}</span>
@@ -633,6 +633,7 @@
         </button>
       </div>
       <el-form label-width="100px">
+        <el-row>
           <el-col :span="4">
             <el-form-item label="应收总金额" prop="">
               <el-input
@@ -650,6 +651,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
       </el-form>
 
     </div>
@@ -1554,4 +1556,7 @@ export default {
 /deep/.myAllTypeOrder .el-table th.el-table__cell{
   background-color: #f5f7fa !important;
 }
+/deep/.myAllTypeOrder .el-table__fixed-right::before, /deep/.myAllTypeOrder .el-table__fixed::before{
+  background-color: rgba(23,23,23,0) !important;
+}
 </style>

src/components/orderCommon/order-form2.vue

@@ -553,7 +553,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="4" style="display: none;">
+        <el-col :span="4">
           <!--交易方式-->
           <el-form-item :label="$t('tips.jiaoyifangshi')" prop="TradeWay"
             v-show="addMsg.ClientSource == 1 || addMsg.ClientSource == 4">

src/components/scenicSpot/reservation/ReservationOrder.vue

@@ -442,7 +442,8 @@ export default {
                   PlatformTax: item.PlatformTax,
                   Refund: item.Refund,
                   PlatformMoney: item.PlatformMoney,
-                  DueInMoney: item.DueInMoney
+                  DueInMoney: item.DueInMoney,
+                  ...item
                 }
                 let DaiShou
                 DaiShou = Number(item.Money-item.Income-item.PlatformTax-item.PlatformMoney+item.Refund)