Skip to content

C
confucius
Commit c004a661 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents 799ebf75 77ab0cc0
Hide whitespace changes
Inline Side-by-side
Showing with 1074 additions and 838 deletions
src/pages/financial/AccountPageList.vue 0 → 100644
View file @ c004a661
<style>
@import "css/cssReset.css";
.page_AccountPageList tr th,.page_AccountPageList tr td{
padding: 10px 20px;
text-align: left;
}
</style>
<template>
<div class="flexOne page_AccountPageList">
<div class='query-box'>
<ul>
<li>
<input type="button" class="hollowFixedBtn" value="返回" @click="goUrl()"/>
</li>
</ul>
</div>
<table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th width='200px'>{{$t('fnc.bieming')}}</th>
<th>{{$t('fnc.zhanghuleixing')}}</th>
<th>{{$t('hotel.hotel_Currency')}}</th>
<th>{{$t('fnc.yueacc')}}</th>
<th>{{$t('fnc.bwbyue')}}</th>
<th>{{$t('admin.admin_czPerson')}}</th>
<th width='200px'>{{$t('fnc.caozuoriqi')}}</th>
</tr>
<tr v-for="(item,index) in dataList" :key="index">
<td>{{item.Alias}}</td>
<td>{{item.AccountTypeName}}</td>
<td>{{item.CurrencyName}}</td>
<td>¥{{item.Initialbalance}}</td>
<td>￥{{item.RBNInitialbalance}}</td>
<td>{{item.emName}}</td>
<td>{{item.CreateDate}}</td>
</tr>
</table>
<div>
<el-pagination
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize
:total=total>
</el-pagination>
</div>
</div>
</template>
<script>
export default {
data(){
return{
dataList:[],
loading:false,
total:0,
currentPage:1,
msg:{
PageIndex:1,
pageSize:15,
BackId:0,
TypeId:0,
ID:0,
BankType:0,
},
}
},created(){
this.msg.BackId = this.$route.query.BackId;
this.msg.TypeId = this.$route.query.TypeId;
},mounted(){
this.getList()
},methods:{
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
resetPageIndex(){
this.msg.pageIndex=1;
this.currentPage = 1
},
getList(){
this.loading = true;
this.apipost('FinancialInstitutions_post_GetAccountList',this.msg,r=>{
if(r.data.resultCode==1){
this.total = r.data.data.count;
this.dataList = r.data.data.pageData;
}
this.loading = false;
},null)
},
goUrl(){
this.$router.go(-1)
}
}
}
</script>
src/pages/financial/AccountType.vue
View file @ c004a661
...@@ -704,12 +704,11 @@ ...@@ -704,12 +704,11 @@
}); });
}, },
goUrl(path, id) { goUrl(path, id) {
var tempStr = '/financial/' + path +'?TypeId='+id;
console.log(tempStr)
this.$router.push({ this.$router.push({
name: path, path: tempStr
query: { });
'TypeId': id
}
})
} }
}, },
mounted() { mounted() {
......
src/pages/financial/CashAccount.vue
View file @ c004a661
...@@ -209,57 +209,13 @@ ...@@ -209,57 +209,13 @@
<el-input v-model="addMsg.Initialbalance" class=""></el-input> <el-input v-model="addMsg.Initialbalance" class=""></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="4" :gutter="35">
<el-form-item label="收款负责人：" prop="InCharge" class="_fuzeren">
<el-select
v-model="addMsg.InCharge"
filterable
remote
reserve-keyword
placeholder="请输入关键词"
:remote-method="remoteMethod"
@focus="Charge=1"
:loading="loading2">
<el-option
v-for="item in showEmployeeList"
:key="item.empId"
:label="`${item.name}`"
:value="item.empId">
<span style="float: left; font-size: 12px">{{ item.name }}</span>
<span style="float: right; font-size: 12px; margin-right:20px;">{{ item.departmentName }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="支款负责人：" prop="OutCharge" class="_fuzeren">
<el-select
v-model="addMsg.OutCharge"
filterable
remote
reserve-keyword
placeholder="请输入关键词"
:remote-method="remoteMethod2"
@focus="Charge=2"
:loading="loading2">
<el-option
v-for="item in showEmployeeList2"
:key="item.empId"
:label="`${item.name}`"
:value="item.empId">
<span style="float: left; font-size: 12px">{{ item.name }}</span>
<span style="float: right; font-size: 12px; margin-right:20px;">{{ item.departmentName }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="4" :gutter="35" class="_BranchIdS"> <el-col :span="4" :gutter="35" class="_BranchIdS">
<el-form-item :label="$t('fnc.ssgongsi')" prop="BranchIdS"> <el-form-item :label="$t('fnc.ssgongsi')" prop="BranchIdS">
<el-select filterable v-model='addMsg.BranchIdS'> <el-select filterable v-model='addMsg.BranchIdS'>
<el-option v-for='item in CompanyList' <el-option v-for='item in CompanyList'
:label='item.BName' :label='item.SName'
:value='item.Id' :value='item.SId'
:key='item.Id' :key='item.SId'
:disabled="item.disabled"> :disabled="item.disabled">
</el-option> </el-option>
</el-select> </el-select>
...@@ -349,6 +305,9 @@ ...@@ -349,6 +305,9 @@
</div> </div>
</template> </template>
<script> <script>
import {
getSchoolPage
} from '../../api/school/index'
export default { export default {
data(){ data(){
return{ return{
...@@ -455,6 +414,13 @@ ...@@ -455,6 +414,13 @@
CostTypeID:'' CostTypeID:''
}, },
costType:[], costType:[],
schoolMsg:{
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
SName: "",
Status: '-1'
}
} }
},methods:{ },methods:{
goUrlNew (item) { goUrlNew (item) {
...@@ -570,15 +536,11 @@ ...@@ -570,15 +536,11 @@
},err=>{}) },err=>{})
}, },
getCompanyList(){ //获取公司列表 getCompanyList(){ //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{ getSchoolPage(this.schoolMsg).then(res => {
if(res.data.resultCode==1){ this.CompanyList = res.Data.PageData;
let data = res.data.data; }).catch(() => {
data.forEach(x=>{
x.disabled = false; })
})
this.CompanyList = data;
}else{}
},err=>{})
}, },
editCurency(id){ // 修改根据ID 获取信息 editCurency(id){ // 修改根据ID 获取信息
this.apipost('BankAccount_post_GetCashAccount',{ID:id}, res => { this.apipost('BankAccount_post_GetCashAccount',{ID:id}, res => {
......
src/pages/financial/CompanyAccount.vue
View file @ c004a661
...@@ -102,9 +102,9 @@ ...@@ -102,9 +102,9 @@
<el-option :label='$t("pub.unlimitedSel")' value='-1'></el-option> <el-option :label='$t("pub.unlimitedSel")' value='-1'></el-option>
<!-- <el-option label='通用' 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.BName' :label='item.SName'
:value='item.Id' :value='item.SId'
:key='item.Id'> :key='item.SId'>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -277,9 +277,9 @@ ...@@ -277,9 +277,9 @@
<el-form-item :label="$t('fnc.ssgongsi')" prop="BranchIdS"> <el-form-item :label="$t('fnc.ssgongsi')" prop="BranchIdS">
<el-select filterable v-model='addMsg.BranchIdS'> <el-select filterable v-model='addMsg.BranchIdS'>
<el-option v-for='item in CompanyList' <el-option v-for='item in CompanyList'
:label='item.BName' :label='item.SName'
:value='item.Id' :value='item.SId'
:key='item.Id' :key='item.SId'
:disabled="item.disabled"> :disabled="item.disabled">
</el-option> </el-option>
</el-select> </el-select>
...@@ -369,6 +369,9 @@ ...@@ -369,6 +369,9 @@
</div> </div>
</template> </template>
<script> <script>
import {
getSchoolPage
} from '../../api/school/index'
export default { export default {
data(){ data(){
return{ return{
...@@ -483,6 +486,13 @@ export default { ...@@ -483,6 +486,13 @@ export default {
CostTypeID:'' CostTypeID:''
}, },
costType:[], costType:[],
schoolMsg:{
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
SName: "",
Status: '-1'
}
} }
},methods:{ },methods:{
regNum(n,t){ // 判断数字 n 值 t 类型 regNum(n,t){ // 判断数字 n 值 t 类型
...@@ -598,15 +608,11 @@ export default { ...@@ -598,15 +608,11 @@ export default {
},err=>{}) },err=>{})
}, },
getCompanyList(){ //获取公司列表 getCompanyList(){ //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{ getSchoolPage(this.schoolMsg).then(res => {
if(res.data.resultCode==1){ this.CompanyList = res.Data.PageData;
let data = res.data.data; }).catch(() => {
data.forEach(x=>{
x.disabled = false; })
})
this.CompanyList = data;
}else{}
},err=>{})
}, },
editCurency(id){ // 修改根据ID 获取信息 editCurency(id){ // 修改根据ID 获取信息
this.apipost('bankaccount_post_Get',{ID:id}, res => { this.apipost('bankaccount_post_Get',{ID:id}, res => {
......
src/pages/financial/PlatformAccount.vue
View file @ c004a661
...@@ -170,9 +170,9 @@ ...@@ -170,9 +170,9 @@
<el-select filterable v-model="addMsg.BranchIdS" collapse-tags> <el-select filterable v-model="addMsg.BranchIdS" collapse-tags>
<el-option <el-option
v-for="item in CompanyList" v-for="item in CompanyList"
:label="item.BName" :label="item.SName"
:value="item.Id" :value="item.SId"
:key="item.Id" :key="item.SId"
:disabled="item.disabled" :disabled="item.disabled"
></el-option> ></el-option>
</el-select> </el-select>
...@@ -315,6 +315,9 @@ ...@@ -315,6 +315,9 @@
</template> </template>
<script> <script>
import Vue from 'vue' import Vue from 'vue'
import {
getSchoolPage
} from '../../api/school/index'
export default { export default {
data() { data() {
return { return {
...@@ -475,7 +478,14 @@ export default { ...@@ -475,7 +478,14 @@ export default {
Source: 2, Source: 2,
CostTypeID: "" CostTypeID: ""
}, },
costType: [] costType: [],
schoolMsg:{
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
SName: "",
Status: '-1'
}
}; };
}, },
methods: { methods: {
...@@ -860,31 +870,12 @@ export default { ...@@ -860,31 +870,12 @@ export default {
err => {} err => {}
); );
}, },
getCompanyList(t, info) { getCompanyList() {
if(t){ getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList.push({ this.CompanyList = res.Data.PageData;
BName: info.BranchName, }).catch(() => {
Id: info.RB_Branch_id
}) })
return
}
//获取公司列表
this.apipost(
"admin_get_BranchGetList",
this.getCompanyMsg,
res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(x => {
x.disabled = false;
});
this.CompanyList = data;
this.initColums();
} else {
}
},
err => {}
);
}, },
editCurency(id) { editCurency(id) {
// 修改根据ID 获取信息 // 修改根据ID 获取信息
...@@ -1190,7 +1181,7 @@ export default { ...@@ -1190,7 +1181,7 @@ export default {
} }
}, },
mounted() { mounted() {
this.msg.pageSize = this.calcPageSize(40); // this.msg.pageSize = this.calcPageSize(40);
// let userInfo = this.getLocalStorage(); // let userInfo = this.getLocalStorage();
// this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID // this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
// var branchId = userInfo.RB_Branch_id; // var branchId = userInfo.RB_Branch_id;
...@@ -1201,6 +1192,7 @@ export default { ...@@ -1201,6 +1192,7 @@ export default {
// this.getCompanyList(2,userInfo); // this.getCompanyList(2,userInfo);
// this.msg.RB_Branch_Id = branchId; // this.msg.RB_Branch_Id = branchId;
// } // }
this.getCompanyList();
this.getList(); this.getList();
this.initColums(); this.initColums();
......
src/pages/financial/accountingWork.vue
View file @ c004a661
...@@ -147,9 +147,9 @@ ...@@ -147,9 +147,9 @@
<el-form-item :label="$t('fnc.ssuogongsi')+'：'" prop="BranchId"> <el-form-item :label="$t('fnc.ssuogongsi')+'：'" prop="BranchId">
<el-select filterable v-model='addMsg.BranchId'> <el-select filterable v-model='addMsg.BranchId'>
<el-option v-for='item in CompanyList' <el-option v-for='item in CompanyList'
:label='item.BName' :label='item.SName'
:value='item.Id' :value='item.SId'
:key='item.Id' :key='item.SId'
:disabled="item.disabled"> :disabled="item.disabled">
</el-option> </el-option>
</el-select> </el-select>
...@@ -206,19 +206,6 @@ ...@@ -206,19 +206,6 @@
<el-radio v-model="addMsg.Direct" :label="3">{{$t('fnc.shouzhi')}}</el-radio> <el-radio v-model="addMsg.Direct" :label="3">{{$t('fnc.shouzhi')}}</el-radio>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12">
<el-form-item label="适用费用" class="_treeselect">
<treeselect
class=""
v-model="CostIdS"
value-consists-of="LEAF_PRIORITY"
placeholder="请选择"
:multiple="true"
:options="CostTypeList"
noChildrenText=''
:normalizer="normalizer"/>
</el-form-item>
</el-col> -->
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
...@@ -228,6 +215,9 @@ ...@@ -228,6 +215,9 @@
<script> <script>
import Treeselect from '@riophae/vue-treeselect' import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css' import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import {
getSchoolPage
} from '../../api/school/index'
export default { export default {
components: { Treeselect }, components: { Treeselect },
data(){ data(){
...@@ -300,6 +290,13 @@ ...@@ -300,6 +290,13 @@
Status:'0', Status:'0',
}, },
SingleList:[], SingleList:[],
schoolMsg:{
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
SName: "",
Status: '-1'
}
} }
},created(){ },created(){
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
...@@ -520,12 +517,11 @@ ...@@ -520,12 +517,11 @@
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
}, },
getCompanyList(){ //获取公司列表 getCompanyList(){ //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{ getSchoolPage(this.schoolMsg).then(res => {
if(res.data.resultCode==1){ this.CompanyList = res.Data.PageData;
let data = res.data.data }).catch(() => {
this.CompanyList=res.data.data;
}else{} })
},err=>{})
}, },
},mounted(){ },mounted(){
this.getList(); this.getList();
......
src/pages/financial/financalDocument/CapitalAllocation.vue
View file @ c004a661
...@@ -73,9 +73,9 @@ ...@@ -73,9 +73,9 @@
<el-select v-model="msg.RB_Branch_Id" :placeholder="$t('rule.company')" @change="getDepartmentMsg.RB_Branch_Id = msg.RB_Branch_Id, getDepartment(),msg.RB_Depart_Id = -2"> <el-select v-model="msg.RB_Branch_Id" :placeholder="$t('rule.company')" @change="getDepartmentMsg.RB_Branch_Id = msg.RB_Branch_Id, getDepartment(),msg.RB_Depart_Id = -2">
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option> <el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in CompanyList' <el-option v-for='item in CompanyList'
:label='item.BName' :label='item.SName'
:value='item.Id' :value='item.SId'
:key='item.Id'> :key='item.SId'>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -218,6 +218,9 @@ ...@@ -218,6 +218,9 @@
</div> </div>
</template> </template>
<script> <script>
import {
getSchoolPage
} from '../../../api/school/index'
export default { export default {
data(){ data(){
return { return {
...@@ -267,6 +270,13 @@ ...@@ -267,6 +270,13 @@
total: 0, total: 0,
currentPage: 0, currentPage: 0,
btnShow:false, btnShow:false,
schoolMsg:{
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
SName: "",
Status: '-1'
}
} }
}, },
created(){ created(){
...@@ -316,11 +326,11 @@ ...@@ -316,11 +326,11 @@
this.msg.EmployeeId=this.EmId; this.msg.EmployeeId=this.EmId;
this.GetLocalFile("Financial_get_OutToFundTransfer", this.msg,this.$t('fnc.zjdbbiao')+".xls");} , this.GetLocalFile("Financial_get_OutToFundTransfer", this.msg,this.$t('fnc.zjdbbiao')+".xls");} ,
getCompanyList: function () { //获取公司列表 getCompanyList: function () { //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{ getSchoolPage(this.schoolMsg).then(res => {
if(res.data.resultCode==1){ this.CompanyList = res.Data.PageData;
this.CompanyList=res.data.data; }).catch(() => {
}else{}
},err=>{}) })
}, },
getDepartment: function () { //获取部门列表 getDepartment: function () { //获取部门列表
this.apipost('admin_get_DepartmentGetList', this.getDepartmentMsg, res => { this.apipost('admin_get_DepartmentGetList', this.getDepartmentMsg, res => {
......
src/pages/financial/financalDocument/FinancialDocuments.vue
View file @ c004a661
...@@ -590,7 +590,7 @@ ...@@ -590,7 +590,7 @@
class="iconfont icon-gengduo"></i></em> class="iconfont icon-gengduo"></i></em>
</span> </span>
<button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button> <button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="goUrlAdd('ChoiceAddFinancialDocuments')">{{$t('pub.addBtn')}}</button> <button class="normalBtn" @click="goUrlWeituo('ChoiceAddFinancialDocuments')">{{$t('pub.addBtn')}}</button>
<button class="normalBtn" v-if="checkboxShow" @click="Financial_post_SetBatch">{{$t('fnc.piltijiao')}}</button> <button class="normalBtn" v-if="checkboxShow" @click="Financial_post_SetBatch">{{$t('fnc.piltijiao')}}</button>
<button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button> <button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button>
<button class="hollowFixedBtn" @click="goUrlWeituo('WorkEntrustmentMy')">{{$t('fnc.gzweituo')}}</button> <button class="hollowFixedBtn" @click="goUrlWeituo('WorkEntrustmentMy')">{{$t('fnc.gzweituo')}}</button>
...@@ -681,7 +681,7 @@ ...@@ -681,7 +681,7 @@
@change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',getDepartment()" @change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',getDepartment()"
class="w150"> class="w150">
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option> <el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in CompanyList' :label='item.BName' :value='item.Id' :key='item.Id'> <el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'>
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
...@@ -1230,6 +1230,9 @@ ...@@ -1230,6 +1230,9 @@
import myrbvBill from "../components/ReceivablesModule.vue"; import myrbvBill from "../components/ReceivablesModule.vue";
import myhrBill from "../components/MergeBillModule.vue"; import myhrBill from "../components/MergeBillModule.vue";
import myGZBill from "../components/GZBillModule.vue"; import myGZBill from "../components/GZBillModule.vue";
import {
getSchoolPage
} from '../../../api/school/index'
export default { export default {
data() { data() {
return { return {
...@@ -1403,10 +1406,13 @@ ...@@ -1403,10 +1406,13 @@
IsAdvanceFinance: 1, IsAdvanceFinance: 1,
}, },
costList: [], costList: [],
schoolMsg:{
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
SName: "",
Status: '-1'
}
} }
}, },
created() { created() {
...@@ -2152,11 +2158,11 @@ ...@@ -2152,11 +2158,11 @@
}, err => {}) }, err => {})
}, },
getCompanyList() { //获取公司列表 getCompanyList() { //获取公司列表
this.apipost('admin_get_BranchGetList', this.getCompanyMsg, res => { getSchoolPage(this.schoolMsg).then(res => {
if (res.data.resultCode == 1) { this.CompanyList = res.Data.PageData;
this.CompanyList = res.data.data; }).catch(() => {
} else {}
}, err => {}) })
}, },
Financial_post_GetConditionList() { //获取财务单据枚举列表 Financial_post_GetConditionList() { //获取财务单据枚举列表
this.apipost('Financial_post_GetConditionList', {}, res => { this.apipost('Financial_post_GetConditionList', {}, res => {
...@@ -2299,15 +2305,6 @@ ...@@ -2299,15 +2305,6 @@
path: tempStr path: tempStr
}); });
}, },
goUrlAdd(path) {
this.$router.push({
name: path,
query: {
blank: 'y',
tab: '选择财务单据类型'
}
})
},
goEit(type, id, edit, Conditon, pageIndex, item) { goEit(type, id, edit, Conditon, pageIndex, item) {
let path = ''; let path = '';
if (type === 1) { if (type === 1) {
......
src/pages/financial/financalDocument/RecPayQuery.vue
View file @ c004a661
...@@ -500,7 +500,7 @@ ...@@ -500,7 +500,7 @@
@change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',msg.UpdateBy='',getDepartment()" @change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',msg.UpdateBy='',getDepartment()"
class=""> class="">
<el-option :value="-1" label="不限"></el-option> <el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in CompanyList' :label='item.BName' :value='item.Id' :key='item.Id'> <el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -705,6 +705,9 @@ ...@@ -705,6 +705,9 @@
import myrbvBill from "../components/ReceivablesModule.vue"; import myrbvBill from "../components/ReceivablesModule.vue";
import myhrBill from "../components/MergeBillModule.vue"; import myhrBill from "../components/MergeBillModule.vue";
import Vue from 'vue' import Vue from 'vue'
import {
getSchoolPage
} from '../../../api/school/index'
// 自定义列组件 // 自定义列组件
Vue.component('table-BranchName', { //查看操作按钮 Vue.component('table-BranchName', { //查看操作按钮
template: `<span>{{rowData.BranchName}}</span>`, template: `<span>{{rowData.BranchName}}</span>`,
...@@ -1341,7 +1344,14 @@ ...@@ -1341,7 +1344,14 @@
], ],
pageSize: 5, pageSize: 5,
pageIndex: 1, pageIndex: 1,
heightQueryBox: false heightQueryBox: false,
schoolMsg:{
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
SName: "",
Status: '-1'
}
} }
}, },
created() { created() {
...@@ -1726,11 +1736,11 @@ ...@@ -1726,11 +1736,11 @@
}, err => {}) }, err => {})
}, },
getCompanyList() { //获取公司列表 getCompanyList() { //获取公司列表
this.apipost('admin_get_BranchGetList', this.getCompanyMsg, res => { getSchoolPage(this.schoolMsg).then(res => {
if (res.data.resultCode == 1) { this.CompanyList = res.Data.PageData;
this.CompanyList = res.data.data; }).catch(() => {
} else {}
}, err => {}) })
}, },
Financial_post_GetConditionList() { //获取财务单据枚举列表 Financial_post_GetConditionList() { //获取财务单据枚举列表
this.apipost('Financial_post_GetConditionList', {}, res => { this.apipost('Financial_post_GetConditionList', {}, res => {
......
src/pages/financial/financalDocument/invoicesManager.vue
View file @ c004a661
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<el-form-item label="公司"> <el-form-item label="公司">
<el-select v-model="msg.RB_Branch_Id" filterable > <el-select v-model="msg.RB_Branch_Id" filterable >
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option> <el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key='item.Id'></el-option> <el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -252,12 +252,15 @@ ...@@ -252,12 +252,15 @@
</div> </div>
</template> </template>
<script> <script>
import {
getSchoolPage
} from '../../../api/school/index'
export default { export default {
data() { data() {
return { return {
active: 1, active: 1,
RB_Group_Id:'', RB_Group_Id:'',
companyList:[], CompanyList:[],
msg: { msg: {
TCID: 0, TCID: 0,
TCNUM: '', TCNUM: '',
...@@ -279,6 +282,13 @@ ...@@ -279,6 +282,13 @@
loading: false, loading: false,
currentPage: 0, currentPage: 0,
total:0, total:0,
schoolMsg:{
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
SName: "",
Status: '-1'
}
}; };
}, },
methods: { methods: {
...@@ -369,13 +379,11 @@ ...@@ -369,13 +379,11 @@
this.currentPage = 1; this.currentPage = 1;
}, },
getBranchList(){ getBranchList(){
getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList = res.Data.PageData;
}).catch(() => {
this.RB_Group_Id = this.getLocalStorage().RB_Group_id; })
this.apipost('admin_get_BranchGetList', {RB_Group_Id:this.RB_Group_Id}, res=>{
if (res.data.resultCode == 1) {
this.companyList=res.data.data;
}
}, null)
} }
}, },
mounted() { mounted() {
......
src/pages/financial/paySetting.vue
View file @ c004a661
<style scoped> <style scoped>
@import "css/cssReset.css"; @import "css/cssReset.css";
._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 {
._scrollbar::-webkit-scrollbar-track{box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);border-radius: 4px;background: #EDEDED;} width: 4px;
.page_paySetting ._edHeight{height:430px;} height: 8px;
.page_paySetting .edHeight{display: block !important;height: 290px;} }
.page_paySetting ._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_paySetting ._vMG_edit ._tit{padding-left: 10px;border-left: 3px solid #E95252; font-size: 16px;color: #000000} ._scrollbar::-webkit-scrollbar-thumb {
.page_paySetting ._vMG_edit ._tit span{color: #666666} border-radius: 4px;
.page_paySetting ._vMG_edit form{padding: 25px 0} box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
.page_paySetting .query-box .h34{line-height: 34px;} background: #c9c9c9;
.page_paySetting ._add_saveBtn{text-align: right;padding-top: 10px} }
.page_paySetting_content{overflow-x: auto;}
.page_paySetting_item{width:260px;margin-top: 25px;background:linear-gradient(-30deg,rgba(149,126,247,1),rgba(21,123,238,1));border-radius:4px;padding: 15px;float: left;margin-right: 17px} ._scrollbar::-webkit-scrollbar-track {
.ps_num{font-size:20px;color: #FFFFFF; font-weight: bold;width: 70%;text-align: right;float: left} box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
.ps_btn{color: #9AB0F8;width: 21%;text-align: right;float: right;padding-top: 2px;cursor: pointer;} border-radius: 4px;
.ps_btn i{margin-right: 10px;font-size: 14px;} background: #EDEDED;
.ps_com{width:230px;background:rgba(0,0,0,0.2);font-size:12px;color: #E2E5F4;padding: 6px;display: flex;margin-top: 30px} }
.ps_com p:nth-child(1){flex: 1}
.ps_com p:nth-child(2){flex: 2;text-align: right} .page_paySetting ._edHeight {
.ps_adr{color: #B1B6FA;font-size: 12px;margin-top: 20px;text-align: left;padding-left: 7px;} height: 430px;
.ps_adr span:nth-child(1){display: inline-block;width: 60px;} }
.ps_adr span:nth-child(2){max-width: 158px;}
.page_paySetting .po_content{ .page_paySetting .edHeight {
display: block !important;
height: 290px;
}
.page_paySetting ._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_paySetting ._vMG_edit ._tit {
padding-left: 10px;
border-left: 3px solid #E95252;
font-size: 16px;
color: #000000
}
.page_paySetting ._vMG_edit ._tit span {
color: #666666
}
.page_paySetting ._vMG_edit form {
padding: 25px 0
}
.page_paySetting .query-box .h34 {
line-height: 34px;
}
.page_paySetting ._add_saveBtn {
text-align: right;
padding-top: 10px
}
.page_paySetting_content {
overflow-x: auto;
}
.page_paySetting_item {
width: 260px;
margin-top: 25px;
background: linear-gradient(-30deg, rgba(149, 126, 247, 1), rgba(21, 123, 238, 1));
border-radius: 4px;
padding: 15px;
float: left;
margin-right: 17px
}
.ps_num {
font-size: 20px;
color: #FFFFFF;
font-weight: bold;
width: 70%;
text-align: right;
float: left
}
.ps_btn {
color: #9AB0F8;
width: 21%;
text-align: right;
float: right;
padding-top: 2px;
cursor: pointer;
}
.ps_btn i {
margin-right: 10px;
font-size: 14px;
}
.ps_com {
width: 230px;
background: rgba(0, 0, 0, 0.2);
font-size: 12px;
color: #E2E5F4;
padding: 6px;
display: flex;
margin-top: 30px
}
.ps_com p:nth-child(1) {
flex: 1
}
.ps_com p:nth-child(2) {
flex: 2;
text-align: right
}
.ps_adr {
color: #B1B6FA;
font-size: 12px;
margin-top: 20px;
text-align: left;
padding-left: 7px;
}
.ps_adr span:nth-child(1) {
display: inline-block;
width: 60px;
}
.ps_adr span:nth-child(2) {
max-width: 158px;
}
.page_paySetting .po_content {
border-collapse: collapse; border-collapse: collapse;
} }
.page_paySetting .po_content{
.page_paySetting .po_content {
width: 100%; width: 100%;
} }
.page_paySetting .po_content tr:first-child{
.page_paySetting .po_content tr:first-child {
font-size: 12px; font-size: 12px;
color: #666666; color: #666666;
background-color: #DCDCDC; background-color: #DCDCDC;
} }
.page_paySetting .po_content tr th,.page_paySetting .po_content tr td{
.page_paySetting .po_content tr th,
.page_paySetting .po_content tr td {
padding: 10px 20px; padding: 10px 20px;
text-align: left; text-align: left;
} }
.page_paySetting .po_content tr td{
.page_paySetting .po_content tr td {
color: #333333; color: #333333;
font-size: 14px; font-size: 14px;
border:1px solid #E6E6E6; border: 1px solid #E6E6E6;
} }
.page_paySetting .po_content tr td .iconfont{
.page_paySetting .po_content tr td .iconfont {
font-size: 14px; font-size: 14px;
padding: 4px; padding: 4px;
} }
.page_paySetting .query-box .iconfont{
.page_paySetting .query-box .iconfont {
cursor: pointer; cursor: pointer;
background-color: #E95252; background-color: #E95252;
color: white; color: white;
...@@ -57,635 +179,667 @@ ...@@ -57,635 +179,667 @@
line-height: 30px; line-height: 30px;
border-radius: 50%; border-radius: 50%;
margin-left: 10px; margin-left: 10px;
} }
</style> </style>
<template> <template>
<div class="page_paySetting"> <div class="page_paySetting">
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li> <li>
<span> <span>
<em>{{$t('fnc.shanghuhao')}}：</em> <em>{{$t('fnc.shanghuhao')}}：</em>
<el-input placeholder="" class="w210" v-model="msg.Mch_Id"></el-input> <el-input placeholder="" class="w210" v-model="msg.Mch_Id"></el-input>
</span> </span>
</li> </li>
<li> <li>
<button class="hollowFixedBtn" @click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button> <button class="hollowFixedBtn" @click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="addShow=true,text=$t('pub.addBtn'),IsAdd=true,cancelEdit(),disabledOption()" >{{$t('pub.addBtn')}}</button> <button class="normalBtn"
<el-tooltip class="item" effect="dark" :content="$t('fnc.qhpaiban')" placement="top-end"> @click="addShow=true,text=$t('pub.addBtn'),IsAdd=true,cancelEdit(),disabledOption()">{{$t('pub.addBtn')}}</button>
<i v-if="transitionShow" class="iconfont icon-biaoge" @click="switchMethod(1)"></i> <el-tooltip class="item" effect="dark" :content="$t('fnc.qhpaiban')" placement="top-end">
<i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i> <i v-if="transitionShow" class="iconfont icon-biaoge" @click="switchMethod(1)"></i>
</el-tooltip> <i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i>
</li> </el-tooltip>
</ul> </li>
</div> </ul>
<div class="page_paySetting_content _scrollbar" :class="addShow==true?'_edHeight':''"> </div>
<div class="clearfix" v-if="transitionShow" v-loading="loading"> <div class="page_paySetting_content _scrollbar" :class="addShow==true?'_edHeight':''">
<div class="page_paySetting_item" v-for="(item,index) in dataList"> <div class="clearfix" v-if="transitionShow" v-loading="loading">
<div class="clearfix"> <div class="page_paySetting_item" v-for="(item,index) in dataList">
<el-tooltip class="item" effect="dark" :content="item.Mch_Id" placement="top-end"> <div class="clearfix">
<p class="over_ellipsis ps_num PingFangSC">{{item.Mch_Id}}</p> <el-tooltip class="item" effect="dark" :content="item.Mch_Id" placement="top-end">
</el-tooltip> <p class="over_ellipsis ps_num PingFangSC">{{item.Mch_Id}}</p>
<p class="ps_btn"> </el-tooltip>
<i class="iconfont icon-bianji-smal" @click="editPay(item.ID),text=$t('pub.updateMsg'),IsAdd=false,addShow=true,OnlinePay_post_GetBranchList(item.ID)"></i> <p class="ps_btn">
<i class="iconfont icon-img_delete_small" @click="deletePay(item.ID,item.Mch_Id)"></i> <i class="iconfont icon-bianji-smal"
</p> @click="editPay(item.ID),text=$t('pub.updateMsg'),IsAdd=false,addShow=true,OnlinePay_post_GetBranchList(item.ID)"></i>
</div> <i class="iconfont icon-img_delete_small" @click="deletePay(item.ID,item.Mch_Id)"></i>
<div class="ps_com"> </p>
<p>{{$t('system.query_company')}}：</p> </div>
<el-tooltip class="item" effect="dark" :content="item.allName" placement="top-end"> <div class="ps_com">
<p class="over_ellipsis"> <p>{{$t('system.query_company')}}：</p>
<template v-for="(son,si) in item.BranchName"> <el-tooltip class="item" effect="dark" :content="item.allName" placement="top-end">
{{son}} <p class="over_ellipsis">
</template> <template v-for="(son,si) in item.BranchName">
</p> {{son}}
</el-tooltip> </template>
</div> </p>
<p class="ps_adr"> </el-tooltip>
<span>{{$t('fnc.qqdizhi')}}：</span> </div>
<el-tooltip class="item" effect="dark" :content="item.Req_URL" placement="top-end"> <p class="ps_adr">
<span class="over_ellipsis">{{item.Req_URL}}</span> <span>{{$t('fnc.qqdizhi')}}：</span>
</el-tooltip> <el-tooltip class="item" effect="dark" :content="item.Req_URL" placement="top-end">
</p> <span class="over_ellipsis">{{item.Req_URL}}</span>
</div> </el-tooltip>
</div> </p>
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-if="transitionShow2" v-loading="loading">
<tr>
<th>{{$t('fnc.shanghuhao')}}</th>
<th>{{$t('fnc.qqdizhi')}}</th>
<!-- <th>版本号</th> -->
<th>{{$t('fnc.zhanghuleixing')}}</th>
<!-- <th>账户分类</th> -->
<!-- <th>账户</th>
<th>所属公司</th> -->
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in dataList" :key="index">
<td>{{item.Mch_Id}}</td>
<td>{{item.Req_URL}}</td>
<!-- <td>{{item.ClientName}}</td> -->
<td>{{item.AccountType}}</td>
<!-- <td>{{item.ClientName}}</td>
<td>{{item.ClientName}}</td> -->
<!-- <td>{{item.ClientName}}</td> -->
<td>
<el-row>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-button type="primary" class="iconfont icon-bianji-smal" circle @click="editPay(item.ID),text=$t('pub.updateMsg'),IsAdd=false,addShow=true,OnlinePay_post_GetBranchList(item.ID)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-button type="danger" class="iconfont icon-img_delete_small" circle @click="deletePay(item.ID,item.Mch_Id)"></el-button>
</el-tooltip>
</el-row>
</td>
</tr>
</table>
<div class="noData" v-show="noData" >
{{$t('system.content_noData')}}
</div>
<div>
<el-pagination
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize
:total=total>
</el-pagination>
</div>
</div> </div>
<div class="_vMG_edit" :class="addShow==true?'edHeight':''"> </div>
<p class="_tit">{{text}}{{$t('fnc.zfxinxi')}}</p> <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0"
<el-form :model="addMsg" ref="addMsg" :rules="rules" label-width="100px"> v-if="transitionShow2" v-loading="loading">
<el-row> <tr>
<el-col :span="6" :gutter="35"> <th>{{$t('fnc.shanghuhao')}}</th>
<el-form-item :label="$t('fnc.shanghuhao')+'：'" prop="Mch_Id"> <th>{{$t('fnc.qqdizhi')}}</th>
<el-input v-model="addMsg.Mch_Id" class="" ></el-input> <th>{{$t('fnc.zhanghuleixing')}}</th>
</el-form-item> <th>{{$t('system.table_operation')}}</th>
</el-col> </tr>
<el-col :span="6" :gutter="35"> <tr v-for="(item,index) in dataList" :key="index">
<el-form-item :label="$t('fnc.shsiyao')+'：'" prop="Mch_PrivateKey"> <td>{{item.Mch_Id}}</td>
<el-input v-model="addMsg.Mch_PrivateKey" class="" ></el-input> <td>{{item.Req_URL}}</td>
</el-form-item> <td>{{item.AccountType}}</td>
</el-col> <td>
<el-col :span="6" :gutter="35"> <el-row>
<el-form-item :label="$t('fnc.ptgongyao')+'：'" prop="Wft_PublicKey"> <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-input v-model="addMsg.Wft_PublicKey" class="" ></el-input> <el-button type="primary" class="iconfont icon-bianji-smal" circle
</el-form-item> @click="editPay(item.ID),text=$t('pub.updateMsg'),IsAdd=false,addShow=true,OnlinePay_post_GetBranchList(item.ID)">
</el-col> </el-button>
<el-col :span="6" :gutter="35"> </el-tooltip>
<el-form-item :label="$t('fnc.qqdizhi')+'：'" prop="Req_URL"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-input v-model="addMsg.Req_URL" class="" ></el-input> <el-button type="danger" class="iconfont icon-img_delete_small" circle
</el-form-item> @click="deletePay(item.ID,item.Mch_Id)"></el-button>
</el-col> </el-tooltip>
</el-row> </el-row>
<el-row> </td>
<el-col :span="6" :gutter="35"> </tr>
<el-form-item :label="$t('fnc.banbenhao')+'：'" prop="Version"> </table>
<el-input v-model="addMsg.Version" class="" ></el-input> <div class="noData" v-show="noData">
</el-form-item> {{$t('system.content_noData')}}
</el-col> </div>
<el-col :span="6"> <div>
<el-form-item :label="$t('fnc.zhanghuleixing')+'：'" prop="AccountType" > <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
<el-select filterable v-model='addMsg.AccountType' @change="claerAcc()"> layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
<el-option v-for='item in AccList' </el-pagination>
:label='item.Name' </div>
:value='item.ID' </div>
:key='item.ID'> <div class="_vMG_edit" :class="addShow==true?'edHeight':''">
</el-option> <p class="_tit">{{text}}{{$t('fnc.zfxinxi')}}</p>
</el-select> <el-form :model="addMsg" ref="addMsg" :rules="rules" label-width="100px">
</el-form-item> <el-row>
</el-col> <el-col :span="6" :gutter="35">
<el-col :span="6"> <el-form-item :label="$t('fnc.shanghuhao')+'：'" prop="Mch_Id">
<el-form-item :label="$t('fnc.zhfenlei')+'：'" prop="BankType"> <el-input v-model="addMsg.Mch_Id" class=""></el-input>
<el-select filterable v-model='addMsg.BankType' @change="getAccountList(addMsg.BankType,1)"> </el-form-item>
<el-option v-for='item in GetAccountType' </el-col>
:label='item.Name' <el-col :span="6" :gutter="35">
:value='item.ID' <el-form-item :label="$t('fnc.shsiyao')+'：'" prop="Mch_PrivateKey">
:key='item.ID'> <el-input v-model="addMsg.Mch_PrivateKey" class=""></el-input>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> <el-col :span="6" :gutter="35">
</el-col> <el-form-item :label="$t('fnc.ptgongyao')+'：'" prop="Wft_PublicKey">
<el-col :span="6"> <el-input v-model="addMsg.Wft_PublicKey" class=""></el-input>
<el-form-item :label="$t('fnc.acc')+'：'" prop="BankID"> </el-form-item>
<el-select filterable v-model='addMsg.BankID'> </el-col>
<el-option v-for='item in accountList' <el-col :span="6" :gutter="35">
:label='item.allName' <el-form-item :label="$t('fnc.qqdizhi')+'：'" prop="Req_URL">
:value='item.ID' <el-input v-model="addMsg.Req_URL" class=""></el-input>
:key='item.ID'> </el-form-item>
</el-option> </el-col>
</el-select> </el-row>
</el-form-item> <el-row>
</el-col> <el-col :span="6" :gutter="35">
<el-col :span="7" :gutter="35"> <el-form-item :label="$t('fnc.banbenhao')+'：'" prop="Version">
<el-form-item :label="$t('fnc.ssuogongsi')+'：'" prop="seleRelationList"> <el-input v-model="addMsg.Version" class=""></el-input>
<el-select filterable multiple collapse-tags v-model='addMsg.seleRelationList' @change="disabledOption" class="seleRelationList"> </el-form-item>
<el-option :label='$t("active.cl_tongyong")' value='-1' key='-1' :disabled="allDisabled&&IsAdd"></el-option> </el-col>
<el-option v-for='item in CompanyList' <el-col :span="6">
:label='item.BName' <el-form-item :label="$t('fnc.zhanghuleixing')+'：'" prop="AccountType">
:value='item.Id' <el-select filterable v-model='addMsg.AccountType' @change="claerAcc()">
:key='item.Id' <el-option v-for='item in AccList' :label='item.Name' :value='item.ID' :key='item.ID'>
:disabled="item.disabled"> </el-option>
</el-option> </el-select>
</el-select> </el-form-item>
</el-form-item> </el-col>
</el-col> <el-col :span="6">
<el-col :span="6"> <el-form-item :label="$t('fnc.zhfenlei')+'：'" prop="BankType">
<el-form-item :label="$t('admin.admin_status')+'：'" > <el-select filterable v-model='addMsg.BankType' @change="getAccountList(addMsg.BankType,1)">
<el-switch v-model="addMsg.Status" active-value="1" inactive-value="0"></el-switch> <el-option v-for='item in GetAccountType' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-form-item> </el-option>
</el-col> </el-select>
<el-col :span="6" :offset="11" class="_add_saveBtn"> </el-form-item>
<button type="button" class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> </el-col>
<button class="hollowFixedBtn" type="button" @click="cancelEdit(),addShow=false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button> <el-col :span="6">
</el-col> <el-form-item :label="$t('fnc.acc')+'：'" prop="BankID">
</el-row> <el-select filterable v-model='addMsg.BankID'>
</el-form> <el-option v-for='item in accountList' :label='item.allName' :value='item.ID' :key='item.ID'>
</div> </el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="7" :gutter="35">
<el-form-item :label="$t('fnc.ssuogongsi')+'：'" prop="seleRelationList">
<el-select filterable multiple collapse-tags v-model='addMsg.seleRelationList' @change="disabledOption"
class="seleRelationList">
<el-option :label='$t("active.cl_tongyong")' value='-1' key='-1' :disabled="allDisabled&&IsAdd">
</el-option>
<el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'
:disabled="item.disabled">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('admin.admin_status')+'：'">
<el-switch v-model="addMsg.Status" active-value="1" inactive-value="0"></el-switch>
</el-form-item>
</el-col>
<el-col :span="6" :offset="11" class="_add_saveBtn">
<button type="button" class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
<button class="hollowFixedBtn" type="button"
@click="cancelEdit(),addShow=false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
</el-col>
</el-row>
</el-form>
</div> </div>
</div>
</template> </template>
<script> <script>
export default { import {
data(){ getSchoolPage
return{ } from '../../api/school/index'
noData:false, export default {
addShow:false, data() {
total:0, return {
currentPage:1, noData: false,
dataList:[], addShow: false,
text:'', total: 0,
msg:{ currentPage: 1,
pageIndex:1, dataList: [],
pageSize:24, text: '',
BranchId:'', msg: {
Mch_Id:'', pageIndex: 1,
}, pageSize: 24,
addMsg:{ BranchId: '',
ID:0, Mch_Id: '',
Mch_Id:'',
Mch_PrivateKey:'',
Wft_PublicKey:'',
Req_URL:'',
Version:'',
RelationList:[],//1-通用2-选项公司
seleRelationList:[],
BankID:'',
BankType:'',
AccountType:'',
Status:'0',
},
CompanyList:[],
AccList:[],
GetAccountType:[],
accountList:[],
OnlinePayList:[],
getCompanyMsg:{
RB_Group_Id:'0',
Status:'0',
},
allDisabled:false,
IsAdd:false,
rules: {//表单必填验证
Mch_Id: [
{ required: true, message: this.$t('rule.qsrshuhao'), trigger: 'blur' }
],
Mch_PrivateKey: [
{ required: true, message: this.$t('rule.qsrshsyao'), trigger: 'blur' }
],Wft_PublicKey: [
{ required: true, message: this.$t('rule.qsrptsiyao'), trigger: 'blur' }
],Req_URL: [
{ required: true, message: this.$t('rule.qsrqqdizhi'), trigger: 'blur' }
],Version: [
{ required: true, message: this.$t('rule.qsrbbenhao'), trigger: 'blur' }
],seleRelationList: [
{ required: true, message: this.$t('rule.qxzssgongsi'), trigger: 'change' }
],AccountType: [
{ required: true, message: this.$t('rule.qxzshleixing'), trigger: 'change' }
],BankType: [
{ required: true, message: this.$t('rule.qxzzhfenlei'), trigger: 'change' }
]
,BankID: [
{ required: true, message: this.$t('rule.qxzzhanghu'), trigger: 'change' }
]
},
transitionShow:false,
transitionShow2:true,
contenWidth:0,
contenHeight:0,
loading:false,
tableSize:0,
blockSize:0,
}
},created(){
let allH,allW,cH,cW;
allH = document.documentElement.clientHeight;
allW = document.documentElement.clientWidth;
cW = allW-90;
cH = allH-255; //255 = 顶部导航 50 面包屑40 查询框75 table表头41 分页49
this.contenWidth = cW;
this.contenHeight = cH;
this.tableSize = this.msg.pageSize = parseInt(cH/45)-1;
},
methods:{
switchMethod(t){
this.msg.pageIndex = 1;
if(t===1){
this.transitionShow = false;
this.transitionShow2 = true;
this.msg.pageSize = this.tableSize;
this.getList();
}else if(t===2){
this.transitionShow = true;
this.transitionShow2 = false;
// 宽 260 高 152
let cont = parseInt(this.contenWidth/260) * parseInt(this.contenHeight/152);
this.msg.pageSize = cont;
this.getList();
}
},
OnlinePay_post_GetBranchList(ID){ // 获取已经选择的公司
if(!ID) return;
this.addMsg.seleRelationList=[];
this.apipost('OnlinePay_post_GetBranchList',{ID:ID}, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
// this.OnlinePayList = data;
data.forEach(x=>{
if(x.Branch_Id==0&&x.Type==1){
this.OnlinePayList.push('-1');
}else{
this.OnlinePayList.push(x.Branch_Id.toString());
}
});
this.OnlinePayList.forEach(x=>{
if(x=='-1'){
this.addMsg.seleRelationList=[];
this.addMsg.seleRelationList.push('-1');
this.allDisabled = true;
this.CompanyList.forEach(y=>{
y.disabled=true;
})
}else{
this.CompanyList.forEach(y=>{
if(y.Id==x){
y.disabled=true;
}
})
}
this.$forceUpdate();
})
}
}, err => {})
},
claerAcc(){ //清除
this.addMsg.BankID = '';
this.addMsg.BankType = '';
},
getAccountList(i,o){ //获取账户类型对应下的账户列表
if(o==1){
this.addMsg.BankID = '';
}
if(this.addMsg.AccountType){
if(i==1){
this.bankaccount_post_GetList()
}
if(i==2){
this.BankAccount_post_GetPlatformList()
}
if(i==3){
this.BankAccount_post_GetCashAccountList()
}
if(i==4){
this.BankAccount_post_GetCashPoolList()
}
}else{
return this.$message.success(this.$t('tips.qxzzhleixing'))
}
},
BankAccount_post_GetPlatformList(i){ //获取平台账户
let msg = {
BackId:0,
TypeId:this.addMsg.AccountType,
BranchId:-1,
Alias:'',
RB_Branch_Id:this.RB_Branch_Id,
}
this.apipost('BankAccount_post_GetPlatformList',msg, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(x=>{
x.allName = x.PlatformNo+"("+x.Alias+")";
x.Name = x.Alias;
})
this.accountList = data;
}
}, err => {})
}, },
BankAccount_post_GetCashAccountList(i){ // 获取现金账户 addMsg: {
let msg = { ID: 0,
TypeId:this.addMsg.AccountType, Mch_Id: '',
BranchId:-1, Mch_PrivateKey: '',
Alias:'', Wft_PublicKey: '',
RB_Branch_Id:this.RB_Branch_Id, Req_URL: '',
}; Version: '',
this.apipost('BankAccount_post_GetCashAccountList',msg, res => { RelationList: [], //1-通用2-选项公司
if(res.data.resultCode == 1) { seleRelationList: [],
let data = res.data.data; BankID: '',
data.forEach(x=>{ BankType: '',
x.allName = x.Alias; AccountType: '',
x.Name = x.Alias; Status: '0',
});
this.accountList = data;
}
}, err => {})
}, },
bankaccount_post_GetList(i){ // 获取银行账户 CompanyList: [],
this.apipost('bankaccount_post_GetList',{TypeId:this.addMsg.AccountType,RB_Branch_Id:this.RB_Branch_Id,}, res => { AccList: [],
if(res.data.resultCode == 1) { GetAccountType: [],
let data = res.data.data; accountList: [],
data.forEach(x=>{ OnlinePayList: [],
x.allName = x.BackNo+"("+x.Openingbank+")"; getCompanyMsg: {
x.Name = x.Alias; RB_Group_Id: '0',
}); Status: '0',
this.accountList = data;
}
}, err => {})
}, },
BankAccount_post_GetCashPoolList(i){ // 获取资金池账 allDisabled: false,
this.apipost('BankAccount_post_GetCashPoolList',{TypeId:this.addMsg.AccountType,BranchId:-1,Alias:'',RB_Branch_Id:this.RB_Branch_Id,}, res => { IsAdd: false,
if(res.data.resultCode == 1) { rules: { //表单必填验证
let data = res.data.data; Mch_Id: [{
data.forEach(x=>{ required: true,
x.allName = x.Alias; message: this.$t('rule.qsrshuhao'),
x.Name = x.Alias; trigger: 'blur'
}); }],
this.accountList = data; Mch_PrivateKey: [{
} required: true,
}, err => {}) message: this.$t('rule.qsrshsyao'),
trigger: 'blur'
}],
Wft_PublicKey: [{
required: true,
message: this.$t('rule.qsrptsiyao'),
trigger: 'blur'
}],
Req_URL: [{
required: true,
message: this.$t('rule.qsrqqdizhi'),
trigger: 'blur'
}],
Version: [{
required: true,
message: this.$t('rule.qsrbbenhao'),
trigger: 'blur'
}],
seleRelationList: [{
required: true,
message: this.$t('rule.qxzssgongsi'),
trigger: 'change'
}],
AccountType: [{
required: true,
message: this.$t('rule.qxzshleixing'),
trigger: 'change'
}],
BankType: [{
required: true,
message: this.$t('rule.qxzzhfenlei'),
trigger: 'change'
}],
BankID: [{
required: true,
message: this.$t('rule.qxzzhanghu'),
trigger: 'change'
}]
}, },
BankAccount_post_GetAccountType(){ //获取账户类型列表 transitionShow: false,
this.apipost('BankAccount_post_GetAccountType',{}, res => { transitionShow2: true,
if(res.data.resultCode == 1) { contenWidth: 0,
this.GetAccountType = res.data.data; contenHeight: 0,
} loading: false,
}, err => {}) tableSize: 0,
}, blockSize: 0,
AccountType_post_GetList(){ //获取账户类型下拉 schoolMsg:{
this.apipost('AccountType_post_GetList',this.queryAccMsg,res=>{ pageIndex: 1,
if(res.data.resultCode==1){ pageSize: 12,
this.AccList = res.data.data; rowsPerPage: 12,
}else{ SName: "",
this.$message.error(res.data.message); Status: '-1'
} }
},err=>{}) }
}, },
editPay(ID){ // 修改 created() {
this.apipost('OnlinePay_post_Get',{ID:ID}, res => { let allH, allW, cH, cW;
if(res.data.resultCode == 1) { allH = document.documentElement.clientHeight;
let data = res.data.data; allW = document.documentElement.clientWidth;
data.seleRelationList = []; cW = allW - 90;
data.RelationList.forEach(x=>{ cH = allH - 255; //255 = 顶部导航 50 面包屑40 查询框75 table表头41 分页49
if(x.Type==1){ this.contenWidth = cW;
data.seleRelationList.push('-1') this.contenHeight = cH;
}else{ this.tableSize = this.msg.pageSize = parseInt(cH / 45) - 1;
data.seleRelationList.push(x.Branch_Id.toString()) },
} methods: {
}); switchMethod(t) {
this.addMsg = data; this.msg.pageIndex = 1;
this.getAccountList(this.addMsg.BankType,2); if (t === 1) {
this.disabledOption(); this.transitionShow = false;
}else{ this.transitionShow2 = true;
this.$message.error(res.data.message); this.msg.pageSize = this.tableSize;
} this.getList();
}, err => {}) } else if (t === 2) {
}, this.transitionShow = true;
deletePay(ID,Name){ //删除 this.transitionShow2 = false;
this.$confirm(this.$t('tips.shifoushanchu')+'‘'+Name+'’'+this.$t('tips.dzfpzxxdelete'), this.$t('tips.tips'), { // 宽 260 高 152
confirmButtonText: this.$t('pub.sureBtn'), let cont = parseInt(this.contenWidth / 260) * parseInt(this.contenHeight / 152);
cancelButtonText: this.$t('pub.cancelBtn'), this.msg.pageSize = cont;
type: 'warning' this.getList();
}).then(() => { }
this.apipost('OnlinePay_post_Remove',{ID:ID}, res => { },
if(res.data.resultCode == 1) { OnlinePay_post_GetBranchList(ID) { // 获取已经选择的公司
this.getList(); if (!ID) return;
this.$message.success(res.data.message); this.addMsg.seleRelationList = [];
}else{ this.apipost('OnlinePay_post_GetBranchList', {
this.$message.error(res.data.message); ID: ID
} }, res => {
}, err => {}) if (res.data.resultCode == 1) {
}).catch(() => { let data = res.data.data;
this.$message({ // this.OnlinePayList = data;
type: 'info', data.forEach(x => {
message: this.$t('hotel.hotel_HasBeenCancelled') if (x.Branch_Id == 0 && x.Type == 1) {
}); this.OnlinePayList.push('-1');
}); } else {
}, this.OnlinePayList.push(x.Branch_Id.toString());
submitForm(addMsg) {//提交创建、修改表单 }
this.$refs[addMsg].validate((valid) => {
if (valid) {
this.OnlinePay_post_Set()
} else {
return false;
}
}); });
}, this.OnlinePayList.forEach(x => {
disabledOption(){ // 选择公司 如果选择通用则禁用其它选项 if (x == '-1') {
if(this.addMsg.seleRelationList.length === 0) { this.addMsg.seleRelationList = [];
this.CompanyList.forEach(y=>{ this.addMsg.seleRelationList.push('-1');
y.disabled=false this.allDisabled = true;
this.CompanyList.forEach(y => {
y.disabled = true;
})
} else {
this.CompanyList.forEach(y => {
if (y.Id == x) {
y.disabled = true;
}
})
}
this.$forceUpdate();
})
}
}, err => {})
},
claerAcc() { //清除
this.addMsg.BankID = '';
this.addMsg.BankType = '';
},
getAccountList(i, o) { //获取账户类型对应下的账户列表
if (o == 1) {
this.addMsg.BankID = '';
}
if (this.addMsg.AccountType) {
if (i == 1) {
this.bankaccount_post_GetList()
}
if (i == 2) {
this.BankAccount_post_GetPlatformList()
}
if (i == 3) {
this.BankAccount_post_GetCashAccountList()
}
if (i == 4) {
this.BankAccount_post_GetCashPoolList()
}
} else {
return this.$message.success(this.$t('tips.qxzzhleixing'))
}
},
BankAccount_post_GetPlatformList(i) { //获取平台账户
let msg = {
BackId: 0,
TypeId: this.addMsg.AccountType,
BranchId: -1,
Alias: '',
RB_Branch_Id: this.RB_Branch_Id,
}
this.apipost('BankAccount_post_GetPlatformList', msg, res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(x => {
x.allName = x.PlatformNo + "(" + x.Alias + ")";
x.Name = x.Alias;
})
this.accountList = data;
}
}, err => {})
},
BankAccount_post_GetCashAccountList(i) { // 获取现金账户
let msg = {
TypeId: this.addMsg.AccountType,
BranchId: -1,
Alias: '',
RB_Branch_Id: this.RB_Branch_Id,
};
this.apipost('BankAccount_post_GetCashAccountList', msg, res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(x => {
x.allName = x.Alias;
x.Name = x.Alias;
}); });
return this.accountList = data;
} }
this.addMsg.seleRelationList.forEach(x=> { }, err => {})
if(x === '-1'){ },
this.addMsg.seleRelationList=[]; bankaccount_post_GetList(i) { // 获取银行账户
this.addMsg.seleRelationList.push('-1'); this.apipost('bankaccount_post_GetList', {
this.CompanyList.forEach(y=> { TypeId: this.addMsg.AccountType,
y.disabled=true RB_Branch_Id: this.RB_Branch_Id,
}) }, res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(x => {
x.allName = x.BackNo + "(" + x.Openingbank + ")";
x.Name = x.Alias;
});
this.accountList = data;
}
}, err => {})
},
BankAccount_post_GetCashPoolList(i) { // 获取资金池账
this.apipost('BankAccount_post_GetCashPoolList', {
TypeId: this.addMsg.AccountType,
BranchId: -1,
Alias: '',
RB_Branch_Id: this.RB_Branch_Id,
}, res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(x => {
x.allName = x.Alias;
x.Name = x.Alias;
});
this.accountList = data;
}
}, err => {})
},
BankAccount_post_GetAccountType() { //获取账户类型列表
this.apipost('BankAccount_post_GetAccountType', {}, res => {
if (res.data.resultCode == 1) {
this.GetAccountType = res.data.data;
}
}, err => {})
},
AccountType_post_GetList() { //获取账户类型下拉
this.apipost('AccountType_post_GetList', this.queryAccMsg, res => {
if (res.data.resultCode == 1) {
this.AccList = res.data.data;
} else {
this.$message.error(res.data.message);
}
}, err => {})
},
editPay(ID) { // 修改
this.apipost('OnlinePay_post_Get', {
ID: ID
}, res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
data.seleRelationList = [];
data.RelationList.forEach(x => {
if (x.Type == 1) {
data.seleRelationList.push('-1')
} else {
data.seleRelationList.push(x.Branch_Id.toString())
}
});
this.addMsg = data;
this.getAccountList(this.addMsg.BankType, 2);
this.disabledOption();
} else {
this.$message.error(res.data.message);
}
}, err => {})
},
deletePay(ID, Name) { //删除
this.$confirm(this.$t('tips.shifoushanchu') + '‘' + Name + '’' + this.$t('tips.dzfpzxxdelete'), this.$t(
'tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.apipost('OnlinePay_post_Remove', {
ID: ID
}, res => {
if (res.data.resultCode == 1) {
this.getList();
this.$message.success(res.data.message);
} else {
this.$message.error(res.data.message);
}
}, err => {})
}).catch(() => {
this.$message({
type: 'info',
message: this.$t('hotel.hotel_HasBeenCancelled')
});
});
},
submitForm(addMsg) { //提交创建、修改表单
this.$refs[addMsg].validate((valid) => {
if (valid) {
this.OnlinePay_post_Set()
} else {
return false;
}
});
},
disabledOption() { // 选择公司 如果选择通用则禁用其它选项
if (this.addMsg.seleRelationList.length === 0) {
this.CompanyList.forEach(y => {
y.disabled = false
});
return
}
this.addMsg.seleRelationList.forEach(x => {
if (x === '-1') {
this.addMsg.seleRelationList = [];
this.addMsg.seleRelationList.push('-1');
this.CompanyList.forEach(y => {
y.disabled = true
})
}
})
},
getCompanyList() { //获取公司列表
getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList = res.Data.PageData;
}).catch(() => {
})
},
cancelEdit() { // 取消重置
this.addMsg = {
ID: 0,
Mch_Id: '',
Mch_PrivateKey: '',
Wft_PublicKey: '',
Req_URL: '',
Version: '',
RelationList: [], //1-通用2-选项公司
seleRelationList: [],
BankID: '',
BankType: '',
AccountType: '',
Status: '0'
};
},
OnlinePay_post_Set() { // 新增
this.addMsg.RelationList = [];
if (!this.IsAdd) {
let list = [];
let list2 = this.addMsg.RelationList;
this.addMsg.seleRelationList.forEach(x => {
if (x == '-1') {
let cp = {
Branch_Id: '',
Type: ''
}
cp.Branch_Id = 0
cp.Type = 1
this.addMsg.RelationList.push(cp)
} else {
let cp = {
Branch_Id: parseInt(x),
Type: 2,
ConfigId: 0,
ID: 0,
}
list.push(cp)
} }
}) })
}, let allArr = list2.concat(list); // 数组合并
getCompanyList(){ //获取公司列表 var obj = {};
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{ allArr = allArr.reduce(function (item, next) { //数组对象去重
if(res.data.resultCode===1) { obj[next.Branch_Id] ? '' : obj[next.Branch_Id] = true && item.push(next);
let data = res.data.data; return item;
data.forEach(x=>{ }, []);
x.Id=x.Id.toString() this.addMsg.RelationList = allArr;
}); } else {
this.CompanyList=res.data.data;
}else{}
},err=>{})
},
cancelEdit(){ // 取消重置
this.addMsg = {
ID:0,
Mch_Id:'',
Mch_PrivateKey:'',
Wft_PublicKey:'',
Req_URL:'',
Version:'',
RelationList:[],//1-通用2-选项公司
seleRelationList:[],
BankID:'',
BankType:'',
AccountType:'',
Status:'0'
};
},
OnlinePay_post_Set(){ // 新增
this.addMsg.RelationList = []; this.addMsg.RelationList = [];
if(!this.IsAdd){ this.addMsg.seleRelationList.forEach(x => {
let list = []; if (x == '-1') {
let list2 = this.addMsg.RelationList; let cp = {
this.addMsg.seleRelationList.forEach(x=>{ Branch_Id: '',
if(x=='-1'){ Type: ''
let cp={ }
Branch_Id:'', cp.Branch_Id = 0
Type:'' cp.Type = 1
} this.addMsg.RelationList.push(cp)
cp.Branch_Id = 0 } else {
cp.Type=1 let cp = {
this.addMsg.RelationList.push(cp) Branch_Id: '',
}else{ Type: ''
let cp={ }
Branch_Id:parseInt(x), cp.Type = 2
Type:2, cp.Branch_Id = x
ConfigId:0, this.addMsg.RelationList.push(cp)
ID:0,
}
list.push(cp)
}
})
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);
return item;
}, []);
this.addMsg.RelationList = allArr;
}else{
this.addMsg.RelationList = [];
this.addMsg.seleRelationList.forEach(x=>{
if(x=='-1'){
let cp={
Branch_Id:'',
Type:''
}
cp.Branch_Id = 0
cp.Type=1
this.addMsg.RelationList.push(cp)
}else{
let cp={
Branch_Id:'',
Type:''
}
cp.Type=2
cp.Branch_Id = x
this.addMsg.RelationList.push(cp)
}
})
} }
this.apipost('OnlinePay_post_Set',this.addMsg, res => { })
if(res.data.resultCode == 1) { }
this.addShow = false; this.apipost('OnlinePay_post_Set', this.addMsg, res => {
this.$message.success(res.data.message); if (res.data.resultCode == 1) {
this.cancelEdit(); this.addShow = false;
this.getList(); this.$message.success(res.data.message);
this.disabledOption();
}else{
this.$message.error(res.data.message);
}
}, err => {})
},
getList() { //获取列表数据
this.dataList = [];
this.loading = true;
this.apipost('OnlinePay_post_GetPageList',this.msg, res => {
if(res.data.resultCode == 1) {
let data = res.data.data.pageData;
data.forEach(x=>{
let allName = '';
x.BranchName.forEach(y=>{
allName = allName+' '+y;
})
x.allName = allName;
})
this.total = res.data.data.count;
if(this.total<=0){
this.noData = true;
}else{
this.dataList = data;
}
this.loading = false;
}
}, err => {this.loading =false;})
},
resetPageIndex() {//查询初始化页码
this.msg.pageIndex = 1;
this.currentPage = 1
},
handleCurrentChange(val) {//翻页功能按钮
this.msg.pageIndex = val;
this.getList();
},
resetForm(formName) {
this.cancelEdit(); this.cancelEdit();
this.$refs[formName].resetFields(); this.getList();
}, this.disabledOption();
}, } else {
mounted(){ this.$message.error(res.data.message);
let userInfo=this.getLocalStorage(); }
console.log(userInfo,'userInfouserInfo'); }, err => {})
this.getCompanyMsg.RB_Group_Id=userInfo.data.Group_Id; //集团ID },
this.getCompanyList(); getList() { //获取列表数据
this.dataList = [];
this.loading = true;
this.apipost('OnlinePay_post_GetPageList', this.msg, res => {
if (res.data.resultCode == 1) {
let data = res.data.data.pageData;
data.forEach(x => {
let allName = '';
x.BranchName.forEach(y => {
allName = allName + ' ' + y;
})
x.allName = allName;
})
this.total = res.data.data.count;
if (this.total <= 0) {
this.noData = true;
} else {
this.dataList = data;
}
this.loading = false;
}
}, err => {
this.loading = false;
})
},
resetPageIndex() { //查询初始化页码
this.msg.pageIndex = 1;
this.currentPage = 1
},
handleCurrentChange(val) { //翻页功能按钮
this.msg.pageIndex = val;
this.getList(); this.getList();
this.AccountType_post_GetList(); },
this.BankAccount_post_GetAccountType(); resetForm(formName) {
this.cancelEdit();
this.$refs[formName].resetFields();
},
},
mounted() {
let userInfo = this.getLocalStorage();
console.log(userInfo, 'userInfouserInfo');
this.getCompanyMsg.RB_Group_Id = userInfo.data.Group_Id; //集团ID
this.getCompanyList();
this.getList();
this.AccountType_post_GetList();
this.BankAccount_post_GetAccountType();
} }
} }
</script>
</script>
src/pages/financial/sellCommissionRules.vue
View file @ c004a661
...@@ -111,8 +111,8 @@ ...@@ -111,8 +111,8 @@
<el-option :label="$t('fnc.jttongyong')" value="-1"></el-option> <el-option :label="$t('fnc.jttongyong')" value="-1"></el-option>
<el-option <el-option
v-for="(item, index) in CompanyList" v-for="(item, index) in CompanyList"
:label="item.BName" :label="item.SName"
:value="item.Id.toString()" :value="item.SId"
:key="index" :key="index"
></el-option> ></el-option>
</el-select> </el-select>
...@@ -255,6 +255,9 @@ ...@@ -255,6 +255,9 @@
</template> </template>
<script> <script>
import Vue from "vue"; import Vue from "vue";
import {
getSchoolPage
} from '../../api/school/index'
export default { export default {
data() { data() {
var checkVariable = (rule, value, callback) => { var checkVariable = (rule, value, callback) => {
...@@ -310,7 +313,14 @@ ...@@ -310,7 +313,14 @@
RB_Group_Id: 0 RB_Group_Id: 0
}, },
desctionsResources:[], desctionsResources:[],
desctions:[] desctions:[],
schoolMsg:{
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
SName: "",
Status: '-1'
}
}; };
}, },
methods: { methods: {
...@@ -625,22 +635,11 @@ ...@@ -625,22 +635,11 @@
}, },
getCompanyList() { getCompanyList() {
//获取公司列表 //获取公司列表
this.apipost( getSchoolPage(this.schoolMsg).then(res => {
"admin_get_BranchGetList", this.CompanyList = res.Data.PageData;
this.getCompanyMsg, }).catch(() => {
res => {
if (res.data.resultCode == 1) { })
let data = res.data.data;
data.forEach(x => {
x.disabled = false;
});
this.CompanyList = data;
this.getline();
} else {
}
},
err => {}
);
}, },
getline() { getline() {
let msg = { pageIndex: 0, pageSize: 100 }; let msg = { pageIndex: 0, pageSize: 100 };
......
src/router/routes.js
View file @ c004a661
...@@ -122,6 +122,11 @@ const routes = [{ ...@@ -122,6 +122,11 @@ const routes = [{
component: () => component: () =>
import("pages/financial/AccountType.vue") import("pages/financial/AccountType.vue")
}, },
{
path: "/financial/AccountPageList", //关联账户
component: () =>
import("pages/financial/AccountPageList.vue")
},
{ {
path: "/financial/CostType", //费用类型 path: "/financial/CostType", //费用类型
component: () => component: () =>
......
src/utils/erpindex.js
View file @ c004a661
...@@ -84,7 +84,8 @@ export default{ ...@@ -84,7 +84,8 @@ export default{
let mallUrl = ""; //商城API let mallUrl = ""; //商城API
let locationName = window.location.hostname; let locationName = window.location.hostname;
// domainUrl = "http://127.0.0.1"; // domainUrl = "http://127.0.0.1";
domainUrl = "http://192.168.1.13:8083"; // domainUrl = "http://192.168.1.13:8083";
domainUrl = "http://192.168.1.48:8015";
//domainUrl = "http://192.168.1.21:8069"; //domainUrl = "http://192.168.1.21:8069";
let javaUrldo = ""; let javaUrldo = "";
......
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