Commit 1be4de20 authored by liudong1993's avatar liudong1993

1

parent bb9dc8f9
......@@ -124,6 +124,15 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="结款查询">
<el-select filterable v-model='msg.IsDiJieSelect' >
<el-option label='不限' :value='-1'></el-option>
<el-option label='未结款' :value='1'></el-option>
<el-option label='已结款' :value='2'></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<ul>
......@@ -140,6 +149,7 @@
<th></th>
<th>{{$t('system.query_company')}}</th>
<th>{{$t('fnc.danhao')}}</th>
<th>结转调拨单</th>
<th>{{$t('fnc.a_zhaiyao')}}</th>
<th>{{$t('fnc.zhidanren')}}</th>
<th>{{$t('fnc.a_hkfkshijian')}}</th>
......@@ -156,7 +166,7 @@
<th>{{$t('fnc.yueacc')}}</th>
</tr>
<tr>
<td :colspan="8">{{$t('fnc.a_qcyue')}}</td>
<td :colspan="9">{{$t('fnc.a_qcyue')}}</td>
<td></td>
<td></td>
<td></td>
......@@ -165,7 +175,7 @@
</tr>
<tr v-for=" ( item , index ) in DataList ">
<td>
<input type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)">
<input v-if="item.CallBackReFrId<=0" type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)">
</td>
<td>{{ item.BName }}</td>
<!-- <td><span class="cursorpointer" :class="item.Type==1?'_bg_green':'_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td> -->
......@@ -173,6 +183,9 @@
<td>
<span class="cursorpointer" :class=" item.Type === 1 ? 'CAcc_bg_green' : 'CAcc_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
</td>
<td>
<span v-if="item.CallBackReFrId>0" class="cursorpointer" :class=" item.Type === 1 ? 'CAcc_bg_green' : 'CAcc_bg_red'" @click="goUrlNew(item,1)">{{ item.CallBackReFrId }}</span>
</td>
<td>
<p>{{item.CostTypeName}}</p>
<p v-for=" ( son , sIndex ) in item.TCIDAndTCNUMList"> <span>{{ son.TCNUM }}</span> </p>
......@@ -201,7 +214,7 @@
<td>{{ moneyFormat(item.EndMoney) }}</td>
</tr>
<tr>
<td :colspan="8">{{$t('fnc.a_heji')}}{{$t('hotel.hotel_totalRoom')}}{{DataList.length}}{{$t('hotel.hotel_item')}}</td>
<td :colspan="9">{{$t('fnc.a_heji')}}{{$t('hotel.hotel_totalRoom')}}{{DataList.length}}{{$t('hotel.hotel_item')}}</td>
<td>
{{ InMoneyB == 0 ? '-' : moneyFormat(InMoneyB) }}
</td>
......@@ -372,6 +385,45 @@
</td>
</tr>
</table>
<el-form label-width="110px">
<el-row>
<el-col :span="12" :gutter="35">
<el-form-item label="上传凭证">
<div class="_addUpload_box clearfix" >
<template v-for="(file,fIndex) in saveMsg">
<div v-if="file.Type==3">
<div style="width:100%;height:100%;overflow: hidden;">
<img :src="file.Url?file.Url:file.Content" @click="showUpLoadFile(file)">
</div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
<div v-if="file.Type==1">
<div class="iconfont " :class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'" @click="showUpLoadFile(file)">
</div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
<div v-if="file.Type==2">
<div class="iconfont icon-excel" @click="showUpLoadFile(file)">
</div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
</template>
<div class="_pic_upload">
<el-upload
drag
:http-request="uploadFileBtn"
:multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">{{$t('active.ld_djscwj')}}</div>
</el-upload>
</div>
</div>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="submitAddChuNa">{{$t('pub.saveBtn')}}</button>
&nbsp;
......@@ -459,6 +511,8 @@ export default {
allBPrice:0,
allWPrice:0,
userInfo:{},
//上传数组
saveMsg:[],
}
},created(){
this.userInfo = this.getLocalStorage();
......@@ -505,7 +559,7 @@ export default {
var fileName = "平台账户明细.xls";
this.GetLocalFile("Financial_post_OutToExcelAccountDetailList", msg, fileName);
},
goUrlNew(item){
goUrlNew(item,type){
let status=false;
if(item.CostTypeList){
item.CostTypeList.forEach(cost=>{
......@@ -514,10 +568,14 @@ export default {
}
})
}
if(status){
this.$router.push({ name: "CapitalAllocationDetail",query:{"id":item.FinanceId,blank:'y'} })
if(type ==1){
this.$router.push({ name: "CapitalAllocationDetail",query:{"id":item.CallBackReFrId,blank:'y'} })
}else{
this.$router.push({ name: "FinancialDocumentsDetail",query:{"id":item.FinanceId,blank:'y'} })
if(status){
this.$router.push({ name: "CapitalAllocationDetail",query:{"id":item.FinanceId,blank:'y'} })
}else{
this.$router.push({ name: "FinancialDocumentsDetail",query:{"id":item.FinanceId,blank:'y'} })
}
}
},
goUrl(path,id){
......@@ -669,6 +727,7 @@ export default {
},
initAddChuNa(){
this.payMsgList = [];
this.saveMsg=[];
this.listAllMoney = 0;
this.huikuanren = '';
this.TradeDate = '';
......@@ -857,7 +916,14 @@ export default {
this.apipost('Financial_post_MergeFinance',this.addMsg,r=>{
if(r.data.resultCode === 1) {
this.addChuNa = false
this.getList()
this.saveMsg=[];
this.getList();
this.addMsg = {
FrIDs:'',
RemitterName:'',
TradeDate:'',
BankList:[],
}
}else{
this.$message.error(r.data.message)
}
......@@ -982,6 +1048,64 @@ export default {
}else{}
},err=>{})
},
showUpLoadFile(i){ // 预览上传文件
if(i.Type==3){
this.picObj.push(i.Url);
this.imgList.push(i.Url);
this.picIsShow= false;
// this.hideFlashMan = true;
}else{
if(i.Content.substring(i.Content.lastIndexOf('.')+1,i.Content.length).toUpperCase()=='PDF'){
this.previewPDF(i.Url)
}else{
window.open("https://view.officeapps.live.com/op/view.aspx?src="+i.Url)
}
}
},
deleteUploadFile(i){ // 删除上传文件
this.saveMsg.splice(i,1);
this.addMsg.vorcherInos = this.saveMsg;
},
uploadFileBtn(file) { //上传
if(file.file.size > 1024 * 1024 * 10) {
this.Error('文件大小不能超过10M!')
return
}
// 1 文档 2 数据 3 图片
let typeArr=[
{stringArr:'GIF|JPG|JPEG|PNG|BMP',type:3},
{stringArr:'DOCX|DOC|XLSX|XLS|PPT|PPTX|PDF',type:1},
]
let ft=file.file.name.substring(file.file.name.lastIndexOf('.')+1,file.file.name.length).toUpperCase();
let fileTypeNumber = 2;
let typeOk = false;
typeArr.forEach(x=>{
if(x.stringArr.indexOf(ft)!='-1')
{
fileTypeNumber=x.type
typeOk = true;
}
})
if (!typeOk) return this.Error('请上传图片、word、excel类型的文件!');
let newArr = [];
newArr.push(file.file)
let path = "/Upload/Temporary/"
this.$message.info('上传中...')
this.UploadSelfFileT(path, newArr, x => {
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
this.saveMsg.push({
Content: x.data.FilePath,
ID:0,
Type:fileTypeNumber,
Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
})
this.addMsg.vorcherInos = this.saveMsg;
this.Success('上传成功');
});
},
},mounted(){
let userInfo=this.getLocalStorage();
this.RB_Branch_Id = userInfo.RB_Branch_id;
......
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