11

src/components/TravelManager/TravelList/HotelOrderTotal.vue

@@ -185,9 +185,6 @@
             </el-select>
           </span>
         </li>
-
-
-
         <li v-if="ActionMenuCode.indexOf('ThirdHotelOrder')!=-1">
           <span>
             <em>{{$t('sm.company')}}</em>
@@ -343,7 +340,6 @@
         <th>{{$t('salesModule.CancelFee')}}</th>
         <th width="110">{{$t('fnc.khxinxi')}}</th>
         <th>{{$t('active.cl_addPp')}}</th>
-        <!-- <th>{{$t('MarketingActi.endTime')}}</th> -->
         <th width="180">{{$t('system.table_operation')}}</th>
       </tr>
       <tbody v-for="(item,index) in dataList" :key="`d_`+index">
@@ -361,7 +357,6 @@
             </div>
           </td>
           <td>{{item.ThirdOrderNo}}</td>
-
           <td><span class="cursorpointer text-decoration" @click="GotoUrl(item.TCNUM)"
               v-if="item.TCID">{{item.TCNUM}}({{item.TCID}})</span></td>
           <td>{{item.Number}}</td>
@@ -443,23 +438,29 @@
                 </el-tooltip>
                 <el-tooltip class="item" effect="dark" :content="$t('sm.exitOrder')" placement="top-start"
                   v-if="item.IsCanOrder == 0">
+                  <!--JALAN-->
                   <el-button type="info" v-if="item.Source==2" icon="iconfont icon-quxiao1"
                     @click="cancelHTorder(item.ThirdOrderNo)"></el-button>
-                  <el-button type="info" v-else-if="item.Source==4" icon="iconfont icon-quxiao1"
-                    @click="cancelDiDaorder(item)"></el-button>
                 </el-tooltip>
-                <el-tooltip class="item" effect="dark" :content="$t('pub.sureBtn')" placement="top-start">
+                <!--取消道旅订单(Source=4，道旅订单；OrderStatus=1或5 待支付，已支付)-->
+                <el-tooltip class="item" effect="dark" :content="$t('sm.exitOrder')" placement="top-start">
+                  <el-button v-if="item.Source==4&&(item.OrderStatus==1||item.OrderStatus==5)" type="info"
+                    icon="iconfont icon-quxiao1" @click="cancelDiDaorder(item)"></el-button>
+                </el-tooltip>
+                <!-- <el-tooltip class="item" effect="dark" :content="$t('pub.sureBtn')" placement="top-start">
                   <el-button type="success" icon="iconfont icon-duigou" v-if="item.IsCanClear == 0"
                     @click="queren(1, item.OrderID)"></el-button>
                 </el-tooltip>
                 <el-tooltip class="item" effect="dark" :content="$t('sm.exitsure')" placement="top-start">
                   <el-button type="info" icon=" iconfont icon-quxiao1" v-if="item.IsCanClear == 1"
                     @click="queren(0, item.OrderID)"></el-button>
-                </el-tooltip>
+                </el-tooltip> -->
+                <!--关联团队-->
                 <el-tooltip class="item" effect="dark" :content="$t('salesModule.UnionTeam')" placement="top-start">
                   <el-button type="warning" icon="iconfont icon-guanlian"
                     @click="TCID = '',GLOrderID = item.OrderID,dialogFormVisible = true"></el-button>
                 </el-tooltip>
+                <!--订单详情-->
                 <el-tooltip class="item" effect="dark" :content="$t('fnc.xiangqing')" placement="top-start">
                   <el-button type="success" icon="iconfont icon-sousuo" @click="goOrderDetails(item.OrderID)">
                   </el-button>
@@ -584,9 +585,8 @@
         <button class="normalBtn" type="primary" @click="querenDidaCancelOrder">{{$t('pub.sureBtn')}}</button>
       </div>
     </el-dialog>
-
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
-      layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
+      layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
     </el-pagination>
   </div>
 </template>
@@ -613,7 +613,7 @@
           CStartTime: '',
           CEndTime: '',
           Source: '4',
-          HotelName:"",//酒店名称
+          HotelName: "", //酒店名称
         },
         TCID: '',
         GLOrderID: '',
@@ -669,7 +669,6 @@
             return startTime.getTime() >= time.getTime()
           }
         },
-
         orderStatus: [{
           Name: this.$t('advmanager.v_all'),
           Id: 0
@@ -719,14 +718,11 @@
       GetSupperOrderEditAuth() {
         var actionCode = this.$AuthCode.isQueryHistoryData;
         this.CheckUserAuth(actionCode, res => {
-          if (res.data.resultCode == 1 && res.data.data == 1) {
-
-          } else {
+          if (res.data.resultCode == 1 && res.data.data == 1) {} else {
             let StartDate = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
             this.msg.StartTime = StartDate
           }
         });
-
       },
       GotoUrl(TCNUM) {
         this.$router.push({
@@ -750,7 +746,6 @@
           }
         }, err => {});
       },
-
       getThirdOrderSourceEnumEnumList() {
         this.apipost("sellorder_post_GetThirdOrderSourceEnumEnumList", {}, res => {
           if (res.data.resultCode == 1) {
@@ -758,7 +753,6 @@
           }
         }, err => {});
       },
-
       //获取当前信息
       getThisMsg(item) {
         this.updatePriceDialog = true;
@@ -830,12 +824,11 @@
           });
         });
       },
-
       querenDidaCancelOrder() {
         let userInfo = this.getLocalStorage();
         let EmployeeId = userInfo.EmployeeId;
-        this.didaCancelOrderMsg.CancelBy = EmployeeId,
-          this.didaCancelOrderMsg.CancelType = 2;
+        this.didaCancelOrderMsg.CancelBy = EmployeeId;
+        this.didaCancelOrderMsg.CancelType = 2;
         this.$confirm(this.$t('objFill.v101.querqxdid'), this.$t('tips.tips'), {
           confirmButtonText: this.$t('pub.sureBtn'),
           cancelButtonText: this.$t('pub.cancelBtn'),
@@ -911,7 +904,6 @@
           },
           err => {}
         );
-
       },
       handleCurrentChange(val) {
         this.msg.pageIndex = val;