Skip to content

S
SuperMan
Commit 2e3b4bb8 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

还原工作台代码

parent 0f4c5b48
Show whitespace changes
Inline Side-by-side
Showing with 270 additions and 292 deletions
src/components/FinancialModule/accountingWork.vue
View file @ 2e3b4bb8
......@@ -15,20 +15,20 @@
</li>
</ul>
</div>
<div v-loading="loading">
<div>
<p class="_cashierWorl_tit">注：指定银行卡收支方向的单据会自动分发到各个窗口，管理员在设定时应注意以下窗口是否涵盖了所有的业务，如果没有请及时设定，以免造成单据混乱</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-if="transitionShow2">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading" v-if="transitionShow2">
<tr>
<th>窗口名称</th>
<th>会计关联费用类型</th>
<th>所属公司</th>
<th>业务人员</th>
<th>负责方向</th>
<th>操作</th>
</tr>
<tr v-for="(item,index) in dataList" :key="index">
<td>{{item.Name}}</td>
<td width="800">{{item.CostName}}</td>
<td>{{item.BName}}</td>
<td>
<span v-for="(i,ix) in item.emList">{{i.emName}} <span v-if="ix!=item.emList.length-1">,</span> </span>
</td>
......@@ -120,20 +120,20 @@
<el-input v-model="addMsg.Name"></el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="费用类型：" prop="TypelistArr">
<treeselect
class="w230"
v-model="addMsg.TypelistArr"
value-consists-of="LEAF_PRIORITY"
placeholder="请选择"
:multiple="true"
:options="CostTypeList"
noChildrenText=''
:normalizer="normalizer"/>
<el-col :span="4">
<el-form-item label="所属公司：" prop="BranchId">
<el-select filterable v-model='addMsg.BranchId'>
</el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
:key='item.Id'
:disabled="item.disabled">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="10">
<el-form-item label="业务人员：" prop="listArr">
<el-select
v-model="addMsg.listArr"
......@@ -157,9 +157,6 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="负责方向" prop="Direct">
<el-radio v-model="addMsg.Direct" :label="1">收</el-radio>
......@@ -167,6 +164,19 @@
<el-radio v-model="addMsg.Direct" :label="3">收支</el-radio>
</el-form-item>
</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-form>
</div>
......@@ -190,7 +200,6 @@ export default {
accountant_list:[],
emList:[],
listArr:[],
TypelistArr:[],
BranchId:'',
Direct:'',
},
......@@ -218,9 +227,6 @@ export default {
{ required: true, message: '请选择公司', trigger: 'change' }
],Direct:[
{ required: true, message: '请选择使用方向', trigger: 'change' }
],
TypelistArr:[
{type: 'array', required: true, editCurencymessage: '费用类型', trigger: 'change' }
]
},
AccListProps: {
......@@ -229,13 +235,13 @@ export default {
children: 'children'
},
selectVal:[],
transitionShow: false,
transitionShow2: true,
transitionShow:false,
transitionShow2:true,
contenWidth:0,
contenHeight:0,
tableSize:0,
shouList:[],
shouListLoading: false,
shouListLoading:false,
CostTypeList:[],
normalizer(node) {
return {
......@@ -296,35 +302,17 @@ export default {
}
})
},
mergeArray(list3, list1, type){
if (type === 1) {
let newList = [...list1,...list3]
let HTobj = {};
newList = newList.reduce(function(item, next) { //数组对象去重
HTobj[next.EmId] ? '' : HTobj[next.EmId] = true && item.push(next);
return item;
}, []);
list3.forEach((x, index)=>{ // 根据MD5Sign过滤删除数据
newList.filter((val, vIndex)=>{
if(x.EmId === val.EmId)
newList.splice(vIndex,1)
})
})
} else {
let newList = [...list1,...list3]
let HTobj = {};
newList = newList.reduce(function(item, next) { //数组对象去重
HTobj[next.CostTypeId] ? '' : HTobj[next.CostTypeId] = true && item.push(next);
return item;
}, []);
list3.forEach((x, index)=>{ // 根据MD5Sign过滤删除数据
newList.filter((val, vIndex)=>{
if(x.CostTypeId === val.CostTypeId)
newList.splice(vIndex,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++){
list3.push(list1[i]);
}
console.log(list3)
return list3;
},
addCashierWork(){ // 提交保存
......@@ -338,16 +326,7 @@ export default {
}
arr.push(obj);
})
let accountant_list = []
this.addMsg.TypelistArr.forEach(x=>{
let obj = {
ID: 0,
CostTypeId: x
}
accountant_list.push(obj)
})
let list4 = this.mergeArray(arr,this.addMsg.emList,1);
this.addMsg.accountant_list = this.mergeArray(accountant_list, this.addMsg.accountant_list,2);
let list4 = this.mergeArray(arr,this.addMsg.emList);
this.addMsg.emList = list4;
this.apipost('Window_post_SetAccountant',this.addMsg,r=>{
if(r.data.resultCode==1){
......@@ -427,11 +406,10 @@ export default {
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);
// })
this.addMsg = data;
this.addMsg.TypelistArr = [];
data.accountant_list.forEach(x=>{
this.addMsg.TypelistArr.push(x.CostTypeId);
})
this.addMsg.listArr = [];
if(data.emList&&data.emList.length>0){
data.emList.forEach(x=>{
......@@ -439,6 +417,7 @@ export default {
this.addMsg.listArr.push(x.EmId)
})
}
this.addMsg.accountant_list = [];
this.addShow = true;
} else {
this.$message.error(res.data.message);
......@@ -457,8 +436,7 @@ export default {
emList:[],
listArr:[],
BranchId:'',
Direct:'',
TypelistArr:[],
Direct:''
}
this.CostIdS = [];
this.searchList = [];
......
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