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

src/components/FinancialModule/FinancialDocuments.vue

@@ -106,6 +106,7 @@
             <li :class="active==3?'_active':''" @click="active=3,msg.Conditon=3,getPageList()">待我审批的</li>
             <li :class="active==2?'_active':''" @click="active=2,msg.Conditon=2,getPageList()">我审批的</li>
             <li :class="active==6?'_active':''" @click="active=6,msg.Conditon=6,getPageList()">我作废的</li>
+            <li :class="active==7?'_active':''" @click="active=7,msg.Conditon=7,getPageList()">被驳回的</li>
             <li :class="active==4?'_active':''" @click="active=4,msg.Conditon=4,getPageList()">抄送给我的</li>
         </ul>
         <div class="query-box">
@@ -490,7 +491,7 @@
                     </td>
                     <td class="_icon_btn">
                         <el-tooltip class="item" effect="dark" content="修改"  placement="top">
-                            <i v-if="(msg.Conditon==1 && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="edit el-icon-edit" @click="goEit(item.Type==1?'addReceivablesDocuments':'addFinancialDocuments',item.Type,item.FrID,true,active,msg.pageIndex)"></i>
+                            <i v-if="((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="edit el-icon-edit" @click="goEit(item.Type==1?'addReceivablesDocuments':'addFinancialDocuments',item.Type,item.FrID,true,active,msg.pageIndex)"></i>
                         </el-tooltip>
                         <el-tooltip class="item" effect="dark" content="查看"  placement="top">
                             <i class="iconfont icon-sousuo" @click="goUrl('FinancialDocumentsDetail',item.FrID,active,msg.pageIndex)"></i>
@@ -502,7 +503,7 @@
                             <i v-if="msg.Conditon==3" class="iconfont icon-zhuanjiao1" @click="zhuanBox = true,zhuanMsg.WorkFlowId = item.FrID"></i>
                         </el-tooltip>
                         <el-tooltip  class="item" effect="dark" content="作废"  placement="top">
-                            <i v-if="(msg.Conditon==1 && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="iconfont icon-quxiao1" @click="financeRemove(item.FrID)"></i>
+                            <i v-if="((msg.Conditon==1 ||msg.Conditon==7)  && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="iconfont icon-quxiao1" @click="financeRemove(item.FrID)"></i>
                         </el-tooltip>
                     </td>
                 </tr>

src/components/FinancialModule/addFinancialDocuments.vue

@@ -580,7 +580,8 @@ export default {
               SourceID:0,
               TCIDAndTCNUMList:[],
               IsLeader:1,
-              PayDate:''
+              PayDate:'',
+              CallType:0
             },
             detailList:{
                 ID:0,
@@ -1181,6 +1182,7 @@ export default {
                         this.msg.TCIDList = this.orderObj.TCIDList?this.orderObj.TCIDList:[];
                         this.msg.Obj = this.orderObj.Obj?this.orderObj.Obj:'';
                         this.msg.SourceID = this.orderObj.SourceID?this.orderObj.SourceID:0;
+                        this.msg.CallType=this.orderObj.CallType?this.orderObj.CallType:0;
                     }
                     if(data.VorcherInos){
                         data.VorcherInos.forEach(x=>{

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -516,7 +516,8 @@ export default {
           TCIDList:[],
           Obj:{},
           SourceID:0,
-          TCIDAndTCNUMList:[]
+          TCIDAndTCNUMList:[],
+              CallType:0
       },
       AccountNumber:'',
       queryAccMsg:{
@@ -1040,6 +1041,7 @@ export default {
             delete x.rate;
           });
           this.loading = true;
+          console.log(this.msg);
             this.apipost('Financial_post_Set',this.msg,res=>{
                 if(res.data.resultCode==1){
                     this.$router.push({name:'FinancialDocuments',query:{'Type':this.$route.query.Type}})
@@ -1328,6 +1330,7 @@ export default {
                         this.msg.TCIDList = this.orderObj.TCIDList?this.orderObj.TCIDList:[];
                         this.msg.Obj = this.orderObj.Obj?this.orderObj.Obj:'';
                         this.msg.SourceID = this.orderObj.SourceID?this.orderObj.SourceID:0;
+                        this.msg.CallType=this.orderObj.CallType?this.orderObj.CallType:0;
                     }
                     if(data.VorcherInos){
                         data.VorcherInos.forEach(x=>{

src/components/SalesModule/SalesFinancialDetail.vue

@@ -92,14 +92,14 @@
           <li><span>团队编号：</span>{{tcnum}}</li>
           <li><span>订单号：</span>{{orderId}}</li>
           <li> </li>
-          <li><span>应收金额：</span>{{moneyFormat(allMoney)}}</li>
-          <li><span>实收金额：</span>{{moneyFormat(shiMoney)}}</li>
-          <li><span>待收金额：</span><span :class="{color_red:(allMoney-shiMoney)!==allMoney}">{{moneyFormat(allMoney-shiMoney)}}</span></li>
+          <li><span>已收总金额：</span>{{moneyFormat(allMoney)}}</li>
+          <li><span>已审金额：</span>{{moneyFormat(shiMoney)}}</li>
+          <li><span>待审金额：</span><span :class="{color_red:(allMoney-shiMoney)!==allMoney}">{{moneyFormat(allMoney-shiMoney)}}</span></li>
         </ul>
         <ul class="clearfix fukuan">
-          <li><span>应付金额：</span>{{moneyFormat(allMoneyP)}}</li>
-          <li><span>实付金额：</span>{{moneyFormat(shiMoneyP)}}</li>
-          <li><span>待付金额：</span><span :class="{color_red:(allMoneyP-shiMoneyP)!==allMoneyP}">{{moneyFormat(allMoneyP-shiMoneyP)}}</span></li>
+          <li><span>应付总金额：</span>{{moneyFormat(allMoneyP)}}</li>
+          <li><span>已审金额：</span>{{moneyFormat(shiMoneyP)}}</li>
+          <li><span>待审金额：</span><span :class="{color_red:(allMoneyP-shiMoneyP)!==allMoneyP}">{{moneyFormat(allMoneyP-shiMoneyP)}}</span></li>
         </ul>
       </div>
       <p class="sfd_tit clearfix">收款单 <input type="button"  v-if="(item.isOwn ? item.isOwn : item.IsOwn) ===1 && (item.orderState ? item.orderState : item.OrderState) !== '4' && (item.orderState ? item.orderState : item.OrderState) !== '3'" value="新增收款" class="normalBtn" @click="addFinancialOrder(1)"></p>

src/components/SalesModule/enrollTotal.vue

@@ -178,6 +178,7 @@
             <p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span></p>
             <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
             <p>发团：{{item.startDate}}</p>
+            <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
           </td>
           <td>
             <p class="over_ellipsis" style="width: 150px;" :title="item.contactName">{{item.contactName}}</p>

src/components/SalesModule/groupTourOrder.vue

@@ -1222,6 +1222,7 @@
             <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName}}</p>
             <p style="min-width: 180px;">发团：{{item.startDate}}</p>
             <p>下单时间：{{item.createDate}}</p>
+            <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
           </td>
           <td>
 						<p class="fz12 over_ellipsis" style="width: 120px;"  :title="item.contactName">{{item.contactName}}</p>
@@ -1377,6 +1378,7 @@
               <span class="RL-redType RL-remarkCon" v-else>
                 <span>暂无名单</span>
               </span>
+              <span v-if="item.tipMoney">（小费：{{item.tipMoney}}）</span>
             </td>
           </tr>
 				<tr>
@@ -2899,7 +2901,7 @@ export default {
     getOrderDetail(obj) {
       this.apipost(
         "Financial_post_GetOrderFinanceList",
-        { OrderId: obj.orderId, OrderResource: 8 },
+        { OrderId: obj.orderId, OrderResource: 8,IsTravelMoney:1 },
         res => {
           if (res.data.resultCode == 1) {
             this.orderList = res.data.data;

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1378,7 +1378,7 @@
     <!-- 表格 -->
 		<table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0">
 			<tr>
-				<th width="150">单号</th>
+				<th width="230">单号</th>
         <th width="100">客户信息</th>
 				<th width="100">人数/机位数</th>
         <th width="80">单价</th>
@@ -1414,11 +1414,12 @@
               </div>
               <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
               <p>下单时间：{{item.createDate}}</p>
+              <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
             </td>
             <td>
               <p v-if='item.isOwn==1||userId==1||userId==5||positionId==168 || isUpdateOrder' class="fz12 over_ellipsis" style="width: 120px;"  :title="item.contactName">{{item.contactName}}</p>
               <p v-if='item.isOwn==1||userId==1||userId==5||positionId==168 || isUpdateOrder' class="fz12">{{item.contactMobile}}</p>
-              <p v-if='item.isOwn==2&&userId!=1&&userId!=5&&positionId!=168&&isUpdateOrder==false'>*****</p>
+              <p v-if='item.isOwn==2&&userId!=1&&userId!=5&&positionId!=168&&isUpdateOrder==false'>*****</p>              
               <!-- <p class="fz12 over_ellipsis" style="width: 120px;"  :title="item.contactName">{{item.contactName}}</p>
               <p class="fz12">{{item.contactMobile}}</p> -->
             </td>
@@ -1571,7 +1572,7 @@
                       <div v-if="item.isOrder=='1'&&item.orderState!='4'" @click="transfer(item)">订单转团</div>
                       <div v-if="isUpdateOrder" @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.orderId'>OP备注</div>
                       <!-- v-if="item.isUpdateOrderCommission" -->
-                      <div  @click='TCMsg.OrderId = item.orderId, TCMsg.CommissionMinusRate = item.commissionMinusRate, TiChengLoading = true'>修改提成</div>
+                      <div v-if="isUpdateOrderCommission" @click='TCMsg.OrderId = item.orderId, TCMsg.CommissionMinusRate = item.commissionMinusRate, TiChengLoading = true'>修改提成</div>
                       <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2')" @click='setChargeLoss(item)'>
                         <span v-if="item.isChargeLossOrders==1">恢复收损单</span>
                         <span v-else>设为收损单</span>
@@ -1579,8 +1580,8 @@
                       <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')" @click='deleteItem(item)'>取消</div>
                     </div>
                     <el-button slot="reference" type="primary" style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;' icon="iconfont icon-more"></el-button>
-                  </el-popover>  
-                </el-tooltip>            
+                  </el-popover>
+                </el-tooltip>
                 </el-button-group>
               <payurlItem v-if='item.isOwn==1' :item="item" :showID="showID" v-show="item.orderState!='4'&&item.orderState!='3'" v-on:childByValue="childByValue"></payurlItem>
             </td>
@@ -2009,6 +2010,7 @@ export default {
       customerId: "",
       createByInfo: "",
       isUpdateSharePeople: false,
+      isUpdateOrderCommission: false,
       starTime: "",
       endTime: "",
       stratPrice: "",
@@ -3569,6 +3571,7 @@ export default {
             this.list = res.data.data.pageData.rtData;
             this.isUpdateOrder = res.data.data.pageData.isUpdateOrder
             this.IsUpdateOrderMoney = res.data.data.pageData.isUpdateOrderMoney
+            this.isUpdateOrderCommission = res.data.data.pageData.isUpdateOrderCommission
             this.cancelRtData = res.data.data.pageData.cancelRtData[0].list;
             this.seat.YSeat = res.data.data.pageData.ySeatNum
             this.seat.CSeat = res.data.data.pageData.eSeatNum

src/components/SalesVisa/VisaProductEditOrder.vue

@@ -47,7 +47,7 @@
 	  margin: 0;
 	  font-size: 14px!important;
 	}
-	.groupTourOrder_tickets_red {
+.groupTourOrder_tickets_red {
   color: #ff0000;
   text-decoration: underline;
 }
@@ -59,6 +59,10 @@
   color: #008000;
   text-decoration: underline;
 }
+.groupTourOrder_tickets_black{
+	color: #000000;
+	text-decoration: underline;
+}
 .VD-remarkTitle {
     display: inline-block;
     float: left;
@@ -190,7 +194,8 @@
 								<span v-for="(item2,index2) in item.financeList" :key="index2" style="margin-right:10px;cursor:pointer;">
 								<span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue" @click="goUrl2('FinancialDocumentsDetail',item2.frID,'财务单据')">{{item2.frID}}</span>
 								<span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green" @click="goUrl2('FinancialDocumentsDetail',item2.frID,'财务单据')">{{item2.frID}}</span>
-								<span v-else class="groupTourOrder_tickets_red" @click="goUrl2('FinancialDocumentsDetail',item2.frID,'财务单据')">{{item2.frID}}</span>
+								<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red" @click="goUrl2('FinancialDocumentsDetail',item2.frID,'财务单据')">{{item2.frID}}</span>
+								<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black" @click="goUrl2('FinancialDocumentsDetail',item2.frID,'财务单据')">{{item2.frID}}</span>
 								</span>
 								<span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span>
 							</div>

src/components/SalesVisa/VisaProductOrder.vue

@@ -61,10 +61,21 @@
 .VO-redType{
 	color:red;
 }
-.groupTourOrder_tickets_blue{
-	color:#0000ff;
+.groupTourOrder_tickets_red {
+  color: #ff0000;
+  text-decoration: underline;
+}
+.groupTourOrder_tickets_blue {
+  color: #0000ff;
+  text-decoration: underline;
+}
+.groupTourOrder_tickets_green {
+  color: #008000;
+  text-decoration: underline;
+}
+.groupTourOrder_tickets_black{
+	color: #000000;
 	text-decoration: underline;
-	cursor: pointer;
 }
 </style>
 <template>
@@ -186,7 +197,8 @@
 								<span v-for="(item2,index2) in item.FinanceList" :key="index2" style="margin-right:10px;cursor:pointer;">
 								<span v-if="item2.ColorState===1" class="groupTourOrder_tickets_blue" @click="goUrl2('FinancialDocumentsDetail',item2.FrID,'财务单据')">{{item2.FrID}}</span>
 								<span v-else-if="item2.ColorState===2" class="groupTourOrder_tickets_green" @click="goUrl2('FinancialDocumentsDetail',item2.FrID,'财务单据')">{{item2.FrID}}</span>
-								<span v-else class="groupTourOrder_tickets_red" @click="goUrl2('FinancialDocumentsDetail',item2.FrID,'财务单据')">{{item2.FrID}}</span>
+								<span v-else-if="item2.ColorState===3" class="groupTourOrder_tickets_red" @click="goUrl2('FinancialDocumentsDetail',item2.FrID,'财务单据')">{{item2.FrID}}</span>
+								<span v-else-if="item2.ColorState===4" class="groupTourOrder_tickets_black" @click="goUrl2('FinancialDocumentsDetail',item2.FrID,'财务单据')">{{item2.FrID}}</span>
 								</span>
 								<span v-if="item.FinanceList.length===0" style="cursor: default;">暂无数据</span>
 							</div>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1334,7 +1334,7 @@
     <div style="width: 100%; height: auto;  overflow-x: auto;" class="ownScrollbarStyle">
       <table class="RegisTrationTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
         <tr>
-          <th width="240">单号</th>
+          <th width="260">单号</th>
           <th width="150">客户信息</th>
           <th width="70" class="nowrap">人数/机位数</th>
           <th width="110" class="nowrap">单价</th>
@@ -1366,7 +1366,6 @@
               <div class="RL_CreatInfo">{{item.CreateBy}}<span v-if="item.LeaveStr!=''" style="color:red">({{item.LeaveStr}})</span></div>
               <div class="RL_CreatInfo">关联销售：{{item.CommissionSPeopleName}}</div>
               <p>下单时间：{{item.CreateDate}}</p>
-              
             </td>
             <td>
               <p class="fz12 over_ellipsis" style="width: 90%;">领队控位</p>
@@ -1476,7 +1475,7 @@
                       <div @click="toTrip(item)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>
                       <div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
                       <div @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId'>OP备注</div>
-                      <div  @click='TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate, TiChengLoading = true'>修改提成</div>
+                      <div v-if="OrderDataList.IsUpdateOrderCommission" @click='TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate, TiChengLoading = true'>修改提成</div>
                       <div @click='deleteItem(item)'>删除</div>
                     </div>
                     <el-button slot="reference" type="primary" style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;'
@@ -1543,6 +1542,7 @@
                 <div class="RL_CreatInfo">关联销售：{{childItem.CommissionSPeopleName}}</div>
                 <!-- <p>发团：{{childItem.startDate}}</p> -->
                 <p>下单时间：{{childItem.CreateDate}}</p>
+                <p v-if='childItem.CommissionMoney' style="color:red">提成：{{childItem.CommissionMoney}}</p>
               </td>
               <td>
                 <p v-if="childItem.IsOwn==1||userId==1||userId==5" class="fz12 over_ellipsis" style="width:90%;" :title="childItem.ContactName">
@@ -1659,7 +1659,7 @@
                         <div v-if="userId==1" @click="getSalerInfo(childItem)">修改业务员</div>
                         <div @click="transfer(childItem)">订单转团</div>
                         <div @click='zhuanLoading = true,OPRemarkMsg.OrderId = childItem.OrderId'>OP备注</div>
-                        <div  @click='TCMsg.OrderId = childItem.OrderId, TCMsg.CommissionMinusRate = childItem.CommissionMinusRate, TiChengLoading = true'>修改提成</div>
+                        <div v-if="OrderDataList.IsUpdateOrderCommission" @click='TCMsg.OrderId = childItem.OrderId, TCMsg.CommissionMinusRate = childItem.CommissionMinusRate, TiChengLoading = true'>修改提成</div>
                         <div v-if="childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'"
                           @click='deleteItem(childItem)'>
                           删除
@@ -1878,7 +1878,7 @@
                       <div @click="toTrip(item)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>
                       <div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
                       <div @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId'>OP备注</div>
-                      <div  @click='TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate, TiChengLoading = true'>修改提成</div>
+                      <div v-if="OrderDataList.IsUpdateOrderCommission" @click='TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate, TiChengLoading = true'>修改提成</div>
                       <div v-if="item.OrderState=='2'||item.OrderState=='3'" @click='deleteItem(item)'>删除</div>
                     </div>
                     <el-button slot="reference" type="primary" style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;'

src/components/commonPage/payURL.vue

@@ -32,8 +32,9 @@
 			</div>
 				 <el-select  slot="reference" v-model="value" class='w80' placeholder="收款方式" @change='chanceType(item)'>
 		       	 	<!-- <el-option  label="二维码" value="1"></el-option> -->
-		       	 	<el-option  label="现金或转账" value="2"></el-option>
-		       	 	<el-option v-if='item.orderState===1'  label="退款" value="3"></el-option>
+		       	 	<el-option  label="团队收款" value="2"></el-option>
+		       	 	<el-option v-if='item.orderState===1'  label="团队退款" value="3"></el-option>
+					<el-option label="团队小费" value="4"></el-option>
 		     	 </el-select>
 		</el-popover>
 	</div>
@@ -144,6 +145,26 @@
 							'orderObj':JSON.stringify(orderObj)
 						}
 					});
+				}else if (this.value === '4') {
+					this.visible=false
+					let orderObj = {
+						OrderID:obj.orderId,
+						OrderSource:8,
+						CallType:1,
+						Obj: {},
+						SourceID:obj.ID,
+						TCIDList: TCIDARR
+					}
+					this.$router.push({
+						name: 'ChoiceAddFinancialDocuments',
+						query:{
+							"Type":1,
+							"companyID":obj.outBranchId,
+							"path": "",
+							'blank':'y',
+							'orderObj':JSON.stringify(orderObj)
+						}
+					});
 				}
 				this.value = ''
 		  	 },