Skip to content

S
SuperMan
Commit 68971617 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 25f7a13b 54ab88b7
Expand all Show whitespace changes
Inline Side-by-side
Showing with 5769 additions and 415 deletions
src/components/Complaints/ComplaintsDetail.vue
View file @ 68971617
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
<span>已赔金额：</span>{{getBackMoney()}} <span>已赔金额：</span>{{getBackMoney()}}
</li> </li>
<li <li
v-if="ComplainInfo.DisposeStatus===4&&(getLocalStorage().EmployeeId===ComplainDetial[ComplainDetial.length-1].CreateBy||authority.indexOf('S_Complain_Finance')!=-1)"> v-if="ComplainInfo.DisposeStatus===4&&(getLocalStorage().EmployeeId===ComplainInfo[ComplainInfo.length-1].CreateBy||getLocalStorage().EmployeeId===ComplainDetial[ComplainDetial.length-1].CreateBy||authority.indexOf('S_Complain_Finance')!=-1)">
<span>立即制单：</span> <span>立即制单：</span>
<span v-for="compensation in ComplainCompensation" class="CD_dealResult" href="javascript:void(0)" <span v-for="compensation in ComplainCompensation" class="CD_dealResult" href="javascript:void(0)"
@click="setFinance(compensation)">{{compensation.CompensateMoney}}</span> @click="setFinance(compensation)">{{compensation.CompensateMoney}}</span>
......
src/components/FinancialModule/Application.vue
View file @ 68971617
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
<div class="Application_content"> <div class="Application_content">
<p style="text-align:center"> <p style="text-align:center">
<span style="font-weight:700;font-size:20px;">現金受取依頼書</span> <span style="font-weight:700;font-size:20px;">現金受取依頼書</span>
<span class="download" @click="downLoad">下载</span> <span class="download" @click="downLoad">下载并保存</span>
</p> </p>
<div> <div>
<div style="margin:30px 0"> <div style="margin:30px 0">
<el-select @change="CashListChange" v-model="id" placeholder="请选择"> <el-select @change="CashListChange" :disabled="disabled" v-model="id" placeholder="请选择">
<el-option <el-option
v-for="item in CashList" v-for="item in CashList"
:key="item.Name" :key="item.Name"
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<td>{{data.GetDate}}</td> <td>{{data.GetDate}}</td>
<td>{{data.LeaderName}}</td> <td>{{data.LeaderName}}</td>
<td> <td>
<el-select v-model="formdata.GetAddress" placeholder="请选择"> <el-select :disabled="disabled" v-model="formdata.GetAddress" placeholder="请选择">
<el-option v-if="id=='' || id==item.CashId" <el-option v-if="id=='' || id==item.CashId"
v-for="item in StoreList" v-for="item in StoreList"
:key="item.Name" :key="item.Name"
...@@ -63,6 +63,7 @@ export default { ...@@ -63,6 +63,7 @@ export default {
data:{}, data:{},
StoreList:[], StoreList:[],
id:"", id:"",
disabled:false,
} }
}, },
created(){ created(){
...@@ -107,10 +108,20 @@ export default { ...@@ -107,10 +108,20 @@ export default {
}, },
GetData(){ GetData(){
this.apipost('Financial_get_GetFinanceCashWithDrawals',{FrId:this.FrId}, res => { this.apipost('Financial_get_GetFinanceCashWithDrawals',{FrId:this.FrId}, res => {
console.log("res",res);
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
this.data = res.data.data; this.data = res.data.data;
this.formdata=Object.assign({},res.data.data); this.formdata=Object.assign({},res.data.data);
this.CashList= res.data.data.CashList; this.CashList= res.data.data.CashList;
if(this.data.Name!=""){
this.disabled=true;
this.CashList.forEach(item=>{
if(item.Name==this.data.Name){
this.id=item.Id;
}
})
}
this.StoreList= res.data.data.StoreList; this.StoreList= res.data.data.StoreList;
} }
}, err => {}) }, err => {})
......
src/components/FinancialModule/BasicDocuments.vue
View file @ 68971617
...@@ -1231,6 +1231,8 @@ export default { ...@@ -1231,6 +1231,8 @@ export default {
}, },
tuiDataList:[], tuiDataList:[],
currentMoney:0, currentMoney:0,
benMoney:0,
Ststus:0,
} }
},components:{ },components:{
"my-FlowChartModule": myFlowChartModule, "my-FlowChartModule": myFlowChartModule,
...@@ -1243,7 +1245,8 @@ export default { ...@@ -1243,7 +1245,8 @@ export default {
'SaleOrderModule':SaleOrderModule, 'SaleOrderModule':SaleOrderModule,
'TicketFinace':TicketFinace, 'TicketFinace':TicketFinace,
'my-HB-Bill':myhrBill, 'my-HB-Bill':myhrBill,
},methods:{ },
methods:{
payMsgListShow: function (type, index) { payMsgListShow: function (type, index) {
if(this.choiceMsg.Status==1){ if(this.choiceMsg.Status==1){
this.payMsgList.forEach(x=>{ this.payMsgList.forEach(x=>{
...@@ -1487,7 +1490,6 @@ export default { ...@@ -1487,7 +1490,6 @@ export default {
} }
}, },
Calculation(type, index){ // 计算价格 Calculation(type, index){ // 计算价格
console.log('aaaaaaaaaaaa');
if (type) { if (type) {
this.payMsgList[index].Fee = isNaN(parseFloat(this.payMsgList[index].Fee))?0:parseFloat(this.payMsgList[index].Fee); this.payMsgList[index].Fee = isNaN(parseFloat(this.payMsgList[index].Fee))?0:parseFloat(this.payMsgList[index].Fee);
this.payMsgList[index].Rate = isNaN(parseFloat(this.payMsgList[index].Rate))?0:parseFloat(this.payMsgList[index].Rate); this.payMsgList[index].Rate = isNaN(parseFloat(this.payMsgList[index].Rate))?0:parseFloat(this.payMsgList[index].Rate);
...@@ -1504,10 +1506,8 @@ export default { ...@@ -1504,10 +1506,8 @@ export default {
Rate = this.payMsg.Rate==0?1:this.payMsg.Rate, Rate = this.payMsg.Rate==0?1:this.payMsg.Rate,
Money = this.payMsg.OriginalMoney; Money = this.payMsg.OriginalMoney;
this.payMsg.allMoney = (Money*Rate)+fee; this.payMsg.allMoney = (Money*Rate)+fee;
console.log(this.payMsg,'payMsg');
} }
// console.log(Rate+"+"+fee+"+"+Money)
}, },
setAccountName(i, type, index){ setAccountName(i, type, index){
this.accountList.forEach(x=>{ this.accountList.forEach(x=>{
...@@ -1623,7 +1623,7 @@ export default { ...@@ -1623,7 +1623,7 @@ export default {
}, },
BankAccount_post_GetCashPoolList(){ // 获取资金池账 BankAccount_post_GetCashPoolList(){ // 获取资金池账
let id = 0; let id = 0;
this.AccList.forEach(x=>{ this.AccListthis.AccList.forEach(x=>{
if (x.Name === this.payMsg.AccName) { if (x.Name === this.payMsg.AccName) {
id = x.ID; id = x.ID;
} }
...@@ -1695,6 +1695,33 @@ export default { ...@@ -1695,6 +1695,33 @@ export default {
}, err => {}) }, err => {})
}, },
AuditOrRefund(){ // 保存 AuditOrRefund(){ // 保存
// console.log("保存")
let that=this;
if(that.Ststus==1){
if(this.AuditOrRefundMsg.Status=='5'){
if(that.GetDetail.AccountNumber.indexOf("东航平台")!=-1){
if(this.allMoney==0){
this.Error("请将信息填写完整！")
return;
}else{
if(this.allMoney>parseFloat(that.benMoney) + 5 || this.allMoney<parseFloat(that.benMoney) - 5){
this.Error("请检查实付金额！")
return;
}
}
// console.log("benMoney",this.benMoney)
// console.log(parseFloat(that.benMoney) - 5)
// console.log(parseFloat(that.benMoney) + 5)
}else{
if(this.allMoney!=parseFloat(that.benMoney)){
this.Error("请检查实付金额！")
return;
}
}
}
}
let imgArr = []; let imgArr = [];
this.uploadImgList.forEach(x=>{ this.uploadImgList.forEach(x=>{
imgArr.push(x.src); imgArr.push(x.src);
...@@ -1762,7 +1789,6 @@ export default { ...@@ -1762,7 +1789,6 @@ export default {
handleAvatarSuccess(res, file) { //上传 handleAvatarSuccess(res, file) { //上传
if(res.resultCode==1){ if(res.resultCode==1){
var img_path = res.data.FullFilePath var img_path = res.data.FullFilePath
console.log(res.data)
this.imageUrl = img_path this.imageUrl = img_path
let obj = { let obj = {
src:img_path src:img_path
...@@ -1798,8 +1824,8 @@ export default { ...@@ -1798,8 +1824,8 @@ export default {
x.UnitPrice = this.$commonUtils.addCommas(x.UnitPrice.toFixed(2)) x.UnitPrice = this.$commonUtils.addCommas(x.UnitPrice.toFixed(2))
x.Money = x.Money.toFixed(2) x.Money = x.Money.toFixed(2)
x.OriginalMoney = x.OriginalMoney.toFixed(2) x.OriginalMoney = x.OriginalMoney.toFixed(2)
this.benMoney += parseFloat(x.Money);
}) })
data.Money = this.$commonUtils.addCommas(data.Money.toFixed(2)) data.Money = this.$commonUtils.addCommas(data.Money.toFixed(2))
data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Money) data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Money)
this.FinancialFlowTemplate_post_GetProcessList(data.FrID,data.TemplateType) this.FinancialFlowTemplate_post_GetProcessList(data.FrID,data.TemplateType)
...@@ -1812,6 +1838,19 @@ export default { ...@@ -1812,6 +1838,19 @@ export default {
}) })
} }
this.GetDetail = data; this.GetDetail = data;
console.log(" this.GetDetail", this.GetDetail)
let AuditSteps=this.GetDetail.AuditSteps;
AuditSteps.forEach(item=>{
if(item.NextStep==1 && item.SpecialNode==2 && item.Status==1){
this.Ststus=1;
item.AuditRecordList.forEach(audit=>{
if(audit.AuditStatus==2){
this.Ststus=0;
}
})
}
})
this.OrderID = this.GetDetail.OrderID; this.OrderID = this.GetDetail.OrderID;
this.OrderSource = this.GetDetail.OrderSource; this.OrderSource = this.GetDetail.OrderSource;
this.SourceID = this.GetDetail.SourceID; this.SourceID = this.GetDetail.SourceID;
...@@ -1855,6 +1894,17 @@ export default { ...@@ -1855,6 +1894,17 @@ export default {
AccountType_post_GetList(){ //获取账户类型下拉 AccountType_post_GetList(){ //获取账户类型下拉
this.apipost('AccountType_post_GetList',this.queryAccMsg,res=>{ this.apipost('AccountType_post_GetList',this.queryAccMsg,res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
let data=res.data.data;
// if(this.RB_Post_Id!=5){
// data.forEach(item=>{
// if(item.Name!="公社资金池" && item.Name!="水口资金池" && item.Name!="橡胶资金池" && item.Name!="地接部专户" && item.Name!="老挝购物店资金池"){
// this.AccList.push(item);
// }
// })
// }else{
// this.AccList = res.data.data;
// }
this.AccList = res.data.data; this.AccList = res.data.data;
}else{ }else{
this.$message.error(res.data.message); this.$message.error(res.data.message);
...@@ -1926,11 +1976,11 @@ export default { ...@@ -1926,11 +1976,11 @@ export default {
if(this.$route.query.pageIndex){ if(this.$route.query.pageIndex){
this.pageIndex = this.$route.query.pageIndex; this.pageIndex = this.$route.query.pageIndex;
} }
this.ISGZ = this.$route.query.ISGZ ? true : false this.ISGZ = this.$route.query.ISGZ ? true : false;
},mounted(){ },mounted(){
let userInfo=this.getLocalStorage(); let userInfo=this.getLocalStorage();
this.userId = userInfo.EmployeeId; this.userId = userInfo.EmployeeId;
this.RB_Post_Id = userInfo.RB_Post_Id this.RB_Post_Id = userInfo.RB_Post_Id;
this.ID = this.$route.query.id; this.ID = this.$route.query.id;
this.queryMsg.FinanceId = this.$route.query.id; this.queryMsg.FinanceId = this.$route.query.id;
this.Financial_post_GetDetail(this.ID); this.Financial_post_GetDetail(this.ID);
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 68971617
...@@ -526,6 +526,10 @@ tr._item_list td:last-child { ...@@ -526,6 +526,10 @@ tr._item_list td:last-child {
<p v-if="UpdateStaus==1">正在更新,更新开始时间 {{UpdateStartTime}}</p> <p v-if="UpdateStaus==1">正在更新,更新开始时间 {{UpdateStartTime}}</p>
<p v-if="UpdateStaus==2">上次更新时间 {{UpdateStartTime}}</p> <p v-if="UpdateStaus==2">上次更新时间 {{UpdateStartTime}}</p>
</el-col> </el-col>
<el-col :span="6">
<el-button @click="msg.Is_Open=0,SetTravelClose()" type="danger" size="small" round :loading="btnloading">开启团队收支</el-button>
<el-button @click="msg.Is_Open=1,SetTravelClose()" type="danger" size="small" round :loading="btnloading">关闭团队收支</el-button>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
...@@ -746,10 +750,12 @@ Vue.component("TCIDJumpWang", { ...@@ -746,10 +750,12 @@ Vue.component("TCIDJumpWang", {
export default { export default {
data() { data() {
return { return {
btnloading:false,
showID: false, showID: false,
active: 1, active: 1,
userId: 0, userId: 0,
msg: { msg: {
Is_Open:-1,
pageIndex: 1, pageIndex: 1,
pageSize: 16, pageSize: 16,
OutBranchId:-1, OutBranchId:-1,
...@@ -1457,6 +1463,22 @@ export default { ...@@ -1457,6 +1463,22 @@ export default {
this.getPageList(); this.getPageList();
}, },
methods: { methods: {
SetTravelClose(){
this.btnloading=true;
this.apipost(
"financestatistics_post_SetTravelCloseReceipts",
this.msg,
res => {
this.btnloading=false;
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
} else {
this.AALloading = false;
this.Error(res.data.message);
}
}
);
},
goEasyReport: function() { goEasyReport: function() {
let year = this.productionDate[0] let year = this.productionDate[0]
? this.productionDate[0].substring(0, 4) ? this.productionDate[0].substring(0, 4)
......
src/components/Hotel/HotelProductManage2.vue
View file @ 68971617
...@@ -143,6 +143,18 @@ ...@@ -143,6 +143,18 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="提前还房天数">
<el-input-number v-model="msg2.BeforeDay" :precision="2" :min="0"
@keyup.native="checkInteger(msg2,'BeforeDay')" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="免间数">
<el-input-number v-model="msg2.FreeRoomNum" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'FreeRoomNum')" maxlength="10"></el-input-number>
</el-form-item>
</el-col
<el-col :span="6"> <el-col :span="6">
<el-form-item label="标准间成本价"> <el-form-item label="标准间成本价">
<el-input-number v-model="msg2.CostPrice" :precision="2" :min="0" <el-input-number v-model="msg2.CostPrice" :precision="2" :min="0"
...@@ -355,17 +367,29 @@ ...@@ -355,17 +367,29 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="提前还房天数">
<el-input-number v-model="msg.BeforeDay" :precision="2" :min="0"
@keyup.native="checkInteger(msg,'BeforeDay')" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="免间数">
<el-input-number v-model="msg.FreeRoomNum" :precision="2" :min="0"
@keyup.native="checkPrice(msg,'FreeRoomNum')" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="标准间成本价"> <el-form-item label="标准间成本价">
<el-input-number v-model="msg.CostPrice" :precision="2" :min="0" <el-input-number v-model="msg.CostPrice" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'CostPrice')" maxlength="10"></el-input-number> @keyup.native="checkPrice(msg,'CostPrice')" maxlength="10"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="散客价"> <el-form-item label="散客价">
<el-input-number v-model="msg.SanKePrice" :precision="2" :min="0" <el-input-number v-model="msg.SanKePrice" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'SanKePrice')" maxlength="10"></el-input-number> @keyup.native="checkPrice(msg,'SanKePrice')" maxlength="10"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
...@@ -577,7 +601,9 @@ ...@@ -577,7 +601,9 @@
DateList: [], DateList: [],
SanKePrice: 0, //散客价 SanKePrice: 0, //散客价
BatchNumber: 1, //批次号 BatchNumber: 1, //批次号
TaxesPrice: 0 //税金 TaxesPrice: 0, //税金
BeforeDay:0,//提前还房天数
FreeRoomNum:0,//免间数
}, },
msg2: { msg2: {
Hotel: '0', Hotel: '0',
...@@ -607,7 +633,9 @@ ...@@ -607,7 +633,9 @@
DateList: [], DateList: [],
SanKePrice: 0, //散客价 SanKePrice: 0, //散客价
BatchNumber: 1, //批次号 BatchNumber: 1, //批次号
TaxesPrice: 0 //税金 TaxesPrice: 0, //税金
BeforeDay:0,//提前还房天数
FreeRoomNum:0,//免间数
}, },
rules: { rules: {
InventoryType: { InventoryType: {
...@@ -931,6 +959,8 @@ ...@@ -931,6 +959,8 @@
this.msg.SanKePrice = data.SanKePrice; this.msg.SanKePrice = data.SanKePrice;
this.msg.BatchNumber = data.BatchNumber; this.msg.BatchNumber = data.BatchNumber;
this.msg.TaxesPrice = data.TaxesPrice; this.msg.TaxesPrice = data.TaxesPrice;
this.msg.BeforeDay=data.BeforeDay;
this.msg.FreeRoomNum=data.FreeRoomNum;
} }
}) })
}, },
...@@ -1009,6 +1039,8 @@ ...@@ -1009,6 +1039,8 @@
this.msg.SanKePrice = 0; this.msg.SanKePrice = 0;
this.msg.BatchNumber = 1; this.msg.BatchNumber = 1;
this.msg.TaxesPrice=0; this.msg.TaxesPrice=0;
this.msg.BeforeDay=0;
this.msg.FreeRoomNum=0;
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
...@@ -1025,6 +1057,8 @@ ...@@ -1025,6 +1057,8 @@
this.msg2.SanKePrice = 0; this.msg2.SanKePrice = 0;
this.msg2.BatchNumber = 1; this.msg2.BatchNumber = 1;
this.msg2.TaxesPrice = 0; this.msg2.TaxesPrice = 0;
this.msg2.BeforeDay=0;
this.msg2.FreeRoomNum=0;
}, },
//批量删除 //批量删除
delete2Reset: function () { delete2Reset: function () {
...@@ -1039,6 +1073,8 @@ ...@@ -1039,6 +1073,8 @@
that.msg2.SanKePrice = 0; that.msg2.SanKePrice = 0;
that.msg2.BatchNumber = 1; that.msg2.BatchNumber = 1;
that.msg2.TaxesPrice = 0; that.msg2.TaxesPrice = 0;
that.msg2.BeforeDay=0;
that.msg2.FreeRoomNum=0;
} else { } else {
that.Error(res.data.message) that.Error(res.data.message)
} }
...@@ -1047,7 +1083,6 @@ ...@@ -1047,7 +1083,6 @@
}, },
// 页面编辑保存 // 页面编辑保存
edit2Save: function () { edit2Save: function () {
console.log("msg2",this.msg2);
this.$refs['hotelProductForm2'].validate((valid) => { this.$refs['hotelProductForm2'].validate((valid) => {
if (valid) { if (valid) {
this.apipost('dict_post_HotelOffer_SetNewHotelPrice', this.msg2, res => { this.apipost('dict_post_HotelOffer_SetNewHotelPrice', this.msg2, res => {
...@@ -1059,6 +1094,8 @@ ...@@ -1059,6 +1094,8 @@
this.msg2.SanKePrice = 0; this.msg2.SanKePrice = 0;
this.msg2.BatchNumber = 1; this.msg2.BatchNumber = 1;
this.msg2.TaxesPrice = 0; this.msg2.TaxesPrice = 0;
this.msg2.BeforeDay=0;
this.msg2.FreeRoomNum=0;
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
...@@ -1105,7 +1142,6 @@ ...@@ -1105,7 +1142,6 @@
this.initSupplier(); this.initSupplier();
} }
} }
</script> </script>
<style> <style>
......
src/components/Hotel/roomReservations.vue
View file @ 68971617
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
<th width="120">占床/不占床</th> <th width="120">占床/不占床</th>
<th width="80">实际用房数</th> <th width="80">实际用房数</th>
<th></th> <th></th>
<!-- <th v-for='item in thLengthTitle'>{{item}}</th> -->
<th></th> <th></th>
<th>备注</th> <th>备注</th>
<th>操作</th> <th>操作</th>
...@@ -140,8 +139,7 @@ ...@@ -140,8 +139,7 @@
<p class="pDateStyle">{{childItem.CheckInDateStr}}</p> <p class="pDateStyle">{{childItem.CheckInDateStr}}</p>
<p @click="goUrlR('HotelManagement',childItem.HotelId,'酒店管理')" <p @click="goUrlR('HotelManagement',childItem.HotelId,'酒店管理')"
class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;"> class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;">
<span v-if='childItem.HotelOrderState==0' <span class="colorE95252">{{childItem.HotelOrderState==1?"[OK]":"[暂定]"}}</span>{{childItem.NewHotelName}}
class="colorE95252">（待定）</span>{{childItem.NewHotelName}}
</p> </p>
<p class="pDateStyle">{{item.CommonReport.HouseStatistics.RealityRoomNum}}</p> <p class="pDateStyle">{{item.CommonReport.HouseStatistics.RealityRoomNum}}</p>
<p class="pDateStyle"> <p class="pDateStyle">
......
src/components/ShoppingStore/ShoppingReimbursement2.vue 0 → 100644
View file @ 68971617
This diff is collapsed.
src/components/ShoppingStore/ShoppingStore.vue
View file @ 68971617
...@@ -375,6 +375,7 @@ ...@@ -375,6 +375,7 @@
.shoppingStore .impoTable { .shoppingStore .impoTable {
width: 100%; width: 100%;
min-width: 1400px; min-width: 1400px;
border-collapse: collapse;
} }
.shoppingStore .impoTable td { .shoppingStore .impoTable td {
...@@ -382,6 +383,7 @@ ...@@ -382,6 +383,7 @@
font-size: 12px; font-size: 12px;
color: #333; color: #333;
background-color: #e0f4ff; background-color: #e0f4ff;
border: 1px solid #dcdfe6;
height: 34px; height: 34px;
} }
...@@ -412,8 +414,8 @@ ...@@ -412,8 +414,8 @@
cursor: pointer; cursor: pointer;
} }
.shoppingStore .redType .el-input__inner { .shoppingStore .redType span {
border-color: #e95252; color: #e95252;
} }
.shoppingStore .downBtn { .shoppingStore .downBtn {
...@@ -669,53 +671,57 @@ ...@@ -669,53 +671,57 @@
</el-form> </el-form>
</div> </div>
<div class="btmAddStore" :class="{'fillShow':fillShow}"> <div class="btmAddStore" :class="{'fillShow':fillShow}">
<div class="btmTitle">导入营销数据<span class="litTip">(红色边框代表未匹配到的数据)</span></div> <div class="btmTitle">导入营销数据<span class="litTip">(红色内容代表未匹配到的数据)</span></div>
<div style="height:250px;overflow-y: auto;"> <div style="height:250px;overflow-y: auto;">
<table class="impoTable" style="border-spacing: 0px 1px;" v-loading="tabLoading"> <table class="impoTable" style="border-spacing: 0px 1px;" v-loading="tabLoading">
<thead> <thead>
<tr> <tr>
<th width="200">团号</th> <th width="120">团号</th>
<th>店名</th> <th width="170">店名</th>
<th>进店时间</th> <th width="100">进店时间</th>
<th>导游名称</th> <th width="80">导游名称</th>
<th>领队名称</th> <th width="80">领队名称</th>
<th>购物总额</th> <th width="80">购物总额</th>
<th>组团社提成</th> <th width="100">组团社提成</th>
<th>领队提成</th> <th width="80">领队提成</th>
<th>导游提成</th> <th width="80">导游提成</th>
<th>汇率</th> <th width="80">汇率</th>
<th>币种</th> <th width="80">币种</th>
<th>操作</th> <th width="80">操作</th>
</tr> </tr>
<tr v-for="(item,index) in importData" :key="item.subCode" :class="{'IsConflict':item.IsConflict==1}"> <tr v-for="(item,index) in importData" :key="item.subCode" :class="{'IsConflict':item.IsConflict==1}">
<td :class="{'redType':item.TCIDExist==-1}"> <td :class="{'redType':item.TCIDExist==-1}">
<el-input v-model="item.TCNUM" class="w150"></el-input> <!-- <el-input v-model="item.TCNUM" class="w150"></el-input> -->
<span>{{item.TCNUM}}</span>
</td> </td>
<td :class="{'redType':item.ShoppingNameExist==-1}"> <td :class="{'redType':item.ShoppingNameExist==-1}">
<el-select clearable class="w150" v-model='item.ShoppingID' filterable placeholder="请选择购物店"> <!-- <el-select clearable class="w150" v-model='item.ShoppingID' filterable placeholder="请选择购物店">
<el-option v-for='item in getShop' :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for='item in getShop' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select> -->
<span>{{item.Name}}</span>
</td> </td>
<td>{{item.EnterTime}}</td> <td>{{item.EnterTime}}</td>
<td :class="{'redType':item.GuideExist==-1}"> <td :class="{'redType':item.GuideID==0}">
<el-select clearable class="w150" v-model='item.GuideID' filterable placeholder="请选择领队"> <!-- <el-select clearable class="w150" v-model='item.GuideID' filterable placeholder="请选择导游">
<el-option v-for='item in guidList' :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for='item in guidList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select> -->
<span>{{item.GuideName}}</span>
</td> </td>
<td :class="{'redType':item.LeaderName==-1}"> <td :class="{'redType':item.LeaderID==0}">
<el-select clearable class="w150" v-model='item.LeaderID' filterable placeholder="请选择导游"> <span>{{item.LeaderName}}</span>
<!-- <el-select clearable class="w150" v-model='item.LeaderID' filterable placeholder="请选择领队">
<el-option v-for='item in leaderList' :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for='item in leaderList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select> -->
</td> </td>
<td>{{item.TotalPrice}}</td> <td>{{item.TotalPrice}}</td>
<td>{{item.GroupExtract}}</td> <td>{{item.GroupExtract}}</td>
<td>{{item.LeaderExtract}}</td> <td>{{item.LeaderExtract}}</td>
<td>{{item.GuideExtract}}</td> <td>{{item.GuideExtract}}</td>
<td>{{item.Rate}}</td> <td>{{item.Rate}}</td>
<td :class="{'redType':item.CurrencyExist==-1}">{{item.Currency}}</td> <td :class="{'redType':item.CurrencyExist==-1}"><span>{{item.Currency}}</span></td>
<td><span class="delInfo" @click="delInfo(index)">删除</span></td> <td><span class="delInfo" @click="delInfo(index)">删除</span></td>
</tr> </tr>
</thead> </thead>
...@@ -1184,7 +1190,7 @@ ...@@ -1184,7 +1190,7 @@
that.tabLoading = false; that.tabLoading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
that.fillShow = false; that.fillShow = false;
that.Success("导入成功"); that.Success("导入成功，用时【"+(res.data.data/1000)+"秒】");
that.getList(); that.getList();
} else { } else {
that.Error(res.data.message); that.Error(res.data.message);
......
src/components/Ticketing/PassengerList.vue
View file @ 68971617
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<tr> <tr>
<th v-if="isShowGuoji">国际机票 <input type="checkbox" @change="checkAllbox(checkdGuoji,'guoji')" v-model="checkdGuoji"/></th> <th v-if="isShowGuoji">国际机票 <input type="checkbox" @change="checkAllbox(checkdGuoji,'guoji')" v-model="checkdGuoji"/></th>
<th v-if="isShowGuoji">国内机票 <input type="checkbox" @change="checkAllbox(checkedGuonei,'guonei')" v-model="checkedGuonei"/></th> <th v-if="isShowGuoji">国内机票 <input type="checkbox" @change="checkAllbox(checkedGuonei,'guonei')" v-model="checkedGuonei"/></th>
<th v-if="isShowGuoji">国际中断 <input type="checkbox" @change="checkAllbox(checkedGJzd,'gjzd')" v-model="checkedGJzd"/></th> <th v-if="isShowGuoji">国际中段 <input type="checkbox" @change="checkAllbox(checkedGJzd,'gjzd')" v-model="checkedGJzd"/></th>
<th v-if="isShowGuoji">税金 <input type="checkbox" @change="checkAllbox(checkedshuijin,'shuijin')" v-model="checkedshuijin"/></th> <th v-if="isShowGuoji">税金 <input type="checkbox" @change="checkAllbox(checkedshuijin,'shuijin')" v-model="checkedshuijin"/></th>
<th v-if="isShowGuoji">升舱 <input type="checkbox" @change="checkAllbox(checkedsc,'shengcang')" v-model="checkedsc"/></th> <th v-if="isShowGuoji">升舱 <input type="checkbox" @change="checkAllbox(checkedsc,'shengcang')" v-model="checkedsc"/></th>
<th>旅客姓名</th> <th>旅客姓名</th>
...@@ -489,6 +489,7 @@ ...@@ -489,6 +489,7 @@
Obj: JSON.parse(this.$route.query.Obj), Obj: JSON.parse(this.$route.query.Obj),
SourceID: this.$route.query.id, SourceID: this.$route.query.id,
TCIDList: JSON.parse(this.$route.query.TCIDList), TCIDList: JSON.parse(this.$route.query.TCIDList),
companyIDList:JSON.parse(this.$route.query.companyIDList),
isFromPassenger:true, isFromPassenger:true,
} }
this.$router.push({ this.$router.push({
......
src/components/Ticketing/TicketManager.vue
View file @ 68971617
...@@ -1339,6 +1339,17 @@ ...@@ -1339,6 +1339,17 @@
<span class="_blu_text">{{$t('Airticket.Air_blueType')}}：</span> <span class="_blu_text">{{$t('Airticket.Air_blueType')}}：</span>
{{$t('Airticket.Air_EconomyClass')}} {{$t('Airticket.Air_EconomyClass')}}
</li> </li>
<li> <span style="color:#4BCA81 ;">√：</span>
<span >全部出票</span>
</li>
<li>
<span style="color: #E95252;">O：</span>
<span > 已出中段/部分出票</span>
</li>
<li>
<span style="color:#E95252 ;">X：</span>
<span >未处理</span>
</li>
</ul> </ul>
<div class="_ol_info" :class="addShow==true||command==true?'_edHeight':''"> <div class="_ol_info" :class="addShow==true||command==true?'_edHeight':''">
<ul class="_ol_list" v-loading="loading"> <ul class="_ol_list" v-loading="loading">
...@@ -1377,7 +1388,7 @@ ...@@ -1377,7 +1388,7 @@
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="vmiddle"> <el-col :span="5" class="vmiddle">
<div class="TMN_Seat"> <div class="TMN_Seat">
<div class="TK_SeatList"> <div class="TK_SeatList">
<ul class="clearfix"> <ul class="clearfix">
...@@ -1456,9 +1467,19 @@ ...@@ -1456,9 +1467,19 @@
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :span="1">
<div><ul>
<!--出票状态-->
<li style="font-size:18px;">
<span style="color: #4BCA81;" v-if="item.TicketState==1">√</span>
<span class="colorE95252" v-else>{{item.TicketState=='0'?"x":"O"}}</span>
</li>
</ul></div>
</el-col>
<el-col :span="4" class="vmiddle"> <el-col :span="4" class="vmiddle">
<div class="TK_raduis"> <div class="TK_raduis">
<ul> <ul>
<!--一定--> <!--一定-->
<li v-if="item.FirstDeposit!=''"> <li v-if="item.FirstDeposit!=''">
<div @click="goFinacePage(item,1)" :class="getClass(item.FirstDepositStatus)"> <div @click="goFinacePage(item,1)" :class="getClass(item.FirstDepositStatus)">
...@@ -1516,7 +1537,7 @@ ...@@ -1516,7 +1537,7 @@
</div> </div>
</li> </li>
<!--尾款--> <!--尾款-->
<li v-if="item.FinalPayment!=''&&item.FirstDeposit==''&&item.SecondDeposit==''&&item.ThirdDeposit==''&&item.FourthDeposit==''"> <!-- <li v-if="item.FinalPayment!=''&&item.FirstDeposit==''&&item.SecondDeposit==''&&item.ThirdDeposit==''&&item.FourthDeposit==''">
<div @click="goFinacePage(item,5)" :class="getClass(item.FinalPaymentStatus)"> <div @click="goFinacePage(item,5)" :class="getClass(item.FinalPaymentStatus)">
<el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250"> <el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250">
<span>尾</span> <span>尾</span>
...@@ -1528,7 +1549,7 @@ ...@@ -1528,7 +1549,7 @@
@click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span> @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span> </span>
</div> </div>
</li> </li> -->
<li v-else-if="item.FinalPayment!=''"> <li v-else-if="item.FinalPayment!=''">
<div @click="goCustomList('PassengerList',item, 5,'旅客名单')" :class="getClass(item.FinalPaymentStatus)"> <div @click="goCustomList('PassengerList',item, 5,'旅客名单')" :class="getClass(item.FinalPaymentStatus)">
<el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250"> <el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250">
...@@ -1562,7 +1583,8 @@ ...@@ -1562,7 +1583,8 @@
<p class="_text">{{$t('Airticket.Air_deadTicketTime')}}</p> <p class="_text">{{$t('Airticket.Air_deadTicketTime')}}</p>
</div> </div>
</el-col> </el-col>
<el-col :span="3" class="vmiddle"> <el-col :span="3" class="">
<div>
<el-button-group size="mini"> <el-button-group size="mini">
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
<el-button type="primary" icon="iconfont icon-Edit" @click="getEntityExtend(item.ID)"></el-button> <el-button type="primary" icon="iconfont icon-Edit" @click="getEntityExtend(item.ID)"></el-button>
...@@ -1613,6 +1635,24 @@ ...@@ -1613,6 +1635,24 @@
</el-popover> </el-popover>
</el-tooltip> </el-tooltip>
</el-button-group> </el-button-group>
</div>
<div style="margin-top:5px;" >
<el-button-group size="mini">
<el-tooltip class="item" effect="dark" content="出票完成" placement="top-start" v-show="item.TicketState!=1">
<el-button type="primary" icon="iconfont icon-ico_shezhi" @click="UpdateTicketState(item.ID,1)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="已出中段" placement="top-start" v-show="item.TicketState==0">
<el-button type="primary" icon="iconfont icon-ico_shezhi" @click="UpdateTicketState(item.ID,2)">
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="部分出票" placement="top-start" v-show="item.TicketState==0">
<el-button type="primary" icon="iconfont icon-ico_shezhi"
@click="UpdateTicketState(item.ID,3)" ></el-button>
</el-tooltip>
</el-button-group>
</div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -2517,7 +2557,6 @@ ...@@ -2517,7 +2557,6 @@
}, },
//跳转至旅客名单 //跳转至旅客名单
goCustomList(path, obj, type, title){ goCustomList(path, obj, type, title){
console.log(obj.TCIDList)
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
...@@ -2528,7 +2567,7 @@ ...@@ -2528,7 +2567,7 @@
Type: type Type: type
}), }),
TCIDList: JSON.stringify(obj.TCIDList), TCIDList: JSON.stringify(obj.TCIDList),
companyIDList: obj.OutBranchIdList, companyIDList: JSON.stringify(obj.OutBranchIdList),
tab: title tab: title
} }
}) })
...@@ -2790,6 +2829,23 @@ ...@@ -2790,6 +2829,23 @@
}, },
err => {} err => {}
); );
}, // 修改 根据ID获取信息
UpdateTicketState(ID,TicketState) {
this.apipost(
"AirTicket_get_UpdateTicketState", {
ID: ID,
TicketState:TicketState
},
res => {
if (res.data.resultCode == 1) {
this.Success("操作成功");
this.getList();
} else {
this.Warning(res.data.message);
}
},
err => {}
);
}, },
//根据航空公司ID 获取机场列表 //根据航空公司ID 获取机场列表
getAirportNameList(AirLineID, type) { getAirportNameList(AirLineID, type) {
......
src/components/activity/TravelCoupomPlanList.vue 0 → 100644
View file @ 68971617
This diff is collapsed.
src/components/activity/TravelInfoList.vue
View file @ 68971617
This diff is collapsed.
src/components/activity/TravelInfoSalesList.vue 0 → 100644
View file @ 68971617
This diff is collapsed.
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ 68971617
...@@ -602,6 +602,7 @@ ...@@ -602,6 +602,7 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
var tempData = res.data.data; var tempData = res.data.data;
console.log("tempData",tempData);
if (tempData.Feature != null) { if (tempData.Feature != null) {
this.FeatureData.ID = tempData.Feature.ID; this.FeatureData.ID = tempData.Feature.ID;
this.FeatureData.ConfigId = tempData.Feature.ConfigId; this.FeatureData.ConfigId = tempData.Feature.ConfigId;
......
src/router/config.js
View file @ 68971617
This diff is collapsed.
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