Skip to content

S
SuperMan
Commit 40ce9508 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

‘资金调拨’

parent 2ae65cd6
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 26 deletions
src/components/FinancialModule/CapitalAllocation.vue
View file @ 40ce9508
......@@ -15,16 +15,43 @@
.page_CapitalAllocation .page_CapitalAllocation_list {
width: 100%;
}
.page_CapitalAllocation i.icon-sousuo,.page_CapitalAllocation i.edit{
width: 30px;
height: 30px;
display: inline-block;
color: white !important;
border-radius: 50%;
text-align: center;
line-height: 30px;
margin-right: 10px;
cursor: pointer;
outline: none;
}
.page_CapitalAllocation i.edit{background-color: #00C6FF;font-size: 16px;}
.page_CapitalAllocation i.edit:hover{background-color: #59daff}
.page_CapitalAllocation i.edit:active{background-color: #00b8ec}
.page_CapitalAllocation i.icon-sousuo{background-color: #47BF8C;}
.page_CapitalAllocation i.icon-sousuo:hover{background-color: #66bb97}
.page_CapitalAllocation i.icon-sousuo:active{background-color: #35ab79}
.page_CapitalAllocation ._btn_group{font-size: 14px;}
.page_CapitalAllocation .icon-daiqueren{color: #4BCA81}
.page_CapitalAllocation .icon-yiqueren{color: #4BCA81}
.page_CapitalAllocation .icon-yiquxiao{color: #959595}
.page_CapitalAllocation .icon-shenhebohui{color: #E95252}
.page_CapitalAllocation .icon-icon-zancun{color: #FF9C01}
.page_CapitalAllocation .text_d{text-decoration: underline;cursor: pointer;}
.InfoChangeLog{height: auto;max-height: 220px;background-color: #FFFFFF;}
.changLogList{padding-left: 20px;max-height: 180px;overflow: auto;}
.changLogList_l{border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;}
._radius_green{background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;}
.changLog_time{color: #666666;font-size: 12px;display: inline-block;padding-right: 10px}
</style>
<template>
<div class="page_CapitalAllocation">
<div class="query-box">
<ul>
<li>
<input type="button" class="normalBtn" value="新增" @click="goURL"/>
<input type="button" class="normalBtn" value="新增" @click="goURL('addCapitalAllocation')"/>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()"/>
</li>
</ul>
......@@ -116,11 +143,11 @@
<th>单号</th>
<th>金额</th>
<th>实付</th>
<th>原币金额</th>
<!-- <th>原币金额</th> -->
<th>交易日期</th>
<th>创建时间</th>
<th>创建人</th>
<th>备注</th>
<!-- <th>备注</th> -->
<th>状态</th>
<th>操作</th>
</tr>
......@@ -128,14 +155,46 @@
<td>{{item.FrID}}</td>
<td>{{item.Money}}</td>
<td>{{item.PayMoney}}</td>
<td>{{item.OriginalMoney}}</td>
<!-- <td>{{item.OriginalMoney}}</td> -->
<td>{{item.TradeDate}}</td>
<td>{{item.CreateDate}}</td>
<td>{{item.EmName}}</td>
<td>{{item.Description}}</td>
<td>{{item.StatusStr}}</td>
<!-- <td>{{item.Description}}</td> -->
<td>
<i v-if="item.Status==1" class="iconfont icon-daiqueren"></i>
<i v-if="item.Status==4" class="iconfont icon-yiquxiao"></i>
<i v-if="item.Status==2" class="iconfont icon-yiqueren"></i>
<i v-if="item.Status==3" class="iconfont icon-shenhebohui"></i>
<i v-if="item.Status==0 || item.Status==5" class="iconfont icon-zancun"></i>
<el-popover
popper-class="detailsIT_Journal"
width="250"
trigger="click">
<div class="InfoChangeLog" >
<div class="changLog">
<p class="_log_t">流程日志</p>
<ul class="changLogList" v-if="GetFinancLogList" v-loading='LogLoading'>
<li class="changLogList_l" v-for="(log,li) in GetFinancLogList">
<span style="background-color: #47BF8C" class="_radius_green"></span>
<p> <span class="_color_blue">{{log.EmName}}</span> <span class="fr changLog_time">{{log.UpdateDate}}</span> </p>
<p class="_dtel">{{log.StartValue}}</p>
</li>
</ul>
<ul v-else>
<li>暂无修改日志</li>
</ul>
</div>
</div>
<span slot="reference" class="text_d _font_init" @click="Financial_post_GetFinancLogList(item.FrID)">{{item.StatusStr}}</span>
</el-popover>
</td>
<td>
<i class="iconfont icon-sousuo" @click="goUrl('FinancialDocumentsDetail',item.FrID,active,msg.pageIndex)"></i>
<el-tooltip class="item" effect="dark" content="修改" placement="top">
<i class="edit el-icon-edit" @click="goURL('addCapitalAllocation', 1, item.FrID)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="详情" placement="top">
<i class="iconfont icon-sousuo" @click="goDetail('CapitalAllocationDetail', item.FrID, msg.pageIndex)"></i>
</el-tooltip>
</td>
</tr>
</table>
......@@ -184,7 +243,9 @@ export default {
productionDate2: [],
StatusList: [],
EmployeeList: [],
GetFinancLogList: [],
loading: true,
LogLoading: true,
}
},
created(){
......@@ -199,7 +260,7 @@ export default {
}
this.loading= true
this.apipost('Financial_get_GetFundTransferPageList', this.msg, res=>{
if (res.resultCode ===1){
if (res.data.resultCode===1){
this.dataList = res.data.data.pageData
} else {
this.$message.error(res.data.message)
......@@ -257,9 +318,23 @@ export default {
}
}, err => {})
},
goURL: function () {
this.$router.push({ name: "addCapitalAllocation",query:{blank:'y',tab:'新增资金调拨'} })
}
goURL: function (url, edit, id) {
this.$router.push({ name: url,query:{edit: edit, id: id, blank: 'y', tab: '新增资金调拨'}})
},
Financial_post_GetFinancLogList: function(id){ // 获取单据日志
if(this.checkboxShow) return
this.LogLoading = true;
this.apipost('Financial_post_GetFinancLogList',{ID:id,Type:2}, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(x=>{
x.UpdateDate = this.$commonUtils.formatMsgTime(x.UpdateDate)
})
this.LogLoading = false;
this.GetFinancLogList = data;
}
}, err => {})
},
},
mounted(){
this.getCompanyList()
......
src/components/FinancialModule/addCapitalAllocation.vue
View file @ 40ce9508
......@@ -148,9 +148,12 @@
line-height: 41px;
text-align: center;
}
.page_addCapitalAllocation ._submit{
text-align: right
}
</style>
<template>
<div class="page_addCapitalAllocation">
<div class="page_addCapitalAllocation" v-loading="loading">
<div class="_top">
<p>四川和平国际旅行社有限公司</p>
<p><span>资金调拨单</span></p>
......@@ -187,7 +190,7 @@
</div>
<div>
<span class="_lable">收款金额：</span>
<el-input v-model='item.OriginalMoney' @input="" class="w100 _border_b_1"></el-input>
<el-input v-model='item.OriginalMoney' @input="Calculation(1, index)" class="w100 _border_b_1"></el-input>
<span class="_lable">币种：</span>
<el-input disabled="disabled" v-model='item.CurrencyName' class="w80 _border_b_1"></el-input>
<span class="_lable">汇率：</span>
......@@ -215,7 +218,7 @@
<div class="_uoload">
<p>上传附件<span class="_addUpload_tips">（单个附件大小不得超过10M）</span></p>
<div class="_addUpload_box clearfix" >
<template v-for="(file,fIndex) in item.VorcherInos">
<template v-for="(file,fIndex) in item.vorcherInos">
<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)">
......@@ -279,7 +282,7 @@
</div>
<div>
<span class="_lable">付款金额：</span>
<el-input v-model='item.OriginalMoney' class="w100 _border_b_1"></el-input>
<el-input v-model='item.OriginalMoney' @input="Calculation(2, index)" class="w100 _border_b_1"></el-input>
<span class="_lable">币种：</span>
<el-input disabled="disabled" v-model='item.CurrencyName' class="w80 _border_b_1"></el-input>
<span class="_lable">汇率：</span>
......@@ -307,7 +310,7 @@
<div class="_uoload">
<p>上传附件<span class="_addUpload_tips">（单个附件大小不得超过10M）</span></p>
<div class="_addUpload_box clearfix" >
<template v-for="(file,fIndex) in item.VorcherInos">
<template v-for="(file,fIndex) in item.vorcherInos">
<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)">
......@@ -327,7 +330,7 @@
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(1, index, fIndex)"></span>
</div>
</template>
<div class="_pic_upload" @click="inUploadIndex = index,inUploadTrue = true">
<div class="_pic_upload" @click="inUploadIndex = index,inUploadTrue = false">
<el-upload
drag
:http-request="uploadFileBtn"
......@@ -341,6 +344,9 @@
</li>
</ul>
</div>
<div class="_submit">
<button class="normalBtn" @click="AddFinancial()">提交</button>
</div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src">
</viewer>
......@@ -390,9 +396,68 @@ export default {
}
},
created(){
this.initMsg()
if (this.$route.query.edit) {
let id = this.$route.query.id
this.getData(id)
} else {
this.initMsg()
let userInfo = this.getLocalStorage();
this.msg.RB_Depart_Id = userInfo.RB_Department_Id;
this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
}
},
methods:{
getData: function(id){
this.loading = true
this.apipost('Financial_get_GetFundTransfer', {ID: id}, res=>{
if(res.data.resultCode==1){
let data = res.data.data
this.inList = data.SBankList
this.outList = data.FBankList
this.msg.FrID = data.FrID
this.msg.TemplateId = data.TemplateId
this.msg.Status = data.Status
this.msg.IsPublic = 0
this.msg.RB_Depart_Id = data.RB_Depart_Id
this.msg.RB_Branch_Id = data.RB_Branch_Id
this.msg.Description = data.Description
this.msg.IsHave = data.IsHave
this.msg.emList = data.FrID
}else{
this.$message.error(res.data.message);
}
this.loading = false
}, null)
},
AddFinancial: function () {
this.loading = true
this.msg.BankList.push(...this.inList,...this.outList)
this.apipost('Financial_post_SetFundTransfer', this.msg, res=>{
if(res.data.resultCode==1){
this.$message.success(res.data.message);
this.$router.push({
name:'CapitalAllocation',
query:{
blank:'y'
}
});
}else{
this.$message.error(res.data.message);
}
this.loading = false
}, null)
},
Calculation: function (type, index) {
if (type===1) {
let OriginalMoney = (this.inList[index].OriginalMoney && !isNaN(this.inList[index].OriginalMoney)) ? parseFloat(this.inList[index].OriginalMoney) : 0
let Rate = (this.inList[index].Rate && !isNaN(this.inList[index].Rate)) ? parseFloat(this.inList[index].Rate) : 0
this.inList[index].Money = OriginalMoney*Rate
} else {
let OriginalMoney = (this.outList[index].OriginalMoney && !isNaN(this.outList[index].OriginalMoney)) ? parseFloat(this.outList[index].OriginalMoney) : 0
let Rate = (this.outList[index].Rate && !isNaN(this.outList[index].Rate)) ? parseFloat(this.outList[index].Rate) : 0
this.outList[index].Money = OriginalMoney*Rate
}
},
clearItem: function (type, index) {
if (type===1) {
this.inList[index].ID = 0
......@@ -409,7 +474,7 @@ export default {
this.inList[index].AllotType = 1
this.inList[index].Sort = ''
this.inList[index].allName = ''
this.inList[index].VorcherInos = []
this.inList[index].vorcherInos = []
}else if(type===2) {
this.outList[index].ID = 0
this.outList[index].Type = ''
......@@ -425,7 +490,7 @@ export default {
this.outList[index].AllotType = 2
this.outList[index].Sort = ''
this.outList[index].allName = ''
this.outList[index].VorcherInos = []
this.outList[index].vorcherInos = []
}
this.$forceUpdate()
},
......@@ -460,7 +525,7 @@ export default {
AllotType: 1,
Sort: '',
allName: '',
VorcherInos: []
vorcherInos: []
})
},
initOnList: function () {
......@@ -478,7 +543,7 @@ export default {
AllotType: 2,
Sort: '',
allName: '',
VorcherInos: []
vorcherInos: []
})
},
initMsg: function (t) {
......@@ -574,14 +639,14 @@ export default {
console.log(x.res.requestUrls[0])
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
if (this.inUploadTrue) {
this.inList[this.inUploadIndex].VorcherInos.push({
this.inList[this.inUploadIndex].vorcherInos.push({
Content: x.name,
ID:0,
Type:fileTypeNumber,
Url:x.res.requestUrls[0].split("?")[0],
})
} else {
this.outList[this.inUploadIndex].VorcherInos.push({
this.outList[this.inUploadIndex].vorcherInos.push({
Content: x.name,
ID:0,
Type:fileTypeNumber,
......@@ -593,9 +658,9 @@ export default {
},
deleteUploadFile: function (type, i , ind) { // 删除上传文件
if (type===1) {
this.inList[i].VorcherInos.splice(ind, 1)
this.inList[i].vorcherInos.splice(ind, 1)
} else {
this.outList[i].VorcherInos.splice(ind, 1)
this.outList[i].vorcherInos.splice(ind, 1)
}
},
showUpLoadFile(i){ // 预览上传文件
......
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