Skip to content

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

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

parents d6556983 bdea1e53
Show whitespace changes
Inline Side-by-side
Showing with 53 additions and 35 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ bb4be032
...@@ -2349,7 +2349,7 @@ export default { ...@@ -2349,7 +2349,7 @@ export default {
if(res.data.resultCode==1){ if(res.data.resultCode==1){
let data=res.data.data; let data=res.data.data;
if(this.RB_Post_Id!=5&&this.userId!=1648){ if(this.RB_Post_Id!=5&&this.userId!=1648){
if(this.userId==1918){ if(this.userId==1918 || this.userId==2113){
this.AccList = res.data.data; this.AccList = res.data.data;
}else{ }else{
data.forEach(item=>{ data.forEach(item=>{
......
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ bb4be032
...@@ -410,23 +410,19 @@ export default { ...@@ -410,23 +410,19 @@ export default {
} }
}) })
if(status){ if(status){
// console.log("this.GetDetail.DetailList[0].Remark",this.GetDetail.DetailList[0].Remark) // this.apipost('Financial_post_GetFinanceSwipingCard',{FrId:this.ID},res=>{
this.apipost('Financial_post_GetFinanceSwipingCard',{FrId:this.ID},res=>{ // if(res.data.resultCode==1){
if(res.data.resultCode==1){ // if(res.data.data.length>0){
// console.log("res.data.data",res.data.data); // this.GetDetail.DetailList[0].Remark+=` `+"刷卡:"
if(res.data.data.length>0){ // res.data.data.forEach(item=>{
this.GetDetail.DetailList[0].Remark+=` `+"刷卡:" // this.GetDetail.DetailList[0].Remark+=`${item.Name}，`;
res.data.data.forEach(item=>{ // })
this.GetDetail.DetailList[0].Remark+=`${item.Name}，`; // }
})
}
}else{
this.Error(res.data.message)
}
},err=>{})
// }else{
// this.Error(res.data.message)
// }
// },err=>{})
} }
} }
} }
......
src/components/FinancialModule/invoicesManager.vue
View file @ bb4be032
...@@ -80,14 +80,15 @@ ...@@ -80,14 +80,15 @@
.page_iisMg ._icon_btn i.icon-sousuo:active{background-color: #35ab79} .page_iisMg ._icon_btn i.icon-sousuo:active{background-color: #35ab79}
._zhuihui{ ._zhuihui{
display: inline-block; display: inline-block;
height: 20px; height: 30px;
width: 20px; width: 30px;
border-radius: 50%; border-radius: 50%;
color: white; color: white;
background-color: #e42d2d; background-color: #e42d2d;
text-align: center; text-align: center;
line-height: 20px; line-height: 30px;
cursor: pointer; cursor: pointer;
margin-right: 10px
} }
</style> </style>
<template> <template>
...@@ -180,7 +181,6 @@ ...@@ -180,7 +181,6 @@
<td :rowspan="item.InvoiceApplyList.length">{{item.ApplyTotalPrice}}</td> <td :rowspan="item.InvoiceApplyList.length">{{item.ApplyTotalPrice}}</td>
<td :rowspan="item.InvoiceApplyList.length"> <td :rowspan="item.InvoiceApplyList.length">
<span>{{item.DpreadPrice - item.ApplyTotalPrice}}</span> <span>{{item.DpreadPrice - item.ApplyTotalPrice}}</span>
<span v-if="item.ApplyTotalPrice!=0" class="_zhuihui" @click="zhuihui(item.OrderId)">追</span>
</td> </td>
<td>{{item.InvoiceApplyList[0].CreateDate.replace('T', ' ')}}</td> <td>{{item.InvoiceApplyList[0].CreateDate.replace('T', ' ')}}</td>
<td> <td>
...@@ -191,11 +191,15 @@ ...@@ -191,11 +191,15 @@
<span v-else-if="item.InvoiceApplyList[0].InvoiceApplyState === 5" class="status_owe">欠票</span> <span v-else-if="item.InvoiceApplyList[0].InvoiceApplyState === 5" class="status_owe">欠票</span>
<span v-else-if="item.InvoiceApplyList[0].InvoiceApplyState === 6" class="status_Recover">发票追回</span> <span v-else-if="item.InvoiceApplyList[0].InvoiceApplyState === 6" class="status_Recover">发票追回</span>
</td> </td>
<td class="_icon_btn"> <td class="_icon_btn" style="text-align: left;padding-left: 20px">
<el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top"> <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top">
<i class="iconfont icon-sousuo" @click="goIisDetail(item.InvoiceApplyList[0].ID)"></i> <i class="iconfont icon-sousuo" @click="goIisDetail(item.InvoiceApplyList[0].ID)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="追回" placement="top"> <el-tooltip class="item" effect="dark" content="追回发票" placement="top">
<span v-if="item.ApplyTotalPrice!=0" class="_zhuihui" @click="zhuihui(item.OrderId)">追</span>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="确认追回" placement="top">
<!-- v-if="item.InvoiceApplyList[0].InvoiceApplyState === 5" -->
<i v-if="item.InvoiceApplyList[0].InvoiceApplyState === 5" class="iconfont icon-ico_commodity_defaul" @click="setStatus(item.InvoiceApplyList[0].ID, 6)"></i> <i v-if="item.InvoiceApplyList[0].InvoiceApplyState === 5" class="iconfont icon-ico_commodity_defaul" @click="setStatus(item.InvoiceApplyList[0].ID, 6)"></i>
</el-tooltip> </el-tooltip>
</td> </td>
...@@ -210,11 +214,15 @@ ...@@ -210,11 +214,15 @@
<span v-else-if="item2.InvoiceApplyState === 5" class="status_owe">欠票</span> <span v-else-if="item2.InvoiceApplyState === 5" class="status_owe">欠票</span>
<span v-else-if="item2.InvoiceApplyState === 6" class="status_Recover">发票追回</span> <span v-else-if="item2.InvoiceApplyState === 6" class="status_Recover">发票追回</span>
</td> </td>
<td class="_icon_btn"> <td class="_icon_btn" style="text-align: left;padding-left: 20px">
<el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top"> <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top">
<i class="iconfont icon-sousuo" @click="goIisDetail(item2.ID)"></i> <i class="iconfont icon-sousuo" @click="goIisDetail(item2.ID)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="追回" placement="top"> <el-tooltip class="item" effect="dark" content="追回发票" placement="top">
<span v-if="item.ApplyTotalPrice!=0" class="_zhuihui" @click="zhuihui(item.OrderId)">追</span>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="确认追回" placement="top">
<!-- v-if="item2.InvoiceApplyState === 5" -->
<i v-if="item2.InvoiceApplyState === 5" class="iconfont icon-ico_commodity_defaul" @click="setStatus(item2.ID, 6)"></i> <i v-if="item2.InvoiceApplyState === 5" class="iconfont icon-ico_commodity_defaul" @click="setStatus(item2.ID, 6)"></i>
</el-tooltip> </el-tooltip>
</td> </td>
...@@ -265,11 +273,18 @@ export default { ...@@ -265,11 +273,18 @@ export default {
}, },
methods: { methods: {
zhuihui: function (OrderId) { zhuihui: function (OrderId) {
this.$confirm('是否设置发票状态为追回？', this.$t('tips.tips'), {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('InvoiceApply_get_BatchUpdateInvoiceApply', {OrderId: OrderId}, res=>{ this.apipost('InvoiceApply_get_BatchUpdateInvoiceApply', {OrderId: OrderId}, res=>{
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.getPageList() this.getPageList()
} }
}, null) }, null)
}).catch(() => {
});
}, },
goIisDetail: function (id) { goIisDetail: function (id) {
this.$router.push({ this.$router.push({
...@@ -283,11 +298,18 @@ export default { ...@@ -283,11 +298,18 @@ export default {
ID: id, ID: id,
InvoiceApplyState: type, InvoiceApplyState: type,
} }
this.$confirm('是否设置发票状态为已追回？', this.$t('tips.tips'), {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('InvoiceApply_get_UpdateInvoiceApply', msg, res=>{ this.apipost('InvoiceApply_get_UpdateInvoiceApply', msg, res=>{
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.getPageList() this.getPageList()
} }
}, null) }, null)
}).catch(() => {
});
}, },
timeAdd: function () { timeAdd: function () {
// 日期格式 // 日期格式
......
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