Commit 31f5578f authored by youjie's avatar youjie

平台对照、附件查看

parent 15473611
...@@ -686,6 +686,15 @@ ...@@ -686,6 +686,15 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="金蝶状态:">
<el-select v-model='msg.KingdeeMark'>
<el-option key="0" value="0" label="不限"></el-option>
<el-option key="1" value="1" label="已导入"></el-option>
<el-option key="2" value="2" label="未导入"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单日期:"> <el-form-item label="制单日期:">
<el-date-picker style="width: 100%;" class="h34" @change="timeAdd(1)" v-model="productionDate" type="daterange" <el-date-picker style="width: 100%;" class="h34" @change="timeAdd(1)" v-model="productionDate" type="daterange"
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
...@@ -719,6 +728,7 @@ ...@@ -719,6 +728,7 @@
</span> </span>
<button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button> <button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="method5()">导出</button> <button class="normalBtn" @click="method5()">导出</button>
<button v-if="DataList&&DataList.length>0" class="hollowFixedBtn" @click="Markers">标记</button>
</li> </li>
</ul> </ul>
<!-- <div style="text-align: right;"> <!-- <div style="text-align: right;">
...@@ -931,7 +941,8 @@ ...@@ -931,7 +941,8 @@
BranchIds:'', BranchIds:'',
AccountIdStr:'', AccountIdStr:'',
ColorType:1,//和平 ColorType:1,//和平
ImportType:1 ImportType:1,
KingdeeMark: '0',
}, },
BranchIds:[], BranchIds:[],
getCompanyMsg: { // 公司 getCompanyMsg: { // 公司
...@@ -1092,6 +1103,40 @@ ...@@ -1092,6 +1103,40 @@
}, },
methods: { methods: {
Markers(){
this.$confirm('是否确认标记此查询条件的下所有财务单据以导入至金蝶?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.SetFinanceToKingdeeMark()
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
});
});
},
SetFinanceToKingdeeMark(){
if(this.msg.FrID===''){
this.msg.FrID = 0
}
if(this.BranchIds.length>0){
let ids = JSON.parse(JSON.stringify(this.BranchIds)).join(',')
this.msg.BranchIds = ids
}else{
this.msg.BranchIds = ''
}
this.apipost('Financial_post_SetFinanceToKingdeeMark', this.msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getPageList()
} else {
this.Error(res.data.message);
}
}, err => {})
},
typeCancel(){ typeCancel(){
for(let i=0;i<this.typeList.length;i++){ for(let i=0;i<this.typeList.length;i++){
this.typeList[i].AccountType = '' this.typeList[i].AccountType = ''
......
...@@ -84,6 +84,9 @@ ...@@ -84,6 +84,9 @@
<!-- 现金 --> <!-- 现金 -->
<cashForm v-if="titleType==3" :list="RCashList" :loading="loading" @clickEdit="clickEdit" @success="getList" <cashForm v-if="titleType==3" :list="RCashList" :loading="loading" @clickEdit="clickEdit" @success="getList"
:type="titleType"></cashForm> :type="titleType"></cashForm>
<!-- 平台 -->
<bankForm v-if="titleType==4" :list="RPlatfromList" :loading="loading" @clickEdit="clickEdit" @success="getList"
:type="titleType"></bankForm>
<!-- 费用 --> <!-- 费用 -->
<costForm v-if="titleType==1" :list="RCostList" :loading="loading" @clickEdit="clickEdit" @success="getList" <costForm v-if="titleType==1" :list="RCostList" :loading="loading" @clickEdit="clickEdit" @success="getList"
:type="titleType"></costForm> :type="titleType"></costForm>
...@@ -154,6 +157,10 @@ ...@@ -154,6 +157,10 @@
Name: '现金', Name: '现金',
Id: 3 Id: 3
}, },
{
Name: '平台',
Id: 4
},
{ {
Name: '费用', Name: '费用',
Id: 1 Id: 1
...@@ -198,6 +205,10 @@ ...@@ -198,6 +205,10 @@
Name: '现金对照表', Name: '现金对照表',
Id: 3 Id: 3
}, },
{
Name: '平台对照表',
Id: 4
},
{ {
Name: '费用对照表', Name: '费用对照表',
Id: 1 Id: 1
...@@ -208,6 +219,7 @@ ...@@ -208,6 +219,7 @@
}, },
RBankList: [], //银行 RBankList: [], //银行
RCashList: [], //现金 RCashList: [], //现金
RPlatfromList: [],//平台
RCostList: [], //费用 RCostList: [], //费用
loading: false, loading: false,
outerVisible: false, outerVisible: false,
...@@ -316,6 +328,9 @@ ...@@ -316,6 +328,9 @@
if (item.Id == 3) { if (item.Id == 3) {
this.text = '新增现金对照表' this.text = '新增现金对照表'
} }
if (item.Id == 4) {
this.text = '新增平台对照表'
}
if (item.Id == 1) { if (item.Id == 1) {
this.text = '新增费用对照表' this.text = '新增费用对照表'
} }
...@@ -356,6 +371,7 @@ ...@@ -356,6 +371,7 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.RBankList = res.data.data.RBankList; this.RBankList = res.data.data.RBankList;
this.RCashList = res.data.data.RCashList; this.RCashList = res.data.data.RCashList;
this.RPlatfromList = res.data.data.RPlatfromList;
this.RCostList = res.data.data.RCostList; this.RCostList = res.data.data.RCostList;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
......
...@@ -147,12 +147,21 @@ ...@@ -147,12 +147,21 @@
<el-input v-model="msg.OrderID"></el-input> <el-input v-model="msg.OrderID"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="4">
<el-form-item label="金额:"> <el-form-item label="金额:">
<el-input v-model="msg.sMoney" class="w64d5" @keyup.native="checkPrice(msg,'sMoney')"></el-input>- <el-input v-model="msg.sMoney" class="w64d5" @keyup.native="checkPrice(msg,'sMoney')"></el-input>-
<el-input v-model="msg.eMoney" @keyup.native="checkPrice(msg,'eMoney')" class="w64d5"></el-input> <el-input v-model="msg.eMoney" @keyup.native="checkPrice(msg,'eMoney')" class="w64d5"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item label="金蝶状态:">
<el-select v-model='msg.KingdeeMark'>
<el-option key="0" value="0" label="不限"></el-option>
<el-option key="1" value="1" label="已导入"></el-option>
<el-option key="2" value="2" label="未导入"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="制单日期:"> <el-form-item label="制单日期:">
<el-date-picker class="h34" @change="timeAdd(1)" v-model="productionDate" type="daterange" <el-date-picker class="h34" @change="timeAdd(1)" v-model="productionDate" type="daterange"
...@@ -685,6 +694,7 @@ ...@@ -685,6 +694,7 @@
Remark: '', //备注查询 Remark: '', //备注查询
Sort: '2', Sort: '2',
EmployeeId: '', EmployeeId: '',
KingdeeMark: '0',
}, },
getCompanyMsg: { // 公司 getCompanyMsg: { // 公司
RB_Group_Id: '0', RB_Group_Id: '0',
......
...@@ -58,7 +58,12 @@ ...@@ -58,7 +58,12 @@
<td > <td >
<div v-if="item.ReimburseList.VoucherPicList.length"> <div v-if="item.ReimburseList.VoucherPicList.length">
<div v-for="(vou, vouIndex) in item.ReimburseList.VoucherPicList" :key="vouIndex"> <div v-for="(vou, vouIndex) in item.ReimburseList.VoucherPicList" :key="vouIndex">
<img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt=""> <el-image
style="width: 20px;height: 20px;"
:src="vou.url"
:preview-src-list="subItem.listUrl">
</el-image>
<!-- <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt=""> -->
</div> </div>
</div> </div>
<div v-else> <div v-else>
...@@ -153,6 +158,14 @@ export default { ...@@ -153,6 +158,14 @@ export default {
}else{ }else{
this.dataList=data; this.dataList=data;
} }
this.dataList.forEach(x => {
x.ScenicStatisticsList.forEach(y=>{
y.listUrl = []
y.ReimburseList.VoucherPicList&&y.ReimburseList.VoucherPicList.forEach(z=>{
y.listUrl.push(z.url)
})
})
});
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
...@@ -64,7 +64,12 @@ ...@@ -64,7 +64,12 @@
<td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length"> <td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">
<div v-if="subItem.ReimburseList.VoucherPicList.length"> <div v-if="subItem.ReimburseList.VoucherPicList.length">
<div v-for="(vou, vouIndex) in subItem.ReimburseList.VoucherPicList" :key="vouIndex"> <div v-for="(vou, vouIndex) in subItem.ReimburseList.VoucherPicList" :key="vouIndex">
<img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt=""> <el-image
style="width: 20px;height: 20px;"
:src="vou.url"
:preview-src-list="subItem.listUrl">
</el-image>
<!-- <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt=""> -->
</div> </div>
</div> </div>
<div v-else> <div v-else>
...@@ -185,6 +190,14 @@ export default { ...@@ -185,6 +190,14 @@ export default {
}else{ }else{
this.dataList=data; this.dataList=data;
} }
this.dataList.forEach(x => {
x.ScenicStatisticsList.forEach(y=>{
y.listUrl = []
y.ReimburseList.VoucherPicList&&y.ReimburseList.VoucherPicList.forEach(z=>{
y.listUrl.push(z.url)
})
})
});
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
...@@ -52,7 +52,12 @@ ...@@ -52,7 +52,12 @@
<td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length"> <td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">
<div v-if="item.ReimburseList.VoucherPicList.length"> <div v-if="item.ReimburseList.VoucherPicList.length">
<div v-for="(vou, vouIndex) in item.ReimburseList.VoucherPicList" :key="vouIndex"> <div v-for="(vou, vouIndex) in item.ReimburseList.VoucherPicList" :key="vouIndex">
<img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt=""> <el-image
style="width: 20px;height: 20px;"
:src="vou.url"
:preview-src-list="subItem.listUrl">
</el-image>
<!-- <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt=""> -->
</div> </div>
</div> </div>
<div v-else> <div v-else>
...@@ -130,6 +135,14 @@ export default { ...@@ -130,6 +135,14 @@ export default {
dataList.push(...x.HotelOrderList) dataList.push(...x.HotelOrderList)
}) })
} }
dataList.forEach(x => {
x.ScenicStatisticsList.forEach(y=>{
y.listUrl = []
y.ReimburseList.VoucherPicList&&y.ReimburseList.VoucherPicList.forEach(z=>{
y.listUrl.push(z.url)
})
})
});
this.dataList = dataList; this.dataList = dataList;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
......
...@@ -52,7 +52,12 @@ ...@@ -52,7 +52,12 @@
<td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length"> <td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">
<div v-if="subItem.ReimburseList.VoucherPicList.length"> <div v-if="subItem.ReimburseList.VoucherPicList.length">
<div v-for="(vou, vouIndex) in subItem.ReimburseList.VoucherPicList" :key="vouIndex"> <div v-for="(vou, vouIndex) in subItem.ReimburseList.VoucherPicList" :key="vouIndex">
<img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt=""> <el-image
style="width: 20px;height: 20px;"
:src="vou.url"
:preview-src-list="subItem.listUrl">
</el-image>
<!-- <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt=""> -->
</div> </div>
</div> </div>
<div v-else> <div v-else>
...@@ -122,6 +127,14 @@ export default { ...@@ -122,6 +127,14 @@ export default {
} else { } else {
dataList = data dataList = data
} }
dataList.forEach(x => {
x.ScenicStatisticsList.forEach(y=>{
y.listUrl = []
y.ReimburseList.VoucherPicList&&y.ReimburseList.VoucherPicList.forEach(z=>{
y.listUrl.push(z.url)
})
})
});
this.dataList = dataList; this.dataList = dataList;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
......
...@@ -19,7 +19,12 @@ ...@@ -19,7 +19,12 @@
<td> <td>
<div v-if="item.VoucherPicList.length"> <div v-if="item.VoucherPicList.length">
<div v-for="(vou, vouIndex) in item.VoucherPicList" :key="vouIndex"> <div v-for="(vou, vouIndex) in item.VoucherPicList" :key="vouIndex">
<img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt=""> <el-image
style="width: 20px;height: 20px;"
:src="vou.url"
:preview-src-list="subItem.listUrl">
</el-image>
<!-- <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt=""> -->
</div> </div>
</div> </div>
<div v-else> <div v-else>
...@@ -96,6 +101,14 @@ export default { ...@@ -96,6 +101,14 @@ export default {
}else{ }else{
this.dataList=data; this.dataList=data;
} }
this.dataList.forEach(x => {
x.ScenicStatisticsList.forEach(y=>{
y.listUrl = []
y.ReimburseList.VoucherPicList&&y.ReimburseList.VoucherPicList.forEach(z=>{
y.listUrl.push(z.url)
})
})
});
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
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