+
-
+
资金渠道
-
{{detail.money_way.value}}
+
{{moneyWayFormatter(detail.money_way_detail)}}
@@ -325,6 +325,14 @@ export default {
return "未知"
}
}
+ },
+ moneyWayFormatter(){
+ return function (arr){
+ let res = arr.map(item => {
+ return item.value
+ })
+ return res.toString()
+ }
}
},
mounted() {
diff --git a/src/views/contract/components/detailPaymentRegistration.vue b/src/views/contract/components/detailPaymentRegistration.vue
index 3940a25..23978f6 100644
--- a/src/views/contract/components/detailPaymentRegistration.vue
+++ b/src/views/contract/components/detailPaymentRegistration.vue
@@ -84,7 +84,7 @@
- scope.row.use_money = e"/>
+
@@ -167,6 +167,18 @@ export default {
}
},
methods: {
+ //预算计划金额输入
+ planInput(e,row){
+ if(e <= (Number(row.money) - Number(row.use_money_total))){
+ row.useMoney = e
+ }else{
+ Message({
+ type:'warning',
+ message:'使用金额大于剩余预算'
+ })
+ row.useMoney = 0
+ }
+ },
async getFundLog(id){
this.id = id
const res = await detailFundLog({id})
@@ -175,8 +187,8 @@ export default {
},
async getBudgets(){
let res = await getBudget({name:this.searchContent,page_size:10,page:this.plansPageIndex})
- this.plans = res.data
- this.planTotal = res.total
+ this.plans = res.list.data
+ this.planTotal = res.list.total
},
planPageChange(e){
diff --git a/src/views/contract/components/editorContract.vue b/src/views/contract/components/editorContract.vue
index 3dbcd71..e876d49 100644
--- a/src/views/contract/components/editorContract.vue
+++ b/src/views/contract/components/editorContract.vue
@@ -110,7 +110,7 @@
- scope.row.useMoney = e"/>
+
@@ -220,7 +220,18 @@ export default {
}
},
methods: {
-
+ //预算计划金额输入
+ planInput(e,row){
+ if(e <= (Number(row.money) - Number(row.use_money_total))){
+ row.useMoney = e
+ }else{
+ Message({
+ type:'warning',
+ message:'使用金额大于剩余预算'
+ })
+ row.useMoney = 0
+ }
+ },
//选择计划
selectPlan(sel,row){
if(sel){
@@ -248,8 +259,8 @@ export default {
//获取预算计划
async getBudgets(){
let res = await getBudget({name:this.planSearch,page_size:10,page:this.plansPageIndex})
- this.plans = res.data
- this.planTotal = res.total
+ this.plans = res.list.data
+ this.planTotal = res.list.total
this.toggleSelection(this.detail.plan.map(item => {
return item.value.plan_id
@@ -263,7 +274,10 @@ export default {
toggleSelection(plans) {
if (plans) {
this.plans.filter(plan => {
- return plans.includes(plan.id)
+ if(plans.includes(plan.id)){
+ plan.useMoney = this.detail.plan[plans.indexOf(plan.id)].value.use_money
+ return true
+ }
}).map(row => {
this.$refs.editorPlanTable.toggleRowSelection(row)
})
@@ -287,7 +301,9 @@ export default {
label:item.name,
value:{
plan_id:item.id,
- use_money:item.useMoney,
+ use_money:res.plan_link.filter(item1 => {
+ return item1.plan_id === item.id
+ })[0].use_money,
new_money:item.money
}
}
diff --git a/src/views/contract/components/examineRegistration.vue b/src/views/contract/components/examineRegistration.vue
index 3a53dfe..0d4e3da 100644
--- a/src/views/contract/components/examineRegistration.vue
+++ b/src/views/contract/components/examineRegistration.vue
@@ -299,8 +299,8 @@ export default {
//获取预算计划
async getBudgets(){
let res = await getBudget({name:this.searchContent,page_size:10,page:this.pageIndex})
- this.plans = res.data
- this.planTotal = res.total
+ this.plans = res.list.data
+ this.planTotal = res.list.total
this.toggleSelection(this.paymentRegistrationForm.plan.map(item => {
return item.plan_id
diff --git a/src/views/contract/components/paymentRegistration.vue b/src/views/contract/components/paymentRegistration.vue
index 5f5c41d..995b2e9 100644
--- a/src/views/contract/components/paymentRegistration.vue
+++ b/src/views/contract/components/paymentRegistration.vue
@@ -274,8 +274,8 @@ export default {
//获取预算计划
async getBudgets(){
let res = await getBudget({name:this.searchContent,page_size:10,page:this.pageIndex})
- this.plans = res.data
- this.planTotal = res.total
+ this.plans = res.list.data
+ this.planTotal = res.list.total
this.toggleSelection(this.paymentRegistrationForm.plan.map(item => {
return item.plan_id
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index 2f0325f..23ce6bb 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -138,7 +138,7 @@
ghost>删除
-
+
@@ -264,7 +264,7 @@
- scope.row.useMoney = e"/>
+
@@ -665,6 +665,18 @@ export default {
}
},
methods: {
+ //预算计划金额输入
+ planInput(e,row){
+ if(e <= (Number(row.money) - Number(row.use_money_total))){
+ row.useMoney = e
+ }else{
+ Message({
+ type:'warning',
+ message:'使用金额大于剩余预算'
+ })
+ row.useMoney = 0
+ }
+ },
//合计
summary(param){
const { columns, data } = param
@@ -851,8 +863,8 @@ export default {
//获取预算计划
async getBudgets(){
let res = await getBudget({name:this.planSearch,page_size:10,page:this.plansPageIndex})
- this.plans = res.data
- this.planTotal = res.total
+ this.plans = res.list.data
+ this.planTotal = res.list.total
},
//获取资金渠道
async getMoneyWay(){
diff --git a/src/views/finance/components/examineRegistration.vue b/src/views/finance/components/examineRegistration.vue
index 6cfe290..365b760 100644
--- a/src/views/finance/components/examineRegistration.vue
+++ b/src/views/finance/components/examineRegistration.vue
@@ -299,8 +299,8 @@ export default {
//获取预算计划
async getBudgets(){
let res = await getBudget({name:this.searchContent,page_size:10,page:this.pageIndex})
- this.plans = res.data
- this.planTotal = res.total
+ this.plans = res.list.data
+ this.planTotal = res.list.total
if(!this.paymentRegistrationForm.is_end) return