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

src/components/FinancialModule/BasicDocuments.vue

@@ -303,6 +303,7 @@
         <p class="_tit">{{GetDetail.FinanceName}} <span style="color: red;" v-if="GetDetail.Status==4">已作废</span></p>
         <div class="_conten">
             <template v-if="!otherTable">
+                <!-- 付款 -->
                 <template v-if="GetDetail.Type!==1 && GetDetail.Type!==7 && GetDetail.Type!=4  && showModel">
                     <my-Bill :ID="FrID" :GetDetail="GetDetail" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill>
                 </template>
@@ -2259,6 +2260,7 @@ export default {
                     }
                     this.chongJudge(data)
                     this.GetDetail = data;
+                    
                     this.showModel = true
                     this.FrID = data.FrID
                     this.ChongDiMsg.Types = ''

src/components/FinancialModule/FinancialSubmodule/BillModule.vue

@@ -326,6 +326,7 @@
         </div>
 </template>
 <script>
+import { connect } from 'net';
 export default {
     props:["ID","width","color","isPrintPage","name","OrderSource"],  //接收参数 ID width color
     data(){
@@ -398,10 +399,36 @@ export default {
                     data.Money = this.$commonUtils.addCommas(Math.round(data.Money * 100) / 100)
                     data.AuditSteps.reverse()
                     this.GetDetail = data;
-                    console.log(this.GetDetail)
                     this.loading=false
                     this.$set(this.$data,"GetDetail",data);
-                    console.log(this.GetDetail)
+                    // console.log("sdfsaoifsjapof ",this.GetDetail)
+                    let status=false;
+                    if(this.GetDetail.DetailList && this.GetDetail.DetailList.length>0 && this.GetDetail.TCIDList.length>0){
+                       this.GetDetail.DetailList.forEach(item=>{
+                           if(item.CostTypeName=="地接费（领取）"){
+                             status=true;
+                           }
+                       }) 
+                      if(status){
+                        // console.log("this.GetDetail.DetailList[0].Remark",this.GetDetail.DetailList[0].Remark)
+                        this.apipost('Financial_post_GetFinanceSwipingCard',{FrId:this.ID},res=>{
+                            if(res.data.resultCode==1){
+                              // console.log("res.data.data",res.data.data);
+                                if(res.data.data.length>0){
+                                  this.GetDetail.DetailList[0].Remark+="刷卡:"
+                                  res.data.data.forEach(item=>{
+                                    this.GetDetail.DetailList[0].Remark+=`${item.Name}，`;
+                                  })
+                                } 
+                                
+                            }else{
+                                this.Error(res.data.message)
+                            }
+                        },err=>{})
+                       
+
+                      }
+                    }
                 }
             }, err => {})
         },        

src/components/FinancialModule/addFinancialDocuments.vue

@@ -205,7 +205,7 @@
                             <el-option :label="$t('fnc.djxnzhanghu')" :value='6' :key='6' v-if='msg.TemplateId!==36 && msg.TemplateId!==37  && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
                             <el-option :label="$t('fnc.szxiangdi')" :value='7' :key='7' v-if='msg.TemplateId!==36 && msg.TemplateId!==37  && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
                             <el-option label="原路退款" :value='8' :key='8' v-if='msg.TemplateId===2 || msg.TemplateId===12 ||msg.TemplateId===61 || msg.TemplateId===62'></el-option>
-                            <el-option label="地接预支款" :value='9' :key='9' v-if='msg.TemplateId===67'></el-option>
+                            <el-option label="地接预支款" :value='9' :key='9' v-if='msg.TemplateId===67||msg.TemplateId===74'></el-option>
                         
                         </el-select>
                         <el-select v-if="!showDisable"  filterable  v-model='msg.ClientType' :placeholder="$t('fnc.khleixing')" @change="financeinfo_post_GetClientAccountList(msg.ClientType)" class="w135 _border_b_1">

src/components/Hotel/roomReservationsDetails.vue

@@ -731,6 +731,11 @@
                     Name: subItem.NewHotelName,
                     ID: subItem.NewHotelId
                   });
+                  //默认成日元
+                  if(subItem.CurrencyId==0)
+                  {
+                    subItem.CurrencyId=3;
+                  }
                   this.calculationPrice(subItem);
                   subItem.OrderDetailsList.forEach((x, index1) => {
                     x.HouseTypeCount = x.HouseTypeCount.toString();

src/components/SalesModule/CustomerCertification.vue

@@ -6,10 +6,10 @@
         class="ownScrollbarStyle"
         @click.stop
       >
-        <div class="title">实名认证详情</div>
+        <div class="title" style="background:#fff">实名认证详情</div>
         <div class="list">
-          <div class="itemAnswer" v-show="answerDetailList.length>0">
-            <div class="item" v-for="item in answerDetailList">
+          <div class="itemAnswer" v-show="answerDetailList.length>0" style="padding:0">
+            <div class="item" v-for="item in answerDetailList" style="margin:0">
               <div class="topMsg">
                 <!-- <img v-if="!item.photo" src="../../assets/img/litheader.png">
                 <img v-if="item.photo" :onerror="defaultImg" :src="item.photo"> -->

src/components/SalesModule/customerApproval.vue

@@ -18,7 +18,7 @@
 	.customerApprovalLayercontentDiv  .item .topMsg>img{float: left; margin-right: 13px;} 
 	.customerApprovalLayercontentDiv  .item .bottomMsg{padding: 15px 0;} 
 	.customerApprovalLayercontentDiv  .item .bottomMsg .pImg{margin-top: 10px;}
-	.customerApprovalLayercontentDiv  .item .bottomMsg .pImg img{cursor: pointer;}
+	.customerApprovalLayercontentDiv  .item .bottomMsg .pImg img{cursor: pointer;height: 100px;}
 	.customerApprovalLayercontentDiv  .answerItem{ overflow: hidden; padding: 15px 0;}
 	.customerApprovalLayercontentDiv  .answerItem>img{float: left;width: 28px; height: 28px; border-radius: 14px;margin-right: 10px;}		
 	.customerApprovalLayercontentBtn{position: fixed; bottom: 0; background: #f5f5f5; width:420px; height:70px; line-height: 70px; text-align: right; padding: 0 20px;}	
@@ -43,6 +43,9 @@
 		      </el-carousel-item>
 		    </el-carousel>
 		</div>
+		<viewer :images="picObj" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
+		<img v-for="item in picObj" :src="item" :key="item">
+		</viewer>	
 		
 		
 		<div :class="{customerApprovalLayer:showlayer}"  @click="closeLayer">
@@ -222,7 +225,8 @@
 			layout="total,prev, pager, next, jumper" 
 			:page-size=msg.pageSize 
 			:total=total>
-		</el-pagination>		
+		</el-pagination>	
+		
 	</div>
 </template>
 
@@ -230,6 +234,10 @@
 	export default {
 	    data(){
 	        return{
+				imageOptions:{
+					navbar:false,
+					title:false
+				},
 	        	lastVisitObj:{},
 	        	meta:'',
 	        	isOk:-1,
@@ -262,6 +270,9 @@
 	        }
 	    },
 	    methods:{
+			inited (viewer){
+				this.$viewer = viewer
+			},
 	    	saveApproval(){
 	    		if(this.addMsg.AdviceStatus==1)
 	    		{
@@ -283,9 +294,11 @@
 		      this.dspNone = true;
 		    },
 	    	getPic(obj, index) {
-		      this.initialIndex = index;
-		      this.picObj = obj;
-		      this.dspNone = false;
+				this.picObj = obj;
+				this.$viewer.show()
+		    //   this.initialIndex = index;
+		    //   
+		    //   this.dspNone = false;
 		    },
 	    	getDetail(obj){
 	    		this.meta=obj.customerName

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1513,7 +1513,7 @@
                             </tr>
                             <tr v-for="item in ScenicRefundList">
                               <td>
-                                  <el-checkbox :checked="item.IsChecked" @change="getGOScenic(item)"></el-checkbox>
+                                  <el-checkbox :checked="item.IsChecked" @change="getGOScenic(item),getGOScenictWO(),getTotalPrice()"></el-checkbox>
                               </td>
                               <td>
                                   {{item.CouponsName}}
@@ -1522,12 +1522,11 @@
                                   {{item.RefundMoney}}
                               </td>
                               <td>
-                                  <el-input class="w80" @keyup.native="checkInteger(item,'Number'),CheckNum(item)" @change="getGOScenictWO"
+                                  <el-input class="w80" @keyup.native="checkInteger(item,'Number'),CheckNum(item),getTotalPrice()" @change="getGOScenictWO"
                                   v-model="item.Number"></el-input>
                               </td>
                               <td>
-                                <el-input class="w80" @keyup.native="checkPrice(item,'BackMoney')" @change="getGOScenictWO"
-                                  v-model="item.BackMoney"></el-input>
+                                  {{item.BackMoney}}
                               </td>
                             </tr>
                           </table>
@@ -3697,6 +3696,8 @@
             this.Error('不能超过总人数');
             item.Number=0;
         }
+        //默认算好退款金额
+        item.BackMoney=item.Number*item.RefundMoney;
       },
       platformOrderMethods() {
         if (this.addMsg.PlatformOrder == "") {
@@ -4314,7 +4315,13 @@
         } else {
           this.addMsg.PreferPrice = Number(this.addMsg.YSeatNum) * Number(this.addMsg.Unit_Price) + this.OpSetLossMoney;
         }
-
+        if(this.ScenicRefundList.length>0&&this.ScenicRefundList!=null){
+          this.ScenicRefundList.forEach(x=>{
+            if(x.IsChecked){
+              this.addMsg.PreferPrice=this.addMsg.PreferPrice-x.BackMoney;
+            }
+          })
+        }
         this.getTicheng();
         if (!t) {
           this.getTypePrice2()