Skip to content

S
SuperMan
Commit fad05ef9 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 36d63f88 0ac43404
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 483 deletions
src/assets/css/summaryLogin.css
View file @ fad05ef9
......@@ -45,7 +45,7 @@
font-size:18px;
color:#333333;
}
.Summary_login_Div .icon-login-name,.icon-login-password{
.Summary_login_Div .icon-login-name, .Summary_login_Div .icon-login-password{
width:16px;
height:15px;
display:inline-block;
......
src/components/FinancialModule/BasicDocuments.vue
View file @ fad05ef9
......@@ -271,6 +271,8 @@
background-color: white;
padding: 15px;
border: 1px solid #e0e0e0;
max-height: 400px;
overflow: auto;
}
.page_bdm .chongdi_list em{
font-size: 14px;
......@@ -591,7 +593,7 @@
<span v-else class="yixuanze_money">已选择金额：{{ChongDiMoney}}</span>
</div>
<div v-if="shifouChongDi" class="chongdi_list">
<!-- <div>
<div>
<em>发团时间：</em>
<el-date-picker class="h34"
@change="timeAdd(1)"
......@@ -600,7 +602,7 @@
value-format="yyyy-MM-dd"
range-separator="-">
</el-date-picker>
</div> -->
</div>
<div class="_kehu">
<em>{{$t('fnc.khleixing')}}：</em>
<el-select filterable v-model='ChongDiMsg.ClientType' :placeholder="$t('fnc.khleixing')" @change="financeinfo_post_GetClientAccountList(ChongDiMsg.ClientType, '1')" class="w135 _border_b_1">
......@@ -902,7 +904,7 @@
<span v-else class="yixuanze_money">已选择金额：{{ChongDiMoney}}</span>
</div>
<div v-if="shifouChongDi" class="chongdi_list">
<!-- <div>
<div>
<em>发团时间：</em>
<el-date-picker class="h34"
@change="timeAdd(1)"
......@@ -911,7 +913,7 @@
value-format="yyyy-MM-dd"
range-separator="-">
</el-date-picker>
</div> -->
</div>
<div class="_kehu">
<em>{{$t('fnc.khleixing')}}：</em>
<el-select filterable v-model='ChongDiMsg.ClientType' :placeholder="$t('fnc.khleixing')" @change="financeinfo_post_GetClientAccountList(ChongDiMsg.ClientType, '1')" class="w135 _border_b_1">
......@@ -1470,7 +1472,6 @@ export default {
methods:{
// 单选计算
checkdIteam(item){
console.log(item.checked)
if (item.checked) {
if (item.HangingAccountsTypeStr === '收') {
this.ChongDiMoney += item.Money
......@@ -1514,7 +1515,6 @@ export default {
this.apipost('Financial_post_GetHangingAccountList', this.ChongDiMsg, res=>{
if(res.data.resultCode == 1) {
let data = res.data.data;
console.log(data)
data.map(item=>{
item.checked = false
})
......@@ -1623,7 +1623,7 @@ export default {
let allMoney = 0
this.payMsgList.forEach(x=>{
allMoney+= x.allMoney;
// x.allMoney=(Math.round(x.allMoney * 100)) / 100;
x.allMoney=(Math.round(x.allMoney * 100)) / 100;
})
if(allMoney.toString().split(".")[1]){
let num=allMoney.toString().split(".")[1].length;
......
src/components/FinancialModule/RecPayQuery.vue
View file @ fad05ef9
......@@ -842,6 +842,14 @@ export default {
if(this.$route.query.Type){
this.msg.Type = this.$route.query.Type+'';
}
if(this.$route.query.rec){
this.msg.AccountType=15;
this.msg.TradeWay=4;
this.getAccountList(this.msg.AccountType,this.msg.TradeWay)
this.msg.BankID=14;
this.transactionDate[0]=this.$route.query.StartDate;
this.transactionDate[1]=this.$route.query.StartDate;
}
},components: {
"my-Bill": myBill,
"my-RVB-Bill":myrbvBill,
......@@ -949,7 +957,7 @@ export default {
this.$message.error(res.data.message);
}
// this.msg.TCID= this.msg.TCID==0?this.msg.TCID:'';
this.queryInfoInit();
// this.queryInfoInit();
this.currentPage = parseInt(this.msg.pageIndex);
},err=>{})
},
......@@ -1049,7 +1057,6 @@ export default {
},
getAccountList(i,t){ //收款账户
let accountList = [];
this.msg.BankID="";
if(t==1){ // 银行
this.apipost('bankaccount_post_GetList',{TypeId:i}, res => {
if(res.data.resultCode == 1) {
......@@ -1264,8 +1271,8 @@ export default {
QEndDate:this.msg.QEndDate,
QStartDate:this.msg.QStartDate,
OrderID:this.msg.OrderID==0?'':this.msg.OrderID,
Sort:this.msg.Sort,
EmployeeId:this.msg.EmployeeId,
Sort:this.msg.Sort,
EmployeeId:this.msg.EmployeeId,
}
this.msg = msg;
},
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ fad05ef9
......@@ -614,6 +614,7 @@ tr._item_list td:last-child {
</div>
</template>
<script>
import moment from 'moment'
import Vue from "vue";
import XLSX from "xlsx";
import downloadExcelEasy from "../../../assets/utils/downloadExcelEasy";
......@@ -663,8 +664,8 @@ Vue.component("TCNUMJump", {
<span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrlExtend('individualTicket',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===6">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===7">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===6" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===7" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
</div>`,
props: {
rowData: {
......@@ -678,6 +679,23 @@ Vue.component("TCNUMJump", {
}
},
methods: {
goRec(path,rowData){
let BankID="";
let StartDate="";
if(rowData.DataType===6){
BankID=14;
}
if(rowData.DataType===7){
BankID=15;
}
if(rowData.TCNUM.indexOf('JAP')!=-1 || rowData.TCNUM.indexOf('LAO')!=-1){
StartDate=moment(rowData.StartDate).format("YYYY-MM-DD");
}
this.$router.push({
path: "/" + path,
query: {'rec':'rec','StartDate':StartDate,"BankID":BankID,blank: "y"}
});
},
goUrl(path, id) {
this.$router.push({
path: "/" + path,
......
src/components/SalesModule/addPassenger.vue
View file @ fad05ef9
......@@ -1860,18 +1860,21 @@
let OrderId = this.addMsg.OrderId;
let IsBed = this.addMsg.IsBed;
let Sex = this.addMsg.Sex;
this.apipost(
"sellorder_post_GetHouseDetailsByOrderID",
{TCIDs:TCIDs,OrderId:OrderId,Sex:Sex,IsBed:IsBed},
res => {
if (res.data.resultCode == 1) {
this.roomlist = res.data.data;
} else {
this.$message.error(res.data.message);
if(Sex ==1 || Sex == 2) {
this.apipost(
"sellorder_post_GetHouseDetailsByOrderID",
{TCIDs: TCIDs, OrderId: OrderId, Sex: Sex, IsBed: IsBed},
res => {
if (res.data.resultCode == 1) {
this.roomlist = res.data.data;
} else {
this.$message.error(res.data.message);
}
},
err => {
}
},
err => {}
);
);
}
},
getHouselist(Sex,TCID,OrderId,IsBed){
if(Sex ==1 || Sex == 2){
......@@ -1887,45 +1890,20 @@
},
err => {}
);
}else {
this.$message.error('请选择性别');
}
},
addhouse(){
let orderId = this.addMsg.OrderId;
let sex = this.addMsg.Sex;
this.apipost(
"sellorder_get_BatchSetOrderHouse_V2",
{orderId:orderId,sex:sex,},
res => {
if (res.data.resultCode == 1) {
this.Roominformation()
} else {
this.$message.error(res.data.message);
}
},
err => {}
);
},
authentication() {
if (this.$route.query.guestId == 0) {
if(sex ==1 || sex == 2) {
this.apipost(
"sellorder_post_GetGusetByIDCard",
{IdCard: this.addMsg.IdCard,},
"sellorder_get_BatchSetOrderHouse_V2",
{orderId: orderId, sex: sex,},
res => {
if (res.data.resultCode == 1) {
let obj = res.data.data;
this.addMsg = obj;
this.addMsg.Sex = obj.Sex.toString();
this.addMsg.Marriage = obj.Marriage.toString();
if (this.addMsg.Marriage == "0") {
this.addMsg.Marriage = "";
}
this.addMsg.IsCriminalRecord = obj.IsCriminalRecord === null ? '' : obj.IsCriminalRecord.toString();
this.addMsg.IsDepartureRecord = obj.IsDepartureRecord.toString();
this.addMsg.Id = this.$route.query.guestId;
this.addMsg.TCID = this.$route.query.TCID;
this.addMsg.OrderId = this.$route.query.orderId;
this.Roominformation() //调取下房间信息
this.Roominformation()
} else {
this.$message.error(res.data.message);
}
......@@ -1934,6 +1912,59 @@
}
);
}
},
authentication() {
let IdCard = this.addMsg.IdCard;
if (this.$route.query.guestId == 0) {
if(IdCard.length == 18){
this.apipost(
"sellorder_post_GetGusetByIDCard",
{IdCard: this.addMsg.IdCard,},
res => {
if (res.data.resultCode == 1) {
let obj = res.data.data;
this.addMsg.SurName = obj.SurName;
this.addMsg.Name = obj.Name;
this.addMsg.ESurName = obj.ESurName;
this.addMsg.EName = obj.EName;
this.addMsg.Sex = obj.Sex.toString();
this.addMsg.MobilePhone = obj.MobilePhone;
this.addMsg.Birthday = obj.Birthday;
this.addMsg.BirthdayAddress = obj.BirthdayAddress;
this.addMsg.PassportNo = obj.PassportNo;
this.addMsg.PassportAddress = obj.PassportAddress;
this.addMsg.PassportIssued = obj.PassportIssued;
this.addMsg.PassportExpiry = obj.PassportExpiry;
this.addMsg.Nationality = obj.Nationality;
this.addMsg.Marriage = obj.Marriage.toString();
if (this.addMsg.Marriage == "0") {
this.addMsg.Marriage = "";
}
this.addMsg.Address = obj.Address;
this.addMsg.AddressDetail = obj.AddressDetail;
this.addMsg.IdentityType = obj.IdentityType;
this.addMsg.HistoryRecord = obj.HistoryRecord;
this.addMsg.Duty = obj.Duty;
this.addMsg.Remarks = obj.Remarks;
this.addMsg.IsHightSchool = obj.IsHightSchool;
this.addMsg.IsRecommend = obj.IsRecommend;
this.addMsg.Id = this.$route.query.guestId;
this.addMsg.TCID = this.$route.query.TCID;
this.addMsg.OrderId = this.$route.query.orderId;
this.Roominformation() //调取下房间信息
} else {
// this.$message.error(res.data.message);
}
},
err => {
}
);
}
}
}
},
mounted() {
......
src/components/Supplier/roomQuery2.vue
View file @ fad05ef9
This diff is collapsed.
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ fad05ef9
......@@ -84,6 +84,9 @@
<td>
<span class="spanlink" v-if='childItem.PeoplePrice==0'
@click="goUrl('ticketManagement',subItem,'门票管理')">设置</span>
<span v-else>
{{childItem.PeoplePrice}}
</span>
</td>
<td>
{{(childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice}}
......
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