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

src/components/Hotel/reservation/OrderList.vue

@@ -524,6 +524,11 @@
             }}</span>
           </template>
         </el-table-column> -->
+        <el-table-column label="待收金额" min-width="100">
+          <template slot-scope="scope">
+            <span class="fz15 fbold">{{ scope.row.DueInMoney || '-' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="利润" min-width="100">
           <template slot-scope="scope">
             <span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
@@ -698,7 +703,7 @@
             ></i>
           </el-tooltip>
         </div>-->
-        <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;">
+        <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
           <div class="row-c justify-sb borderD pb5">
             <span class="fz12 c9e">订单总金额</span>
             <div class="ml">

src/components/Hotel/reservation/correlationOP.vue

@@ -13,7 +13,7 @@
             </el-form-item>
             </template>
             <template v-else>
-                <el-form-item label="总价" prop="Money">
+                <el-form-item label="总金额" prop="Money">
                     <el-input v-model='msg.Money' placeholder="请输入总金额"></el-input>
                 </el-form-item>
             </template>

src/components/Hotel/singleProduct/components/OrderList.vue

@@ -668,7 +668,7 @@
             ></i>
           </el-tooltip>
         </div>
-        <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;">
+        <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
           <div class="row-c justify-sb borderD pb5">
             <span class="fz12 c9e">订单总金额</span>
             <div class="ml">

src/components/SalesVisa/VisaProductOrder.vue

@@ -874,18 +874,20 @@
         <th width="6%">业务员</th>
         <th width="6%">公司</th>
         <th width="4%">人数</th>
-        <th width="8%">出发日期</th>
-        <th width="8%">报名日期</th>
-        <th width="8%">应收总额</th>
-        <th width="8%">实收</th>
-        <th width="6%">退款</th>
-        <th width="6%">平台税金</th>
-        <th width="6%">优惠</th>
+        <th width="7%">出发日期</th>
+        <th width="7%">报名日期</th>
+        <th width="7%">应收总额</th>
+        
+        <th width="7%">实收</th>
+        <th width="5%">退款</th>
+        <th width="5%">平台税金</th>
+        <th width="7%">成本</th>
+        <th width="5%">优惠</th>
         <th width="5%">待收</th>
         <th width="5%">在途</th>
-        <th width="6%">订单状态</th>
+        <th width="4%">订单状态</th>
         <th width="5%">状态</th>
-        <th width="12%">操作</th>
+        <th width="14%">操作</th>
       </tr>
       <tbody v-for='(item,index) in dataList'>
         <tr>
@@ -917,6 +919,9 @@
           <td>
             <span>￥{{moneyFormat(item.PlatformTax)}}</span>
           </td>
+          <td>
+            <span>￥{{moneyFormat(item.CostMoney)}}</span>
+          </td>
           <td>
             <span>￥{{moneyFormat(item.DiscountMoney)}}</span>
           </td>
@@ -967,7 +972,7 @@
         </tr>
 
         <tr>
-          <td colspan="16" class="RL_Order" style="height:40px;">
+          <td colspan="17" class="RL_Order" style="height:40px;">
             <span class="VO-remarkTitle">名单:</span>
             <span class="VO-redType VO-remarkCon" v-if="item.GuestList.length>0" style="cursor:pointer">
               <span v-for="(childItem) in item.GuestList" style="margin-right:10px;"
@@ -987,7 +992,7 @@
               </div>
             </div>
           </td>
-          <td colspan="8" class="groupTourOrder_tickets2" style="height: 40px;">
+          <td colspan="9" class="groupTourOrder_tickets2" style="height: 40px;">
             <div>
               <div class="row justify-sb wrap mr">
                 <div class="row relative" style="margin-top: 5px;">
@@ -1080,11 +1085,11 @@
           </td>
         </tr>
         <tr>
-          <td colspan="17" style="height: 1px;magrin:0;padding: 0;background-color: #000;"></td>
+          <td colspan="18" style="height: 1px;magrin:0;padding: 0;background-color: #000;"></td>
         </tr>
       </tbody>
       <tr v-show="dataList.length==0">
-        <td v-show="dataList.length==0" colspan="17" align="center">暂无数据</td>
+        <td colspan="18" align="center">暂无数据</td>
       </tr>
     </table>
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total"

src/components/SalesVisa/saleOrderSettlement.vue

@@ -200,7 +200,7 @@
 					<td>{{item.CreateBy}}</td>
 					<td>{{item.PeopleNum}}</td>
 					<td>￥{{moneyFormat(item.CommissionMoney)}}</td>
-					<td><input type="checkbox" :value="item.Id" v-model="OrderIds"></td>
+					<td><input type="checkbox" :value="item.Id" v-model="OrderIds" :disabled="isDisabled"></td>
 				</tr>
 				<tr class="h40" v-show="tichengList.length==0"> 
 					<td colspan="10" align="center">
@@ -215,6 +215,7 @@
 	export default {
 	    data(){
 	        return{
+				isDisabled: true,
 	        	OrderIds:[],
 	            total: 0,	
 	            currentPage: 1,

src/components/SingleAirTicket/components/OrderList.vue

@@ -765,7 +765,7 @@
                 </el-tooltip>
               </div> -->
             </div>
-            <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;">
+            <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
               <div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}">
                 <span class="fz12 c9e">订单总金额</span>
                 <div class="ml">

src/components/administrative/empBankAccount.vue

@@ -9,6 +9,14 @@
   .empBankAccountTable tr{background: #fff;text-align: left;}
   .empBankAccountTable tr:nth-child(2n+1){background: #E5E5E5;}
   .empBankAccountTable tr td{height: 60px; padding-left:20px; border-right: 1px solid #DCDCDC; border-bottom: 1px solid #DCDCDC;}
+  
+ .popTable{width: 80%; font-size:14px; color: #333; background: #ccc;}
+  .popTable tr{border-bottom: 2px solid #333;}
+  .popTable tr th{background: #BDBDBD;height:30px; font-size: 12px; text-align: left; text-indent: 20px;}
+  .popTable tr{background: #fff;text-align: left;}
+  .popTable tr:nth-child(2n+1){background: #E5E5E5;}
+  .popTable tr td{height: 60px; padding-left:20px; border-right: 1px solid #DCDCDC; border-bottom: 1px solid #DCDCDC;}
+
   .empBankAccountIcon button{width: 30px; height: 30px;border-radius:4px;}
   .empBankAccountIcon .el-button--primary {padding: 5px;margin: 0;font-size: 14px!important;}
   .empBankAccountIcon .el-button+.el-button{margin-left: 0!important;}
@@ -61,6 +69,31 @@
 					</el-col>
 				</el-row>
 			</el-form>
+			<div v-if="accountList.length" style="padding: 20px; display: flex; justify-content: center; align-items: center;flex-direction: column">
+				<div style="padding: 10px">已存在相同的账户信息</div>
+		<table class="popTable" border="0" cellspacing="0" cellpadding="0">
+			<tr>
+				<th>{{$t("ground.zhanghumingcheng")}}</th>
+				<th>{{$t("fnc.w_zhbieming")}}</th>
+				<th>{{$t("ground.zhanghuleibie")}}</th>
+				<th>{{$t("ground.suoshujigou")}}</th>
+				<th>{{$t("fnc.acc")}}</th>
+			</tr>
+			<tr v-for="(item,index) in accountList">
+				<td>{{item.OpenBankName}}</td>
+				<td>{{item.AccountAlias}}</td>
+				<td>
+					<span v-if="item.AccountClassify==1">{{$t('fnc.a_ptzhanghu')}}</span>
+					<span v-if="item.AccountClassify==2">银行账户</span>
+					<span v-if="item.AccountClassify==3">虚拟账户</span>
+					<span v-if="item.AccountClassify==4">微信支付宝</span>
+					</td>
+				<td>{{item.BankName}}</td>
+				<td>{{item.CardNum}}
+					<br/>{{item.AccountHolder}}</td>
+			</tr>
+		</table>
+		</div>
 		</div>
 		<div class="query-box">
 			<ul>
@@ -120,12 +153,14 @@
 
 	</div>
 
+
 </template>
 
 <script>
 	export default {
 		data() {
 			return {
+				accountList: [],
 				nameA: this.$t("ground.zhanghumingcheng2"),
 				nameB: this.$t("fnc.khuren"),
 				nameC: this.$t("ground.kahao"),
@@ -259,6 +294,10 @@
 					     this.$message.error(this.$t('visaT.Pleasefillin')+this.nameD)
 						 return
 						}
+						// 查询是否有冲突的账户信息
+						this.checkCanAdd()
+			},
+			addAccount() {
 				this.apipost("admin_post_SetEmpBankAccount",this.addMsg,res=>{
 					if(res.data.resultCode==1)
 					{
@@ -270,8 +309,19 @@
 						this.$message.error(res.data.message)
 					}
 
+				},err=>{})},
+			checkCanAdd() {
+				this.apipost('admin_post_GetBackAccount',{RB_Group_Id: this.addMsg.ObjID, ...this.addMsg},res=>{
+					if(res.data.resultCode==1){
+						if(res.data.data && res.data.data.length) {
+							this.accountList = res.data.data
+						} else {
+						this.addAccount()
+						}
+					}else{
+						this.$message.error(res.data.message)}
 				},err=>{})
-			},
+				},
 			updateData(id){  //修改角色
 				this.apipost('admin_get_GetEmpBackAccount',{BAId:id},res=>{
 					if(res.data.resultCode==1){
@@ -327,6 +377,7 @@
 		         this.resetForm('addMsg');
 		    },
         resetForm(formName) {//弹出框取消 初始化谈框内表单
+		this.accountList = []
           this.$refs[formName].resetFields();
           this.addMsg.AccountType='1';
 		  this.addMsg.AccountClassify='2';

src/components/busManagement/BookAcar/components/BookAcarOrder.vue

@@ -139,7 +139,7 @@
     </div>
   </template>
   <script>
-    import OrderList from './OrderList.vue';
+    import OrderList from './orderList';
     export default {
       props:['pagesTitle','dataObj'],
       components: { OrderList },

src/components/busManagement/BookAcar/components/orderList.vue

@@ -421,7 +421,7 @@
             <div class="c9e fz12">
               <span>客人信息：{{ item.SurName }}{{ item.Name }}/{{ item.Mobile }}</span>
               <span v-if="pagesTitle!='销售'">
-                /来源<template v-if="!item.OrderSource&&!item.CustomerId">销售</template>
+                <template v-if="item.SurName||item.Name"> /</template>来源<template v-if="!item.OrderSource&&!item.CustomerId">销售</template>
                 <template v-if="!item.OrderSource&&item.CustomerId>0">B2B</template>
                 <template v-if="item.OrderSource==1">B2C</template>
               </span>
@@ -571,6 +571,11 @@
                 <span class="fz15 fbold">{{ scope.row.Refund ? scope.row.Refund : "-" }}</span>
               </template>
             </el-table-column>
+        <el-table-column label="待收金额" min-width="100">
+          <template slot-scope="scope">
+            <span class="fz15 fbold">{{ scope.row.DueInMoney || '-' }}</span>
+          </template>
+        </el-table-column>
             <el-table-column label="利润" min-width="100">
               <template slot-scope="scope">
                 <span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
@@ -666,7 +671,7 @@
                 </el-tooltip>
               </div>
             </div>
-            <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;">
+            <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
               <div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}">
                 <span class="fz12 c9e">订单总金额</span>
                 <div class="ml">

src/components/busManagement/BookAcar/components/tripBusOrderList.vue

@@ -371,7 +371,7 @@
                 </template>
                 <span v-if="item.CustomerTel">/{{item.CustomerTel}}</span> </span>
                 <span v-if="pagesTitle!='销售'">
-                  /来源<template v-if="!item.OrderSource&&!item.CustomerId">销售</template>
+                  <template v-if="item.UseCompName||item.CustomerName"> /</template>来源<template v-if="!item.OrderSource&&!item.CustomerId">销售</template>
                   <template v-if="!item.OrderSource&&item.CustomerId>0">B2B</template>
                   <template v-if="item.OrderSource==1">B2C</template>
                 </span>
@@ -625,7 +625,7 @@
                 </el-tooltip>
               </div>
             </div>
-            <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;">
+            <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
               <div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}">
                 <span class="fz12 c9e">订单总金额</span>
                 <div class="ml">

src/components/public/offset.vue

@@ -112,16 +112,18 @@
         isShow: {
             handler(newValue,onldValue) {
                 this.cdState = newValue
-                // this.czgetList()
-                // this.getCostTypeList()
+                if(this.cdState==true){
+                  this.czgetList()
+                  this.getCostTypeList()
+                }
             },
             // deep:true,
             immediate: false
         }
     },
     mounted() {
-        this.czgetList()
-        this.getCostTypeList()
+        // this.czgetList()
+        // this.getCostTypeList()
     },
     methods: {
         close(){

src/components/scenicSpot/reservation/OrderList.vue

@@ -375,9 +375,10 @@
 }
 
 .orderop div {
-  width: 100px;
-  height: 50%;
+  width: auto;
+  height: 30px;
   display: flex;
+  padding: 0 5px;
   justify-content: center;
 }
 
@@ -520,7 +521,7 @@
         <div class="c9e fz12">
           <span v-if="item.Name||item.EName">客人信息：{{ item.Name }}({{ item.EName }})<template v-if="item.Mobile"> /{{ item.Mobile }}</template></span>
           <span v-if="pagesTitle!='销售'">
-            /来源<template v-if="!item.OrderSource&&!item.CustomerId">销售</template>
+            <template v-if="item.Name||item.EName"> /</template>来源<template v-if="!item.OrderSource&&!item.CustomerId">销售</template>
             <template v-if="!item.OrderSource&&item.CustomerId>0">B2B</template>
             <template v-if="item.OrderSource==1">B2C</template>
           </span>
@@ -613,7 +614,10 @@
         </el-table-column>
         <el-table-column label="待收" min-width="100">
           <template slot-scope="scope">
-            <span class="fz15 fbold" :class="{'cF1416C':(item.Money-scope.row.Income-scope.row.PlatformTax+scope.row.Refund).toFixed(2)!=0}">{{ (item.Money-scope.row.Income-scope.row.PlatformTax+scope.row.Refund).toFixed(2)}}</span>
+            <span class="fz15 fbold" 
+            :class="{'cF1416C':item.DaiShou>0}">
+            {{item.DaiShou}}
+          </span>
           </template>
         </el-table-column>
         <el-table-column label="利润" min-width="100">
@@ -629,7 +633,7 @@
       </el-table>
       
       <div class="row justify-sb mt mb20">
-        <div class="column px15 bjFFF3E0 radius5 flex-g pa relative" style="max-width: 300px;">
+        <div class="column px15 bjFFF3E0 radius5 flex-g pa relative" style="max-width: 300px;min-width: 150px;">
           <div class="fz12 row justify-sb" v-if="item.MailingState != 4">
             <span>{{ item.MailingState > 1 ? '收货地址：' : '自取地址：' }}</span>
             <div :class="{ 'cF1416C': item.MailingState == 2, 'c02C854': item.MailingState == 3 }">
@@ -750,11 +754,11 @@
           </div>
           
         </div>
-        <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;">
+        <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
           <div class="row-c justify-sb pb5" :class="{'borderD':item.MailingMoney>0||item.DiscountsMoney>0}">
             <span class="fz12 c9e">订单总金额</span>
             <div class="ml">
-              <span class="fz15 fbold">{{ item.Money.toFixed(2) }}</span>
+              <span class="fz15 fbold">{{ (item.Money+item.MailingMoney).toFixed(2) }}</span>
               <span class="fz12">{{ item.CurrencyName }}</span>
             </div>
           </div>
@@ -781,7 +785,7 @@
           </div>
         </div>
         <div v-if="item.OrderStatus > 0 && item.OrderStatus < 4 && item.OrderStatus != 3"
-          class="column justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s">
+          class="row-c wrap justify-c px15 bgE8F5E9 radius5 ml fz12 orderop flex-s">
           <div v-if="
             item.OrderStatus == 1 &&
             item.IncomeList.length == 0 &&
@@ -1141,15 +1145,15 @@ export default {
   methods: {
     close(){
       this.isShowCorrelation = false
-      this.CorrelationObj.TypeNum=null
+      this.CorrelationObj.TypeNum = null
+      this.CorrelationObj.Money = null
     },
     success(){
-      this.CorrelationObj.TypeNum=null
       this.close()
       this.$emit('success')
     },
     clickCorrelation(item,type){
-      this.CorrelationObj = item
+      this.CorrelationObj = JSON.parse(JSON.stringify(item))
       if(type==2){
         this.CorrelationObj.TypeNum = 4 //编辑总价
       }else{

src/components/scenicSpot/reservation/ReservationOrder.vue

@@ -302,6 +302,7 @@ export default {
         { Name: '自行取票', ID: '1' },
         { Name: '邮寄票券', ID: '2' },
         // {Name: '已邮寄票券',ID:'3'},
+        {Name: '电子券',ID:'4'},
       ],
       orderType: [
         { Name: this.$t('OrderList.orderType.tour'), ID: '1' },
@@ -419,11 +420,13 @@ export default {
             let addList = function(arr){
               arr.forEach(x=>{
                 x.list = []
+                x.DaiShou = 0
               })
             }
             addList(data)
             data.forEach((x) => {
               // x.Money = 0
+              
               let Money = 0
               x.DetailList.forEach((y) => {
                 Money+=y.Money
@@ -439,6 +442,9 @@ export default {
                   PlatformTax: item.PlatformTax,
                   Refund: item.Refund
                 }
+                let DaiShou
+                DaiShou = Number(item.Money+item.MailingMoney-item.Income-item.PlatformTax+item.Refund)
+                item.DaiShou = DaiShou.toFixed(2)==='-0.00'?'0.00':DaiShou.toFixed(2)
                 item.list.push(datas)
               })
             this.total = res.data.data.count;

src/router/config.js

@@ -262,6 +262,15 @@ export default {
                 title: '新增付款对象'
               },
             },
+
+            {
+              path: '/empBankAccountAll', //付款对象管理
+              name: 'empBankAccountAll',
+              component: resolve => require(['@/components/administrative/empBankAccountAll'], resolve),
+              meta: {
+                title: '付款对象管理'
+              },
+            },
             {
               path: '/CommissionManagement', //提成管理
               name: 'CommissionManagement',