Skip to content

S
SuperMan
Commit 984bf9d3 authored by 吴春's avatar 吴春
Browse files
Options

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

parents a6d41926 53df760c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 491 additions and 33 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 984bf9d3
......@@ -262,17 +262,22 @@
<div class="page_bdm" v-if="GetDetail" v-loading="loading">
<p class="_tit">{{GetDetail.FinanceName}}</p>
<div class="_conten">
<template v-if="GetDetail.Type!==1 && GetDetail.Type!==7 && GetDetail.Type!=4">
<my-Bill :ID="GetDetail.FrID" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill>
</template>
<template v-else-if="GetDetail.Type===4">
<new-Bill :ID="GetDetail.FrID"></new-Bill>
</template>
<template v-else-if="GetDetail.Type===1 && GetDetail.Type!==7">
<my-RVB-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-RVB-Bill>
<template v-if="!otherTable">
<template v-if="GetDetail.Type!==1 && GetDetail.Type!==7 && GetDetail.Type!=4">
<my-Bill :ID="GetDetail.FrID" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill>
</template>
<template v-else-if="GetDetail.Type===4">
<new-Bill :ID="GetDetail.FrID"></new-Bill>
</template>
<template v-else-if="GetDetail.Type===1 && GetDetail.Type!==7">
<my-RVB-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-RVB-Bill>
</template>
<template v-else-if="GetDetail.Type===7">
<my-GZ-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-GZ-Bill>
</template>
</template>
<template v-else-if="GetDetail.Type===7">
<my-GZ-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-GZ-Bill>
<template v-else>
<my-DJ-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-DJ-Bill>
</template>
<div class="_explain">
<p>附加说明：</p>
......@@ -1105,15 +1110,18 @@ import newBill from "./FinancialSubmodule/NewBillModule.vue";
import myGZBill from "./FinancialSubmodule/GZBillModule.vue";
import myrbvBill from "./FinancialSubmodule/ReceivablesModule.vue";
import myhrBill from "./FinancialSubmodule/MergeBillModule.vue";
import myDJBill from "./FinancialSubmodule/DjieMergeBillModule.vue";
import teamProductModule from "../commonPage/teamProductModule.vue";
import TicketFinace from "../commonPage/TicketFinace.vue";
import SaleOrderModule from "../commonPage/SaleOrderModule.vue";
import TicketingModule from "../commonPage/TicketingModule.vue";
import { truncate } from 'fs';
// import MsgBus from '../../assets/utils/msgBus.js';
export default {
data(){
return{
otherTable: true,
imageOptions:{
navbar:false,
title:false
......@@ -1240,6 +1248,7 @@ export default {
"new-Bill":newBill,
"my-RVB-Bill":myrbvBill,
"my-GZ-Bill": myGZBill,
'my-DJ-Bill': myDJBill,
'TicketingModule':TicketingModule,
'teamProductModule':teamProductModule,
'SaleOrderModule':SaleOrderModule,
......@@ -1841,7 +1850,10 @@ export default {
let AuditSteps=this.GetDetail.AuditSteps;
AuditSteps.forEach(item=>{
if(item.NextStep==1 && item.SpecialNode==2 && item.Status==1){
this.Ststus=1;
if (this.GetDetail.DijieBathFinanceList.length) {
this.otherTable = false
}
this.Ststus = 1;
item.AuditRecordList.forEach(audit=>{
if(audit.AuditStatus==2){
this.Ststus=0;
......
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ 984bf9d3
......@@ -150,7 +150,8 @@
data.forEach(x => {
// 5-8 OrderSource 为5 并且当前登录人为吴珊，只显示49和50
// 如果不是吴珊，只显示49
if (this.OrderSource === '5' && this.showTab === '2') {
// 如果没有 OrderSource 则49和50都不显示
if (this.OrderSource === '5' && this.showTab === '2' && (x.Id === 49 || x.Id === 50)) {
if (x.Id === 49 || x.Id === 50){
x.bigShow = false
if (x.Id === 49){
......@@ -158,11 +159,11 @@
} else if (x.Id === 50 && this.EmployeeId === 639){
x.bigShow = true
}
console.log('if',x.Id,x.bigShow)
} else {
x.bigShow = false
console.log('else',x.Id,x.bigShow)
}
} else if (x.Id === 49 || x.Id === 50){
x.bigShow = false
} else {
// 5-5 仅茈、而巳。 14:32:06
// 部门id = 242 或者 240 就展示出 templeteId=33 的流程， 流程名字叫做 公司佣金收款
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 984bf9d3
......@@ -427,6 +427,7 @@
</div>
</div>
<my-HB-Bill v-if="GetDetail.Is_Merge===1 && ZhiDanRen!==bossID" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon" :color="colorSon"></my-HB-Bill>
<!-- <myDJieBill v-if="GetDetail.DijieBathFinanceList && GetDetail.DijieBathFinanceList.length" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon" :color="colorSon"/> -->
<!--<my-C-Bill v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&GetDetail.Type!=1" :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-C-Bill>-->
<div class="_fujian_box" v-if="(GetDetail.VorcherInos&&GetDetail.VorcherInos.length>0) || saveMsg.length>0">
<div class="_fujian_zhankai cursorpointer" v-if="!fujianShow" @click="fujianShow = true">
......@@ -782,6 +783,7 @@ import teamProductModule from "../commonPage/teamProductModule.vue";
import TicketFinace from "../commonPage/TicketFinace.vue";
import SaleOrderModule from "../commonPage/SaleOrderModule.vue";
import TicketingModule from "../commonPage/TicketingModule.vue";
import myDJieBill from "./FinancialSubmodule/DjieMergeBillModule.vue";
export default {
data(){
return{
......@@ -855,7 +857,8 @@ export default {
'teamProductModule':teamProductModule,
'TicketingModule':TicketingModule,
'SaleOrderModule':SaleOrderModule,
'TicketFinace':TicketFinace
'TicketFinace':TicketFinace,
'myDJieBill': myDJieBill,
},
created(){
this.ID = this.$route.query.id;
......
src/components/FinancialModule/FinancialSubmodule/MergeBillModule.vue
View file @ 984bf9d3
......@@ -154,7 +154,7 @@
<td height="34px">{{item.BName}}</td>
<td height="34px">
<template v-for="tc in item.TCIDAndTCNUMList">
<p class="_jump_page" @click="jumpPage('productQuery',o.TCID,1)">{{tc.TCNUM}}({{tc.TCID}})</p>
<p class="_jump_page" @click="jumpPage('productQuery',tc.TCID,1)">{{tc.TCNUM}}({{tc.TCID}})</p>
</template>
</td>
<td height="34px">{{item.FinanceId}}</td>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 984bf9d3
......@@ -1062,6 +1062,7 @@
</el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="4" v-show="addMsg.TradeWay==1&&addMsg.PlatformOrder!='' && isAllowUpdate!==0">
<el-form-item label="定金" prop="MinOrderPrice">
<el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input>
......@@ -1243,14 +1244,14 @@
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="单地接数量" prop="AirticketNum">
<el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')"
@input='getNumber();getTotalPrice();getHouseNo()'></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="单房数量" prop="SingleRoomNum">
<el-input v-model='addMsg.SingleRoomNum' @keyup.native="checkInteger(addMsg,'SingleRoomNum')"
......@@ -1274,12 +1275,6 @@
<el-input v-model='addMsg.VisaNum' @keyup.native="checkInteger(addMsg,'VisaNum')"
@input='getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="保险数量" prop="SaleNum">
<el-input v-model='addMsg.SafeNum' @keyup.native="checkInteger(addMsg,'SafeNum')"
@input='getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="拒签人数" prop="RefuseVisaNum" style="display:none;">
......@@ -1287,11 +1282,14 @@
@input='getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
&nbsp;
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="保险数量" prop="SaleNum">
<el-input v-model='addMsg.SafeNum' @keyup.native="checkInteger(addMsg,'SafeNum')"
@input='getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="预计用房" prop="PredictRoomNum">
<el-input v-model='addMsg.PredictRoomNum' :disabled="true"></el-input>
......@@ -1402,8 +1400,13 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
&nbsp;
<el-col :span="4" style="display:none;">
<el-form-item label="是否可清位">
<el-select v-model='addMsg.IsCanClear' :placeholder="$t('pub.pleaseSel')">
<el-option label='可以清位' :value='0' :key='0'></el-option>
<el-option label='不可以清位' :value='1' :key='1'></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
......@@ -1445,6 +1448,7 @@
</el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="4" v-show="addMsg.TradeWay==1&&addMsg.PlatformOrder!='' && isAllowUpdate!==0">
<el-form-item label="定金" prop="MinOrderPrice">
<el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input>
......@@ -2772,6 +2776,7 @@
//订单归属【HK新加，报名清单页面修改使用】
CreateBy: 0,
RefuseVisaNum:0,//拒签人数
IsCanClear:0 //是否可清位
},
//行程下载使用
travelControlTripLayerShow: false,
......@@ -3086,6 +3091,7 @@
},
res => {
if (res.data.resultCode == 1) {
console.log(res,'data');
this.IsUnion = res.data.data.IsUnion
this.isAllowUpdate = res.data.data.IsUpdatePlatOrder;
this.addObj = res.data.data.modelPrice;
......@@ -3112,6 +3118,8 @@
this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
this.addMsg.BabyNum = x.BabyNum.toString();
this.addMsg.RefuseVisaNum=x.RefuseVisaNum.toString();
this.addMsg.IsCanClear=x.IsCanClear;
this.IsChildrenTour = x.IsChildrenTour;
this.IsBirdDiscount = x.IsBirdDiscount;
this.OpSetLossPeople = x.OpSetLossPeople;
......
src/components/busManagement/busHandBook.vue
View file @ 984bf9d3
......@@ -9,7 +9,9 @@
text-align: center;
height: 40px;
}
.busManagerTalbe tr td{
padding:0 5px;
}
.commonBackColor {
background-color: #E6E6E6;
color: #333;
......@@ -25,7 +27,15 @@
color: #fff;
border: 1px solid #d1d1d1;
}
.addHandBook{
margin-right: 5px;
color: seagreen;
cursor: pointer;
visibility: hidden;
}
.addHandBookDIS{
visibility: visible!important;
}
</style>
<template>
<div>
......@@ -73,9 +83,10 @@
<td class="commonBackColor">ホテル</td>
<td class="commonBackColor">ホテルTEL</td>
</tr>
<tr v-for="subItem in DataObj.Details_Extends">
<tr v-for="(subItem,index) in DataObj.Details_Extends">
<td>
{{subItem.UseDate}}
<i class="iconfont icon-bumenguanli-tianjia addHandBook" :class="{'addHandBookDIS':index==0||index==DataObj.Details_Extends.length-1}" @click="addHand(index)"></i>
<el-date-picker v-model='subItem.UseDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</td>
<td>
<el-input type="text" v-model="subItem.BusType" />
......@@ -163,6 +174,7 @@
this.loading = false;
if (res.data.resultCode == 1) {
this.DataObj = res.data.data;
console.log(this.DataObj,'dataObj');
} else {
this.Error(res.data.message);
}
......@@ -182,6 +194,30 @@
this.isSave = false;
}, err => {})
}
},
//添加
addHand(index){
var obj = {
BusContent:'',
BusType:'',
FlightNum:'',
HotelName:'',
HotelTel:'',
Id:0,
MainId:0,
UseDate:''
}
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth() + 1;
var day = date.getDate();
var UseDate = year+'-'+month+"-"+day;
obj.UseDate = UseDate
if(index==0){
this.DataObj.Details_Extends.unshift(obj)
}else{
this.DataObj.Details_Extends.push(obj);
}
}
},
mounted() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment