Commit 9aaeb5b7 authored by 华国豪's avatar 华国豪 🙄

修复财务单据详上传图片问题,修复领队报账餐厅显示问题

parent 2d4fc89e
...@@ -118,10 +118,10 @@ ...@@ -118,10 +118,10 @@
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
font-size: 12px; font-size: 12px;
} }
._fujian_box{ .FinancialDocumentsDetail ._fujian_box{
position: fixed; position: absolute;
left: 961px; left: 895px;
top: 141px; top: -0;
width: 440px; width: 440px;
} }
._wenjian{ ._wenjian{
...@@ -262,8 +262,10 @@ ...@@ -262,8 +262,10 @@
text-decoration: underline; text-decoration: underline;
color: rgb(255, 0, 0); color: rgb(255, 0, 0);
} }
._addUpload_box_btm{ .FinancialDocumentsDetail ._addUpload_box_btm{
padding-top: 20px; padding-top: 20px;
max-height: 230px;
overflow: auto;
} }
._addUpload_box_btm img{ ._addUpload_box_btm img{
width: 100%; width: 100%;
...@@ -373,7 +375,7 @@ ...@@ -373,7 +375,7 @@
</style> </style>
<template> <template>
<div class="page_fdd" v-if="GetDetail"> <div class="page_fdd FinancialDocumentsDetail" v-if="GetDetail">
<div class="_none_print"> <div class="_none_print">
<span class="_Printing" @click="goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">打印单据</span> <span class="_Printing" @click="goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">打印单据</span>
<span v-if="GetDetail.TemplateId==48 || GetDetail.TemplateId==43" class="Note_span" @click="goUrl('DebitNote',GetDetail.FrID)">借支单下载</span> <span v-if="GetDetail.TemplateId==48 || GetDetail.TemplateId==43" class="Note_span" @click="goUrl('DebitNote',GetDetail.FrID)">借支单下载</span>
......
...@@ -573,7 +573,7 @@ export default { ...@@ -573,7 +573,7 @@ export default {
cancelButtonText: this.$t('pub.cancelBtn'), cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.apipost('dmc_post_get_UpdateOrderCanClear',{OrderID: OrderID, IsCanClear: type},res=>{ this.apipost('KKDayOrder_Post_UpdateOrderCanClear',{OrderID: OrderID, IsCanClear: type},res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.Success(res.data.message); this.Success(res.data.message);
this.getList(); this.getList();
......
...@@ -1694,6 +1694,7 @@ ...@@ -1694,6 +1694,7 @@
Diningdest.push({ Diningdest.push({
UseTimeStr: ai.UseTimeStr, UseTimeStr: ai.UseTimeStr,
DiningID: ai.DiningID, DiningID: ai.DiningID,
id: ai.DiningID + ai.UseTimeStr,
data: [ai] data: [ai]
}); });
Diningmap[ai.UseTimeStr] = ai; Diningmap[ai.UseTimeStr] = ai;
...@@ -1712,6 +1713,7 @@ ...@@ -1712,6 +1713,7 @@
Diningdest.push({ Diningdest.push({
UseTimeStr: ai.UseTimeStr, UseTimeStr: ai.UseTimeStr,
DiningID: ai.DiningID, DiningID: ai.DiningID,
id: ai.DiningID + ai.UseTimeStr,
data: [ai] data: [ai]
}); });
} }
...@@ -1724,7 +1726,8 @@ ...@@ -1724,7 +1726,8 @@
} }
Diningdest[i].row = row Diningdest[i].row = row
} }
this.DiningDataList = this.unique(Diningdest, 'DiningID'); console.log(Diningdest)
this.DiningDataList = this.unique(Diningdest, 'id');
// this.DiningDataList = Diningdest // this.DiningDataList = Diningdest
//票 //票
let ScenicList = [] let ScenicList = []
......
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