Skip to content

C
confucius
Commit b5a5896e authored by zhengke's avatar zhengke
Browse files
Options

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

parents e83196bf 39ed0177
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 76 deletions
src/pages/financial/CompanyAccount.vue
View file @ b5a5896e
......@@ -4,7 +4,7 @@
._scrollbar::-webkit-scrollbar{width: 4px;height: 8px;}
._scrollbar::-webkit-scrollbar-thumb{border-radius: 4px;box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);background: #c9c9c9;}
._scrollbar::-webkit-scrollbar-track{box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);border-radius: 4px;background: #EDEDED;}
.page_CompanyAccount ._vMG_edit{overflow: auto;display: none;position:absolute;bottom:0;left: 0;font-family: 'PingFangSc-Fine';border-top:3px solid #38425d;background-color:#FFFFFF;padding: 10px;width: 100%;}
.page_CompanyAccount ._vMG_edit{overflow: auto;display: none;position:absolute;bottom:0;left: 0;font-family: 'PingFangSc-Fine';border-top:3px solid #38425d;background-color:#FFFFFF;padding: 10px;width: 100%;}
.page_CompanyAccount ._vMG_edit ._tit{padding-left: 10px;border-left: 3px solid #E95252; font-size: 16px;color: #000000}
.page_CompanyAccount ._vMG_edit ._tit span{color: #666666}
.cm_content{margin:0;padding: 0;overflow-x: auto;}
......@@ -88,7 +88,7 @@
<el-form-item :label="$t('fnc.accType')">
<el-select filterable v-model='msg.TypeId' >
<el-option :label='$t("pub.unlimitedSel")' value='-1'></el-option>
<el-option v-for='item in AccountTypeList'
<el-option v-for='item in AccountTypeList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
......@@ -101,13 +101,13 @@
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :label='$t("pub.unlimitedSel")' value='-1'></el-option>
<!-- <el-option label='通用' value='-1'></el-option> -->
<el-option v-for='item in CompanyList'
<el-option v-for='item in CompanyList'
:label='item.SName'
:value='item.SId'
:key='item.SId'>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-row>
</el-form>
......@@ -122,7 +122,7 @@
<div class="instMg_list_item" v-for="(item,index) in DataList">
<div class="_top">
<img v-if="!item.LogoStr" style="width:100%" src="../financial/image/bg_c1@2x.png" alt="">
<img v-else :src="item.LogoStr" alt="">
<img v-else :src="item.LogoStr" alt="">
</div>
<div class="_bt">
<div class="_bt_t">
......@@ -146,16 +146,16 @@
<div class="_bt_b">
<p>
<span class="_name">{{$t('fnc.zhyue')}}</span>
<span>
<span>
<span v-if="item.IsStandardCurrency!=1">{{item.showB?item.StandardCurrencyCode:item.CurrencyCode}}</span>
<span v-else>{{item.StandardCurrencyCode}}</span>
<span v-else>{{item.StandardCurrencyCode}}</span>
<!-- <span class="fc_green PingFangSC _underline" @click="item.IsStandardCurrency!=1?goUrl('FineBalance',item.ID,item.Alias):''">{{item.showB?moneyFormat(item.benBalance):moneyFormat(item.Initialbalance)}}</span> -->
<span class="fc_green PingFangSC _underline" @click="goUrlNew(item)">{{item.showB?moneyFormat(item.benBalance):moneyFormat(item.Initialbalance)}}</span>
<span class="iconfont icon-qiehuan" @click="item.showB=!item.showB" v-if="item.IsStandardCurrency!=1"></span>
<span class="fc_green PingFangSC _underline" @click="goUrlNew(item)">{{item.showB?moneyFormat(item.benBalance):moneyFormat(item.Initialbalance)}}</span>
<span class="iconfont icon-qiehuan" @click="item.showB=!item.showB" v-if="item.IsStandardCurrency!=1"></span>
<span v-if="item.IsStandardCurrency!=1" class="iconfont icon-ico-renwuyaoqiu"></span>
</span>
</p>
<p><span class="_name">{{$t('fnc.zhubizhong')}}</span><span class="_bold">
<p><span class="_name">{{$t('fnc.zhubizhong')}}</span><span class="_bold">
<el-tooltip class="item" effect="dark" :content="item.CurrencyName" placement="top-start">
<span class="_max_wd">{{item.CurrencyName}}</span>
</el-tooltip>
......@@ -187,12 +187,12 @@
{{$t('system.content_noData')}}
</div>
<div>
<el-pagination
<el-pagination
background
@current-change="handleCurrentChange"
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="prev, pager, next"
:page-size=msg.pageSize
:page-size=msg.pageSize
:total=total>
</el-pagination>
</div>
......@@ -203,7 +203,7 @@
<p class="_tit">{{text}}{{$t('fnc.acc')}}</p>
</el-col>
<el-col :span="4" class="_add_saveBtn">
<button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button>
<button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button>
<button class="hollowFixedBtn" type="button" @click="cancelEdit(),resetForm('addMsg'),addShow=false">{{$t('pub.cancelBtn')}}</button>
</el-col>
</el-row>
......@@ -212,13 +212,13 @@
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.accBming')" prop="Alias">
<el-input v-model="addMsg.Alias" class="" maxlength="10"></el-input>
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.accType')" prop="TypeId">
<el-select filterable v-model='addMsg.TypeId' class="">
<el-option v-for='item in AccountTypeList'
<el-option v-for='item in AccountTypeList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
......@@ -226,7 +226,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.yhjigou')" prop="BackId">
<el-select filterable v-model='addMsg.BackId' class="">
......@@ -238,22 +238,22 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.khuren')" prop="Accountholder">
<el-input v-model="addMsg.Accountholder" class="" maxlength="50"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.khuhang')" prop="Openingbank">
<el-input v-model="addMsg.Openingbank" class="" maxlength="50"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.yhkahao')" prop="BackNo">
<el-input v-model="addMsg.BackNo" class="" maxlength="50"></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-row>
<el-row>
......@@ -265,18 +265,18 @@
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.zhbizhong')" prop="CurrencyId">
<el-select filterable v-model='addMsg.CurrencyId' class="">
<el-option v-for='item in financeinfoList'
<el-option v-for='item in financeinfoList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" class="_BranchIdS">
<el-form-item label="校区" prop="BranchIdS">
<el-select filterable v-model='addMsg.BranchIdS'>
<el-option v-for='item in CompanyList'
<el-option v-for='item in CompanyList'
:label='item.SName'
:value='item.SId'
:key='item.SId'
......@@ -285,16 +285,16 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.fxshangxian')" >
<el-input v-model="addMsg.RiskLimitMoney" type="number" class=""></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.fxxiaxian')" >
<el-input v-model="addMsg.RiskLowerLimitMoney" type="number" class=""></el-input>
</el-form-item>
</el-col>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="初始本位币金额">
<el-input v-model="addMsg.AccountStartWBMoney" type="number" class></el-input>
......@@ -311,9 +311,9 @@
value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-row>
</el-form>
</div>
</div>
<div class="_vMG_edit _scrollbar" v-if="addCuren == false" :class="addCuren==false?'edHeight_t':''">
<el-row>
<el-col :span="20">
......@@ -323,18 +323,18 @@
<button type="button" class="normalBtn" @click="submitForm('SetProfitLossMsg',2)">{{$t('fnc.qrtijiao')}}</button>
<button class="hollowFixedBtn" type="button" @click="cancelEdit(),resetForm('SetProfitLossMsg')">{{$t('pub.cancelBtn')}}</button>
</el-col>
</el-row>
</el-row>
<el-form class="_info_box clearfix" :model="SetProfitLossMsg" ref="SetProfitLossMsg" :rules="rules" label-width="100px">
<el-row>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.sqhuilv')">
<el-input v-model="SetProfitLossMsg.initRate" disabled=""></el-input>
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.qmhuilv')" prop="EndRate">
<el-input v-model="SetProfitLossMsg.EndRate" type="number" @change="Calculation()"></el-input>
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.xzqishu')" prop="TermNum">
......@@ -350,22 +350,22 @@
<el-col :span="4" :gutter="35" v-if="costType.length">
<el-form-item :label="$t('fnc.fyleixing')" prop="CostTypeID">
<el-select filterable v-model='SetProfitLossMsg.CostTypeID'>
<el-option v-for='item in costType'
<el-option v-for='item in costType'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" class="_yingkui">
<p v-if="moneyDate.ProfitLoss<0">{{$t('fnc.yingkui')}}<span class="fc_red">{{moneyDate.ProfitLoss}}</span></p>
<p v-if="moneyDate.ProfitLoss>0">{{$t('fnc.yingli')}}<span class="fc_green">{{moneyDate.ProfitLoss}}</span></p>
<p v-if="moneyDate.ProfitLoss==0">{{$t('fnc.yingkui')}}<span class="fc_green">0</span></p>
<p v-if="moneyDate.ProfitLoss==0">{{$t('fnc.yingkui')}}<span class="fc_green">0</span></p>
</el-col>
</el-row>
</el-form>
</div>
</div>
</div>
</template>
<script>
......@@ -406,10 +406,10 @@ export default {
RB_Group_Id:'0',
Status:'0',
},
DataList:[],
total:0,
DataList:[],
total:0,
currentPage:1,
loading:true,
loading:true,
text:'',
dialogTitle:'',
AccountTypeList:[],
......@@ -431,7 +431,7 @@ export default {
{ required: true, message: this.$t('rule.qsrkhuren'), trigger: 'blur' }
],Openingbank: [
{ required: true, message: this.$t('rule.qsrkhuhang'), trigger: 'blur' }
],BackNo:
],BackNo:
[
{ required: true, message: this.$t('rule.qssrzhhaoma'), trigger: 'blur' }
// {pattern:/^[0-9]*$/, message: this.$t('rule.qsrzqdzhhaoma')}
......@@ -502,7 +502,7 @@ export default {
if(reg.test(n)){
return Number(n)
}
return 0;
return 0;
}else if(t==1){
if(reg.test(n)){
return Number(n)
......@@ -539,7 +539,7 @@ export default {
this.loadingPeople = true
this.apipost('admin_Get_Chat_All_SelectEmpName',{EmName:query}, res => {
if(res.data.resultCode == 1) {
this.showEmployeeList = res.data.data
this.showEmployeeList = res.data.data
}
this.loadingPeople = false
}, err => {})
......@@ -552,7 +552,7 @@ export default {
this.loadingPeople = true
this.apipost('admin_Get_Chat_All_SelectEmpName',{EmName:query}, res => {
if(res.data.resultCode == 1) {
this.showEmployeeList2 = res.data.data
this.showEmployeeList2 = res.data.data
}
this.loadingPeople = false
}, err => {})
......@@ -562,10 +562,10 @@ export default {
},
goUrlNew (item) {
let path="CompanyAccDetail";
this.$router.push({ name: path,query:{"TypeId":item.TypeId,'ID':item.ID, blank: "y",}})
this.$router.push({ name: path,query:{"TypeId":item.TypeId,'ID':item.ID, blank: "y",}})
},
goUrl (path,id,name,source,CurrencyId) {
this.$router.push({ name: path,query:{"id":id,'name':name,'source':source,'CurrencyId':CurrencyId}})
this.$router.push({ name: path,query:{"id":id,'name':name,'source':source,'CurrencyId':CurrencyId}})
},
disabledOption(){ // 选择公司 如果选择通用则禁用其它选项
if(this.addMsg.BranchIdS&&this.addMsg.BranchIdS.length==0){
......@@ -587,11 +587,11 @@ export default {
getCurrentRate(id,index){// 更新汇率
this.apipost('financeinfo_post_GetCurrentRate',{ID:id}, res => {
if(res.data.resultCode == 1) {
this.tips(res.data.message,'success');
this.tips(res.data.message,'success');
} else {
this.tips(res.data.message,'error');
this.tips(res.data.message,'error');
}
}, err => {})
}, err => {})
},
getfinanceinfoList(){ //获取币种列表
this.apipost('financeinfo_post_GetList',{Name:''},res=>{
......@@ -599,21 +599,21 @@ export default {
this.financeinfoList=res.data.data;
}else{}
},err=>{})
},
},
getFinancialList(){ //获取机构列表
this.apipost('FinancialInstitutions_post_GetList',{},res=>{
if(res.data.resultCode==1){
this.FinancialList=res.data.data;
}else{}
},err=>{})
},
},
getCompanyList(){ //获取公司列表
getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList = res.Data.PageData;
}).catch(() => {
})
},
},
editCurency(id){ // 修改根据ID 获取信息
this.apipost('bankaccount_post_Get',{ID:id}, res => {
if(res.data.resultCode == 1) {
......@@ -622,9 +622,9 @@ export default {
this.addMsg = data;
// this.disabledOption();
} else {
this.tips(res.data.message,'error');
this.tips(res.data.message,'error');
}
}, err => {})
}, err => {})
},
cancelEdit(t){ // 取消修改、新增
this.addMsg ={
......@@ -669,7 +669,7 @@ export default {
if(res.data.resultCode == 1) {
this.AccountTypeList = res.data.data;
}
}, err => {})
}, err => {})
},
getList(){ //获取列表
this.loading = true
......@@ -678,16 +678,16 @@ export default {
this.total = res.data.data.count;
let data = res.data.data.pageData;
if(this.total>0){
this.noData =false;
this.noData =false;
}else{
this.noData =true;
this.noData =true;
}
data.forEach(x => {
x.showB = false
if(x.Initialbalance){
x.benBalance = (Number(x.CurrentRate)*x.Initialbalance).toFixed(2)
}
let allName = '';
let allName = '';
x.BranchName.forEach(y=>{
allName = allName+y.BranchName;
})
......@@ -698,7 +698,7 @@ export default {
}else{
this.$message.error(res.data.message)
this.loading = false;
}
}
},err=>{})
},
addInstitutions(){ // 保存 修改、新增
......@@ -725,7 +725,7 @@ export default {
this.addShow = false
} else {
this.$message.error(res.data.message)
}
}
},err=>{})
},
financeinfoRemove(id,text){//删除
......@@ -734,8 +734,8 @@ export default {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.deletInstitutions(id)
}).then(() => {
this.deletInstitutions(id)
}).catch(() => {
this.$message({
type: 'info',
......@@ -747,7 +747,7 @@ export default {
this.apipost('bankaccount_post_Remove',{ID:id},res=>{
if(res.data.resultCode == 1) {
this.innerVisible=false;
this.$message.success(res.data.message)
this.$message.success(res.data.message)
}else{
this.$message.error(res.data.message)
}
......@@ -776,14 +776,15 @@ export default {
SetProfitLoss(){ //币种调汇
this.apipost('FinanceInfo_post_SetProfitLoss',this.SetProfitLossMsg, res => {
if(res.data.resultCode == 1) {
this.tips(res.data.message,'success');
this.tips(res.data.message,'success');
this.addShow =false
this.addCuren = true
this.ed =0
} else {
this.tips(res.data.message,'error');
this.tips(res.data.message,'error');
}
}, err => {})
},
submitForm(addMsg,type) {//提交创建、修改表单
this.$refs[addMsg].validate((valid) => {
......@@ -825,8 +826,8 @@ export default {
this.getList()
this.getAccountTypeList()
let userInfo=this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id=userInfo.Group_Id; //集团ID
this.getCompanyList()
this.getCompanyMsg.RB_Group_Id=userInfo.Group_Id; //集团ID
this.getCompanyList()
this.getFinancialList()
this.getfinanceinfoList()
}
......
src/pages/financial/empBankAccount.vue
View file @ b5a5896e
......@@ -109,9 +109,9 @@
<el-button v-if='item.Status==1' @click="deleteData(item.ID)" type="primary" style='background:#09D49D; border-color:#09D49D' icon="iconfont icon-qidong" ></el-button>
<el-button v-if='item.Status==0' @click="deleteData(item.ID)" type="primary" style='background:#E95252; border-color:#E95252' icon="iconfont icon-dongjie" ></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('ground.mingxi')" placement="top-start">
<el-button type="primary" style='background:#E6A014; border-color:#E6A014' icon="iconfont icon-rizhi1" ></el-button>
</el-tooltip>
<!-- <el-tooltip class="item" effect="dark" :content="$t('ground.mingxi')" placement="top-start">-->
<!-- <el-button type="primary" style='background:#E6A014; border-color:#E6A014' icon="iconfont icon-rizhi1" ></el-button>-->
<!-- </el-tooltip>-->
</el-button-group>
</td>
</tr>
......
src/pages/financial/paySetting.vue
View file @ b5a5896e
......@@ -752,7 +752,7 @@
list.push(cp)
}
})
let allArr = list2.concat(list); // 数组合并
let allArr = list2.concat(list); // 数组合并
var obj = {};
allArr = allArr.reduce(function (item, next) { //数组对象去重
obj[next.Branch_Id] ? '' : obj[next.Branch_Id] = true && item.push(next);
......@@ -834,7 +834,7 @@
mounted() {
let userInfo = this.getLocalStorage();
console.log(userInfo, 'userInfouserInfo');
this.getCompanyMsg.RB_Group_Id = userInfo.data.Group_Id; //集团ID
this.getCompanyMsg.RB_Group_Id = userInfo.Group_Id; //集团ID
this.getCompanyList();
this.getList();
this.AccountType_post_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