|
@@ -362,7 +362,7 @@
|
|
},
|
|
},
|
|
submit(status){
|
|
submit(status){
|
|
//经营性费用不进行分配
|
|
//经营性费用不进行分配
|
|
- if(this.deptBudgetList.expensesPurpose!=5){
|
|
|
|
|
|
+ if(this.deptBudgetList.expensesPurpose!=5&&this.mode!='暂不分配'){
|
|
for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
|
|
for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
|
|
if(!this.feeDetailsDistributions[i].distributionMoney){
|
|
if(!this.feeDetailsDistributions[i].distributionMoney){
|
|
this.$message({
|
|
this.$message({
|
|
@@ -389,9 +389,11 @@
|
|
return
|
|
return
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- this.deptBudgetList.expenseAllocationInfoList=this.feeDetailsDistributions
|
|
|
|
- if(this.deptBudgetList.expensesPurpose==1){
|
|
|
|
- var data=[]
|
|
|
|
|
|
+ if(this.mode!='暂不分配'){
|
|
|
|
+ this.deptBudgetList.expenseAllocationInfoList=this.feeDetailsDistributions
|
|
|
|
+ }
|
|
|
|
+ if(this.deptBudgetList.expensesPurpose==1&&this.mode!='暂不分配'){
|
|
|
|
+ var data=[]
|
|
for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
|
|
for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
|
|
if(data.length==0){
|
|
if(data.length==0){
|
|
data.push(this.feeDetailsDistributions[i])
|
|
data.push(this.feeDetailsDistributions[i])
|
|
@@ -420,7 +422,7 @@
|
|
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if(this.deptBudgetList.expensesPurpose==3){
|
|
|
|
|
|
+ if(this.deptBudgetList.expensesPurpose==3&&this.mode!='暂不分配'){
|
|
var data=[]
|
|
var data=[]
|
|
for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
|
|
for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
|
|
if(data.length==0){
|
|
if(data.length==0){
|
|
@@ -464,26 +466,26 @@
|
|
|
|
|
|
// this.deptBudgetList.addressUrl=this.paymentScreenshot.toString()
|
|
// this.deptBudgetList.addressUrl=this.paymentScreenshot.toString()
|
|
this.deptBudgetList.flag=3
|
|
this.deptBudgetList.flag=3
|
|
- if(status==1){
|
|
|
|
|
|
+ if(status==1){
|
|
this.$confirm('确定提交分配信息', '提示', {
|
|
this.$confirm('确定提交分配信息', '提示', {
|
|
confirmButtonText: '确定',
|
|
confirmButtonText: '确定',
|
|
cancelButtonText: '取消',
|
|
cancelButtonText: '取消',
|
|
type: 'warning'
|
|
type: 'warning'
|
|
})
|
|
})
|
|
.then(() => {
|
|
.then(() => {
|
|
- editexenseinfo(this.deptBudgetList).toPromise()
|
|
|
|
- .then(response => {
|
|
|
|
- this.title='通过'
|
|
|
|
- this.rejectshow=true
|
|
|
|
- })
|
|
|
|
|
|
+ editexenseinfo(this.deptBudgetList).toPromise()
|
|
|
|
+ .then(response => {
|
|
|
|
+ this.title='通过'
|
|
|
|
+ this.rejectshow=true
|
|
|
|
+ })
|
|
})
|
|
})
|
|
- }else{
|
|
|
|
|
|
+ }else{
|
|
editexenseinfo(this.deptBudgetList).toPromise()
|
|
editexenseinfo(this.deptBudgetList).toPromise()
|
|
.then(response => {
|
|
.then(response => {
|
|
this.title='驳回'
|
|
this.title='驳回'
|
|
this.rejectshow=true
|
|
this.rejectshow=true
|
|
})
|
|
})
|
|
- }
|
|
|
|
|
|
+ }
|
|
}else{
|
|
}else{
|
|
if(status==1){
|
|
if(status==1){
|
|
editexenseinfo(this.deptBudgetList).toPromise()
|
|
editexenseinfo(this.deptBudgetList).toPromise()
|