Skip to content

S
SuperMan
Commit e2aaca11 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

财务新增汇兑收益

parent 4ddc801b
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 121 deletions
src/components/FinancialModule/ExchangeLoss.vue
View file @ e2aaca11
......@@ -123,7 +123,7 @@
</el-col> -->
<el-col :span="4">
<el-form-item label="所属公司：">
<el-select filterable v-model='msg.RB_Branch_Id' @change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',msg.UpdateBy='',getDepartment()" class="">
<el-select filterable v-model='msg.RB_Branch_Id' @change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',msg.UpdateBy=''" class="">
<el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
......@@ -133,37 +133,8 @@
</el-select>
</el-form-item>
</el-col>
<!--
<el-col :span="4">
<el-form-item label="制单人员：">
<el-select filterable v-model='msg.UpdateBy' class="">
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="单据类型：">
<el-select filterable v-model='msg.Type' class="">
<el-option key="-1" value="-1" 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> -->
<template>
<el-col :span="4">
<el-form-item label="费用类型：">
<el-select class="_height_auto" filterable multiple v-model='msg.CostTypeIDslist'>
<el-option :value="0" label="不限"></el-option>
<el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="审核状态：">
<el-select filterable v-model='msg.Status' class="">
......@@ -183,7 +154,7 @@
<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-option key="3" :value="3" label="资金调拨"></el-option>
<el-option key="4" :value="4" label="资金调拨"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -209,6 +180,16 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单日期：">
<el-date-picker class="h34"
@change="timeAdd(1)"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</template>
</el-row>
......@@ -630,6 +611,9 @@ export default {
Type:0,
UpdateBy:'',
Status:-1,
sDate:"",
eDate:"",
CostTypeIDslist:[],
},
getCompanyMsg:{ // 公司
RB_Group_Id:'0',
......@@ -649,18 +633,9 @@ export default {
PostId:0,
IsLeave:0,
},
zhuanMsg:{
AuditEmId:null,
WorkFlowId:0,
},
DataList:[],
GetFinancLogList:[],
StatusList:[],
ClientAccountList:[],
ClientTypeList:[],
DepartmentList:[],
EmployeeList:[],
ConditionList:[],
CompanyList:[],
approvalDate:[],
transactionDate:[],
......@@ -672,6 +647,7 @@ export default {
dateArr:'',
status:'1',
type:'1',
productionDate:[],
loading:false,
LogLoading:false,
isCkedAll: false,
......@@ -729,11 +705,7 @@ export default {
this.msg.EmployeeId= userInfo.EmployeeId;
this.financeinfo_post_GetCostTypeList();
this.getCompanyList();
this.Financial_post_GetConditionList();
this.getEmployee();
this.getDepartment();
this.financeinfo_post_GetClientTypeList();
this.FinancialFlowTemplate_post_GetStatusList();
this.getPageList();
},methods:{
getEmployee() { //员工
......@@ -845,30 +817,7 @@ export default {
if(!this.msg.Conditon)this.msg.Conditon=1;
this.GetLocalFile("Financial_post_DownInOrOut", this.msg,"收支款.xls");
} ,
financeRemove(id){//作废
this.$confirm('是否对申请单进行作废操作？作废后不可恢复！', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.deletFinance(id)
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
});
});
},
deletFinance(id){
this.apipost('Financial_post_Cancel',{ID:id},res=>{
if(res.data.resultCode == 1) {
this.$message.success(res.data.message)
}else{
this.$message.error(res.data.message)
}
this.getPageList();
},err=>{})
},
Financial_post_GetFinancLogList(id){ // 获取单据日志
this.LogLoading = true;
this.apipost('Financial_post_GetFinancLogList',{ID:id,Type:2}, res => {
......@@ -885,49 +834,9 @@ export default {
mathMoney(n){ // 数字转中文大写 1
this.ChineseStr = this.$commonUtils.changeMoneyToChinese(n)
},
FinancialFlowTemplate_post_GetStatusList(){ // 获取审核状态枚举
this.apipost('FinancialFlowTemplate_post_GetStatusList',{}, res => {
if(res.data.resultCode == 1) {
this.StatusList = res.data.data;
}
}, err => {})
},
financeinfo_post_GetClientTypeList(){ // 获取对象类型
this.apipost('financeinfo_post_GetClientTypeList',{}, res => {
if(res.data.resultCode == 1) {
this.ClientTypeList = res.data.data;
}
}, err => {})
},
financeinfo_post_GetClientAccountList(t){ // 获取对象类型
let msg = {
Type:t,
ObjID:0,
CardNum:''
}
this.apipost('financeinfo_post_GetClientAccountList',msg, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
let ClientAccountList = [];
data.forEach(x=>{
let obj = {
ID:x.ID,
Name:x.AccountAlias,
Nom:x.CardNum
}
ClientAccountList.push(obj)
})
this.ClientAccountList = ClientAccountList;
}
}, err => {})
},
getDepartment(){ //部门
this.apipost('admin_get_DepartmentGetList', this.getDepartmentMsg, res => {
if(res.data.resultCode == 1) {
this.DepartmentList = res.data.data;
}
}, err => {})
},
getEmployee() { //员工
this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
if(res.data.resultCode == 1) {
......@@ -942,13 +851,7 @@ export default {
}else{}
},err=>{})
},
Financial_post_GetConditionList(){ //获取财务单据枚举列表
this.apipost('Financial_post_GetConditionList',{},res=>{
if(res.data.resultCode==1){
this.ConditionList=res.data.data;
}else{}
},err=>{})
},
financeinfo_post_GetCostTypeList(){ // 费用类型
this.apipost('financeinfo_post_GetCostTypeList',{Name:'',type:0,DepartIDs:this.DepartIDs},res=>{
if(res.data.resultCode==1){
......@@ -959,7 +862,15 @@ export default {
},err=>{})
},
timeAdd(t){ // 日期格式
if(t==1){ //制单日期
if(!this.productionDate){
this.msg.sDate = '';
this.msg.eDate = '';
return
}
this.msg.sDate = this.productionDate[0];
this.msg.eDate = this.productionDate[1];
}
if(t==2){ //审批日期
if(!this.approvalDate){
this.dateStart = '';
......@@ -1004,7 +915,7 @@ export default {
QEndDate:this.msg.QEndDate,
QStartDate:this.msg.QStartDate,
OrderID:this.msg.OrderID==0?'':this.msg.OrderID,
EmployeeId:this.msg.EmployeeId,
EmployeeId:this.msg.EmployeeId,
}
this.msg = msg;
......
src/components/FinancialModule/FinancialSubmodule/NewBillModule.vue
View file @ e2aaca11
......@@ -214,6 +214,7 @@
<th width="110">{{$t('fnc.jine')}}</th>
<th width="90">{{$t('hotel.hotel_Currency')}}</th>
<th width="85">{{$t('hotel.hotel_CurrentRate')}}</th>
<th>汇兑损益</th>
<th>{{$t('fnc.bwbjine')}}</th>
</tr>
<tr>
......@@ -224,6 +225,10 @@
<td>{{item.OriginalMoney}}</td>
<td>{{item.CurrencyName}}</td>
<td>{{item.Rate}}</td>
<td>
<span v-if="item.IsExChange==0">否</span>
<span v-if="item.IsExChange==1">是</span>
</td>
<td>{{item.Money}}</td>
</tr>
</table>
......@@ -266,6 +271,7 @@
<th width="110">{{$t('fnc.jine')}}</th>
<th width="90">{{$t('hotel.hotel_Currency')}}</th>
<th width="85">{{$t('hotel.hotel_CurrentRate')}}</th>
<th>汇兑损益</th>
<th>{{$t('fnc.bwbjine')}}</th>
</tr>
<tr>
......@@ -276,6 +282,10 @@
<td>{{item.OriginalMoney}}</td>
<td>{{item.CurrencyName}}</td>
<td>{{item.Rate}}</td>
<td>
<span v-if="item.IsExChange==0">否</span>
<span v-if="item.IsExChange==1">是</span>
</td>
<td>{{item.Money}}</td>
</tr>
</table>
......
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