Skip to content

C
confucius
Commit 7bf3ad9d authored by Mac's avatar Mac
Browse files
Options

1

parent d7936166
Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 40 deletions
src/pages/financial/CashAccount.vue
View file @ 7bf3ad9d
...@@ -407,8 +407,8 @@ ...@@ -407,8 +407,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35" class="_BranchIdS"> <el-col :span="4" :gutter="35" class="_BranchIdS">
<el-form-item label="校区" prop="BranchIdS"> <el-form-item label="校区" prop="BranchList">
<el-select filterable v-model='addMsg.BranchIdS'> <el-select filterable multiple v-model='addMsg.BranchList'>
<el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId' <el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'
:disabled="item.disabled"> :disabled="item.disabled">
</el-option> </el-option>
...@@ -609,7 +609,10 @@ ...@@ -609,7 +609,10 @@
required: true, required: true,
message: this.$t('rule.qxzfyleixing'), message: this.$t('rule.qxzfyleixing'),
trigger: 'change' trigger: 'change'
}, ] }, ],
BranchList:[{
type:'array',required: true,message: '请选择校区', trigger: 'change'
}]
}, },
addCuren: true, addCuren: true,
ed: false, ed: false,
...@@ -804,11 +807,16 @@ ...@@ -804,11 +807,16 @@
ID: id ID: id
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data let data = JSON.parse(JSON.stringify(res.data.data)) ;
data.BranchIdS = data.BranchList[0].RB_Branch_Id; data.BranchIdS = data.BranchList[0].RB_Branch_Id;
// this.remoteMethod(data.InemName) // this.remoteMethod(data.InemName)
// this.remoteMethod2(data.OutemName) // this.remoteMethod2(data.OutemName)
this.addMsg = data; this.addMsg = data;
//6-30新加 校区可以多选
this.addMsg.BranchList = []
res.data.data.BranchList.forEach(x=>{
this.addMsg.BranchList.push(x.RB_Branch_Id)
})
// this.disabledOption(); // this.disabledOption();
} else { } else {
this.tips(res.data.message, 'error'); this.tips(res.data.message, 'error');
...@@ -887,7 +895,7 @@ ...@@ -887,7 +895,7 @@
}, err => {}) }, err => {})
}, },
addInstitutions() { // 保存 修改、新增 addInstitutions() { // 保存 修改、新增
this.addMsg.BranchList = []; // this.addMsg.BranchList = [];
if (!this.addMsg.RiskLimitMoney) { if (!this.addMsg.RiskLimitMoney) {
this.addMsg.RiskLimitMoney = 0; this.addMsg.RiskLimitMoney = 0;
} }
...@@ -895,13 +903,28 @@ ...@@ -895,13 +903,28 @@
obj = this.CompanyList.find(item => { obj = this.CompanyList.find(item => {
return item.SId === this.addMsg.BranchIdS; //筛选出匹配数据 return item.SId === this.addMsg.BranchIdS; //筛选出匹配数据
}); });
let msg = { // let msg = {
ID: 0, // ID: 0,
Type: 2, // Type: 2,
RB_Branch_Id: this.addMsg.BranchIdS, // RB_Branch_Id: this.addMsg.BranchIdS,
RB_BranchName: obj.SName // RB_BranchName: obj.SName
} // }
this.addMsg.BranchList.push(msg); // this.addMsg.BranchList.push(msg);
let data = [];
this.addMsg.BranchList.forEach(x=>{
this.CompanyList.map(j=>{//筛选出匹配数据
if(x == j.SId){
let msg = {
ID: 0,
Type: 2,
RB_Branch_Id: j.SId,
RB_BranchName: j.SName
}
data.push(msg)
}
})
})
this.addMsg.BranchList = data;
this.apipost('BankAccount_post_SetCashAccount', this.addMsg, res => { this.apipost('BankAccount_post_SetCashAccount', this.addMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.tips('保存成功！', 'success') this.tips('保存成功！', 'success')
......
src/pages/financial/CompanyAccount.vue
View file @ 7bf3ad9d
...@@ -413,6 +413,7 @@ ...@@ -413,6 +413,7 @@
</span></span> </span></span>
</el-tooltip> </el-tooltip>
</p> </p>
<p v-if="item.IsStandardCurrency!=1"> <p v-if="item.IsStandardCurrency!=1">
<span class="_name">{{$t('fnc.sqisunyi')}}</span> <span class="_name">{{$t('fnc.sqisunyi')}}</span>
<span class="fr" v-if="item.ProfitLossMoney&&item.ProfitLossMoney!=0" <span class="fr" v-if="item.ProfitLossMoney&&item.ProfitLossMoney!=0"
...@@ -518,8 +519,8 @@ ...@@ -518,8 +519,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35" class="_BranchIdS"> <el-col :span="4" :gutter="35" class="_BranchIdS">
<el-form-item label="校区" prop="BranchIdS"> <el-form-item label="校区" prop="BranchList">
<el-select filterable v-model='addMsg.BranchIdS'> <el-select filterable multiple v-model='addMsg.BranchList'>
<el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId' <el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'
:disabled="item.disabled"> :disabled="item.disabled">
</el-option> </el-option>
...@@ -724,7 +725,11 @@ ...@@ -724,7 +725,11 @@
required: true, required: true,
message: this.$t('rule.qxzfyleixing'), message: this.$t('rule.qxzfyleixing'),
trigger: 'change' trigger: 'change'
}, ] }, ],
BranchList:[{
type:'array',required: true,message: '请选择校区', trigger: 'change'
}]
}, },
addCuren: true, addCuren: true,
ed: false, ed: false,
...@@ -921,9 +926,14 @@ ...@@ -921,9 +926,14 @@
ID: id ID: id
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data; let data = JSON.parse(JSON.stringify(res.data.data)) ;
data.BranchIdS = data.BranchList[0].RB_Branch_Id; data.BranchIdS = data.BranchList[0].RB_Branch_Id;
this.addMsg = data; this.addMsg = data;
//6-30新加 校区可以多选
this.addMsg.BranchList = []
res.data.data.BranchList.forEach(x=>{
this.addMsg.BranchList.push(x.RB_Branch_Id)
})
// this.disabledOption(); // this.disabledOption();
} else { } else {
this.tips(res.data.message, 'error'); this.tips(res.data.message, 'error');
...@@ -1006,7 +1016,7 @@ ...@@ -1006,7 +1016,7 @@
}, err => {}) }, err => {})
}, },
addInstitutions() { // 保存 修改、新增 addInstitutions() { // 保存 修改、新增
this.addMsg.BranchList = []; // this.addMsg.BranchList = [];
if (!this.addMsg.RiskLimitMoney) { if (!this.addMsg.RiskLimitMoney) {
this.addMsg.RiskLimitMoney = 0; this.addMsg.RiskLimitMoney = 0;
} }
...@@ -1014,13 +1024,29 @@ ...@@ -1014,13 +1024,29 @@
obj = this.CompanyList.find(item => { obj = this.CompanyList.find(item => {
return item.SId === this.addMsg.BranchIdS; //筛选出匹配数据 return item.SId === this.addMsg.BranchIdS; //筛选出匹配数据
}); });
let msg = { let data = [];
ID: 0, this.addMsg.BranchList.forEach(x=>{
Type: 2, this.CompanyList.map(j=>{//筛选出匹配数据
RB_Branch_Id: this.addMsg.BranchIdS, if(x == j.SId){
RB_BranchName: obj.SName let msg = {
} ID: 0,
this.addMsg.BranchList.push(msg); Type: 2,
RB_Branch_Id: j.SId,
RB_BranchName: j.SName
}
data.push(msg)
}
})
})
// let msg = {
// ID: 0,
// Type: 2,
// RB_Branch_Id: this.addMsg.BranchIdS,
// RB_BranchName: obj.SName
// }
// this.addMsg.BranchList.push(msg);
this.addMsg.BranchList = data;
this.apipost('bankaccount_post_Set', this.addMsg, res => { this.apipost('bankaccount_post_Set', this.addMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.tips(this.$t('tips.saveYes'), "success"); this.tips(this.$t('tips.saveYes'), "success");
......
src/pages/financial/TeamRevenueReport.vue
View file @ 7bf3ad9d
...@@ -1114,7 +1114,7 @@ ...@@ -1114,7 +1114,7 @@
{ {
field: "YingShou", field: "YingShou",
formatter: this.moneyFormat, formatter: this.moneyFormat,
title: "应收", title: "原价",
width: 100, width: 100,
titleAlign: "left", titleAlign: "left",
columnAlign: "right", columnAlign: "right",
......
src/pages/financial/accDetail/CashAccDetail.vue
View file @ 7bf3ad9d
...@@ -501,6 +501,9 @@ ...@@ -501,6 +501,9 @@
this.msg.eTradeDate = this.$route.query.eTradeDate; this.msg.eTradeDate = this.$route.query.eTradeDate;
this.productionDate = [this.msg.sTradeDate, this.msg.eTradeDate]; this.productionDate = [this.msg.sTradeDate, this.msg.eTradeDate];
this.productionDateByTC = [this.msg.QStartDate, this.msg.QEndDate]; this.productionDateByTC = [this.msg.QStartDate, this.msg.QEndDate];
this.msg.RB_Branch_Id = Number(this.$route.query.RB_Branch_Id)
this.getList(); this.getList();
this.BankAccount_post_GetCashAccountList("query"); this.BankAccount_post_GetCashAccountList("query");
} }
......
src/pages/financial/accDetail/newCashReport.vue
View file @ 7bf3ad9d
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="校区"> <el-form-item label="校区">
<el-select filterable v-model='msg.RB_Branch_Id'> <el-select filterable v-model='msg.RB_Branch_Id' @change='getList'>
<el-option :value="-1" label="不限"></el-option> <el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'> <el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'>
</el-option> </el-option>
...@@ -228,6 +228,7 @@ ...@@ -228,6 +228,7 @@
}, },
methods: { methods: {
goUrlNew(obj) { goUrlNew(obj) {
this.$router.push({ this.$router.push({
path: "DocumentStatistics", path: "DocumentStatistics",
query: { query: {
...@@ -240,19 +241,29 @@ ...@@ -240,19 +241,29 @@
}) })
}, },
goUrl(obj) { goUrl(obj) {
this.$router.push({ this.OpenNewUrl('/financial/accDetail/CashAccDetail', {
path: "CashAccDetail", "Is_Cashier": 1,
query: {
"Is_Cashier": 1,
"TypeId": obj.TypeId, "TypeId": obj.TypeId,
"BankID": obj.BankID, "BankID": obj.BankID,
"sTradeDate": this.msg.sTradeDate, "sTradeDate": this.msg.sTradeDate,
"eTradeDate": this.msg.eTradeDate, "eTradeDate": this.msg.eTradeDate,
"DayReport": 1, "DayReport": 1,
"blank": 'y', 'RB_Branch_Id':this.msg.RB_Branch_Id
"tab": '现金账户明细'
} });
}) // this.$router.push({
// path: "CashAccDetail",
// query: {
// "Is_Cashier": 1,
// "TypeId": obj.TypeId,
// "BankID": obj.BankID,
// "sTradeDate": this.msg.sTradeDate,
// "eTradeDate": this.msg.eTradeDate,
// "DayReport": 1,
// "blank": 'y',
// "tab": '现金账户明细'
// }
// })
}, },
getList: function () { getList: function () {
this.loading = true; this.loading = true;
...@@ -283,6 +294,7 @@ ...@@ -283,6 +294,7 @@
} }
this.msg.sTradeDate = this.transactionDate[0]; this.msg.sTradeDate = this.transactionDate[0];
this.msg.eTradeDate = this.transactionDate[1]; this.msg.eTradeDate = this.transactionDate[1];
this.getList()
}, },
queryInfoInit() { // 初始化msg queryInfoInit() { // 初始化msg
......
src/pages/financial/financalDocument/FinancialDocuments.vue
View file @ 7bf3ad9d
...@@ -1035,7 +1035,7 @@ ...@@ -1035,7 +1035,7 @@
@click="dialogFormVisible=true,updateMsg.FrID=item.FrID,updateMsg.OTradeDate=item.TradeDate"></i> @click="dialogFormVisible=true,updateMsg.FrID=item.FrID,updateMsg.OTradeDate=item.TradeDate"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" content="交易方式" placement="top" v-if="active==2 && istransaction == true"> <el-tooltip class="item" content="交易方式" placement="top" v-if="active==2 && istransaction == true">
<i v-if="active==2" class="iconfont icon-jiaoyi" <i v-if="active==2 && istransaction == true" class="iconfont icon-jiaoyi"
@click="showjiaoyi(item.FrID)"></i> @click="showjiaoyi(item.FrID)"></i>
</el-tooltip> </el-tooltip>
</td> </td>
......
src/pages/user/personalData.vue
View file @ 7bf3ad9d
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
<div style="font-size: 12px;color: #999999;margin-top: 12px;">图片格式：png、jpg、jpeg</div> <div style="font-size: 12px;color: #999999;margin-top: 12px;">图片格式：png、jpg、jpeg</div>
<div class="box_r_title">基础资料</div> <div class="box_r_title">基础资料</div>
<div class="box_r_input"> <div class="box_r_input">
<q-input standout="bg-primary text-white" v-model="datamodify.EmployeeName" label="姓名" <q-input v-model="datamodify.EmployeeName" label="姓名"
:rules="[val => !!val || '姓名不能为空']" lazy-rules filled maxlength="20" /> :rules="[val => !!val || '姓名不能为空']" lazy-rules filled maxlength="20" />
</div> </div>
<div class="box_r_input"> <div class="box_r_input">
...@@ -156,11 +156,11 @@ ...@@ -156,11 +156,11 @@
</div> </div>
<div class="box_r_title">联系方式</div> <div class="box_r_title">联系方式</div>
<div class="box_r_input"> <div class="box_r_input">
<q-input standout="bg-primary text-white" v-model="datamodify.EmployeeTel" label="电话" type='number' <q-input v-model="datamodify.EmployeeTel" label="电话" type='number'
:rules="[val => !!val || '电话不能为空']" lazy-rules filled maxlength="11" /> :rules="[val => !!val || '电话不能为空']" lazy-rules filled maxlength="11" />
</div> </div>
<div class="box_r_input"> <div class="box_r_input">
<q-input standout="bg-primary text-white" v-model="datamodify.Email" label="邮箱" <q-input v-model="datamodify.Email" label="邮箱"
:rules="[val => !!val || '邮箱不能为空']" lazy-rules filled maxlength="20" /> :rules="[val => !!val || '邮箱不能为空']" lazy-rules filled maxlength="20" />
</div> </div>
<q-btn color="primary" style="width: 300px;margin-top: 50px;" :loading="loading1" @click='dataSubmit'> <q-btn color="primary" style="width: 300px;margin-top: 50px;" :loading="loading1" @click='dataSubmit'>
...@@ -169,6 +169,28 @@ ...@@ -169,6 +169,28 @@
</div> </div>
</q-btn> </q-btn>
</template> </template>
<template v-if='rightType == 2'>
<div style="font-size: 16px;font-weight: bold;color: #000000;">密码修改</div>
<form @submit.prevent.stop="passwordSubmit" class="q-gutter-md">
<div class="box_r_title">原密码</div>
<div class="box_r_input">
<q-input v-model="passwordMsg.OldPassWord" label="请输入旧密码" type='password' ref='OldPassWord'
:rules="[val => !!val || '请输入旧密码']" lazy-rules filled />
</div>
<div class="box_r_title">新密码</div>
<div class="box_r_input">
<q-input v-model="passwordMsg.NewPassWord" label="请输入新密码" type='password' ref='NewPassWord'
:rules="[val => !!val || '请输入新密码']" lazy-rules filled />
</div>
<div class="box_r_input">
<q-input v-model="passwordMsg.NewSurePassWord" label="请再次输入新密码" type='password' ref='NewSurePassWord'
:rules="[val => !!val || '请再次输入新密码']" lazy-rules filled />
</div>
<q-btn color="primary" style="width: 300px;margin-top: 50px;" :loading="loading2" label="确定修改" type="submit" > </q-btn>
</form>
</template>
</div> </div>
</div> </div>
</template> </template>
...@@ -182,6 +204,11 @@ ...@@ -182,6 +204,11 @@
import { import {
UploadSelfFile UploadSelfFile
} from '../../api/common/common' } from '../../api/common/common'
const defaultpassword = {
OldPassWord:'',
NewPassWord:'',
NewSurePassWord:'',
}
export default { export default {
meta: { meta: {
title: "个人资料" title: "个人资料"
...@@ -192,11 +219,14 @@ ...@@ -192,11 +219,14 @@
data() { data() {
return { return {
loading1: false, loading1: false,
loading2:false,
showObj: {}, showObj: {},
rightType: 1,//右边显示类型 rightType: 1,//右边显示类型
datamodify: {}, datamodify: {},
CompanyList: [], CompanyList: [],
passwordMsg:Object.assign({},defaultpassword),
name: '',
age: '',
} }
}, },
created() { created() {
...@@ -303,7 +333,23 @@ ...@@ -303,7 +333,23 @@
}).catch(() => { }).catch(() => {
}) })
} },
passwordSubmit () {
this.$refs.OldPassWord.validate()
this.$refs.NewPassWord.validate()
this.$refs.NewSurePassWord.validate()
if (this.$refs.OldPassWord.hasError || this.$refs.NewPassWord.hasError|| this.$refs.NewSurePassWord.hasError) {
this.formHasError = true
}
else {
// 掉接口
console.log('掉接口')
}
},
}, },
......
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