Skip to content

C
CRM
Commit 8f75ae78 authored by zhengke's avatar zhengke
Browse files
Options

no message

parent d5ff468c
Show whitespace changes
Inline Side-by-side
Showing with 158 additions and 150 deletions
src/components/guestManagement/Agreement.vue
View file @ 8f75ae78
......@@ -51,10 +51,12 @@
.income_1 {
color: #2961FE;
cursor: pointer;
}
.income_2 {
color: #3FC4FF;
cursor: pointer;
}
.enedit-box {
......@@ -107,6 +109,9 @@
border-bottom: 3px solid #fff;
left:-8px;
}
/deep/.el-table .cell.el-tooltip{
overflow: hidden !important;
}
</style>
<template>
<div class="Business">
......@@ -244,7 +249,10 @@
(scope.row.TicketStatus==4?'Black':'')))">
{{scope.row.TicketStatusName}}
</span>
<i v-if="scope.row.TicketStatus!=1&&scope.row.TicketVoucherList!=[]&&scope.row.CancelVoucherList!=[]" class="iconfont iconpingzhengchaxun Credentials" @click="viewCredentials(scope.row)"></i>
<i v-if="scope.row.TicketStatus!=1&&
scope.row.TicketVoucherList!=[]&&
scope.row.CancelVoucherList!=[]&&
scope.row.TicketStatusName!='无需机票'" class="iconfont iconpingzhengchaxun Credentials" @click="viewCredentials(scope.row)"></i>
</template>
</el-table-column>
<el-table-column label="订单状态" show-overflow-tooltip>
......@@ -426,8 +434,13 @@
}
this.makeAdocumentFun(row, index, num)
if(num==1){
if(this.dataList[index].checkList.length==1){
}else{
this.dataList[index].actuallyReceived =false
}
}
if(num==3){
this.dataList[index].cost =false
}
......@@ -519,7 +532,7 @@
makeAdocument(row, index, num) {
this.dataList[index].MultipleChoiceList=[]
let list = row.OrderType&&row.OrderType.split(',')
if(list!=null&&list.length!=0&&num==1){
if(list!=null&&list.length>1&&num==1){
this.dataList.forEach(item=>{
return item.cost = false
})
......@@ -536,7 +549,7 @@
}
}
else if(list!=null&&list.length!=0&&num==3){
else if(list!=null&&list.length>1&&num==3){
this.dataList.forEach(item=>{
return item.actuallyReceived = false
})
......@@ -562,13 +575,14 @@
} else {
if (row.OrderStatus != '2') {
if(list&&list.length>1){
if(num=='1'){
let typeList = row.selectedType.split(',')
if(num=='1'&&typeList.length>=2){
let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本anceId2 = num
let $this = this;
row.ReFinanceId2 = num
this.MsgBus.$emit("BillMakingOrderBoxOpen", $this.ID, row, true);
}if(num=='3'){
}if(typeList.length==1&&num=='1'||num=='3'){
let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
let href
......@@ -589,10 +603,10 @@
}]
href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
window.open(href);
for(let i=0;i<$this.dataList.length;i++){
$this.dataList[i].checkList = []
$this.dataList[i].MultipleChoiceList = []
$this.dataList[i].selectedType = ""
for(let i=0;i<this.dataList.length;i++){
this.dataList[i].checkList = []
this.dataList[i].MultipleChoiceList = []
this.dataList[i].selectedType = ""
}
}
......@@ -630,10 +644,10 @@
}
href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
window.open(href);
for(let i=0;i<$this.dataList.length;i++){
$this.dataList[i].checkList = []
$this.dataList[i].MultipleChoiceList = []
$this.dataList[i].selectedType = ""
for(let i=0;i<this.dataList.length;i++){
this.dataList[i].checkList = []
this.dataList[i].MultipleChoiceList = []
this.dataList[i].selectedType = ""
}
}
......@@ -641,6 +655,7 @@
}
},
// 操作日志
operationLog(row) {
let $this = this;
......
src/components/guestManagement/ticketOrder.vue
View file @ 8f75ae78
......@@ -349,7 +349,9 @@
.BillMakingType-box{
display: flex;
flex-direction: row;
margin: 10px 0;
/* margin: 20px 0; */
padding: 20px 10px 0 10px;
background-color: #fff;
}
.BillMakingType-left{
flex-shrink: 0;
......@@ -374,7 +376,7 @@
flex-wrap: wrap;
}
.BillMakingType-right-center{
width: 155px;
width: 150px;
display: flex;
align-items: center;
margin-right: 10px;
......@@ -395,6 +397,9 @@
.BillingTotal-box{
display: flex;
justify-content: flex-end;
background-color: #fff;
padding: 0 10px 20px 0;
margin-bottom: 20px;
}
.BillingTotal-center{
display: flex;
......@@ -407,21 +412,48 @@
.appendix-box{
display: flex;
flex-direction: column;
margin-top: 20px;
}
.appendix-top{
display: flex;
flex-wrap: wrap;
margin-bottom: 10px;
background-color: #fff;
padding: 20px 10px;
}
.appendix-top-img{
width: 100px;
height: 100px;
width: 120px;
height: 80px;
margin-bottom: 10px;
margin-right: 10px;
position: relative;
}
.appendix-img{
width: 120px;
height: 80px;
}
.imgdelete{
position: absolute;
right: 0px;
top: -10px;
color: red;
z-index: 2;
font-size: 25px;
cursor: pointer;
}
.appendix-bottom{
width: 120px;
height: 80px;
overflow: hidden;
margin-bottom: 10px;
}
/deep/.appendix-upload-demo .el-upload-dragger{
width: 120px !important;
height: 80px !important;
}
/deep/.appendix-upload-demo .el-upload-dragger .el-icon-upload{
margin: 0px !important;
font-size: 20px;
}
.RemittanceInformation-box{
display: flex;
}
......@@ -441,6 +473,7 @@
.RemittanceInformation-center-right{
flex: 1;
}
</style>
<template>
<el-dialog :visible.sync="dialogTableVisible"
......@@ -580,7 +613,7 @@
<div class="MyEditForm-item">
<el-form-item label="凭证/图片" prop="">
<div class="certificate-img-box">
<div class="img-box" v-for="(item,index) in form.Voucher" :key="index">
<div class="img-box" v-loding="imgShow" v-for="(item,index) in form.Voucher" :key="index">
<el-image
style="width: 100px; height: 100px"
:src="item"
......@@ -603,6 +636,8 @@
:http-request="uploadImg"
:multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp"
:before-upload="handleAvatarUpload"
:on-progress="handleAvatarProgres"
:on-success="handleAvatarSuccess"
>
<i class="el-icon-upload"></i>
......@@ -641,16 +676,18 @@
<div class="Credentialstext-box">
<p>熔断/取消凭证</p>
<div class="Credentialsimg-box">
<el-image v-for="(items,index) in obj.CancelVoucherList" :key="index"
:src="domainManager().ViittoFileUrl+items"></el-image>
<el-image v-for="(items,index) in obj.CancelVoucherList.map(item=>{return domainManager().ViittoFileUrl + item})" :key="index"
:src="items"
:preview-src-list="obj.CancelVoucherList.map(item=>{return domainManager().ViittoFileUrl + item})"></el-image>
</div>
</div>
<div class="Credentialstext-box">
<p>出票凭证</p>
<div class="Credentialsimg-box">
<el-image v-for="(items,index) in obj.TicketVoucherList" :key="index"
:src="domainManager().ViittoFileUrl+items">
<el-image v-for="(items,index) in obj.TicketVoucherList.map(item=>{return domainManager().ViittoFileUrl + item})" :key="index"
:src="items"
:preview-src-list="obj.TicketVoucherList.map(item=>{return domainManager().ViittoFileUrl + item})">
</el-image>
</div>
......@@ -728,7 +765,7 @@
</el-select>
</div>
<div class="BillMaking-header-center">
<span>收款账号：</span>
<span> </span>
<el-select size="mini" v-model="BillMaking.AccountId" filterable placeholder="请选择收款账号"
@change="getReceivingAccount">
<el-option
......@@ -791,10 +828,10 @@
<el-input size="mini" placeholder="请输入手续费" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="airTickets.OriginalFee"></el-input>
</div>
<div class="BillingTotal-center">
<!-- <div class="BillingTotal-center">
<span>总价：</span>
<span>{{airTickets.TotalCost}}</span>
</div>
</div> -->
<div class="BillingTotal-center">
<span>应收：</span>
<span>{{airTickets.WBMoney}}</span>
......@@ -810,7 +847,7 @@
<div class="BillMakingType-right-box">
<div class="BillMakingType-right-center">
<span>费用说明：</span>
<el-select size="mini" filterable v-model='item.CostTypeId' placeholder="费用说明">
<el-select size="mini" filterable v-model='item.CostTypeId' placeholder="说明">
<el-option v-for='item in GetCostTypeList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
......@@ -852,10 +889,10 @@
<el-input size="mini" placeholder="请输入手续费" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="visa.OriginalFee"></el-input>
</div>
<div class="BillingTotal-center">
<!-- <div class="BillingTotal-center">
<span>总价：</span>
<span>{{visa.TotalCost}}</span>
</div>
</div> -->
<div class="BillingTotal-center">
<span>应收：</span>
<span>{{visa.WBMoney}}</span>
......@@ -871,7 +908,7 @@
<div class="BillMakingType-right-box">
<div class="BillMakingType-right-center">
<span>费用说明：</span>
<el-select size="mini" filterable v-model='item.CostTypeId' placeholder="费用说明">
<el-select size="mini" filterable v-model='item.CostTypeId' placeholder="说明">
<el-option v-for='item in GetCostTypeList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
......@@ -913,126 +950,47 @@
<el-input size="mini" placeholder="请输入手续费" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="ground.OriginalFee"></el-input>
</div>
<div class="BillingTotal-center">
<!-- <div class="BillingTotal-center">
<span>总价：</span>
<span>{{ground.TotalCost}}</span>
</div>
</div> -->
<div class="BillingTotal-center">
<span>应收：</span>
<span>{{ground.WBMoney}}</span>
</div>
</div>
</div>
<!-- 套餐 -->
<!-- <div v-if="obj.checkList.indexOf('4')!=-1">
<div class="BillMakingType-box">
<div class="BillMakingType-left">{{combo.title}}</div>
<div class="BillMakingType-right">
<div class="BillMakingType-right-list" v-for="(item,index) in combo.detailList" :key="index">
<div class="BillMakingType-right-center">
<el-input size="mini" placeholder="数量" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="item.Number"></el-input>
</div>
<div class="BillMakingType-right-center">
<el-input size="mini" placeholder="单价" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="item.UnitPrice"></el-input>
</div>
<div class="BillMakingType-right-center">
<el-input size="mini" placeholder="金额" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="item.OriginalMoney"></el-input>
</div>
<div class="BillMakingType-right-center">
<el-input
size="mini"
type="textarea"
:rows="1"
placeholder="备注"
v-model="value"></el-input>
</div>
<i class="iconfont clickJia" v-if="index==0" @click="addTypeList(1)">&#xe615;</i>
<i class="iconfont clickJia" v-if="index!=0" @click="deleteTypeList(item,index,1)">&#xe67a;</i>
</div>
</div>
</div>
<div class="BillingTotal-box">
<div class="BillingTotal-center">
<el-input size="mini" placeholder="总价" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="combo.WBMoney"></el-input>
</div>
<div class="BillingTotal-center">
<el-input size="mini" placeholder="手续费" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="combo.OriginalFee"></el-input>
</div>
</div>
</div> -->
<!-- 其他 -->
<!-- <div v-if="obj.checkList.indexOf('5')!=-1">
<div class="BillMakingType-box">
<div class="BillMakingType-left">{{other.title}}</div>
<div class="BillMakingType-right">
<div class="BillMakingType-right-list" v-for="(item,index) in other.detailList" :key="index">
<div class="BillMakingType-right-center">
<el-input size="mini" placeholder="数量" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="item.Number"></el-input>
</div>
<div class="BillMakingType-right-center">
<el-input size="mini" placeholder="单价" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="item.UnitPrice"></el-input>
</div>
<div class="BillMakingType-right-center">
<el-input size="mini" placeholder="金额" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="item.OriginalMoney"></el-input>
</div>
<div class="BillMakingType-right-center">
<el-input
size="mini"
type="textarea"
:rows="1"
placeholder="备注"
v-model="value"></el-input>
</div>
<i class="iconfont clickJia" v-if="index==0" @click="addTypeList(1)">&#xe615;</i>
<i class="iconfont clickJia" v-if="index!=0" @click="deleteTypeList(item,index,1)">&#xe67a;</i>
</div>
</div>
</div>
<div class="BillingTotal-box">
<div class="BillingTotal-center">
<el-input size="mini" placeholder="总价" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="other.WBMoney"></el-input>
</div>
<div class="BillingTotal-center">
<el-input size="mini" placeholder="手续费" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="other.OriginalFee"></el-input>
</div>
</div>
</div> -->
<div class="appendix-box">
<div class="appendix-top">
<div class="appendix-top-img" v-for="(items,index) in form.Voucher" :key="index">
<div v-loading="imgShow" class="appendix-top-img" v-for="(items,index) in form.Voucher" :key="index">
<el-image class="appendix-img"
:src="items"></el-image>
:src="items" :preview-src-list="form.Voucher">
<div slot="placeholder" class="image-slot">
加载中<span class="dot">...</span>
</div>
</el-image>
<i class="iconfont imgdelete" @click="deleteImg(index)">&#xe608;</i>
</div>
<div class="appendix-bottom">
<!-- :file-list="fileList" -->
<el-upload
ref="ticketUpload"
class="upload-demo"
class="appendix-upload-demo"
drag
action=""
:file-list="fileList"
:http-request="uploadImg"
:multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp"
:before-upload="handleAvatarUpload"
:on-progress="handleAvatarProgres"
:on-success="handleAvatarSuccess"
>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<!-- <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div> -->
<div class="el-upload__text"><em>拖拽/点击上传</em></div>
</el-upload>
</div>
</div>
</div>
<div class="RemittanceInformation-box">
......@@ -1108,6 +1066,7 @@
},
data() {
return {
imgShow:false,
clickShow:false,
GetCostTypeList:[],//费用类型
accountList:[],//账号类别
......@@ -1461,6 +1420,10 @@
}
},
mounted() {
let $this = this;
setTimeout(() => {
$this.dialogTableVisible = true;
}, 50);
this.form.GuestId = this.GuestId
if (this.name == "编辑机票订单") {
this.checkList = this.obj.OrderType.split(',')
......@@ -1514,6 +1477,13 @@
}
if (this.name == '编辑订单金额') {
this.width = "600px"
this.form = {
TicketMoney:this.obj.TicketMoney,
VisaMoney:this.obj.VisaMoney,
DiJieMoney:this.obj.DiJieMoney,
MealMoney:this.obj.MealMoney,
MealDescription:this.obj.MealDescription
}
}
if (this.name == '凭证图') {
this.width = "600px"
......@@ -1535,7 +1505,7 @@
ReFinanceId:this.obj.OrderId,//订单ID
ReFinanceId2:this.obj.ReFinanceId2,//类型 1收款
GuestId:this.GuestId,//客人ID
RelevanceFrId:this.obj.selectedType,//订单类型 1机票 2签证 3地接 4套餐 5其他
RelevanceFrId:"",//订单类型 1机票 2签证 3地接 4套餐 5其他
vorcherInos:[],
detailList:[]
}
......@@ -1548,10 +1518,7 @@
this.AccountType_post_GetList()
this.Financial_post_GetCostTypeList()
}
let $this = this;
setTimeout(() => {
$this.dialogTableVisible = true;
}, 50);
},
methods: {
......@@ -1846,9 +1813,30 @@
handleAvatarSuccess(res, file) {
this.$refs.ticketUpload.clearFiles();
if (res.resultCode == 1) {
this.Success(res.message);
}
},
// 上传时钩子
handleAvatarProgres(event, file, fileList){
},
// 上传前钩子
handleAvatarUpload(file){
this.imgShow = true
},
// 删除图片
deleteImg(index){
this.form.Voucher.splice(index,1)
this.BillMaking.vorcherInos=[]
this.form.Voucher.forEach(item=>{
let Content ={
Content:item
}
this.BillMaking.vorcherInos.push(Content)
})
},
//上传图片
uploadImg(file) {
let newArr = [];
......@@ -1868,7 +1856,12 @@
}
this.BillMaking.vorcherInos.push(Content)
this.form.Voucher.push(url);
if(x.data.StatusCode==1){
this.imgShow = false
this.$message.success('上传成功！')
}
});
},
radioChange() {
if (this.form.Type == '3') {
......@@ -2139,10 +2132,10 @@
AccountNumber:this.BillMaking.AccountNumber,//流水号
TemplateId:this.BillMaking.TemplateId,//流程ID
OtherType:this.BillMaking.OtherType,//默认=55
ReFinanceId:this.BillMaking.OrderId,//订单ID
ReFinanceId:this.BillMaking.ReFinanceId,//订单ID
ReFinanceId2:this.BillMaking.ReFinanceId2,//类型 1收款
GuestId:this.BillMaking.GuestId,//客人ID
RelevanceFrId:this.BillMaking.RelevanceFrId,
RelevanceFrId:'1',
vorcherInos:this.BillMaking.vorcherInos,
detailList:this.airTickets.detailList
}
......@@ -2164,10 +2157,10 @@
AccountNumber:this.BillMaking.AccountNumber,//流水号
TemplateId:this.BillMaking.TemplateId,//流程ID
OtherType:this.BillMaking.OtherType,//默认=55
ReFinanceId:this.BillMaking.OrderId,//订单ID
ReFinanceId:this.BillMaking.ReFinanceId,//订单ID
ReFinanceId2:this.BillMaking.ReFinanceId2,//类型 1收款
GuestId:this.BillMaking.GuestId,//客人ID
RelevanceFrId:this.BillMaking.RelevanceFrId,
RelevanceFrId:'2',
vorcherInos:this.BillMaking.vorcherInos,
detailList:this.visa.detailList
......@@ -2190,10 +2183,10 @@
AccountNumber:this.BillMaking.AccountNumber,//流水号
TemplateId:this.BillMaking.TemplateId,//流程ID
OtherType:this.BillMaking.OtherType,//默认=55
ReFinanceId:this.BillMaking.OrderId,//订单ID
ReFinanceId:this.BillMaking.ReFinanceId,//订单ID
ReFinanceId2:this.BillMaking.ReFinanceId2,//类型 1收款
GuestId:this.BillMaking.GuestId,//客人ID
RelevanceFrId:this.BillMaking.RelevanceFrId,
RelevanceFrId:'3',
vorcherInos:this.BillMaking.vorcherInos,
detailList:this.ground.detailList
......
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