liuhj 8 mesi fa
parent
commit
2c6eb74b1a

+ 28 - 0
src/components/Finance/GroupUnreviewed.vue

@@ -0,0 +1,28 @@
+<template>
+    <div class="groupunreviewed-all">
+        <div>团组未审核数据</div>
+        <div class="rvsreport-haed">
+            <el-date-picker @change="datechange" style="width:350px" v-model="value2" type="daterange" align="left"
+                unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+                :picker-options="pickerOptions">
+            </el-date-picker>
+            <el-button @click="Skeclick" type="primary">生 成</el-button>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    
+}
+</script>
+<style>
+.groupunreviewed-all{
+    background-color: #fff;
+    padding: 10px;
+    box-shadow: 0 0 5px #0005;
+    border-radius: 10px;
+    height: 100%;
+    min-height: 840px;
+    min-width: 1400px;
+}
+</style>

+ 20 - 64
src/components/OP/HotelReservations.vue

@@ -1536,11 +1536,9 @@ export default {
         //转换日期
         transferdate(val){
             var today = new Date(val);
-
             var DD = String(today.getDate()).padStart(2, '0'); // 获取日
             var MM = String(today.getMonth() + 1).padStart(2, '0'); //获取月份,1 月为 0
             var yyyy = today.getFullYear(); // 获取年
-
             return yyyy+'-'+MM+'-'+DD
         },
         //新增修改api
@@ -1585,70 +1583,29 @@ export default {
                     this.Hotelbreakfastobj.rate=this.currencyList[b].rate
                 }
             }
+            if(this.roomtaxobj.payDId!=72){
+                this.roomtaxobj.ctdId=0;
+                this.roomtaxobj.bankNo='';
+                this.roomtaxobj.cardholderName='';
+            }
+            if(this.Citytaxobj.payDId!=72){
+                this.Citytaxobj.ctdId=0;
+                this.Citytaxobj.bankNo='';
+                this.Citytaxobj.cardholderName='';
+            }
+            if(this.landtaxobj.payDId!=72){
+                this.landtaxobj.ctdId=0;
+                this.landtaxobj.bankNo='';
+                this.landtaxobj.cardholderName='';
+            }
+            if(this.Hotelbreakfastobj.payDId!=72){
+                this.Hotelbreakfastobj.ctdId=0;
+                this.Hotelbreakfastobj.bankNo='';
+                this.Hotelbreakfastobj.cardholderName='';
+            }
             this.loading=true;
             var url = "/api/Groups/PostHotelReservationsAddOrEdit"
             var that = this
-            var data= {
-                    portType:1,
-                    userId:that.userId,//用户Id
-                    pageId:that.pageId,//页面Id
-                    id:that.inifid,//Id
-                    diId:that.OpHotelReservationsData.diId,//团组Id
-                    gtId:that.RequiredParameters.TypeGuest,//客人类型 Id 
-                    ctdId:that.RequiredParameters.BankCards,//信用卡类型 
-                    checkNumber:that.RequiredParameters.VoucherNumber,//入住卷号
-                    reservationsWebsite:that.RequiredParameters.BookingWeb,//预订网站
-                    reservationsNo:that.RequiredParameters.ReservationNumber,//预订号码
-                    determineNo:that.RequiredParameters.DetermineNumber,//酒店确定号码
-                    city:that.RequiredParameters.LocationCity,//城市
-                    hotelName:that.RequiredParameters.HotelName,//酒店名称
-                    hotelTel:that.RequiredParameters.HotelPhone,//酒店电话
-                    hotelAddress:that.RequiredParameters.HotelAddress,//酒店地址
-                    guestName:guestNametext.substring(0, guestNametext.length - 1),//客户名称
-                    checkInDate:that.transferdate(that.RequiredParameters.OnTime),//入住时间
-                    checkOutDate:that.transferdate(that.RequiredParameters.OutTime),//离店时间
-                    checkType:that.RequiredParameters.TypeStay,//房间入住人类型
-                    roomExplanation:that.RequiredParameters.RoomExplain,//房间说明
-                    hotelRemark:that.RequiredParameters.Remark,//酒店备注
-                    singleRoomPrice:that.TwoParameters.singleroomsPrice,//单间价格
-                    singleRoomCount:that.TwoParameters.singleroomsNum,//单间数量
-                    doubleRoomPrice:that.TwoParameters.doubleroomPrice,//双间价格
-                    doubleRoomCount:that.TwoParameters.doubleroomNum,//双间数量
-                    suiteRoomPrice:that.TwoParameters.suitePrice,//套房价格
-                    suiteRoomCount:that.TwoParameters.suiteNum,//套房数量
-                    otherRoomPrice:that.TwoParameters.otherroomPrice,//其他房间价格
-                    otherRoomCount:that.TwoParameters.otherroomNum,//其他房间数量
-                    cardPrice:that.Paymentinfor.paymentAmount,//付款金额
-                    cardPriceCurrency:that.Paymentinfor.paymentCurrency,//付款币种
-                    contents:[
-                        that.roomtaxobj,
-                        that.Citytaxobj,
-                        that.landtaxobj,
-                        that.Hotelbreakfastobj
-                    ],
-                    // isoppay:that.TwoParameters.resource==true?1:0,//是否由地接支付 0 否 1 是
-                    // breakfastPrice:that.TwoParameters.breakfastPrice,//早餐价格
-                    // breakfastCurrency:that.TwoParameters.breakfastCurrency,//早餐币种
-                    // governmentRent:that.TwoParameters.RentPrice,//地税
-                    // governmentRentCurrency:that.TwoParameters.RentCurrency,//地税币种
-                    // cityTax:that.TwoParameters.CitytaxPrice,//城市税
-                    // cityTaxCurrency:that.TwoParameters.CitytaxCurrency,//城市税币种
-                    // payDId:that.Paymentinfor.paymentMethods,//支付方式
-                    // consumptionPatterns:that.Paymentinfor.consumptionPatterns,//消费方式
-                    // consumptionDate:that.Paymentinfor.purchaseDate!=''?that.transferdate(that.Paymentinfor.purchaseDate):'',//消费日期
-                    // payMoney:that.Paymentinfor.paymentAmount,//付款金额
-                    // paymentCurrency:that.Paymentinfor.paymentCurrency,//付款币种
-                    // bankNo:that.Paymentinfor.cardnumber,//银行卡号
-                    // cardholderName:that.Paymentinfor.cardname,//持卡人姓名
-                    // CompanyBankNo:that.Paymentinfor.transferbanknumber,//公司银行账户
-                    // otherBankName:that.Paymentinfor.transferbank,//对方开户行
-                    // otherSideNo:that.Paymentinfor.transfercardnumber,//对方银行账号
-                    // otherSideName:that.Paymentinfor.transfername,//对方姓名
-                    // payee:that.Paymentinfor.beneficiary,//收款方
-                    // orbitalPrivateTransfer:that.Paymentinfor.expenseid,//费用标识
-                    ccpRemark:that.Paymentinfor.remarks,//C表付款信息 备注
-                }
-                // console.log(JSON.stringify(data))
             this.$axios({
                 method: 'post',
                 url: url,
@@ -2053,7 +2010,6 @@ export default {
         },
         //计算信用卡金额
         CalculateAmount(){
-            console.log(this.CalculateTade())//天数
             var compute=0
             compute=((this.TwoParameters.singleroomsNum*this.TwoParameters.singleroomsPrice)+(this.TwoParameters.doubleroomNum*this.TwoParameters.doubleroomPrice)+(this.TwoParameters.suiteNum*this.TwoParameters.suitePrice)+(this.TwoParameters.otherroomNum*this.TwoParameters.otherroomPrice))*this.CalculateTade()
             this.TwoParameters.amount=compute

+ 1 - 1
src/components/OP/RoyaltyRecogn.vue

@@ -196,7 +196,7 @@ export default {
                 {
                     lable:'全部',
                     value:-1
-                },
+                 },
                 {
                     lable:'未确认',
                     value:0

+ 7 - 1
src/router/index.js

@@ -119,7 +119,8 @@ import VisitSchedule from '@/components/Resource/VisitSchedule'
 import billUploading from '@/components/Finance/billUploading';
 import TellerStatement from '@/components/statistics/TellerStatement';
 import TellerStatementTB from '@/components/statistics/TellerStatementTB';
-import RoyaltyRecogn from '@/components/OP/RoyaltyRecogn'
+import RoyaltyRecogn from '@/components/OP/RoyaltyRecogn';
+import GroupUnreviewed from '@/components/Finance/GroupUnreviewed';
 
 Vue.use(Router)
 
@@ -726,6 +727,11 @@ export default new Router({
           name: 'RoyaltyRecogn',
           component: RoyaltyRecogn
         },
+        {
+          path: '/home/GroupUnreviewed',
+          name: 'GroupUnreviewed',
+          component: GroupUnreviewed
+        },
       ]
     },
     {