Skip to content

S
SuperMan
Commit bcbd702c authored by 吴春's avatar 吴春
Browse files
Options

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

parents a9291ad5 abfdd2f3
Hide whitespace changes
Inline Side-by-side
Showing with 202 additions and 10 deletions
src/components/FinancialModule/BankStatementReconciliation/index.vue
View file @ bcbd702c
......@@ -125,12 +125,33 @@
<div class='query-box'>
<el-form class="_info_box clearfix" label-width="110px">
<el-row style="padding: 10px 0 0 0;">
<!-- <el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.zhanghuleixing')">
<el-select filterable v-model='accType' @change="getAccountList(msg.BankType),msg.BankId=''">
<el-option v-for='item in AccList'
:label='item.Name'
: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="$t('tips.jiaoyifangshi')">
<el-select filterable v-model='msg.BankType'
@change="getAccountList(msg.BankType),msg.BankId=''">
<el-option value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in BranchAccountList' :label='item.Name' :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="$t('fnc.zhanghuleixing')">
<el-select filterable v-model='msg.BankId'
@change="getList">
<el-option v-for='item in AccList'
:label='item.Name'
<el-option v-for='item in accountList'
:label='item.Alias'
:value='item.ID'
:key='item.ID'>
</el-option>
......@@ -149,9 +170,12 @@
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div>
<!-- <span>注：和工与和中信需每日维护银行流水得到期末余额，其他账户则根据财务单据自动计算期末余额</span> -->
<span>注：均根据填入的银行流水计算得到期末余额</span>
</div>
<ul>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
......@@ -183,6 +207,7 @@
:key="index"
align="center">
<template #header>
<!-- <div style="cursor: pointer;" @click="getTimeObj(item)">{{ String(item.StartDate) }} <i v-if="msg.BankType==1&&(msg.BankId==1||msg.BankId==35)" style="color: #33B3FF" class="el-icon-edit"></i> </div> -->
<div style="cursor: pointer;" @click="getTimeObj(item)">{{ String(item.StartDate) }} <i style="color: #33B3FF" class="el-icon-edit"></i> </div>
</template>
<el-table-column style="position: relative;" :label="String(item.StartBalance)" align="center">
......@@ -254,11 +279,20 @@ export default {
BankId:1,
StartDate:'',
EndDate:'',
BankType:1
},
AccList: [
{Name: '和工',ID: 1},
{Name: '中信',ID: 35},
{Name: '公帐账户',ID: 3},
{Name: '私帐账户',ID: 4},
{Name: '现金账户',ID: 8},
{Name: '微信支付宝',ID: 13},
],
BranchAccountList:[
{Name: '银行',ID: 1},
{Name: '现金',ID: 3},
],
accountList:[],
accType:0,
loadingTable:false,
DateList: [],
SubjectList: [],
......@@ -276,6 +310,7 @@ export default {
isShowBankSta: false,
BankStaObj:{
BankId: 0,//银行ID
BankType: 1,
Date: '',// 日期
StartBalance: '',// 期初余额
Image: '',
......@@ -305,7 +340,8 @@ export default {
this.msg.EndDate=mon1;
let userInfo = this.getLocalStorage();
this.userId = userInfo.EmployeeId;
this.getSubjectList()
this.getSubjectList();
this.getAccountList(1);
this.getList();
},
methods:{
......@@ -315,7 +351,8 @@ export default {
name: "AccountStatementDetail",
query: {
ID: this.msg.BankId,
TypeId: 3,
Type: this.msg.BankType,
TypeId: 0,
sTradeDate: item.StartDate,
eTradeDate: item.StartDate,
SubjectId: row.SubjectId>0?row.SubjectId:-2,
......@@ -339,6 +376,7 @@ export default {
this.BankStaObj = {
Id: 0,
BankId: this.msg.BankId,
BankType: this.msg.BankType,
Date: '',
StartBalance: 0,
Image: '',
......@@ -358,9 +396,11 @@ export default {
this.isShowBankSta = true
},
getTimeObj(item){
// if(!(this.msg.BankType==1&&(this.msg.BankId==1||this.msg.BankId==35))){return;}
this.BankStaObj = {
Id: 1,
BankId: this.msg.BankId,
BankType: this.msg.BankType,
Date: item.StartDate,
StartBalance: item.StartBalance,
Image: '',
......@@ -458,6 +498,42 @@ export default {
this.titleEnd = this.msg.EndDate.slice(5,7)>9?this.msg.EndDate.slice(5,7):this.msg.EndDate.slice(6,7)
this.getList()
},
getAccountList(i){
if(i===1){
this.bankaccount_post_GetListS()
}
if(i===3){
this.BankAccount_post_GetCashAccountList()
}
},
BankAccount_post_GetCashAccountList(){ // 获取现金账户
let msg = {
TypeId:this.accType,
BranchId:-1,
Alias:''
};
this.apipost('BankAccount_post_GetCashAccountList',msg, res => {
if(res.data.resultCode === 1) {
let data = res.data.data;
data.forEach(x=>{
x.allName = x.Alias;
});
this.accountList = data;
}
}, err => {})
},
bankaccount_post_GetListS(){ // 获取银行账户
this.apipost('bankaccount_post_GetList',{TypeId:this.accType}, res => {
if(res.data.resultCode === 1) {
let data = res.data.data;
data.forEach(x=>{
x.allName = x.Alias+' '+x.BackNo;
});
this.accountList = data;
}
}, err => {})
},
},
mounted(){
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ bcbd702c
......@@ -812,6 +812,7 @@
<el-dropdown-item><span @click="ToPICDetial()">PIC资金预算</span></el-dropdown-item>
<el-dropdown-item><span @click="ToYFDetial()">压房明细</span></el-dropdown-item>
<el-dropdown-item><span @click="ToHotelNoFDetial()">酒店临期未制单</span></el-dropdown-item>
<el-dropdown-item><span @click="outerVisible4=true">车资回送费分摊</span></el-dropdown-item>
</template>
<template v-if="ActionMenuCode.indexOf('isManageFinance')!=-1 || ActionMenuCode.indexOf('Finance_ExpenseType')!=-1">
<el-dropdown-item><span @click="openAirPayDialog()">机票今日应付款</span></el-dropdown-item>
......@@ -1825,6 +1826,60 @@
</el-dialog>
<el-dialog custom-class='w700' title="导入车资回送费分摊" :visible.sync="outerVisible4" center>
<el-upload drag class="upload-demo" :action="importFileUrl6" :on-success="handleAvatarSuccess3"
:before-upload="beforeAvatarUpload2">
<i class="el-icon-upload"></i>
<div class="el-upload__text">{{$t("tips.tuodongwenjian")}}<em>{{$t('tips.dianjishanhcuan')}}</em></div>
<div slot="tip" class="el-upload__tip">{{$t("ground.znscexcel")}}</div>
</el-upload>
<div class="_addUpload_box clearfix">
<el-form class="cdForm" label-width="80px">
<el-form-item label="预付单号" prop="KingdeeBId">
<el-input class="w220" v-model="carBackMsg.KingdeeBId"></el-input>
</el-form-item>
<el-form-item label="制单汇率" prop="KingdeeBId">
<el-input class="w220" v-model="carBackMsg.OrderId"></el-input>
</el-form-item>
</el-form>
<template v-for="(file,fIndex) in carBackMsg.Image">
<div v-if="file.Type==3" style="width:30px; float:left;">
<div class="iconfont ">
<el-image style="height:16px;" :src="file.Url?file.Url:file.Content"
:preview-src-list="[file.Url?file.Url:file.Content]">
</el-image>
<!-- <img :src="file.Url?file.Url:file.Content" @click="showUpLoadFile(file,index)" style="height:16px;"> -->
</div>
<span class="iconfont icon-guanbi1" style="font-size:12px;"
@click="deleteCarBackUploadFile(fIndex,index)"></span>
</div>
<div v-if="file.Type==1" style="width:30px; float:left;">
<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" style="font-size:12px;"
@click="deleteCarBackUploadFile(fIndex,index)"></span>
</div>
<div v-if="file.Type==2" style="width:30px; float:left;">
<div class="iconfont icon-excel" @click="showUpLoadFile(file,index)">
</div>
<span class="iconfont icon-guanbi1" style="font-size:12px;"
@click="deleteCarBackUploadFile(fIndex,index)"></span>
</div>
</template>
<div class="_pic_upload financiaUpload">
<el-upload drag :http-request="uploadFileCarBackBtn" :multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">附件凭证</div>
</el-upload>
</div>
</div>
</el-dialog>
<editExchangeRate v-if="costmodeHL" :hlData="trabeListHL" @success="resetPageIndex(),
getPageList(),
costmodeHL=false" @cancel="costmodeHL=false"></editExchangeRate>
......@@ -2065,6 +2120,7 @@
outerVisible: false,
outerVisible2: false,
outerVisible3: false,
outerVisible4: false,
importData: "",
importDataIndex: 0,
picObj: [],
......@@ -2081,6 +2137,15 @@
"?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=21",
importFileUrl4: this.domainManager().UploadFileUrl +
"?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=21",
importFileUrl6: this.domainManager().UploadFileUrl +
"?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=27",
importFileUrl7: this.domainManager().UploadFileUrl +
"?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=27",
carBackMsg: {
Image:[],
KingdeeBId:'',
OrderId:''
},
hbMsg: {
FrIDList: [],
Type: 1
......@@ -2570,6 +2635,52 @@
// this.saveMsgInvoice.splice(i, 1);
this.expressageMsg.splice(i, 1);
},
uploadFileCarBackBtn(file) { //上传
if (file.file.size > 1024 * 1024 * 10) {
this.$message.warning(this.$t('tips.wjdxbncgsz'))
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.$message.error(this.$t('tips.qscWEfile'));
let newArr = [];
newArr.push(file.file)
let path = "/Upload/Temporary/"
this.$message.info(this.$t('tips.shangchuanzhong'))
this.UploadSelfFileT(path, newArr, x => {
let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0);
this.carBackMsg.Image = [];
this.carBackMsg.Image.push({
Content: x.data.FilePath,
ID: 0,
Type: fileTypeNumber,
Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
})
this.importFileUrl6 = this.importFileUrl7 + '&CreateByName=' + this.carBackMsg.Image[0].Url+ '&KingdeeBId=' + this.carBackMsg.KingdeeBId+ '&OrderId=' + this.carBackMsg.OrderId;
this.$message.success(this.$t('tips.scchenggong'))
}, 1);
},
deleteCarBackUploadFile(i) { // 删除上传文件
// this.saveMsgInvoice.splice(i, 1);
this.carBackMsg.Image.splice(i, 1);
},
handleSelectionChange(val) {
this.multipleSelection = []
this.checkList = []
......
src/components/FinancialModule/accDetail/AccountStatementDetail.vue
View file @ bcbd702c
......@@ -175,7 +175,7 @@
<th>{{$t('fnc.yueacc')}}</th>
</tr>
<tr>
<td :colspan="10">{{$t('fnc.a_qcyue')}}：</td>
<td :colspan="11">{{$t('fnc.a_qcyue')}}：</td>
<td>{{moneyFormat(StartMoney)}}</td>
</tr>
<tr v-for="(item,index) in DataList">
......@@ -198,7 +198,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>{{ InMoney == 0 ? '-' : moneyFormat(InMoney) }}</td>
<td>{{ OutMoney == 0 ? '-' : moneyFormat(OutMoney) }}</td>
<td>{{ moneyFormat(allMoney) }}</td>
......@@ -332,6 +332,7 @@ export default {
if(this.$route.query.ID){
this.accType = parseInt(this.$route.query.TypeId);
this.AccountId=parseInt(this.$route.query.ID);
if(this.$route.query.Type){this.Type=parseInt(this.$route.query.Type)}
let mon1=this.$route.query.sTradeDate?this.$route.query.sTradeDate:moment().format("YYYY-MM-DD");
let mon2=this.$route.query.eTradeDate?this.$route.query.eTradeDate:moment().subtract(1, "months").format("YYYY-MM-DD");
this.productionDate=[mon2,mon1];
......@@ -342,7 +343,11 @@ export default {
Type:this.Type,
AccountId:this.AccountId
})
this.bankaccount_post_GetList();
if(this.Type==1){
this.bankaccount_post_GetList();
}else if(this.Type==3){
this.BankAccount_post_GetCashAccountList();
}
this.getList();
}
......
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