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

src/components/SalesModule/SalesFinancialDetail.vue

@@ -195,8 +195,8 @@
           <th width="200">费用类型</th>
           <th width="350">交易方式</th>
           <th width="100">同行转款</th>
-          <th width="100">应收</th>
-          <th width="100">实收</th>
+          <th width="100">应付</th>
+          <th width="100">实付</th>
           <th width="100">平台税金</th>
           <th width="150">交易日期</th>
           <th width="100">制单人员</th>

src/components/SalesModule/groupTourOrder.vue

@@ -1349,7 +1349,7 @@
 										<div @click="goUrlT('confirmationOrder',item.orderId)">确认函</div>
                     <div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
 										<div v-if="item.isGuestOk=='1'&&item.outNotice==1" @click="toTrip(item)">出团通知书<span v-if="item.outNotice==1">(OK)</span><span v-else>(暂定)</span></div>
-										<div v-if="item.isOrder=='1'&&item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">旅客名单</div>
+										<div v-if="item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">旅客名单</div>
                     <div v-if="item.isOrder=='1'&&(item.isHaveFinance=='1'||item.orderState=='1')" @click='getHouse(item)'>修改房型</div>
                     <div v-if="item.isOrder=='1'&&item.orderState!='4'" @click="transfer(item)">订单转团</div>
 										<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')" @click='deleteItem(item)'>取消</div>
@@ -2002,7 +2002,7 @@ export default {
 				window.open(routeData.href, '_blank');
     },
     goUrlP(name, path, item) {
-      this.$router.push({ name: path, query: { id: item.orderId,tcid: item.tcid, tcnum: item.tcnum, blank: 'y', tab: name} });
+      this.$router.push({ name: path, query: { id: item.orderId,tcid: item.tcid, tcnum: item.tcnum,isOrder:item.isOrder, blank: 'y', tab: name} });
     },
     goUrl(name, path, id, tcmun) {
       this.$router.push({ name: path, query: { id: id, tcmun: tcmun, blank: 'y', tab: name} });

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1563,7 +1563,7 @@
                       <div @click="goUrlT('confirmationOrder',item.orderId)">确认函</div>
                       <div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
                       <div v-if="item.isGuestOk=='1'&&item.outNotice==1" @click="toTrip(item)">出团通知书<span v-if="item.outNotice==1">(OK)</span><span v-else>(暂定)</span></div>
-                      <div v-if="item.isOrder=='1'&&item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">旅客名单</div>
+                      <div v-if="item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">旅客名单</div>
                       <div v-if="item.isOrder=='1'&&(item.isHaveFinance=='1'||item.orderState=='1')" @click='getHouse(item)'>修改房型</div>
                       <div v-if="item.isOrder=='1'&&item.orderState!='4'" @click="transfer(item)">订单转团</div>
                       <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')" @click='deleteItem(item)'>取消</div>
@@ -1820,7 +1820,7 @@
                       <div @click="goUrlT('confirmationOrder',item.orderId)">确认函</div>
                       <div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
                       <div v-if="item.isGuestOk=='1'&&item.outNotice==1" @click="toTrip(item)">出团通知书<span v-if="item.outNotice==1">(OK)</span><span v-else>(暂定)</span></div>
-                      <div v-if="item.isOrder=='1'&&item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">旅客名单</div>
+                      <div v-if="item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">旅客名单</div>
                       <div v-if="item.isOrder=='1'&&(item.isHaveFinance=='1'||item.orderState=='1')" @click='getHouse(item)'>修改房型</div>
                       <div v-if="item.isOrder=='1'&&item.orderState!='4'" @click="transfer(item)">订单转团</div>
                       <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')" @click='deleteItem(item)'>取消</div>
@@ -3490,7 +3490,7 @@ export default {
       );
     },
     goUrlP(name, path, item) {
-      this.$router.push({ name: path, query: { id: item.orderId,tcid: item.tcid, tcnum: item.tcnum, blank: 'y', tab: name} });
+      this.$router.push({ name: path, query: { id: item.orderId,tcid: item.tcid, tcnum: item.tcnum,isOrder: item.isOrder, blank: 'y', tab: name} });
     },
     goUrl(name, path, id, tcmun) {
       this.$router.push({ name: path, query: { id: id, tcmun: tcmun, blank: 'y', tab: name} });

src/components/SalesModule/passengerSaleList.vue

 <template>
     <div class="passengerSaleList">
         <div class="passengerSaleList_topBtn">
-            <div v-show="tableList.length<guestNum" @click="goUrlA(0)">新增</div>
-            <div @click="goUrlP()">分房</div>
+            <div v-if="isOrder==1" v-show="tableList.length<guestNum" @click="goUrlA(0)">新增</div>
+            <div v-if="isOrder==1" @click="goUrlP()">分房</div>
         </div>
         <div class="passengerSaleList_tableBox">
             <table class="passengerSaleList_table" border="0" cellspacing="0" cellpadding="0" :loading="loading">
@@ -47,13 +47,13 @@
                         <td>{{item.IdCard}}</td>
                         <td>
                             <el-button-group>
-                                <el-tooltip  class="item" effect="dark" content="修改" placement="top-start">
+                                <el-tooltip v-if="isOrder==1"  class="item" effect="dark" content="修改" placement="top-start">
                                     <el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' icon="iconfont icon-bianji-smal" @click="goUrlA(item.Id)"></el-button>
                                 </el-tooltip>
-                                <el-tooltip  class="item" effect="dark" content="删除" placement="top-start">
+                                <el-tooltip v-if="isOrder==1" class="item" effect="dark" content="删除" placement="top-start">
                                     <el-button type="primary" style='background:#e95252; border-color:#e95252' icon="iconfont icon-shanchu" @click="pal_del(item)"></el-button>
                                 </el-tooltip>
-                                <el-tooltip  class="item" effect="dark" content="下载申请表" placement="top-start">
+                                <el-tooltip v-if="isOrder==1" class="item" effect="dark" content="下载申请表" placement="top-start">
                                     <el-button type="primary" style='background:#9E8DE3; border-color:#9E8DE3' icon="iconfont icon-img_download" @click="goUrlB(item.Id)"></el-button>
                                 </el-tooltip>
                             </el-button-group>
@@ -81,6 +81,7 @@ export default {
                 tcnum: '0'
             },
             guestNum: 0,
+            isOrder:0,
             tableList:[]
         };
     },
@@ -128,6 +129,7 @@ export default {
         this.msg.id = this.$route.query.id===undefined?"0":this.$route.query.id
         this.msg.tcid = this.$route.query.tcid===undefined?"0":this.$route.query.tcid
         this.msg.tcnum = this.$route.query.tcnum===undefined?"0":this.$route.query.tcnum
+        this.isOrder=this.$route.query.isOrder===undefined?0:this.$route.query.isOrder
         this.getData()
     }
 };