Skip to content

S
SuperMan
Commit c1b9cce2 authored by youjie's avatar youjie
Browse files
Options

单项、签证 验证是否收款， 制成本单据

parent 39d7cd4f
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 53 deletions
src/components/Hotel/reservation/OrderList.vue
View file @ c1b9cce2
......@@ -1008,10 +1008,6 @@ export default {
},
isOffset(row, index, num,name){
this.makeAdocument(row, index, num, name, 'Offset')
setTimeout(()=>{
this.cdState = true
},100)
},
editRemark(item){
this.postMsg.OrderId = item.OrderId
......@@ -1103,6 +1099,13 @@ export default {
},
// 制作单据
makeAdocument(row, index, num, name,Offset) {
if((num==2||num==3)&&row.Income<=0){
this.Info('请先制收款单据，再制成本或退款单据！')
return
}
if(Offset){
this.cdState = true
}
let type = 0
if(num==3){
type = 2
......
src/components/Hotel/singleProduct/components/OrderList.vue
View file @ c1b9cce2
......@@ -891,10 +891,7 @@ export default {
methods: {
isOffset(row, index, num,name){
this.makeAdocument(row, index, num, name, 'Offset')
setTimeout(()=>{
this.cdState = true
},100)
},
// 单据详情
openDetails(item) {
......@@ -909,6 +906,13 @@ export default {
},
// 制作单据
makeAdocument(row, index, num, name,Offset) {
if((num==2||num==3)&&row.Income<=0){
this.Info('请先制收款单据，再制成本或退款单据！')
return
}
if(Offset){
this.cdState = true
}
let type = 0
if(num==3){
type = 2
......
src/components/SalesVisa/VisaProductOrder.vue
View file @ c1b9cce2
......@@ -880,7 +880,7 @@
<th width="7%">出发日期</th>
<th width="7%">报名日期</th>
<th width="7%">应收总额</th>
<th width="7%">实收</th>
<th width="5%">退款</th>
<th width="5%">平台税金</th>
......@@ -948,7 +948,7 @@
</span>
</td>
<td class="groupTourOrderIcon">
<el-tooltip effect="dark" content="签证详情" placement="top-start" v-if="item.VisaPlanIdStr !=''">
<el-button type="primary" @click="goUrlVisaList(item)" style='background:#00C6FF; border-color:#00C6FF'
icon="iconfont icon-sousuo"></el-button>
......@@ -1000,7 +1000,7 @@
<div class="row justify-sb wrap mr">
<div class="row relative" style="margin-top: 5px;">
<span>收款单据：</span>
<span class="cursor-pointer radius5 mr mb px5"
<span class="cursor-pointer radius5 mr mb 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.FinanceList"
@click="goUrl2('FinancialDocumentsDetail',x.FrID,'财务单据')">{{ x.FrID }}</span>
......@@ -1017,7 +1017,7 @@
</div>
<div class="row relative" style="margin-top: 5px;">
<span>退款单据：</span>
<span class="cursor-pointer radius5 mr mb px5"
<span class="cursor-pointer radius5 mr mb 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.RefundFinanceList"
@click="goUrl2('FinancialDocumentsDetail',x.FrID,'财务单据')">{{ x.FrID }}</span>
......@@ -1034,7 +1034,7 @@
</div>
<div class="row relative" style="margin-top: 5px;">
<span>成本单据：</span>
<span class="cursor-pointer radius5 mr mb px5"
<span class="cursor-pointer radius5 mr mb 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.CostFinanceList"
@click="goUrl2('FinancialDocumentsDetail',x.FrID,'财务单据')">{{ x.FrID }}</span>
......@@ -1053,7 +1053,7 @@
</el-tooltip>
</div>
</div>
<!-- <span v-for="(item2,index2) in item.FinanceList" :key="index2"
style="margin-right:10px;cursor:pointer;">
<span v-if="item2.ColorState===1" class="groupTourOrder_tickets_blue"
......@@ -1153,13 +1153,16 @@
methods: {
isOffset(row, index, num){
this.makeAdocument(row, index, num,'Offset')
setTimeout(()=>{
this.cdState = true
},100)
},
// 制作单据
makeAdocument(row, index, num, Offset) {
if((num==2||num==3)&&row.Income<=0){
this.Info('请先制收款单据，再制成本或退款单据！')
return
}
if(Offset){
this.cdState = true
}
let type = 0
if(num==3){
type = 2
......@@ -1170,7 +1173,7 @@
if (row.tcid) {
TCIDARR.push(row.tcid)
}
let orderObj = {
OrderID: row.Id,
OrderSource: 10,
......@@ -1197,7 +1200,7 @@
});
}
},
goIisDetail: function (id) { // 跳转发票详情页面
this.$router.push({
name: 'invoicesManagerDetail',
......
src/components/SingleAirTicket/components/OrderList.vue
View file @ c1b9cce2
......@@ -575,12 +575,12 @@
</el-table-column>
<el-table-column label="应收">
<template slot-scope="scope">
{{ scope.row.IncomeMoney }}
{{ scope.row.Money }}
</template>
</el-table-column>
<el-table-column label="实收">
<template slot-scope="scope">
{{ scope.row.BackMoney }}
{{ scope.row.IncomeMoney }}
</template>
</el-table-column>
<el-table-column label="退款">
......@@ -1036,9 +1036,6 @@
},
isOffset(row, index, num){
this.makeAdocument(row, index, num,'Offset')
setTimeout(()=>{
this.cdState = true
},100)
},
submit2(){
if(this.loading3) return
......@@ -1139,6 +1136,13 @@
},
// 制作单据
makeAdocument(row, index, num, Offset) {
if((num==2||num==3)&&row.IncomeMoney<=0){
this.Info('请先制收款单据，再制成本或退款单据！')
return
}
if(Offset){
this.cdState = true
}
let type = 0
if(num==3){
type = 2
......
src/components/busManagement/BookAcar/components/orderList.vue
View file @ c1b9cce2
......@@ -1167,9 +1167,6 @@ export default {
},
isOffset(row, index, num) {
this.makeAdocument(row, index, num, "Offset");
setTimeout(() => {
this.cdState = true;
}, 100);
},
editRemark(item) {
this.postMsg.OrderId = item.OrderId;
......@@ -1313,6 +1310,13 @@ export default {
},
// 制作单据
makeAdocument(row, index, num, Offset) {
if((num==2||num==3)&&row.Income<=0){
this.Info('请先制收款单据，再制成本或退款单据！')
return
}
if(Offset){
this.cdState = true
}
let type = 0;
if (num == 3) {
type = 2;
......
src/components/busManagement/BookAcar/components/tripBusOrderList.vue
View file @ c1b9cce2
......@@ -331,7 +331,7 @@
margin-top: 15px;
}
</style>
<template>
<div v-if="OrderList.length>0" class="content-Car">
<div
......@@ -365,7 +365,7 @@
<span v-if="item.UseCompName||item.CustomerName">客人信息：
<template v-if="item.EmpId>0">
{{ item.UseCompName }}({{ item.UseName }})
</template>
</template>
<template v-else>
{{ item.CustomerName }}({{ item.CustomerContact }})
</template>
......@@ -384,13 +384,13 @@
{{ item.EmName }}
</span>
</template>
<!-- <span class="mr" v-if="item.CustomerName">创建人：</span>
<span class="mr" v-if="item.CustomerName"
>{{ item.CustomerName }} ({{ item.CustomerContact }}/{{
item.CustomerTel
}})</span> -->
<span>下单时间：</span>
<span class="mr">{{ item.CreateDate }}</span>
<div class="">
......@@ -547,7 +547,7 @@
<div class="fz12">收款单据</div>
<div class="row wrap orderNo fz12 py">
<span
class="cursor-pointer radius5 mr px5"
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.IncomeList"
......@@ -575,7 +575,7 @@
<div class="fz12">退款单据</div>
<div class="row wrap orderNo fz12 py">
<span
class="cursor-pointer radius5 mr px5"
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.RefundList"
......@@ -603,7 +603,7 @@
<div class="fz12">成本单据</div>
<div class="row wrap orderNo fz12 py">
<span
class="cursor-pointer radius5 mr px5"
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.CostList"
......@@ -786,7 +786,7 @@
</div>
</el-dialog>
<!-- 报价 -->
<el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="isShowPrice"
<el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="isShowPrice"
center min-width="1000px">
<span style="font-weight: bold;font-size: 16px;
display: inline-block;
......@@ -853,7 +853,7 @@
币种：
<span>
<template v-if="priceType == 1">
<el-select filterable v-model='postMsg.CurrencyId'
<el-select filterable v-model='postMsg.CurrencyId'
:placeholder="$t('rule.qxzbzhong')" class=" _border_b_1 w150">
<!-- <el-option :value="0" label="不限"></el-option> -->
<el-option v-for='item in coinGetList'
......@@ -1094,7 +1094,7 @@
},
OrderList:{
handler(val, oldVal){
}
}
},
......@@ -1111,14 +1111,10 @@
}
})
}
},
isOffset(row, index, num){
this.makeAdocument(row, index, num,'Offset')
setTimeout(()=>{
this.cdState = true
},100)
},
editRemark(item){
this.postMsg.Id = item.Id
......@@ -1149,7 +1145,7 @@
this.$refs.drivermsg.resetFields()
// this.$confirm('确认关闭？')
// .then(_ => {
// })
// .catch(_ => {});
},
......@@ -1206,6 +1202,13 @@
},
// 制作单据
makeAdocument(row, index, num, Offset) {
if((num==2||num==3)&&row.Income<=0){
this.Info('请先制收款单据，再制成本或退款单据！')
return
}
if(Offset){
this.cdState = true
}
let type = 0
if(num==3){
type = 2
......@@ -1340,7 +1343,7 @@
this.postMsg.details = tempData.details;
this.calcPrice();
}
} else {
this.Error(res.data.message);
}
......@@ -1402,7 +1405,7 @@
} else {
sums[index] = '';
}
});
return sums;
},
......@@ -1493,9 +1496,9 @@
this.loading0 = false;
}
);
},
saveUpdate() {
let text = '是否确认设置收损?'
this.$confirm(text, "提示", {
......@@ -1604,4 +1607,3 @@
}
};
</script>
\ No newline at end of file
src/components/scenicSpot/reservation/OrderList.vue
View file @ c1b9cce2
......@@ -1168,10 +1168,6 @@ export default {
},
isOffset(row, index, num){
this.makeAdocument(row, index, num,'Offset')
setTimeout(()=>{
this.cdState = true
},100)
},
editRemark(item){
this.postMsg.OrderId = item.OrderId
......@@ -1315,6 +1311,13 @@ export default {
},
// 制作单据
makeAdocument(row, index, num, Offset) {
if((num==2||num==3)&&row.Income<=0){
this.Info('请先制收款单据，再制成本或退款单据！')
return
}
if(Offset){
this.cdState = true
}
let type = 0
if(num==3){
type = 2
......
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