Skip to content

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

新增付款流程控制

parent 55eb3fdf
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 37 deletions
src/components/FinancialModule/CapitalAllocation.vue
View file @ cd06ee41
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
.page_CapitalAllocation .page_CapitalAllocation_list { .page_CapitalAllocation .page_CapitalAllocation_list {
width: 100%; width: 100%;
} }
.page_CapitalAllocation i.icon-sousuo,.page_CapitalAllocation i.editedit{ .page_CapitalAllocation i.icon-sousuo,.page_CapitalAllocation i.el-icon-edit{
width: 30px; width: 30px;
height: 30px; height: 30px;
display: inline-block; display: inline-block;
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
cursor: pointer; cursor: pointer;
outline: none; outline: none;
} }
.page_CapitalAllocation i.edit{background-color: #00C6FF;font-size: 16px;} .page_CapitalAllocation i.el-icon-edit{background-color: #00C6FF;font-size: 16px;}
.page_CapitalAllocation i.edit:hover{background-color: #59daff} .page_CapitalAllocation i.el-icon-edit:hover{background-color: #59daff}
.page_CapitalAllocation i.edit:active{background-color: #00b8ec} .page_CapitalAllocation i.el-icon-edit:active{background-color: #00b8ec}
.page_CapitalAllocation i.icon-sousuo{background-color: #47BF8C;} .page_CapitalAllocation i.icon-sousuo{background-color: #47BF8C;}
.page_CapitalAllocation i.icon-sousuo:hover{background-color: #66bb97} .page_CapitalAllocation i.icon-sousuo:hover{background-color: #66bb97}
.page_CapitalAllocation i.icon-sousuo:active{background-color: #35ab79} .page_CapitalAllocation i.icon-sousuo:active{background-color: #35ab79}
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
</el-popover> </el-popover>
</td> </td>
<td> <td>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top" v-if="item.Status===1 && item.CreateBy===EmId && item.InOrNotProcess===-1"> <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top" v-if="(item.Status===1 || item.Status===3) && item.CreateBy===EmId && item.InOrNotProcess===-1">
<i class="edit el-icon-edit" @click="goURL('addCapitalAllocation', 1, item.FrID)"></i> <i class="edit el-icon-edit" @click="goURL('addCapitalAllocation', 1, item.FrID)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('fnc.xiangqing')" placement="top"> <el-tooltip class="item" effect="dark" :content="$t('fnc.xiangqing')" placement="top">
......
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ cd06ee41
...@@ -88,6 +88,7 @@ ...@@ -88,6 +88,7 @@
templateID: null, templateID: null,
DepartID: null, DepartID: null,
EmployeeId: null, EmployeeId: null,
OrderSource: null,
} }
},methods:{ },methods:{
goUrl(path,id,Name,Type,IsUploadPic) { goUrl(path,id,Name,Type,IsUploadPic) {
...@@ -142,43 +143,53 @@ ...@@ -142,43 +143,53 @@
}, },
Financial_post_GetList(){ //获取 Financial_post_GetList(){ //获取
this.apipost('Financial_post_GetList',{},res=>{ this.apipost('Financial_post_GetList',{},res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
let data = res.data.data; let data = res.data.data;
console.log("data",data); console.log("data",data);
if(data){ if(data){
data.forEach(x => { data.forEach(x => {
if(x.Type==1){ // 5-8 OrderSource 为5 并且当前登录人为吴珊，只显示49和50
this.collectList.push(x); // 如果不是吴珊，只显示49
}else if (x.Type==2){ if (this.OrderSource === '5' && this.showTab === '2') {
// if(this.active===2){ if (x.Id === 49 || x.Id === 50){
// if(x.Id!=11){ x.bigShow = false
// this.payList.push(x); if (x.Id === 49){
// }
// }else{
this.payList.push(x);
// }
}else if (x.Type==7){
this.GZList.push(x);
}
// 5-5 仅茈、而巳。 14:32:06
// 部门id = 242 或者 240 就展示出 templeteId=33 的流程， 流程名字叫做 公司佣金收款
if (x.Id === 33 || x.Id === 48) {
if (x.Id === 33) {
if (this.DepartID === 242 || this.DepartID === 240) {
x.bigShow = true x.bigShow = true
} else { } else if (x.Id === 50 && this.EmployeeId === 639){
x.bigShow = false
}
} else if (x.Id === 48) {
if (this.EmployeeId === 1725) {
x.bigShow = true x.bigShow = true
} else {
x.bigShow = false
} }
console.log('if',x.Id,x.bigShow)
} else {
x.bigShow = false
console.log('else',x.Id,x.bigShow)
} }
} else { } else {
x.bigShow = true // 5-5 仅茈、而巳。 14:32:06
// 部门id = 242 或者 240 就展示出 templeteId=33 的流程， 流程名字叫做 公司佣金收款
if (x.Id === 33 || x.Id === 48) {
if (x.Id === 33) {
if (this.DepartID === 242 || this.DepartID === 240) {
x.bigShow = true
} else {
x.bigShow = false
}
} else if (x.Id === 48) {
if (this.EmployeeId === 1725) {
x.bigShow = true
} else {
x.bigShow = false
}
}
} else {
x.bigShow = true
}
}
if(x.Type==1){
this.collectList.push(x);
}else if (x.Type==2){
this.payList.push(x);
}else if (x.Type==7){
this.GZList.push(x);
} }
}); });
} }
...@@ -199,8 +210,9 @@ ...@@ -199,8 +210,9 @@
this.DepartID = userInfo.RB_Department_Id; this.DepartID = userInfo.RB_Department_Id;
this.EmployeeId = userInfo.EmployeeId; this.EmployeeId = userInfo.EmployeeId;
this.templateID = this.$route.query.templateID ? JSON.parse(this.$route.query.templateID) : null this.templateID = this.$route.query.templateID ? JSON.parse(this.$route.query.templateID) : null
this.Financial_post_GetList(); this.OrderSource = this.$route.query.OrderSource ? this.$route.query.OrderSource : null
this.showTab = this.$route.query.Type?this.$route.query.Type:0; this.showTab = this.$route.query.Type?this.$route.query.Type:0;
if(this.showTab==1){ if(this.showTab==1){
this.GetList = this.collectList; this.GetList = this.collectList;
} else if(this.showTab==3){ } else if(this.showTab==3){
...@@ -210,6 +222,7 @@ ...@@ -210,6 +222,7 @@
} }
this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1; this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1;
this.orderObj = this.$route.query.orderObj; this.orderObj = this.$route.query.orderObj;
this.Financial_post_GetList();
},components: { },components: {
"my-FlowChartModule": myFlowChartModule "my-FlowChartModule": myFlowChartModule
} }
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ cd06ee41
...@@ -535,7 +535,7 @@ ...@@ -535,7 +535,7 @@
</td> </td>
<td class="_icon_btn"> <td class="_icon_btn">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top"> <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
<i v-if="((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="edit el-icon-edit" @click="goEit(item.Type==1?'addReceivablesDocuments':'addFinancialDocuments',item.Type,item.FrID,true,active,msg.pageIndex)"></i> <i v-if="((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="edit el-icon-edit" @click="goEit(item.Type,item.FrID,true,active,msg.pageIndex)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top"> <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top">
<i class="iconfont icon-sousuo" v-if='item.Type!==4' @click="goUrl('FinancialDocumentsDetail',item.FrID,active,msg.pageIndex)"></i> <i class="iconfont icon-sousuo" v-if='item.Type!==4' @click="goUrl('FinancialDocumentsDetail',item.FrID,active,msg.pageIndex)"></i>
...@@ -1382,8 +1382,19 @@ export default { ...@@ -1382,8 +1382,19 @@ export default {
goUrlAdd(path){ goUrlAdd(path){
this.$router.push({ name: path,query:{blank:'y',tab:'选择财务单据类型'} }) this.$router.push({ name: path,query:{blank:'y',tab:'选择财务单据类型'} })
}, },
goEit(path,type,id,edit,Conditon,pageIndex){ goEit(type,id,edit,Conditon,pageIndex){
this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'修改财务单据'} }) let path = '';
if (type === 1) {
path = 'addReceivablesDocuments'
this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'修改财务单据'} })
} else if (type === 2) {
path = 'addFinancialDocuments'
this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'修改财务单据'} })
} else if (type === 4) {
path = 'addCapitalAllocation'
this.$router.push({ name: path,query:{"id":id,"edit":1,blank:'y',tab:'修改财务单据'} })
}
// this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'修改财务单据'} })
} }
}, },
watch:{ watch:{
......
src/components/dmc/manager/teamRevenueExpenditure.vue
View file @ cd06ee41
...@@ -450,7 +450,8 @@ ...@@ -450,7 +450,8 @@
'path': 'teamRevenueExpenditure', 'path': 'teamRevenueExpenditure',
'companyID': this.msgList[0].OutBranchId, 'companyID': this.msgList[0].OutBranchId,
'blank': 'y', 'blank': 'y',
'orderObj': JSON.stringify(orderObj) 'orderObj': JSON.stringify(orderObj),
'OrderSource': _orderSource,
} }
}); });
}, },
......
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