Skip to content

S
SuperMan
Commit 823c0149 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents 15c8ef3e 7869c1dd
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 60 deletions
src/components/FinancialModule/invoicesManager.vue
View file @ 823c0149
......@@ -126,13 +126,20 @@
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="公司">
<el-select v-model="msg.RB_Branch_Id" filterable style="width: 130px">
<el-select v-model="msg.RB_Branch_Id" filterable >
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key='item.Id'></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="发票类型">
<el-select v-model="msg.InvoiceApplyType" filterable >
<el-option :value="1" label="跟团游"></el-option>
<el-option :value="2" label="签证"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8" :gutter="35">
<el-form-item label="申请日期">
<el-date-picker
......@@ -262,6 +269,7 @@ export default {
eDate: '',
pageIndex: 1,
pageSize: 10,
InvoiceApplyType: 1,
RB_Branch_Id:-1
},
productionDate: [],
......
src/components/FinancialModule/invoicesManagerAdd.vue
View file @ 823c0149
......@@ -120,24 +120,10 @@
<td>到账金额</td>
<td>{{orderList.moneyStr}}</td>
</tr>
<!-- 因为没有返回应收和代收金额，所以 吴春说不显示 4/22号 ，-->
<!-- <tr>
<td>应收总额</td>
<td class="w600 font-weight cursorpointer">
<span @click="goUrlO(orderList.OrderId)">{{orderList.PreferPrice}}</span>
</td>
<td>待收金额</td>
<td class="w600 font-weight cursorpointer">
<span @click="goUrlO(orderList.OrderId)">{{orderList.DueInMoney}}</span>
</td>
</tr> -->
<tr class="page_iisMgadd_bank">
<td>到账银行</td>
<td colspan="3" class="_bank_td">
{{orderList.AccountNumber}}
<!-- <el-select v-model="msg.AccountInfo" class="width100b">
<el-option v-for="(a, i) in accountList" :key="i" :value="a.ID" :label="a.allName"></el-option>
</el-select>-->
</td>
</tr>
<tr>
......@@ -153,16 +139,6 @@
<td>订单号</td>
<td>{{msg.OrderId}}</td>
</tr>
<!-- <tr>-->
<!-- <td>团号</td>-->
<!-- <td colspan="3" class="w600 text-align-left">{{msg.TCID}}</td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td>订单号</td>-->
<!-- <td colspan="3" class="w600 text-align-left">{{msg.OrderId}}</td>-->
<!-- </tr>-->
<tr>
<td rowspan="6">开具内容</td>
<td>
......@@ -237,13 +213,6 @@
placeholder="选择日期"></el-date-picker>
</td>
</tr>
<!-- <tr>-->
<!-- <td>备注</td>-->
<!-- <td colspan="3">-->
<!-- <el-input type="textarea" placeholder v-model="msg.Remarks"></el-input>-->
<!-- </td>-->
<!-- </tr>-->
</table>
<div>
<div>
......@@ -431,15 +400,15 @@ export default {
}
this.msg.ApplyPics = this.saveMsg
this.apipost(
"InvoiceApply_get_SetInvoiceApply",
"InvoiceApply_get_SetInvoiceApply_V2",
this.msg,
res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
let path = this.msg.InvoiceApplyType == 1 ? 'groupTourOrder' : 'VisaProductEditOrder'
setTimeout(() => {
this.$router.push({
name: "groupTourOrder"
name: path
});
// this.$router.go(-1)
}, 1000);
......@@ -469,9 +438,10 @@ export default {
},
getOrderDetail: function() {
// 获取订单详情
let OrderResource = this.msg.InvoiceApplyType ? 10 : 8
this.apipost(
"InvoiceApply_get_GetOrderFinanceList",
{ OrderId: this.msg.OrderId, OrderResource: 8, IsTravelMoney: 1 },
{ OrderId: this.msg.OrderId, OrderResource: OrderResource, IsTravelMoney: 1 },
res => {
if (res.data.resultCode == 1) {
this.orderList = res.data.data;
......@@ -494,7 +464,8 @@ export default {
);
},
getDetail: function (id) { // 获取详情
this.apipost('InvoiceApply_get_GetDetails', {ID: id}, res=>{
let InvoiceApplyType = this.$route.query.InvoiceApplyType ? this.$route.query.InvoiceApplyType : 1
this.apipost('InvoiceApply_get_GetDetails', {ID: id, InvoiceApplyType: InvoiceApplyType}, res=>{
if (res.data.resultCode == 1) {
let detail = res.data.data
this.isChang = 2
......@@ -527,6 +498,7 @@ export default {
this.msg.OrderId = this.$route.query.OrderId;
this.msg.TCID = this.$route.query.TCID;
this.msg.CustomerId = this.$route.query.customerId;
this.msg.InvoiceApplyType = this.$route.query.InvoiceApplyType ? this.$route.query.InvoiceApplyType : ''
this.getAccountList();
this.getOrderDetail();
this.getCustomerInvoiceList();
......
src/components/FinancialModule/invoicesManagerDetail.vue
View file @ 823c0149
......@@ -256,7 +256,7 @@
<tr class="page_iisMgdetail_bank">
<td>{{$t('ios.dzyinhang')}}</td>
<td colspan="3" class="_bank_td">
{{orderList. AccountNumber}}
{{orderList.AccountNumber}}
</td>
</tr>
<tr>
......@@ -613,7 +613,8 @@ export default {
}, null)
},
getDetail: function (id) { // 获取详情
this.apipost('InvoiceApply_get_GetDetails', {ID: id}, res=>{
let InvoiceApplyType = this.$route.query.InvoiceApplyType ? this.$route.query.InvoiceApplyType : 1
this.apipost('InvoiceApply_get_GetDetails', {ID: id, InvoiceApplyType: InvoiceApplyType}, res=>{
if (res.data.resultCode == 1) {
let detail = res.data.data
if(detail.ApplyPics && detail.ApplyPics.length>0){
......@@ -634,16 +635,15 @@ export default {
done();
},
getOrderDetail: function () { // 获取交易信息详情
let OrderResource = this.$route.query.InvoiceApplyType ? 10 : 8
this.apipost(
'InvoiceApply_get_GetOrderFinanceList',
{OrderId: this.detail.OrderId, OrderResource: 8, IsTravelMoney: 1},
{OrderId: this.detail.OrderId, OrderResource: OrderResource, IsTravelMoney: 1},
res => {
if (res.data.resultCode == 1) {
this.orderList = res.data.data
}
},
err => {
}
},err => {}
)
},
goUrlSFD: function (path, name, OrderId, tcnum, tcid) {
......
src/components/SalesModule/groupTourOrder.vue
View file @ 823c0149
......@@ -1803,7 +1803,7 @@
</div>
<!-- item.confirmFileList.length>0 && ((item.receivableMoney - item.invoiceApplyTotal) > 0) -->
<div v-if='(item.confirmFileList.length>0||item.contractNum.length>0) && ((item.receivableMoney - item.invoiceApplyTotal) > 0)'
@click='goUrlAdd("invoicesManagerAdd", item.orderId, item.tcid, item.customerId)'>{{$t('salesModule.ApplyInvoice')}}</div>
@click='goUrlAdd("invoicesManagerAdd", item.orderId, item.tcid, item.customerId, 1)'>{{$t('salesModule.ApplyInvoice')}}</div>
<div
@click='Discount(item.tcid),SOMsg.OrderId = item.orderId,SOMsg.OrderUnitPrice = item.unit_Price'>
{{$t('pub.ApplyYH')}}</div>
......
src/components/SalesVisa/VisaProductEditOrder.vue
View file @ 823c0149
......@@ -169,6 +169,9 @@
</el-tooltip>
<el-tooltip v-if="(item.visaOrderStatus==1||item.visaOrderStatus==3)&&item.visaStatus==1" effect="dark" :content="$t('salesModule.LKMD')" placement="top-start">
<el-button v-show='item.visaManagementId>0' type="primary" style='background:#00a1f1; border-color:#00a1f1' @click='goUrlT(item)' icon="iconfont icon-bumen"></el-button>
</el-tooltip>
<el-tooltip effect="dark" :content="$t('salesModule.ApplyInvoice')" placement="top-start">
<el-button v-show='item.visaManagementId>0' type="primary" style='background:#607D8B; border-color:#607D8B' @click='goUrlAdd("invoicesManagerAdd", item.id, item.visaId, item.CustomerId, 2)' icon="iconfont icon-rizhi1"></el-button>
</el-tooltip>
<el-tooltip v-if="item.income<=0&&(item.visaOrderStatus==1||item.visaOrderStatus==3)" class="item" effect="dark" :content="$t('pub.cancelBtn')" placement="top-start">
<el-button type="primary" style='background:#E95252; border-color:#E95252;' icon="iconfont icon-xingzhuangkaobei" @click='cancelOrder(item)'></el-button>
......@@ -202,10 +205,25 @@
<div>
<span>{{$t('hotel.hotel_Order')}}：</span>
<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" @click="goUrl2('FinancialDocumentsDetail',item2.frID,'财务单据')">{{item2.frID}}</span>
<span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green" @click="goUrl2('FinancialDocumentsDetail',item2.frID,'财务单据')">{{item2.frID}}</span>
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red" @click="goUrl2('FinancialDocumentsDetail',item2.frID,'财务单据')">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black" @click="goUrl2('FinancialDocumentsDetail',item2.frID,'财务单据')">{{item2.frID}}</span>
<span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue" @click="goUrl2('FinancialDocumentsDetail',item2.frID,'财务单据')">{{item2.frID}}</span>
<span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green" @click="goUrl2('FinancialDocumentsDetail',item2.frID,'财务单据')">{{item2.frID}}</span>
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red" @click="goUrl2('FinancialDocumentsDetail',item2.frID,'财务单据')">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black" @click="goUrl2('FinancialDocumentsDetail',item2.frID,'财务单据')">{{item2.frID}}</span>
</span>
<span v-if="item.financeList.length===0" style="cursor: default;">{{$t('system.content_noData')}}</span>
</div>
<div>
<span>{{$t('salesModule.Invoice')}}：</span>
<span v-for="(item2,index2) in item.invoiceApplyList" :key="index2" style="margin-right:10px;cursor:pointer;">
<span v-if="item2.invoiceApplyState === 6" class="groupTourOrder_tickets_blue"
@click="goIisDetail(item2.id)">{{item2.id}}</span>
<span
v-else-if="item2.invoiceApplyState === 1 || item2.invoiceApplyState === 3 || item2.invoiceApplyState === 6"
class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState === 5 || item2.invoiceApplyState === 4 "
class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black"
@click="goIisDetail(item2.id)">{{item2.id}}</span>
</span>
<span v-if="item.financeList.length===0" style="cursor: default;">{{$t('system.content_noData')}}</span>
</div>
......@@ -412,7 +430,7 @@ export default {
VisaDutyTypeEnum:[],
VisaIdentityTypeEnum:[],
FilghtForAirIn:[],
FilghtForAirOut:[],
FilghtForAirOut:[],
dataList:[],
EmployeeList:[],
loading:true,
......@@ -424,6 +442,30 @@ export default {
goUrlFinance(name, path, id, tcmun) {
this.$router.push({ name: path, query: { id: id, tcmun: tcmun, blank: 'y', tab: name} });
},
goIisDetail: function (id) { // 跳转发票详情页面
this.$router.push({
name: 'invoicesManagerDetail',
query: {
id: id,
noDetail: 1,
InvoiceApplyType: 2,
blank: "y",
}
});
},
// 申请发票
goUrlAdd: function (path, OrderId, TCID, customerId, InvoiceApplyType) {
this.$router.push({
name: path,
query: {
OrderId: OrderId,
TCID: TCID,
customerId: customerId ? customerId : 0,
InvoiceApplyType: InvoiceApplyType,
blank: "y",
}
});
},
goUrl2(path, id, name) {
this.$router.push({
name: path,
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 823c0149
......@@ -2315,9 +2315,8 @@
</div>
</template>
</td>
<td colspan="4" style="height: 40px;cursor: pointer;"
@click="goUrlSFD('SalesFinancialDetail', '销售财务单据', childItem)">
<div>
<td colspan="4" style="height: 40px;cursor: pointer;">
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', childItem)">
<span>{{$t('hotel.hotel_Order')}}：</span>
<span v-for="(item2,index2) in childItem.FinanceList" :key="index2">
<span v-if="item2.ColorState===1" class="groupTourOrder_tickets_blue">《{{item2.FrID}}》&nbsp;</span>
......@@ -2341,6 +2340,7 @@
class="groupTourOrder_tickets_red" @click="goIisDetail(item2.ID)">{{item2.ID}}</span>
<span v-else-if="item2.InvoiceApplyState === 2" class="groupTourOrder_tickets_black"
@click="goIisDetail(item2.ID)">{{item2.ID}}</span>
{{index2 !== childItem.InvoiceApplyList.length -1 ? '、' : ''}}
</span>
<span v-if="childItem.InvoiceApplyList.length===0" style="cursor: default;">{{$t('system.content_noData')}}</span>
</div>
......
src/components/index.vue
View file @ 823c0149
......@@ -1932,20 +1932,23 @@ export default {
null
);
},
refreshSysNoteDate(add) {
refreshSysNoteDate(add) {
this.sysMsgList = [];
if (add) {
this.sysMsgPageIndex = this.sysMsgPageIndex + 1;
}
let userInfo = this.getLocalStorage();
let RBBranchid = userInfo.RB_Branch_id; //集团
let EmployeeId = userInfo.EmployeeId; //员工ID
// todo 实现加载系统通知
//获取消息列表
let msg = {
pageIndex: this.sysMsgPageIndex,
pageSize: "5",
RB_BranchId: parseInt(this.$cookie.get("RB_Branch_id")),
RB_BranchId: RBBranchid,
IsRead: 0,
IsSys: 1,
Recipient: parseInt(this.$cookie.get("EmployeeId")),
Recipient: EmployeeId,
RecPlatform: 2,
Title: "",
Type: "0",
......@@ -3786,13 +3789,11 @@ export default {
}
},
deletMsg(type) {
let LogStr = [],
ContentType = [];
let LogStr = [];
this.msgList.forEach(x=>{
LogStr.push(x.ID)
ContentType.push(x.ContentType)
})
this.apipost('SystemLog_post_SetReadStatusBatch',{LogStr:LogStr,ContentType:ContentType},r=>{
this.apipost('SystemLog_post_SetReadStatusBatch',{LogStr:LogStr},r=>{
if(r.data.resultCode==1){
this.msgList = [];
this.MsgCount = this.msgList.length;
......
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