Skip to content

S
SuperMan
Commit 4c209a7b authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parents 653e956a 945d4ec9
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1717 additions and 1612 deletions
src/components/FinancialModule/FProcessManagement.vue
View file @ 4c209a7b
...@@ -215,7 +215,8 @@ ...@@ -215,7 +215,8 @@
</ul> </ul>
</div> </div>
</div> </div>
<i slot="reference" v-show="item.Status==1" class="iconfont icon-rizhi1" @click="FinanceInfoChangeLog = item.FinanceInfoChangeLog"></i> <i slot="reference" v-show="item.Status==1" class="iconfont icon-rizhi1"
@click="getFinanceInfoChangeLog(item)"></i>
</el-popover> </el-popover>
</el-tooltip> </el-tooltip>
<el-tooltip popper-class="item _process" effect="dark" content="流程" placement="top"> <el-tooltip popper-class="item _process" effect="dark" content="流程" placement="top">
...@@ -294,6 +295,17 @@ export default { ...@@ -294,6 +295,17 @@ export default {
},components: { },components: {
"my-FlowChartModule": myFlowChartModule "my-FlowChartModule": myFlowChartModule
},methods:{ },methods:{
getFinanceInfoChangeLog(item){
this.apipost('FinancialFlowTemplate_post_GetTemplateLogList',{
TempleteId: item.Id
},res=>{
if(res.data.resultCode==1){
this.FinanceInfoChangeLog = res.data.data
}else{
this.$message.error(res.data.message)
}
},err=>{})
},
handleCurrentChange(val) {//翻页功能按钮 handleCurrentChange(val) {//翻页功能按钮
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getTemplateList(); this.getTemplateList();
......
src/components/FinancialModule/ReportForm/CombinedRevenueReport.vue
View file @ 4c209a7b
...@@ -941,6 +941,22 @@ export default { ...@@ -941,6 +941,22 @@ export default {
columnAlign: "left", columnAlign: "left",
isResize: true isResize: true
}, },
{
field: "TransportWL",
title: "网络",
width: 50,
titleAlign: "left",
columnAlign: "left",
isResize: true
},
{
field: "TransportPW",
title: "票务",
width: 50,
titleAlign: "left",
columnAlign: "left",
isResize: true
},
{ {
field: "TransportCost", field: "TransportCost",
formatter: this.moneyFormat, formatter: this.moneyFormat,
......
src/components/FinancialModule/ReportForm/EasyReport.vue
View file @ 4c209a7b
...@@ -911,9 +911,10 @@ export default { ...@@ -911,9 +911,10 @@ export default {
} }
if(rowIndex<15){ if(rowIndex<15){
if(BranchId == 1245){ // if(BranchId == 1245){
that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,blank:'y',tab:"营收报表"} }) // that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,blank:'y',tab:"营收报表"} })
}else if(rowData.ZhaiYao=="联运收入"){ // }
if(rowData.ZhaiYao=="联运收入"){
that.goUrl("CombinedRevenueReport",startDate,endDate,BranchId,"联运收入") that.goUrl("CombinedRevenueReport",startDate,endDate,BranchId,"联运收入")
} }
// 跳转到应收团款查询 // 跳转到应收团款查询
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 4c209a7b
...@@ -1911,6 +1911,22 @@ export default { ...@@ -1911,6 +1911,22 @@ export default {
columnAlign: "right", columnAlign: "right",
isResize: true isResize: true
}, },
{
field: "TransportWL",
title: "网络",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportPW",
title: "票务",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{ {
field: "TransportCost", field: "TransportCost",
formatter: this.moneyFormat, formatter: this.moneyFormat,
......
src/components/FinancialModule/invoicesManagerAdd.vue
View file @ 4c209a7b
...@@ -146,10 +146,10 @@ ...@@ -146,10 +146,10 @@
</tr> </tr>
<tr> <tr>
<td v-if="msg.TCID">团号</td> <td v-if="msg.TCID>0">团号</td>
<td v-if="msg.TCID">{{msg.TCID}}</td> <td v-if="msg.TCID>0">{{msg.TCID}}</td>
<td>订单号</td> <td>订单号</td>
<td :colspan="msg.TCID?0:3">{{msg.OrderId}}</td> <td :colspan="msg.TCID>0?0:3">{{msg.OrderId}}</td>
</tr> </tr>
<tr> <tr>
<td rowspan="6">开具内容</td> <td rowspan="6">开具内容</td>
...@@ -421,7 +421,12 @@ ...@@ -421,7 +421,12 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.$message.success(res.data.message); this.$message.success(res.data.message);
let path = this.msg.InvoiceApplyType == 1 ? 'groupTourOrder' : 'VisaProductEditOrder' let path = ''
if(this.msg.InvoiceApplyType == 1){
path = 'groupTourOrder'
}else if(this.msg.InvoiceApplyType == 4){
path = 'VisaProductEditOrder'
}
setTimeout(() => { setTimeout(() => {
if(!this.crmOrderObj){ if(!this.crmOrderObj){
this.$router.push({ this.$router.push({
...@@ -469,9 +474,17 @@ ...@@ -469,9 +474,17 @@
}, },
getOrderDetail: function () { getOrderDetail: function () {
// 获取订单详情 // 获取订单详情
let OrderResource = 8; //团队订单 let OrderResource = this.msg.InvoiceApplyType;
if (this.msg.InvoiceApplyType != 1) { if (this.msg.InvoiceApplyType == 1) {
OrderResource = 8; //团队订单
}else if(this.msg.InvoiceApplyType==4){
OrderResource = 10; //签证订单 OrderResource = 10; //签证订单
}else if(this.msg.InvoiceApplyType==5){
OrderResource = 4; //车
}else if(this.msg.InvoiceApplyType==6){
OrderResource = 1; //酒店
}else if(this.msg.InvoiceApplyType==7){
OrderResource = 3; //景点
} }
this.apipost( this.apipost(
"InvoiceApply_get_GetOrderFinanceList", { "InvoiceApply_get_GetOrderFinanceList", {
...@@ -536,11 +549,9 @@ ...@@ -536,11 +549,9 @@
this.DepartName = userInfo.DepartName; this.DepartName = userInfo.DepartName;
this.emName = userInfo.emName; this.emName = userInfo.emName;
this.msg.OrderId = this.$route.query.OrderId; this.msg.OrderId = this.$route.query.OrderId;
this.msg.TCID = this.$route.query.TCID; this.msg.TCID = this.$route.query.TCID?this.$route.query.TCID:0;
this.msg.CustomerId = this.$route.query.customerId; this.msg.CustomerId = this.$route.query.customerId;
if (this.$route.query.InvoiceApplyType) { this.msg.InvoiceApplyType = this.$route.query.InvoiceApplyType?this.$route.query.InvoiceApplyType:1;
this.msg.InvoiceApplyType = this.$route.query.InvoiceApplyType;
}
if(this.$route.query.crmOrderObj){ if(this.$route.query.crmOrderObj){
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj) let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.crmOrderObj = crmOrderObj this.crmOrderObj = crmOrderObj
......
src/components/Hotel/reservation/OrderList.vue
View file @ 4c209a7b
...@@ -678,6 +678,22 @@ ...@@ -678,6 +678,22 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">发票单据</div>
<div class="row wrap orderNo fz12 py">
<span
class="cursor-pointer radius5 mr px5"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
v-for="(x, i) in item.InvoiceApplyList"
@click="openDetails(x)"
>{{ x.FrID }}</span
>
<span v-if="item.InvoiceApplyList&&item.InvoiceApplyList.length == 0" class="c9e fz12">
暂无发票单据
</span>
</div>
</div>
<!--<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px"> <!--<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">手配费单据</div> <div class="fz12">手配费单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
...@@ -738,8 +754,8 @@ ...@@ -738,8 +754,8 @@
</div> </div>
</div> </div>
</div> </div>
<!-- v-if="item.OrderStatus > 3 || item.OrderStatus < 3" -->
<div <div
v-if="item.OrderStatus > 3 || item.OrderStatus < 3"
class="row-c wrap justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s" class="row-c wrap justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s"
> >
<div <div
...@@ -802,6 +818,8 @@ ...@@ -802,6 +818,8 @@
> >
<span class="c059FF6">编辑总金额</span> <span class="c059FF6">编辑总金额</span>
</div> </div>
<!-- 申请发票 -->
<ApplyFoInvoice v-if="userInfo.EmployeeId==item.EnterID" :obj="item" :type="6"></ApplyFoInvoice>
</div> </div>
<!-- <div v-if="item.OrderStatus==2" class="column-jac px15 bgE8F5E9 radius5 ml fz12 pa20 flex-s c20C997"> <!-- <div v-if="item.OrderStatus==2" class="column-jac px15 bgE8F5E9 radius5 ml fz12 pa20 flex-s c20C997">
<div class="mb5">已支付</div> <div class="mb5">已支付</div>
...@@ -928,8 +946,9 @@ ...@@ -928,8 +946,9 @@
import more from '../../public/more.vue'; import more from '../../public/more.vue';
import correlationOP from './correlationOP.vue'; import correlationOP from './correlationOP.vue';
import commissionDialog from "../../FinancialModule/TradeCommission/commissionDialog" import commissionDialog from "../../FinancialModule/TradeCommission/commissionDialog"
import ApplyFoInvoice from '../../public/ApplyFoInvoice';
export default { export default {
components: { offset, more, correlationOP,commissionDialog }, components: { offset, more, correlationOP,commissionDialog, ApplyFoInvoice },
props: ["OrderList","pagesTitle"], props: ["OrderList","pagesTitle"],
data() { data() {
return { return {
......
src/components/Hotel/reservation/correlationOP.vue
View file @ 4c209a7b
...@@ -104,14 +104,13 @@ ...@@ -104,14 +104,13 @@
} }
if(this.CorrelationObj.TypeNum==1){ if(this.CorrelationObj.TypeNum==1){
url = 'dict_post_SetCustomerOrderOP' url = 'dict_post_SetCustomerOrderOP'
} }else if(this.CorrelationObj.TypeNum===2){
if(this.CorrelationObj.TypeNum===2){
url = 'ticket_post_SetTicketOrderOP' url = 'ticket_post_SetTicketOrderOP'
} }else if(this.CorrelationObj.TypeNum===3){
if(this.CorrelationObj.TypeNum===3){
url = 'CarSingle_post_SetCarOrderOP' url = 'CarSingle_post_SetCarOrderOP'
} }else if(this.CorrelationObj.TypeNum===7){//签证op
if(this.CorrelationObj.TypeNum===4){ url = ''
}else if(this.CorrelationObj.TypeNum===4){
msg = { msg = {
OrderId: this.msg.OrderId, OrderId: this.msg.OrderId,
Money: this.msg.Money Money: this.msg.Money
......
src/components/SalesModule/VisaFinancialDocuments.vue
View file @ 4c209a7b
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
.checklist_ul li{ .checklist_ul li{
display: inline-block; display: inline-block;
margin:10px 0; margin:10px 0;
width: 85px; width: 115px;
cursor: pointer; cursor: pointer;
} }
.tickets_red { .tickets_red {
...@@ -541,6 +541,9 @@ ...@@ -541,6 +541,9 @@
<span v-if="item.VisaStatus===1" class="tickets_red" ><span v-if="item.Status==0" >{{item.guestName}}</span><span v-else style="text-decoration:line-through;">{{item.guestName}}</span></span> <span v-if="item.VisaStatus===1" class="tickets_red" ><span v-if="item.Status==0" >{{item.guestName}}</span><span v-else style="text-decoration:line-through;">{{item.guestName}}</span></span>
<span v-if="item.VisaStatus===2" class="tickets_blue" ><span v-if="item.Status==0" >{{item.guestName}}</span><span v-else style="text-decoration:line-through;">{{item.guestName}}</span></span> <span v-if="item.VisaStatus===2" class="tickets_blue" ><span v-if="item.Status==0" >{{item.guestName}}</span><span v-else style="text-decoration:line-through;">{{item.guestName}}</span></span>
<span v-if="item.VisaStatus===3" class="tickets_black" ><span v-if="item.Status==0" >{{item.guestName}}</span><span v-else style="text-decoration:line-through;">{{item.guestName}}</span></span> <span v-if="item.VisaStatus===3" class="tickets_black" ><span v-if="item.Status==0" >{{item.guestName}}</span><span v-else style="text-decoration:line-through;">{{item.guestName}}</span></span>
<template v-if="item.CostRelationList.length+item.InsureRelationList.length+item.ServiceRelationList.length>0">
({{item.CostRelationList.length+item.InsureRelationList.length+item.ServiceRelationList.length}})
</template>
</label> </label>
</li> </li>
...@@ -633,6 +636,7 @@ export default { ...@@ -633,6 +636,7 @@ export default {
checkListAll:[], checkListAll:[],
checkd:false, checkd:false,
type2: null, type2: null,
isSignMonth: [44,64,164,255,267],//签证、月结相关流程
} }
}, },
methods: { methods: {
...@@ -769,7 +773,8 @@ export default { ...@@ -769,7 +773,8 @@ export default {
"companyID": this.OutBranchId, "companyID": this.OutBranchId,
"path": "", "path": "",
'blank': 'y', 'blank': 'y',
'orderObj': JSON.stringify(orderObj) 'orderObj': JSON.stringify(orderObj),
'templateID': JSON.stringify(this.isSignMonth),
} }
}); });
return return
...@@ -871,7 +876,8 @@ export default { ...@@ -871,7 +876,8 @@ export default {
"companyID": this.OutBranchId, "companyID": this.OutBranchId,
"path": "", "path": "",
'blank': 'y', 'blank': 'y',
'orderObj': JSON.stringify(orderObj) 'orderObj': JSON.stringify(orderObj),
'templateID': JSON.stringify(this.isSignMonth),
} }
}); });
}else if(this.Offset=='Offset'){ }else if(this.Offset=='Offset'){
...@@ -883,6 +889,7 @@ export default { ...@@ -883,6 +889,7 @@ export default {
blank: 'y', blank: 'y',
orderObj: JSON.stringify(orderObj), orderObj: JSON.stringify(orderObj),
Type: this.type, Type: this.type,
templateID: JSON.stringify(this.isSignMonth),
} }
this.queryObj = query this.queryObj = query
this.cdState = true this.cdState = true
...@@ -902,7 +909,8 @@ export default { ...@@ -902,7 +909,8 @@ export default {
"companyID": this.OutBranchId, "companyID": this.OutBranchId,
"path": "", "path": "",
'blank': 'y', 'blank': 'y',
'orderObj': JSON.stringify(orderObj) 'orderObj': JSON.stringify(orderObj),
'templateID': JSON.stringify(this.isSignMonth),
} }
}); });
} }
......
src/components/SalesVisa/ModifyVisaProduct.vue
View file @ 4c209a7b
...@@ -426,9 +426,9 @@ ...@@ -426,9 +426,9 @@
<el-input v-model="addMsg.VisaB2CPrice" @keyup.native="checkPrice(addMsg,'VisaB2CPrice')" placeholder="请输入" maxlength="20"></el-input> <el-input v-model="addMsg.VisaB2CPrice" @keyup.native="checkPrice(addMsg,'VisaB2CPrice')" placeholder="请输入" maxlength="20"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="提成金额" prop="CommissionPrice"> <!-- <el-form-item label="提成金额" prop="CommissionPrice">
<el-input v-model="addMsg.CommissionPrice" placeholder="请输入" @keyup.native="checkPrice(addMsg,'CommissionPrice')"></el-input> <el-input v-model="addMsg.CommissionPrice" placeholder="请输入" @keyup.native="checkPrice(addMsg,'CommissionPrice')"></el-input>
</el-form-item> </el-form-item> -->
<el-form-item label="交通过路费" prop="TrafficToll"> <el-form-item label="交通过路费" prop="TrafficToll">
<el-input v-model="addMsg.TrafficToll" placeholder="请输入" @keyup.native="checkPrice(addMsg,'TrafficToll')"></el-input> <el-input v-model="addMsg.TrafficToll" placeholder="请输入" @keyup.native="checkPrice(addMsg,'TrafficToll')"></el-input>
</el-form-item> </el-form-item>
...@@ -787,7 +787,7 @@ export default { ...@@ -787,7 +787,7 @@ export default {
PeopleNum: "0", PeopleNum: "0",
CostPrice: "", CostPrice: "",
EntryType:1, EntryType:1,
CommissionPrice: "", CommissionPrice: "0",
VisaManagementId: "", VisaManagementId: "",
VisaB2CPrice: "", VisaB2CPrice: "",
TrafficToll:"0", TrafficToll:"0",
...@@ -986,7 +986,7 @@ getCompanyList() { ...@@ -986,7 +986,7 @@ getCompanyList() {
VisaPrice: "", VisaPrice: "",
PeopleNum: 0, PeopleNum: 0,
CostPrice: "", CostPrice: "",
CommissionPrice: "", CommissionPrice: "0",
VisaManagementId: "", VisaManagementId: "",
VisaB2CPrice: "", VisaB2CPrice: "",
VisaProductInfo: {}, VisaProductInfo: {},
......
src/components/SalesVisa/components/VisaProductOrder.vue
View file @ 4c209a7b
...@@ -358,6 +358,19 @@ ...@@ -358,6 +358,19 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li>
<span>
<em>OP</em>
<el-select filterable v-model='msg.OpEmpId'>
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
</span>
</li>
<li v-if="pagesTitle!='销售'"> <li v-if="pagesTitle!='销售'">
<span> <span>
<em>公司</em> <em>公司</em>
...@@ -529,6 +542,7 @@ ...@@ -529,6 +542,7 @@
RB_Branch_Id: -1, RB_Branch_Id: -1,
OrderId: 0, OrderId: 0,
IsFinish: '0', IsFinish: '0',
OpEmpId: 0,
}, },
addMsg: { addMsg: {
Id: 0, Id: 0,
......
src/components/SalesVisa/components/visaOrderList.vue
View file @ 4c209a7b
...@@ -582,6 +582,7 @@ ...@@ -582,6 +582,7 @@
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="OP" prop="opEmName" min-width="100" style="background:#EAEAEA"></el-table-column>
<el-table-column label="出发日期" min-width="100" style="background:#EAEAEA"> <el-table-column label="出发日期" min-width="100" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<template> <template>
...@@ -767,6 +768,13 @@ ...@@ -767,6 +768,13 @@
v-if="scope.row.VisaPlanIdStr!=''&&pagesTitle!='销售'"> v-if="scope.row.VisaPlanIdStr!=''&&pagesTitle!='销售'">
<span class="c059FF6">签证详情</span> <span class="c059FF6">签证详情</span>
</div> </div>
<!-- <div
v-if="pagesTitle=='OP'"
class="row-c cursor-pointer radius5 change py5"
@click="clickCorrelation(item, 1)"
>
<span class="c059FF6">编辑关联OP</span>
</div> -->
<div class="row-c cursor-pointer radius5 change py5" @click="getDetail(scope.row,false)" <div class="row-c cursor-pointer radius5 change py5" @click="getDetail(scope.row,false)"
v-if="scope.row.income<=0&&(scope.row.visaOrderStatus==1||scope.row.visaOrderStatus==3)&&scope.row.visaStatus==1&&pagesTitle=='销售'"> v-if="scope.row.income<=0&&(scope.row.visaOrderStatus==1||scope.row.visaOrderStatus==3)&&scope.row.visaStatus==1&&pagesTitle=='销售'">
<span class="c059FF6">{{$t('system.table_edit')}}订单</span> <span class="c059FF6">{{$t('system.table_edit')}}订单</span>
...@@ -1056,6 +1064,10 @@ export default { ...@@ -1056,6 +1064,10 @@ export default {
} }
}, },
methods: { methods: {
clickCorrelation(item,){
this.CorrelationObj = JSON.parse(JSON.stringify(item));
this.CorrelationObj.TypeNum = 7;
},
DetailsOfRoyalty(){ DetailsOfRoyalty(){
}, },
......
src/components/busManagement/BookAcar/components/orderList.vue
View file @ 4c209a7b
...@@ -785,6 +785,22 @@ ...@@ -785,6 +785,22 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">发票单据</div>
<div class="row wrap orderNo fz12 py">
<span
class="cursor-pointer radius5 mr px5"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
v-for="(x, i) in item.InvoiceApplyList"
@click="openDetails(x)"
>{{ x.FrID }}</span
>
<span v-if="item.InvoiceApplyList&&item.InvoiceApplyList.length == 0" class="c9e fz12">
暂无发票单据
</span>
</div>
</div>
<div <div
class="column justify-c px15 bgf5 radius5 ml flex-g pa20" class="column justify-c px15 bgf5 radius5 ml flex-g pa20"
style="min-width: 230px" style="min-width: 230px"
...@@ -809,13 +825,13 @@ ...@@ -809,13 +825,13 @@
</div> </div>
</div> </div>
</div> </div>
<div <!-- v-if="
v-if="
item.OrderStatus > 0 && item.OrderStatus > 0 &&
item.OrderStatus < 4 && item.OrderStatus < 4 &&
item.OrderStatus != 3 item.OrderStatus != 3
" " -->
class="column justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s" <div
class="row-c wrap justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s"
> >
<div <div
v-if=" v-if="
...@@ -877,6 +893,8 @@ ...@@ -877,6 +893,8 @@
> >
<span class="c059FF6">编辑总金额</span> <span class="c059FF6">编辑总金额</span>
</div> </div>
<!-- 申请发票 -->
<ApplyFoInvoice v-if="userInfo.EmployeeId==item.EnterID" :obj="item" :type="5"></ApplyFoInvoice>
</div> </div>
</div> </div>
<div class="mt mb20 bgf5 pa15 row-c" v-if="item.CancelRemark"> <div class="mt mb20 bgf5 pa15 row-c" v-if="item.CancelRemark">
...@@ -1015,8 +1033,9 @@ ...@@ -1015,8 +1033,9 @@
import offset from "../../../public/offset.vue"; import offset from "../../../public/offset.vue";
import correlationOP from "../../../Hotel/reservation/correlationOP.vue"; import correlationOP from "../../../Hotel/reservation/correlationOP.vue";
import commissionDialog from "../../../FinancialModule/TradeCommission/commissionDialog"; import commissionDialog from "../../../FinancialModule/TradeCommission/commissionDialog";
import ApplyFoInvoice from '../../../public/ApplyFoInvoice';
export default { export default {
components: { offset, correlationOP, commissionDialog }, components: { offset, correlationOP, commissionDialog,ApplyFoInvoice },
props: ["OrderList", "pagesTitle"], props: ["OrderList", "pagesTitle"],
data() { data() {
return { return {
......
src/components/busManagement/BookAcar/components/tripBusOrderList.vue
View file @ 4c209a7b
...@@ -650,7 +650,7 @@ ...@@ -650,7 +650,7 @@
</div> </div>
<div <div
v-if="item.OfferState!=3" v-if="item.OfferState!=3"
class="column justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s" class="row-c wrap justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s"
> >
<div <div
v-if=" v-if="
......
src/components/busManagement/BookAcar/list.vue
View file @ 4c209a7b
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
margin-right: 15px; margin-right: 15px;
border-radius: 5px; border-radius: 5px;
display: block; display: block;
border: 1px solid #eee;
} }
.listone-list{ .listone-list{
flex-grow: 1; flex-grow: 1;
...@@ -219,7 +220,8 @@ ...@@ -219,7 +220,8 @@
<div :style="{'height':tableHeight+'px'}" style="overflow: auto;" v-loading="loading"> <div :style="{'height':tableHeight+'px'}" style="overflow: auto;" v-loading="loading">
<div v-if="ViewType==1" class="listone-box"> <div v-if="ViewType==1" class="listone-box">
<div class="listone-form" v-for="(x,index) in tableData" :key="index"> <div class="listone-form" v-for="(x,index) in tableData" :key="index">
<el-image v-if="x.ImageList" class="listone-img" :src="x.ImageList[0]" fit="contain"> <el-image v-if="x.ImageList" class="listone-img" :src="x.ImageList[0]" fit="cover"
style="max-height: 110px;">
<div slot="placeholder" class="image-slot"> <div slot="placeholder" class="image-slot">
<span> <span>
加载中<span class="dot">...</span> 加载中<span class="dot">...</span>
...@@ -469,4 +471,3 @@ ...@@ -469,4 +471,3 @@
}; };
</script> </script>
\ No newline at end of file
src/components/public/ApplyFoInvoice.vue 0 → 100644
View file @ 4c209a7b
<template>
<div class="row-c cursor-pointer radius5 change py5" @click="goUrlAdd">
<span class="c059FF6">申请发票</span>
</div>
</template>
<script>
export default {
props: ["obj","type"],
components: {},
data() {
return {
}
},
watch: {
obj: {
handler(newValue,onldValue) {
},
deep:true,
immediate: true
},
},
mounted() {
},
methods: {
// 申请发票 tyep 4机票 5车 6酒店 7景点
goUrlAdd() {
this.$router.push({
name: 'invoicesManagerAdd',
query: {
OrderId: this.obj.OrderId,
TCID: 0,
customerId: this.obj.CustomerId,
InvoiceApplyType: this.type,
blank: "y",
}
});
},
}
}
</script>
<style scoped>
</style>
src/components/scenicSpot/Singleticket/OrderPreview.vue
View file @ 4c209a7b
...@@ -368,7 +368,7 @@ ...@@ -368,7 +368,7 @@
</li> </li>
<li> <li>
<el-form-item label="电话" prop="Mobile"> <el-form-item label="电话" prop="">
<el-input type="Number" v-model="msg.Mobile" placeholder="请输入电话"/> <el-input type="Number" v-model="msg.Mobile" placeholder="请输入电话"/>
</el-form-item> </el-form-item>
</li> </li>
...@@ -454,14 +454,14 @@ ...@@ -454,14 +454,14 @@
</div> </div>
</div> </div>
<div class="right-Submit"> <div class="right-Submit">
<button class="hollowFixedBtn" v-loading="loading"
type="primary"
:disabled="!isCheck" @click="submit">
提交订单
</button>
<!-- <button v-else class="normalBtn" type="primary" @click="submit"> <!-- <button v-else class="normalBtn" type="primary" @click="submit">
提交订单 提交订单
</button> --> </button> -->
<el-button :disabled="!isCheck"
:loading="loading"
class="normalBtn" type="primary" @click="submit">
提交订单
</el-button>
</div> </div>
</div> </div>
<!-- 门票详情信息 --> <!-- 门票详情信息 -->
...@@ -656,8 +656,11 @@ ...@@ -656,8 +656,11 @@
}); });
}; };
addList(res.data.data.TicketPriceList); addList(res.data.data.TicketPriceList);
this.types = res.data.data.TicketPriceList.filter(x=>{ return x.B2BPrice>0})
this.msg.Money = 0.00 this.msg.Money = 0.00
this.types = res.data.data.TicketPriceList.filter(x=>{ return x.B2BPrice>0})
if(this.types&&this.types.length>0){
this.changeDetailListHandler(this.types[0])
}
if(this.types&&this.types.length==0){ if(this.types&&this.types.length==0){
this.Error('暂无报价，无法下单') this.Error('暂无报价，无法下单')
} }
......
src/components/scenicSpot/reservation/OrderList.vue
View file @ 4c209a7b
...@@ -757,7 +757,22 @@ ...@@ -757,7 +757,22 @@
@click="isOffset(item, index, 3)"></i> @click="isOffset(item, index, 3)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
</div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">发票单据</div>
<div class="row wrap orderNo fz12 py">
<span
class="cursor-pointer radius5 mr px5"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
v-for="(x, i) in item.InvoiceApplyList"
@click="openDetails(x)"
>{{ x.FrID }}</span
>
<span v-if="item.InvoiceApplyList&&item.InvoiceApplyList.length == 0" class="c9e fz12">
暂无发票单据
</span>
</div>
</div> </div>
<div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;"> <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
<div class="row-c justify-sb pb5" :class="{'borderD':item.MailingMoney>0||item.DiscountsMoney>0}"> <div class="row-c justify-sb pb5" :class="{'borderD':item.MailingMoney>0||item.DiscountsMoney>0}">
...@@ -789,7 +804,8 @@ ...@@ -789,7 +804,8 @@
</div> </div>
</div> </div>
</div> </div>
<div v-if="item.OrderStatus > 0 && item.OrderStatus < 4 && item.OrderStatus != 3" <!-- v-if="item.OrderStatus > 0 && item.OrderStatus < 4 && item.OrderStatus != 3" -->
<div
class="row-c wrap justify-c px15 bgE8F5E9 radius5 ml fz12 orderop flex-s"> class="row-c wrap justify-c px15 bgE8F5E9 radius5 ml fz12 orderop flex-s">
<div v-if=" <div v-if="
item.OrderStatus == 1 && item.OrderStatus == 1 &&
...@@ -849,6 +865,8 @@ ...@@ -849,6 +865,8 @@
> >
<span class="c059FF6">编辑总金额</span> <span class="c059FF6">编辑总金额</span>
</div> </div>
<!-- 申请发票 -->
<ApplyFoInvoice v-if="userInfo.EmployeeId==item.EnterID" :obj="item" :type="7"></ApplyFoInvoice>
<!-- <template v-if="item.OrderStatus==2"> <!-- <template v-if="item.OrderStatus==2">
<div class="column-jac fz12 flex-s c20C997"> <div class="column-jac fz12 flex-s c20C997">
<div class="mb5">已支付</div> <div class="mb5">已支付</div>
...@@ -1015,9 +1033,11 @@ ...@@ -1015,9 +1033,11 @@
import offset from '../../public/offset.vue'; import offset from '../../public/offset.vue';
import correlationOP from '../../Hotel/reservation/correlationOP.vue'; import correlationOP from '../../Hotel/reservation/correlationOP.vue';
import commissionDialog from "../../FinancialModule/TradeCommission/commissionDialog" import commissionDialog from "../../FinancialModule/TradeCommission/commissionDialog"
export default { import ApplyFoInvoice from '../../public/ApplyFoInvoice';
export default {
components: { components: {
offset,correlationOP,commissionDialog offset,correlationOP,commissionDialog,ApplyFoInvoice
}, },
props: ["OrderList", "pagesTitle"], props: ["OrderList", "pagesTitle"],
data() { data() {
......
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