Skip to content

S
SuperMan
Commit ba2014e7 authored by liudong1993's avatar liudong1993
Browse files
Options

1 财务流程优化

parent e165ba10
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 8 deletions
src/components/FinancialModule/FProcessManagement.vue
View file @ ba2014e7
......@@ -406,9 +406,9 @@ export default {
// v-if="lc.AuditWay!=1">({{lc.AuditWay=="2"?'会签':'或签'}})
x.Workflow_Condition.AuditList.forEach(y=>{
if(y.AuditWay==1){
y.contentTips = y.AuditDescription
y.contentTips = (y.NodeTypeList && y.NodeTypeList.length>0?y.NodeTypeList[0]+'|':'') + y.AuditDescription
}else{
y.contentTips = y.AuditWay==2?y.AuditDescription+'（会签）':y.AuditDescription+'（或签）'
y.contentTips = (y.NodeTypeList && y.NodeTypeList.length>0?y.NodeTypeList[0]+'|':'') + (y.AuditWay==2?y.AuditDescription+'（会签）':y.AuditDescription+'（或签）')
}
})
}
......
src/components/FinancialModule/FinancialSubmodule/FlowChartModule.vue
View file @ ba2014e7
......@@ -46,7 +46,12 @@
<div class="_liu_block clearfix" :class="[Math.floor((li+1)%3==0?li:(li+1)/3)%2==0?'fl text_l ':'fr text_r ']">
<span class="_array _array_h" :class="(li+1)%3!=0&&Math.floor((li+1)%3==0?li:(li+1)/3)%2!=0?'_array_h_left ':''" v-if="(li+1)%3!=0&&Math.floor((li+1)%3==0?li:(li+1)/3)%2!=0&&li!=dataList.AuditList.length-1"><span class="iconfont icon-xiaotuziCduan_2"></span></span>
<el-tooltip class="dataList" effect="dark" :content="lc.contentTips" placement="top">
<span :class="lc.AuditType==3?'_bg_org':'_bg_blue'" class="_miaoshu ">{{lc.AuditDescription}} <span v-if="lc.AuditWay!=1">({{lc.AuditWay=="2"?$t('fnc.huiqian'):$t('fnc.huoqian')}})</span></span>
<span :class="lc.AuditType==3?'_bg_org':'_bg_blue'" class="_miaoshu ">
<span v-if="lc.NodeType=='1'">总|</span>
<span v-if="lc.NodeType=='2'">分|</span>
<span v-if="lc.NodeType=='3'">团|</span>
{{lc.AuditDescription}} <span v-if="lc.AuditWay!=1">({{lc.AuditWay=="2"?$t('fnc.huiqian'):$t('fnc.huoqian')}})</span>
</span>
</el-tooltip>
<span v-if="(li+1)%3!=0&&Math.floor((li+1)%3==0?li:(li+1)/3)%2==0&&li!=dataList.AuditList.length-1" :class="(li+1)%3!=0&&Math.floor((li+1)%3==0?li:(li+1)/3)%2==0?'_array_h_right ':''" class="_array _array_h"><span class="iconfont icon-xiaotuziCduan_"></span></span>
<div class="_array_h_dbox" v-if="li!=dataList.AuditList.length-1" :class="Math.floor((li+1)%3==0?li:(li+1)/3)%2==0?'':'_array_h_dbox_l'">
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ ba2014e7
......@@ -717,7 +717,16 @@
</table>
<div class="rb_top_row _r_mt10">
<template v-for="(item,index) in newAuditList">
<p :key="index">
<p v-if="item.NodeType == '3' && AuditState.IsTravel">
{{item.AuditDescription}}:<span class="_r_name"></span>
</p>
<p v-else-if="item.NodeType == '2' && msg.RB_Branch_Id!=0">
{{item.AuditDescription}}:<span class="_r_name"></span>
</p>
<p v-else-if="item.NodeType == '1' && msg.RB_Branch_Id==0">
{{item.AuditDescription}}:<span class="_r_name"></span>
</p>
<p v-else-if="!item.NodeType || item.NodeType == ''">
{{item.AuditDescription}}:<span class="_r_name"></span>
</p>
</template>
......@@ -1016,6 +1025,10 @@
AuditList: []
},
newAuditList: [],
AuditState:{
IsTravel:false,
IsParentBranch:false
},
peopleData: [],
BillName: '',
BillSonName: '',
......@@ -2586,6 +2599,14 @@
}
}, err => {})
//验证是否团队
if(TCID>0){this.AuditState.IsTravel=true;}
if (this.orderObj != null && this.orderObj.OrderSource === 10 && this.orderObj.OrderID>0){this.AuditState.IsTravel=true;}
if (this.tradeObj && this.tradeObj.OtherType){
if(this.tradeObj.OtherType==61 || this.tradeObj.OtherType==66 || this.tradeObj.OtherType==67|| this.tradeObj.OtherType==55){
this.AuditState.IsTravel=true;
}
}
this.getCustomerIdList()
},
......
src/components/FinancialModule/addFinancialProcess.vue
View file @ ba2014e7
......@@ -29,7 +29,7 @@
overflow: hidden;
}
.page_addfp .approval_page_content {
width: 680px;
width: 780px;
min-height: auto !important;
overflow: hidden;
padding: 0 20px;
......@@ -59,14 +59,14 @@
}
.approval_person_list {
float: left;
width: 550px;
width: 650px;
max-height: 400px;
overflow: auto;
margin-bottom: 20px;
}
.approval_person_content span.approval_span_type {
float: left;
width: 120px;
width: 140px;
margin-bottom: 20px;
color:#333333;
font-size: 14px;
......@@ -181,6 +181,18 @@
</el-option>
</el-select>
</div>
<div v-show="!xingzhenState" class="_info_box _info_box_top">
<label>节点类型</label>
<el-select filterable v-model='NodeTypeValue' class="w200" size="mini">
<el-option label="常规" value="" key="0"></el-option>
<el-option v-for='item in NodeTypeList'
:label='item.Name'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
<span style="font-size: 10px;">*此处可以设置总公司/分公司显示</span>
</div>
<el-row>
<el-col :span="10" style="padding-left: 20px;">
<el-radio-group v-model="approvalType" @change='clearValue'>
......@@ -428,6 +440,9 @@
<i class="iconfont icon-user11"></i>
{{item.AuditDescription}}&nbsp;
<b class="bnotice" v-if="item.AuditWay!=1">({{item.AuditWay=="2"?$t('fnc.huiqian'):$t('fnc.huoqian')}})</b>
<b v-if="item.NodeType=='1'">总部</b>
<b v-else-if="item.NodeType=='2'">分公司</b>
<b v-else-if="item.NodeType=='3'">团队</b>
<em v-if='index==itemIndex' class="iconfont icon-guanbi approval_process_item_delete" @click.stop='deleteItem(item.Sort)'></em>
</span>
<i class="iconfont icon-jiantouyou"></i>
......@@ -727,6 +742,8 @@ export default {
},
WindowList:[],
WindowID:'',
NodeTypeValue: '',
NodeTypeList: [],
AccCheckAll: false,
AccList: [{
id: 1,
......@@ -784,6 +801,7 @@ export default {
this.getCostTypeList(1)
}
this.getFinancialFlowTemplate_post_GetNodeList();
this.getNodeTypeList();
this.getRole()
this.getEmployeeList();
this.getDepartment();
......@@ -892,6 +910,13 @@ export default {
}
}, err => {})
},
getNodeTypeList(){
this.apipost('Template_post_GetNodeTypeEnumList', {}, res => {
if(res.data.resultCode==1){
this.NodeTypeList = res.data.data
}
}, err => {})
},
getList() {
this.loading = true
this.apipost('FinancialFlowTemplate_post_Get', {ID:this.TemplateId,TemplateType:this.addMsg.TemplateType}, res => {
......@@ -1221,6 +1246,7 @@ export default {
if(this.AuditDescription==''){
return this.$message.error(this.$t('tips.qtxjdmiaoshu'))
}
AuditList.NodeType = this.NodeTypeValue;
if(type == 1)
{
AuditList.AuditType = type;
......@@ -1399,6 +1425,8 @@ export default {
this.showLayer();
this.approvalType=obj.AuditType;
this.GetNodeValue = obj.SpecialNode;
if(!obj.NodeType){obj.NodeType =''}
this.NodeTypeValue = obj.NodeType;
if(obj.AuditType==1){
this.directors=obj.RoleOrInitiator
}
......@@ -1500,6 +1528,7 @@ export default {
if(this.AuditDescription==''){
return this.$message.error(this.$t('tips.qtxjdmiaoshu'))
}
AuditList.NodeType = this.NodeTypeValue;
if(type==1){
AuditList.AuditType = type;
AuditList.AuditWay = 1;
......@@ -1737,6 +1766,7 @@ export default {
this.showMember = [];
this.showRole = [];
this.GetNodeValue = 0;
this.NodeType = '0';
},
goUrl(path) {
this.$router.push({ name: path,query:{"type":this.addMsg.TemplateType,'Branch_Id':this.$route.query.Branch_Id} })
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ ba2014e7
......@@ -571,7 +571,16 @@
</table>
<div class="rb_top_row _r_mt10">
<template v-for="(item,index) in newAuditList">
<p>
<p v-if="item.NodeType == '3' && AuditState.IsTravel">
{{item.AuditDescription}}:<span class="_r_name"></span>
</p>
<p v-else-if="item.NodeType == '2' && msg.RB_Branch_Id!=0">
{{item.AuditDescription}}:<span class="_r_name"></span>
</p>
<p v-else-if="item.NodeType == '1' && msg.RB_Branch_Id==0">
{{item.AuditDescription}}:<span class="_r_name"></span>
</p>
<p v-else-if="!item.NodeType || item.NodeType == ''">
{{item.AuditDescription}}:<span class="_r_name"></span>
</p>
</template>
......@@ -817,6 +826,10 @@
accountList: [],
GetAccountType: [],
newAuditList: [],
AuditState:{
IsTravel:false,
IsParentBranch:false
},
BillName: '',
BillSonName: '',
department: '',
......@@ -2071,6 +2084,14 @@
})
}
}
//验证是否团队
if(TCID>0){this.AuditState.IsTravel=true;}
if (this.orderObj != null && this.orderObj.OrderSource === 10 && this.orderObj.OrderID>0){this.AuditState.IsTravel=true;}
if (this.tradeObj && this.tradeObj.OtherType){
if(this.tradeObj.OtherType==61 || this.tradeObj.OtherType==66 || this.tradeObj.OtherType==67|| this.tradeObj.OtherType==55){
this.AuditState.IsTravel=true;
}
}
},
mounted() {
this.getCustomerIdList();
......
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