*关联预算计划
@@ -312,9 +312,6 @@ import detail from "./components/detailContract"
import paymentRegistration from "./components/paymentRegistration";
import contractSign from "@/views/contract/components/contractSign";
import contractPaymentRegistration from "@/views/contract/components/contractPaymentRegistration";
-import {login} from "@/api/user";
-
-
export default {
components:{
@@ -511,20 +508,17 @@ export default {
}
},
{
- label:'已付金额',
+ label:'已付金额(元)',
prop:'fund_log_total',
- width:120,
+ width:180,
align:'right',
formatter:(cell,data,value)=>{
- if(!value){
- return '0.00'
- }
- return value
+ return Number(value).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
}
},
{
- label:"合同预算价(万元)",
- width: 160,
+ label:"合同预算价(元)",
+ width: 180,
prop:"plan_price",
align:'right',
formatter:(v1,v2,value)=>{
@@ -532,10 +526,13 @@ export default {
}
},
{
- label:'合同签订价（万元）',
+ label:'合同签订价（元）',
width: 180,
prop:'money',
- align:'right'
+ align:'right',
+ formatter:(cell,data,value)=>{
+ return Number(value).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
+ }
},
{
label:"合同状态",
@@ -589,6 +586,7 @@ export default {
planPriceTotal:0
},
+ planTypes:[],
planTable:[
{
width: 36,
@@ -598,17 +596,11 @@ export default {
{
label:"分类",
prop:'type',
- formatter:(cell,data,value)=>{
- switch (value){
- case 1:
- return "部门预算"
- break;
- case 2:
- return "水务计划"
- break;
- default:
- return "未知"
- }
+ formatter: (cell, data, value) => {
+ let res = this.planTypes.filter(item => {
+ return item.id === value
+ })
+ return res[0]?.value || '未知'
}
},
{
@@ -671,6 +663,11 @@ export default {
}
},
methods: {
+ async getPlanTypes(){
+ const res = await getparameter({number:'money_way'})
+ this.planTypes = res.detail
+ },
+
//预算计划金额输入
planInput(e,row){
if(!/^[0-9]+.?[0-9]*$/.test(e) && e){
@@ -829,8 +826,8 @@ export default {
"项目类型":this.type.filter(item => {
return item.value === row.type
})[0]?.label,
- "项目预算（万元）":row?.plan_price,
- "资金渠道":row?.money_way?.value
+ "资金渠道":row?.money_way?.value,
+ "项目预算（万元）":row?.plan_price
}
let res = await getOatoken()
let url = `${process.env.VUE_APP_OUT_URL}/admin/flow/create/2?oatoken=${res.oatoken}&out_contract_id=${row.id}&contract_json=${JSON.stringify(baseInfo)}`
@@ -1113,7 +1110,7 @@ export default {
position: absolute;
right: 0;
top: 0;
- content:'（万元）'
+ content:'（元）'
}
}
diff --git a/src/views/contract/paymentPlan.vue b/src/views/contract/paymentPlan.vue
index 6b797f7..a935240 100644
--- a/src/views/contract/paymentPlan.vue
+++ b/src/views/contract/paymentPlan.vue
@@ -67,7 +67,10 @@ export default {
prop:'money',
label:'计划付款金额（元）',
align:'right',
- width:168
+ width:170,
+ formatter:(v1,v2,value)=>{
+ return Number(value).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
+ }
},
{
prop:'date',
diff --git a/src/views/contract/paymentRegistrationList.vue b/src/views/contract/paymentRegistrationList.vue
index f6c9c0c..e3a9443 100644
--- a/src/views/contract/paymentRegistrationList.vue
+++ b/src/views/contract/paymentRegistrationList.vue
@@ -82,13 +82,19 @@ export default {
label:"付款申请金额(元)",
prop:"apply_money",
align:'right',
- width: 180
+ width: 180,
+ formatter:(v1,v2,value)=>{
+ return Number(value).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
+ }
},
{
- label:'实际支付金额',
+ label:'实际支付金额(元)',
prop:"act_money",
align:'right',
- width: 180
+ width: 180,
+ formatter:(v1,v2,value)=>{
+ return Number(value).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
+ }
},
{
label:"款项类型",
@@ -105,9 +111,9 @@ export default {
}
},
{
- label:"是否最后一笔",
+ label:"是否为预算内确定项目",
prop:"is_end",
- width: 146,
+ width: 184,
formatter:(cell,data,value)=>{
return value == 1 ? "是" : "否"
}
diff --git a/src/views/contract/seeContract.vue b/src/views/contract/seeContract.vue
index e484b2f..d13ab67 100644
--- a/src/views/contract/seeContract.vue
+++ b/src/views/contract/seeContract.vue
@@ -327,7 +327,7 @@ export default {
}
},
{
- label:'已付金额',
+ label:'已付金额(元)',
prop:'fund_log_total',
width:120,
align:'right',
@@ -339,7 +339,7 @@ export default {
}
},
{
- label:"合同预算价(万元)",
+ label:"合同预算价(元)",
width: 160,
prop:"plan_price",
align:'right',
@@ -348,7 +348,7 @@ export default {
}
},
{
- label:'合同签订价（万元）',
+ label:'合同签订价（元）',
width: 180,
prop:'money',
align:'right'
@@ -422,6 +422,12 @@ export default {
case 2:
return "水务计划"
break;
+ case 3:
+ return '补助经费'
+ break
+ case 4:
+ return '其他'
+ break
default:
return "未知"
}
@@ -855,7 +861,7 @@ export default {
position: absolute;
right: 0;
top: 0;
- content:'（万元）'
+ content:'（元）'
}
}
diff --git a/src/views/finance/components/examineRegistration.vue b/src/views/finance/components/examineRegistration.vue
index 02d8b80..f57be73 100644
--- a/src/views/finance/components/examineRegistration.vue
+++ b/src/views/finance/components/examineRegistration.vue
@@ -91,8 +91,8 @@
-
-
*是否最后一笔
+
+ *是否为预算内确定项目
@@ -104,12 +104,12 @@
*实际付款金额
-
-
+
@@ -147,10 +147,11 @@ export default {
plans:[],
contract:{},
payment:[],//合同关联的付款登记
+ planTypes:[],
payTable:[
{
label:'支付金额',
- prop:'act_money',
+ prop:'apply_money',
sortable:false,
align:'right'
},
@@ -204,17 +205,11 @@ export default {
{
label:"分类",
prop:'type',
- formatter:(cell,data,value)=>{
- switch (value){
- case 1:
- return "部门预算"
- break;
- case 2:
- return "水务计划"
- break;
- default:
- return "未知"
- }
+ formatter: (cell, data, value) => {
+ let res = this.planTypes.filter(item => {
+ return item.id === value
+ })
+ return res[0]?.value || '未知'
}
},
{
@@ -231,6 +226,10 @@ export default {
}
},
methods: {
+ async getPlanTypes(){
+ const res = await getparameter({number:'money_way'})
+ this.planTypes = res.detail
+ },
//翻页
pageChange(e){
this.pageIndex = e
@@ -347,7 +346,7 @@ export default {
},
async mounted() {
await this.getBudgets()
-
+ await this.getPlanTypes()
}
}
diff --git a/src/views/finance/paymentRegistrationList.vue b/src/views/finance/paymentRegistrationList.vue
index f45d83e..dcd608c 100644
--- a/src/views/finance/paymentRegistrationList.vue
+++ b/src/views/finance/paymentRegistrationList.vue
@@ -70,13 +70,19 @@ export default {
label:"付款申请金额(元)",
prop:"apply_money",
align:'right',
- width: 170
+ width: 170,
+ formatter:(v1,v2,value)=>{
+ return Number(value).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
+ }
},
{
- label:'实际付款金额',
+ label:'实际付款金额(元)',
prop:"act_money",
align:'right',
- width: 165
+ width: 170,
+ formatter:(v1,v2,value)=>{
+ return Number(value).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
+ }
},
{
label:"款项类型",
@@ -93,9 +99,9 @@ export default {
}
},
{
- label:"是否最后一笔",
+ label:"是否为预算内确定项目",
prop:"is_end",
- width: 146,
+ width: 184,
formatter:(cell,data,value)=>{
return value == 1 ? "是" : "否"
}
diff --git a/src/views/statisticalReport/budgetProgress.vue b/src/views/statisticalReport/budgetProgress.vue
index 4228ba1..71c8c6f 100644
--- a/src/views/statisticalReport/budgetProgress.vue
+++ b/src/views/statisticalReport/budgetProgress.vue
@@ -50,19 +50,12 @@