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

src/components/SalesModule/SalesFinancialDetail.vue

@@ -90,14 +90,15 @@
           <li><span>{{activeTab===1 ? '实收' : '实付'}}金额：</span>{{moneyFormat(shiMoney)}}</li>
           <li><span>{{activeTab===1 ? '待收' : '待付'}}金额：</span><span :class="{color_red:(allMoney-shiMoney)!==allMoney}">{{moneyFormat(allMoney-shiMoney)}}</span></li>
         </ul>
-        <input v-if="item.commissionSharePeople !== userId && item.orderState !== '4' && item.orderState !== '3'" type="button" :value="`新增${activeTab===1 ? '收款' : '付款'}`" class="normalBtn" @click="addFinancialOrder()">
+        <input v-if="item.isOwn ===1 && item.orderState !== '4' && item.orderState !== '3'" type="button" :value="`新增${activeTab===1 ? '收款' : '付款'}`" class="normalBtn" @click="addFinancialOrder()">
       </div>
       <table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
         <tr>
           <th width="100">单号</th>
           <th width="400">费用类型</th>
           <th width="400">交易方式</th>
-          <th width="100">金额</th>
+          <th width="150">{{activeTab==1?'应收':'应付'}}</th>
+          <th width="150">{{activeTab==1?'实收':'实付'}}</th>
           <th width="150">交易日期</th>
           <th width="">制单人员</th>
           <th width="">当前状态</th>
@@ -123,8 +124,10 @@
             </template>
           </td>
           <td width="">
-            <p style="line-height:20px">{{item.Type==1?'应收':'应付'}}：<span>{{moneyFormat(item.Money)}}</span></p>
-            <p style="line-height:20px">{{item.Type==1?'实收':'实付'}}：<span>{{moneyFormat(item.PayMoney)}}</span></p>
+            <p style="line-height:20px"><span>{{moneyFormat(item.Money)}}</span></p>
+          </td>
+          <td>
+            <p style="line-height:20px"><span>{{moneyFormat(item.PayMoney)}}</span></p>
           </td>
           <td width="">{{item.TradeDate}}</td>
           <td width="">{{item.EmName}}</td>

src/components/SalesModule/groupTourOrder.vue

@@ -1346,8 +1346,8 @@
 										<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.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="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>
 									</div>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1557,8 +1557,8 @@
                       <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.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="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>
                     </div>
@@ -1803,8 +1803,8 @@
                       <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.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="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>
                     </div>