页面修改

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/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];