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

src/components/TravelManager/Lxy/directorOrderDetails.vue

 <template>
   <div class="directorOrderDetails">
     <div class="head-title">
-      <span @click="CommonJump('directorOrderList')" class="blue point">订单列表</span> / 订单详情
+      <span @click="gobaclk()" class="blue point">订单列表</span> / 订单详情
     </div>
     <div class="content app-order-detail">
       <el-card class="app-order-status" shadow="never">
@@ -123,7 +123,7 @@
                   </button>
                 </div>
               </div>
-              <div flex="dir:left cross:center" class="item-box" v-if="dataInfo.DetailList[0].CarType!=5">
+              <div flex="dir:left cross:center" class="item-box" v-if="dataInfo.DetailList.length>0 && dataInfo.DetailList[0].CarType!=5">
                 <span class="label">目的地:</span>
                 <div class="express-address">
                   {{dataInfo.OrderInfo.DestinationAddress}}
@@ -289,7 +289,7 @@
         </el-col>
       </el-row>
       <el-card style="margin-top:15px" shadow="never">
-        <el-table border :data="dataInfo.DetailList" style="width: 100%">
+        <el-table border :data="dataInfo.DetailList"  style="width: 100%">
           <el-table-column prop="Id" label="商品标题">
             <template slot-scope="scope">
               <div flex="dir:left cross:center">
@@ -344,10 +344,6 @@
         </el-form>
       </el-card>
       <div flex="dir:right" class="action-box">
-        <el-button v-if="(activeStep==2 || activeStep==3) && !exitState" style="margin-left: 10px;" size="small"
-                   type="primary">打印发货单</el-button>
-        <el-button style="margin-left: 10px;" size="small" type="primary">打印小票</el-button>
-
         <el-button @click="qrEnd(dataInfo,3)" v-if="activeStep==4 && !exitState" style="margin-left: 10px;" size="small"
                    type="primary">确认完成</el-button>
         <el-button @click="qrEnd(dataInfo,2)" v-if="activeStep==3 && !exitState" style="margin-left: 10px;"
@@ -818,6 +814,9 @@
           }
         })
       },
+      gobaclk(){
+         this.$router.go(-1);//返回上一层
+      }
 
     },
     mounted() {

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2007,6 +2007,7 @@
           <tbody v-for="(childItem,childIndex) in subItem.List" :key="childIndex+2000">
             <tr>
               <td rowspan="3" style="position:relative;">
+                <div v-if="childItem.IsApplyForCancel==1" style="color:red;">有取消订单</div>
                 <div class="order_union">
                   <div v-if="childItem.IsReturnIntermodal==1 || childItem.IsIntermodal==1" class="fl">
                     {{$t('Operation.Op_lian')}}</div>
@@ -2234,6 +2235,7 @@
                         <div v-if="childItem.ScoreNum >= 0"
                           @click='goInvetig("investigationList", childItem.tcid, childItem.OrderId)'>
                           {{$t('salesModule.LookTourse')}}</div>
+                        <div v-if="childItem.IsApplyForCancel==1" @click="DingdanCancel(childItem)">取消审核</div>
                       </div>
                       <el-button slot="reference" type="primary"
                         style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;'
@@ -3108,6 +3110,31 @@
         <div slot="tip" class="el-upload__tip">{{$t('ground.znscexcel')}}</div>
       </el-upload>
     </el-dialog>
+
+    <el-dialog custom-class='w450' title="op确认" :visible.sync="isShowOpSure" center>
+      <el-form label-width="110px">
+        <el-form-item label="审核状态">
+            <el-radio v-model="OpSureMsg.AuditState" :label="1">通过</el-radio>
+            <el-radio v-model="OpSureMsg.AuditState" :label="2">拒绝</el-radio>
+        </el-form-item>
+        <template v-if="OpSureMsg.AuditState==1">
+          <el-form-item label="审核备注">
+            <el-input type="textarea" :rows="4" v-model="OpSureMsg.Remark"></el-input>
+          </el-form-item>
+          <el-form-item label="是否收损">
+              <el-radio v-model="OpSureMsg.IsLoss" :label="1">是</el-radio>
+              <el-radio v-model="OpSureMsg.IsLoss" :label="2">否</el-radio>
+          </el-form-item>
+          <el-form-item v-if="OpSureMsg.IsLoss==1" label="收损金额">
+              <el-input v-model="OpSureMsg.LossMoney" @keyup.native="checkPrice(OpSureMsg,'LossMoney')"></el-input>
+          </el-form-item>
+        </template>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <button class="normalBtn" type="primary" @click="opSureAudit">{{$t('pub.saveBtn')}}</button>
+        <button class="hollowFixedBtn" @click="isShowOpSure=false">{{$t('pub.cancelBtn')}}</button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -3118,6 +3145,7 @@
   export default {
     data() {
       return {
+        isShowOpSure:false, //op确认弹窗
         IsSupperOrderEdit: false, //获取总经理副总经理超级修改权限
         IsLookOrder: false, //出纳查看订单权限
         EditBtn: false, //恢复订单
@@ -3534,6 +3562,13 @@
         zhuijiaMsg: {},
         SetShouSunGuestNum: 0,
         RBBranchId: '',
+        OpSureMsg:{
+          OrderId:0,
+          AuditState:1, //1通过 2拒绝
+          Remark:'',
+          IsLoss:1, //是否受损 1是2否
+          LossMoney:'' //收损金额
+        }
       };
     },
     components: {
@@ -5697,6 +5732,27 @@
           }
         });
       },
+      //点击取消订单
+      DingdanCancel(item){
+        this.OpSureMsg.OrderId = item.OrderId;
+        this.OpSureMsg.AuditState = 1, //1通过 2拒绝
+        this.OpSureMsg.Remark = '',
+        this.OpSureMsg.IsLoss = 1, //是否受损 1是2否
+        this.OpSureMsg.LossMoney = '' //收损金额
+        this.isShowOpSure=true;
+      },
+      //op确认取消
+      opSureAudit(){
+         this.apipost('sellorder_post_SetAuditUserApplyForCancel', this.OpSureMsg , res => {
+            if (res.data.resultCode == 1) {
+              this.Success(res.data.message);
+              this.getList();
+              this.isShowOpSure=false;
+            } else {
+              this.Error(res.data.message);
+            }
+          }, err => {})
+      }
     },
     mounted() {
       this.GetSupperOrderEditAuth();

src/router/config.js

@@ -2688,7 +2688,7 @@ export default {
               name: 'travelOrders',
               component: resolve => require(['@/components/TravelManager/customizedcar/travelOrders'], resolve),
               meta: {
-                title: '线路报价'
+                title: '订单管理'
               },
             },
             {
@@ -2696,7 +2696,15 @@ export default {
               name: 'traveorderdetails',
               component: resolve => require(['@/components/TravelManager/customizedcar/traveorderdetails'], resolve),
               meta: {
-                title: '线路报价'
+                title: '订单详情'
+              },
+            },
+            {
+              path: '/costManagement', //国内旅游=>成本管理
+              name: 'costManagement',
+              component: resolve => require(['@/components/TravelManager/customizedcar/costManagement'], resolve),
+              meta: {
+                title: '成本管理'
               },
             },