Skip to content

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

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

parents 4be89a13 465723f0
Hide whitespace changes
Inline Side-by-side
Showing with 319 additions and 278 deletions
src/pages/financial/PlatformAccount.vue
View file @ 739bf549
......@@ -481,7 +481,7 @@ export default {
costType: [],
schoolMsg:{
pageIndex: 1,
pageSize: 12,
pageSize: 9999,
rowsPerPage: 12,
SName: "",
Status: '-1'
......@@ -539,8 +539,8 @@ export default {
// let companyList = [];
this.CompanyList.forEach(x => {
let item = {};
item.label = x.BName;
item.value = x.Id;
item.label = x.SName;
item.value = x.SId;
this.CompanySelect.push(item);
});
let allName = {
......
src/pages/financial/accDetail/CashAccDetail.vue
View file @ 739bf549
......@@ -125,9 +125,9 @@
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
:key='item.Id'>
:label='item.SName'
:value='item.SId'
:key='item.SId'>
</el-option>
</el-select>
</el-form-item>
......@@ -390,6 +390,7 @@
</template>
<script>
import moment from "moment"
import {getSchoolPage} from '../../../api/school/index'
export default {
data(){
return{
......@@ -475,6 +476,13 @@
allBPrice:0,
allWPrice:0,
userInfo:{},
schoolMsg:{
pageIndex: 1,
pageSize: 99999,
rowsPerPage: 12,
SName: "",
Status: '-1'
}
}
},created(){
this.userInfo = this.getLocalStorage();
......@@ -916,15 +924,11 @@
},err=>{})
},
getCompanyList(){ //获取公司列表
let userInfo=this.getLocalStorage();
let msg={
RB_Group_Id:userInfo.RB_Group_id
};
this.apipost('admin_get_BranchGetList',msg,res=>{
if(res.data.resultCode==1){
this.CompanyList=res.data.data;
}else{}
},err=>{})
getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList = res.Data.PageData;
}).catch(() => {
})
},
getList(){ //获取列表
this.checkList=[];
......
src/pages/financial/accDetail/CompanyAccDetail.vue
View file @ 739bf549
......@@ -158,9 +158,9 @@
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
:key='item.Id'>
:label='item.SName'
:value='item.SId'
:key='item.SId'>
</el-option>
</el-select>
</el-form-item>
......@@ -437,6 +437,8 @@
</template>
<script>
import moment from "moment"
import {getSchoolPage} from '../../../api/school/index'
export default {
data(){
return{
......@@ -519,6 +521,13 @@
saveMsg:[],
TradeDate:'',
initialIndex: 0,
schoolMsg:{
pageIndex: 1,
pageSize: 99999,
rowsPerPage: 12,
SName: "",
Status: '-1'
}
}
},
created(){
......@@ -1047,15 +1056,11 @@
},err=>{})
},
getCompanyList(){ //获取公司列表
let userInfo=this.getLocalStorage();
let msg={
RB_Group_Id:userInfo.RB_Group_id
};
this.apipost('admin_get_BranchGetList',msg,res=>{
if(res.data.resultCode==1){
this.CompanyList=res.data.data;
}else{}
},err=>{})
getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList = res.Data.PageData;
}).catch(() => {
})
},
showUpLoadFile(i){ // 预览上传文件
......
src/pages/financial/accDetail/PlatformAccDetail.vue
View file @ 739bf549
......@@ -119,9 +119,9 @@
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
:key='item.Id'>
:label='item.SName'
:value='item.SId'
:key='item.SId'>
</el-option>
</el-select>
</el-form-item>
......@@ -360,6 +360,8 @@
</template>
<script>
import moment from 'moment'
import {getSchoolPage} from '../../../api/school/index'
export default {
data(){
return{
......@@ -435,6 +437,13 @@
allBPrice:0,
allWPrice:0,
userInfo:{},
schoolMsg:{
pageIndex: 1,
pageSize: 99999,
rowsPerPage: 12,
SName: "",
Status: '-1'
}
}
},created(){
this.userInfo = this.getLocalStorage();
......@@ -936,15 +945,11 @@
},err=>{})
},
getCompanyList(){ //获取公司列表
let userInfo=this.getLocalStorage();
let msg={
RB_Group_Id:userInfo.RB_Group_id
};
this.apipost('admin_get_BranchGetList',msg,res=>{
if(res.data.resultCode==1){
this.CompanyList=res.data.data;
}else{}
},err=>{})
getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList = res.Data.PageData;
}).catch(() => {
})
},
},mounted(){
let userInfo=this.getLocalStorage();
......
src/pages/financial/accountingWork.vue
View file @ 739bf549
......@@ -8,25 +8,18 @@
<div class="query-box">
<ul>
<li>
<span>
<em>流程</em>
<el-select class="w200"
filterable
v-model="msg.TemplateId"
>
<el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
<el-option
v-for="(item,index) in SingleList"
:label="item.Name"
:value="item.Id"
:key="index+50000"
></el-option>
</el-select>
</span>
<span>
<em>流程</em>
<el-select class="w200" filterable v-model="msg.TemplateId">
<el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
<el-option v-for="(item,index) in SingleList" :label="item.Name" :value="item.Id" :key="index+50000">
</el-option>
</el-select>
</span>
</li>
<li>
<button class="normalBtn" @click="getList" >查询</button>
<button class="normalBtn" @click="addShow=true,text=$t('pub.addBtn')" >{{$t('pub.addBtn')}}</button>
<button class="normalBtn" @click="getList">查询</button>
<button class="normalBtn" @click="addShow=true,text=$t('pub.addBtn')">{{$t('pub.addBtn')}}</button>
<el-tooltip class="item" effect="dark" :content="$t('fnc.qhpaiban')" placement="top-end">
<i v-if="transitionShow" class="iconfont icon-biaoge" @click="switchMethod(1)"></i>
<i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i>
......@@ -37,7 +30,8 @@
<div>
<p class="_cashierWorl_tit">{{$t('tips.accWorkTips')}}</p>
<div class="cm_content _scrollbar" :class="addShow==true?'_edHeight':''">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading" v-if="transitionShow2">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0"
v-loading="loading" v-if="transitionShow2">
<tr>
<th>{{$t('fnc.w_ckmingcheng')}}</th>
<th>{{$t('system.query_company')}}</th>
......@@ -53,7 +47,8 @@
<span v-for="(i,ix) in item.emList">{{i.emName}} <span v-if="ix!=item.emList.length-1">,</span> </span>
</td>
<td>
<span v-for="(i,ix) in item.TemplateList" :key="ix+5000">{{i.Name}} <span v-if="ix!=item.TemplateList.length-1">,</span> </span>
<span v-for="(i,ix) in item.TemplateList" :key="ix+5000">{{i.Name}} <span
v-if="ix!=item.TemplateList.length-1">,</span> </span>
</td>
<td>
<span v-if="item.Direct==1">{{$t('fnc.shoukuan')}}</span>
......@@ -63,13 +58,16 @@
<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="editCurency(item.ID),text='修改'"></el-button>
<el-button type="primary" class="iconfont icon-bianji-smal" circle
@click="editCurency(item.ID),text='修改'"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('fnc.w_djxinxi')" placement="top-start">
<el-button type="danger" class="iconfont icon-img-rili" circle @click="goUrlDetail('CashierWorkDetail',2,item.Name,item.ID,item.BranchId)"></el-button>
<el-button type="danger" class="iconfont icon-img-rili" circle
@click="goUrlDetail('CashierWorkDetail',2,item.Name,item.ID,item.BranchId)"></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="financeinfoRemove(item.ID,item.ID)"></el-button>
<el-button type="danger" class="iconfont icon-img_delete_small" circle
@click="financeinfoRemove(item.ID,item.ID)"></el-button>
</el-tooltip>
</el-row>
</td>
......@@ -80,27 +78,26 @@
<div class="po_content_list_item_top">
<span class="_item_top_name">{{item.Name}}</span>
<span class="_item_top_icon">
<i class="iconfont icon-rizhi1" @click="goUrlDetail('CashierWorkDetail',1,item.Name,item.ID,item.BranchId)"></i>
<i class="iconfont icon-bianji-smal" @click="editCurency(item.ID),text=$t('system.table_edit')"></i>
<i class="iconfont icon-img_delete_small" @click="financeinfoRemove(item.ID)"></i>
</span>
<i class="iconfont icon-rizhi1"
@click="goUrlDetail('CashierWorkDetail',1,item.Name,item.ID,item.BranchId)"></i>
<i class="iconfont icon-bianji-smal" @click="editCurency(item.ID),text=$t('system.table_edit')"></i>
<i class="iconfont icon-img_delete_small" @click="financeinfoRemove(item.ID)"></i>
</span>
</div>
<div class="po_content_list_item_bottom">
<p>
<span>{{$t('fnc.w_ywrenyuan')}}</span>
<template v-if="item.emList.length>0">
<span v-if="item.emList.length==1">
{{item.emList[0].emName}}
</span>
<span v-if="item.emList.length==1">
{{item.emList[0].emName}}
</span>
<div v-else>
<el-popover
placement="bottom"
popper-class="CashierWork_tripDetails"
trigger="click">
<el-popover placement="bottom" popper-class="CashierWork_tripDetails" trigger="click">
<div class="">
<span class="_all_name" v-for="(i,io) in item.emList">{{i.emName}}</span>
</div>
<span slot="reference" @click="" class="_underline">{{item.emList[0].emName}} {{$t('fnc.w_gong')}}（{{item.emList.length}}）{{$t('hotel.hotel_people')}}</span>
<span slot="reference" @click="" class="_underline">{{item.emList[0].emName}}
{{$t('fnc.w_gong')}}（{{item.emList.length}}）{{$t('hotel.hotel_people')}}</span>
</el-popover>
</div>
</template>
......@@ -116,13 +113,8 @@
{{$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 background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination>
</div>
</div>
......@@ -133,7 +125,8 @@
</el-col>
<el-col :span="4" class="_add_saveBtn">
<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>
<button class="hollowFixedBtn" type="button"
@click="cancelEdit(),resetForm('addMsg'),addShow=false">{{$t('pub.cancelBtn')}}</button>
</el-col>
</el-row>
<el-form class=" clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="100px">
......@@ -145,35 +138,21 @@
</el-col>
<el-col :span="4">
<el-form-item :label="$t('fnc.ssuogongsi')+'：'" prop="BranchId">
<el-select filterable v-model='addMsg.BranchId'>
<el-option v-for='item in CompanyList'
:label='item.SName'
:value='item.SId'
:key='item.SId'
:disabled="item.disabled">
<el-select filterable v-model='addMsg.BranchId'>
<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="5">
<el-form-item :label="$t('fnc.w_ywrenyuan')+'：'" prop="listArr">
<el-select
v-model="addMsg.listArr"
filterable
remote
multiple
reserve-keyword
:placeholder="$t('pub.pleaseImport')"
:remote-method="remoteMethod"
@change="$forceUpdate()"
@remove-tag="removeTag"
:loading="loading2">
<el-option
v-for="(item,index) in searchList"
:key="index+60000"
:label="item.name"
:value="item.empId">
<span style="float: left">{{ item.name }}</span>
<el-select v-model="addMsg.listArr" filterable remote multiple reserve-keyword
:placeholder="$t('pub.pleaseImport')" :remote-method="remoteMethod" @change="$forceUpdate()"
@remove-tag="removeTag" :loading="loading2">
<el-option v-for="(item,index) in searchList" :key="index+60000" :label="item.EmployeeName"
:value="item.Id">
<span style="float: left">{{ item.EmployeeName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.postName }}</span>
</el-option>
</el-select>
......@@ -181,20 +160,9 @@
</el-col>
<el-col :span="5">
<el-form-item label="流程">
<el-select
v-model="addMsg.TemplateListArr"
filterable
multiple
collapse-tags
@change="$forceUpdate()"
<el-select v-model="addMsg.TemplateListArr" filterable multiple collapse-tags @change="$forceUpdate()"
:placeholder="$t('pub.pleaseImport')">
<el-option
v-for="(item,index) in SingleList"
:key="index+200"
:label="item.Name"
:value="item.Id">
<!-- <span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.postName }}</span> -->
<el-option v-for="(item,index) in SingleList" :key="index+200" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</el-form-item>
......@@ -218,65 +186,83 @@
import {
getSchoolPage
} from '../../api/school/index'
import {
queryEmployee
} from '../../api/users/user'
export default {
components: { Treeselect },
data(){
return{
msg:{
pageIndex:1,
pageSize:15,
TemplateId:'',
components: {
Treeselect
},
data() {
return {
msg: {
pageIndex: 1,
pageSize: 15,
TemplateId: '',
},
addMsg:{
ID:0,
Name:'',
accountant_list:[],
emList:[],
TemplateList:[],
listArr:[],
BranchId:'',
Direct:'',
addMsg: {
ID: 0,
Name: '',
accountant_list: [],
emList: [],
TemplateList: [],
listArr: [],
BranchId: '',
Direct: '',
BranchIdName:''
},
type:-1,
addShow:false,
loading:false,
loading2:false,
noData:false,
zhiChe:false,
shouChe:false,
total:0,
type: -1,
addShow: false,
loading: false,
loading2: false,
noData: false,
zhiChe: false,
shouChe: false,
total: 0,
currentPage: 1,
text:'',
dataList:[],
searchList:[],
AccList:[],
CompanyList:[],
rules: {//表单必填验证
Name: [
{ required: true, message: this.$t('rule.qtxckmingcheng'), trigger: 'blur' }
],
listArr: [
{type: 'array', required: true, editCurencymessage: this.$t('rule.qxzywuyuan'), trigger: 'blur' }
],BranchId:[
{ required: true, message: this.$t('rule.company'), trigger: 'change' }
],Direct:[
{ required: true, message: this.$t('rule.qxzsyfangxiang'), trigger: 'change' }
]
text: '',
dataList: [],
searchList: [],
AccList: [],
CompanyList: [],
rules: { //表单必填验证
Name: [{
required: true,
message: this.$t('rule.qtxckmingcheng'),
trigger: 'blur'
}],
listArr: [{
type: 'array',
required: true,
editCurencymessage: this.$t('rule.qxzywuyuan'),
trigger: 'blur'
}],
BranchId: [{
required: true,
message: this.$t('rule.company'),
trigger: 'change'
}],
Direct: [{
required: true,
message: this.$t('rule.qxzsyfangxiang'),
trigger: 'change'
}]
},
AccListProps: {
value:'Num',
label:'Name',
value: 'Num',
label: 'Name',
children: 'children'
},
selectVal:[],
transitionShow:false,
transitionShow2:true,
contenWidth:0,
contenHeight:0,
tableSize:0,
shouList:[],
shouListLoading:false,
CostTypeList:[],
selectVal: [],
transitionShow: false,
transitionShow2: true,
contenWidth: 0,
contenHeight: 0,
tableSize: 0,
shouList: [],
shouListLoading: false,
CostTypeList: [],
normalizer(node) {
return {
id: node.ID,
......@@ -284,13 +270,13 @@
children: node.ChildList,
}
},
CostIdS:[],
getCompanyMsg:{
RB_Group_Id:'0',
Status:'0',
CostIdS: [],
getCompanyMsg: {
RB_Group_Id: '0',
Status: '0',
},
SingleList:[],
schoolMsg:{
SingleList: [],
schoolMsg: {
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
......@@ -298,94 +284,108 @@
Status: '-1'
}
}
},created(){
},
created() {
let userInfo = this.getLocalStorage();
let allH,allW,cH,cW;
let allH, allW, cH, cW;
allH = document.documentElement.clientHeight;
allW = document.documentElement.clientWidth;
cW = allW-90;
cH = allH-187; //255 = 50 40 21 36 40
cW = allW - 90;
cH = allH - 187; //255 = 50 40 21 36 40
this.contenWidth = cW;
this.contenHeight = cH;
this.msg.pageSize = parseInt(cH/40)-1;
this.tableSize = this.msg.pageSize = parseInt(cH/45);
this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
this.msg.pageSize = parseInt(cH / 40) - 1;
this.tableSize = this.msg.pageSize = parseInt(cH / 45);
this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
this.getSingleList();
},methods:{
getSingleList(){ // 获取费用类型
this.apipost('FinancialFlowTemplate_post_GetSingleList',{},res=>{
if(res.data.resultCode==1){
this.SingleList=res.data.data;
}else{}
},err=>{})
},
methods: {
getSingleList() { // 获取费用类型
this.apipost('FinancialFlowTemplate_post_GetSingleList', {}, res => {
if (res.data.resultCode == 1) {
this.SingleList = res.data.data;
} else {}
}, err => {})
},
switchMethod(t){
switchMethod(t) {
this.msg.pageIndex = 1;
if(t===1){
if (t === 1) {
this.transitionShow = false;
this.transitionShow2 = true;
this.msg.pageSize = this.tableSize;
this.getList();
}else if(t===2){
} else if (t === 2) {
this.transitionShow = true;
this.transitionShow2 = false;
// 宽 235 高 206
let cont = parseInt(this.contenWidth/235) * parseInt(this.contenHeight/120);
let cont = parseInt(this.contenWidth / 235) * parseInt(this.contenHeight / 120);
this.msg.pageSize = cont;
this.getList();
}
},
getCostTypeList(){ // 获取费用类型
this.apipost('Financial_post_GetTreeList',{Type:3},res=>{
if(res.data.resultCode==1){
this.CostTypeList=res.data.data;
}else{}
},err=>{})
getCostTypeList() { // 获取费用类型
this.apipost('Financial_post_GetTreeList', {
Type: 3
}, res => {
if (res.data.resultCode == 1) {
this.CostTypeList = res.data.data;
} else {}
}, err => {})
},
goUrlDetail(path,type,name,id,bid){
this.$router.push({name:path,query:{WindowType:type,name:name,id:id,bid:bid,blank:'y',tab:'会计窗口单据信息'}})
goUrlDetail(path, type, name, id, bid) {
this.$router.push({
name: path,
query: {
WindowType: type,
name: name,
id: id,
bid: bid,
blank: 'y',
tab: '会计窗口单据信息'
}
})
},
removeTag(id){
this.addMsg.emList.forEach((x,index)=>{
if(x.EmId === id){
this.addMsg.emList.splice(index,1)
removeTag(id) {
this.addMsg.emList.forEach((x, index) => {
if (x.EmId === id) {
this.addMsg.emList.splice(index, 1)
}
})
},
mergeArray(list3, list1){
for (var i = 0 ; i < list3.length ; i ++ ){
for(var j = 0 ; j < list1.length ; j ++ ){
if (list3[i].EmId === list1[j].EmId){
list3.splice(i,1);
mergeArray(list3, list1) {
for (var i = 0; i < list3.length; i++) {
for (var j = 0; j < list1.length; j++) {
if (list3[i].EmId === list1[j].EmId) {
list3.splice(i, 1);
}
}
}
for(var i = 0; i <list1.length; i++){
for (var i = 0; i < list1.length; i++) {
list3.push(list1[i]);
}
return list3;
},
addCashierWork(){ // 提交保存
addCashierWork() { // 提交保存
let emList = this.addMsg.listArr;
let arr = [];
emList.forEach(x=>{
emList.forEach(x => {
let obj = {
'EmId':x,
'ID':0,
'WindowId':0
'EmId': x,
'ID': 0,
'WindowId': 0
}
arr.push(obj);
})
let list4 = this.mergeArray(arr,this.addMsg.emList);
let TemplateListArr=this.addMsg.TemplateListArr;
let newArr=[];
let list4 = this.mergeArray(arr, this.addMsg.emList);
let TemplateListArr = this.addMsg.TemplateListArr;
let newArr = [];
TemplateListArr.forEach(item=>{
this.SingleList.forEach(val=>{
let obj={};
if(item==val.Id){
obj.Id=val.Id;
obj.Name=val.Name;
TemplateListArr.forEach(item => {
this.SingleList.forEach(val => {
let obj = {};
if (item == val.Id) {
obj.Id = val.Id;
obj.Name = val.Name;
newArr.push(obj);
}
})
......@@ -393,19 +393,24 @@
this.addMsg.emList = list4;
this.addMsg.TemplateList = newArr;
this.apipost('Window_post_SetAccountant',this.addMsg,r=>{
if(r.data.resultCode==1){
let obj = {};
obj = this.CompanyList.find(item => {
return item.SId === this.addMsg.BranchId; //筛选出匹配数据
});
this.addMsg.BranchIdName = obj.SName;
this.apipost('Window_post_SetAccountant', this.addMsg, r => {
if (r.data.resultCode == 1) {
this.$message.success(r.data.message);
this.getList();
this.addShow = false;
this.cancelEdit();
// this.CostIdS = [];
}else{
} else {
this.$message.error(r.data.message);
}
},null)
}, null)
},
submitForm(addMsg) {//提交创建、修改表单
submitForm(addMsg) { //提交创建、修改表单
this.$refs[addMsg].validate((valid) => {
if (valid) {
this.addCashierWork();
......@@ -414,14 +419,16 @@
}
});
},
financeinfoRemove(id){ // 删除
financeinfoRemove(id) { // 删除
this.$confirm(this.$t('tips.qrscchuangkou'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.apipost('Window_post_RemoveAccountant',{ID:id}, res => {
if(res.data.resultCode == 1) {
this.apipost('Window_post_RemoveAccountant', {
ID: id
}, res => {
if (res.data.resultCode == 1) {
this.getList()
this.$message.success(res.data.message);
} else {
......@@ -436,39 +443,56 @@
});
},
remoteMethod(query) {
if (query !== ''||this.addShow) {
this.loading2 = true;
this.apipost("admin_Get_Chat_All_SelectEmpName",{ EmName:query },res => {
if (res.data.resultCode == 1) {
this.searchList = res.data.data;
this.loading2 = false;
}
},err => {});
} else {
this.searchList = [];
this.loading2 = false;
console.log('搜索');
let msg = {
EmployeeName:query
}
queryEmployee(msg).then(res => {
if(res.Code==1){
this.searchList = res.Data;
}
}).catch(() => {
})
// if (query !== '' || this.addShow) {
// this.loading2 = true;
// this.apipost("admin_Get_Chat_All_SelectEmpName", {
// EmName: query
// }, res => {
// if (res.data.resultCode == 1) {
// this.searchList = res.data.data;
// this.loading2 = false;
// }
// }, err => {});
// } else {
// this.searchList = [];
// this.loading2 = false;
// }
},
getList(){
getList() {
this.loading = true;
this.apipost('Window_post_GetAccountantPageList',this.msg, res => {
if(res.data.resultCode == 1) {
this.apipost('Window_post_GetAccountantPageList', this.msg, res => {
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
if(this.total>0){
this.noData =false;
}else{
this.noData =true;
if (this.total > 0) {
this.noData = false;
} else {
this.noData = true;
}
} else {
this.$message.error(res.data.message);
}
this.loading = false;
}, err => {this.loading = false;})
}, err => {
this.loading = false;
})
},
editCurency(id){ // 修改 根据id 获取信息
this.apipost('Window_post_GetAccountant',{ID:id}, res => {
if(res.data.resultCode == 1) {
editCurency(id) { // 修改 根据id 获取信息
this.apipost('Window_post_GetAccountant', {
ID: id
}, res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
// data.CostList.forEach(x=>{
// this.CostIdS.push(x.CostTypeId);
......@@ -476,14 +500,14 @@
this.addMsg = data;
this.addMsg.listArr = [];
this.addMsg.TemplateListArr = [];
if(data.emList&&data.emList.length>0){
data.emList.forEach(x=>{
if (data.emList && data.emList.length > 0) {
data.emList.forEach(x => {
this.remoteMethod(x.emName);
this.addMsg.listArr.push(x.EmId)
})
}
if(data.TemplateList&&data.TemplateList.length>0){
data.TemplateList.forEach(x=>{
if (data.TemplateList && data.TemplateList.length > 0) {
data.TemplateList.forEach(x => {
this.addMsg.TemplateListArr.push(x.Id)
})
}
......@@ -498,35 +522,37 @@
this.msg.pageIndex = val;
this.getList();
},
cancelEdit(){ // 取消修改、新增
cancelEdit() { // 取消修改、新增
this.addMsg = {
ID:0,
Name:'',
accountant_list:[],
emList:[],
listArr:[],
TemplateListArr:[],
TemplateList:[],
BranchId:'',
Direct:''
ID: 0,
Name: '',
accountant_list: [],
emList: [],
listArr: [],
TemplateListArr: [],
TemplateList: [],
BranchId: '',
Direct: ''
}
this.CostIdS = [];
this.searchList = [];
},
resetForm(formName) {//弹出框取消 初始化谈框内表单
resetForm(formName) { //弹出框取消 初始化谈框内表单
this.$refs[formName].resetFields();
},
getCompanyList(){ //获取公司列表
getCompanyList() { //获取公司列表
getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList = res.Data.PageData;
}).catch(() => {
})
},
},mounted(){
},
mounted() {
this.getList();
this.getCostTypeList();
this.getCompanyList();
}
}
</script>
src/pages/financial/addFinancialProcess.vue
View file @ 739bf549
......@@ -706,7 +706,7 @@
isIndeterminate: true,
schoolMsg:{
pageIndex: 1,
pageSize: 12,
pageSize: 99999,
rowsPerPage: 12,
SName: "",
Status: '-1'
......
src/pages/financial/financalDocument/addCapitalAllocation.vue
View file @ 739bf549
......@@ -158,7 +158,8 @@
<div class="page_addCapitalAllocation" v-loading="loading">
<div class="_top">
<p>{{BillName}}</p>
<p><span>{{msg.TemplateId==34?$t('fnc.zongbu'):$t('fnc.fgongsi')}}{{$t('fnc.zjdbodan')}}</span></p>
<!-- <p><span>{{msg.TemplateId==34?$t('fnc.zongbu'):$t('fnc.fgongsi')}}{{$t('fnc.zjdbodan')}}</span></p>-->
<p><span>{{$t('fnc.zjdbodan')}}</span></p>
</div>
<div class="_conten">
<ul v-if="inList.length">
......@@ -415,8 +416,8 @@
} else {
this.initMsg()
let userInfo = this.getLocalStorage();
this.msg.RB_Depart_Id = userInfo.RB_Department_Id;
this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
this.msg.RB_Depart_Id = userInfo.DeptId;
this.msg.RB_Branch_Id = userInfo.School_Id;
if(this.$route.query.fengs){
this.msg.RB_Branch_Id = 1218;
}
......
src/utils/erpindex.js
View file @ 739bf549
......@@ -73,7 +73,7 @@ export default{
Vue.prototype.getLocalStorage = function () {
var localStorageData = window.localStorage["loginUserInfo"];
if (localStorageData !== undefined && localStorageData != 'undefined') {
return JSON.parse(localStorageData);
return JSON.parse(localStorageData).data;
} else {
return null;
}
......@@ -84,8 +84,8 @@ export default{
let mallUrl = ""; //商城API
let locationName = window.location.hostname;
// domainUrl = "http://127.0.0.1";
// domainUrl = "http://192.168.1.13:8083";
domainUrl = "http://192.168.1.48:8015";
domainUrl = "http://192.168.1.13:8083";
// domainUrl = "http://192.168.1.48:8015";
//domainUrl = "http://192.168.1.21:8069";
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