diff --git a/.env.development b/.env.development
index f14882a..56074d9 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
ENV = 'development'
# base api
-#VUE_APP_DOMIAN=http://192.168.60.99:9003/
-VUE_APP_DOMIAN=http://hdcontract.ali251.langye.net/
+VUE_APP_DOMIAN=http://192.168.60.99:9003/
+#VUE_APP_DOMIAN=http://hdcontract.ali251.langye.net/
VUE_APP_BASE_API = ''
diff --git a/src/views/contract/components/detailContract.vue b/src/views/contract/components/detailContract.vue
index 23cd7cb..c2683ff 100644
--- a/src/views/contract/components/detailContract.vue
+++ b/src/views/contract/components/detailContract.vue
@@ -66,11 +66,11 @@
@@ -455,7 +455,7 @@ export default {
@extend .link-budget-plan-title;
}
&-item{
- color: red;
+ //color: red;
display: flex;
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index af1a582..97d329e 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -502,6 +502,15 @@ export default {
}
},
+ {
+ label:'已申请金额(元)',
+ prop:'apply_money_total',
+ width:180,
+ align:'right',
+ formatter:(cell,data,value)=>{
+ return Number(value).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
+ }
+ },
{
label:'已付金额(元)',
prop:'fund_log_total',
@@ -518,7 +527,7 @@ export default {
let per = ((((row.fund_log_total)/row.money)||0)*100)?.toFixed(2) || 0
return (
110 ? 'red' : 'green'}}>
- {per.padStart(5,'0')}%
+ {per}%
)
}
@@ -806,8 +815,8 @@ export default {
showPaymentPlan(row, column, cell){
if(column.property === 'sign_plan_count'){
this.$refs['contractPaymentRegistration'].getSignPlan(row.id)
+ row.status === 2 ? this.$refs['contractPaymentRegistration'].isSign = true : this.$refs['contractPaymentRegistration'].isSign = false
this.$refs['contractPaymentRegistration'].isShow = true
- row.id === 2 ? this.$refs['contractPaymentRegistration'].isSign = true : this.$refs['contractPaymentRegistration'].isSign = false
}
if(column.property === 'fund_log_total'){
this.$router.push(`/contract/paymentRegistrationList?contractId=${row.id}`)
diff --git a/src/views/contract/seeContract.vue b/src/views/contract/seeContract.vue
index 99575e4..c6f3f28 100644
--- a/src/views/contract/seeContract.vue
+++ b/src/views/contract/seeContract.vue
@@ -1,20 +1,21 @@
-
-
+
+
@@ -31,8 +32,8 @@
业务科室
-
-
+
+
@@ -41,8 +42,8 @@
采购形式
-
@@ -50,8 +51,8 @@
采购方式
-
-
+
+
@@ -60,41 +61,49 @@
预算金额
+ placeholder="最小金额"
+ style="width: 100px;"/>
-
+ placeholder="最大金额"
+ style="width: 100px;"/>
状态
-
-
+
+
-
-
+
+
- deleteContract(row.id)" @cellClick="showPaymentPlan" :cell-style="cellStyle" :show-summary="true" :summary-method="summary">
+ deleteContract(row.id)" @editor="">
-
+
-
+
@@ -114,7 +123,7 @@
-
diff --git a/src/views/statisticalReport/budgetProgress.vue b/src/views/statisticalReport/budgetProgress.vue
index bebbf9f..3ecd1c1 100644
--- a/src/views/statisticalReport/budgetProgress.vue
+++ b/src/views/statisticalReport/budgetProgress.vue
@@ -98,6 +98,18 @@ export default {
align:'left',
minWidth:300
},
+ {
+ prop:'money',
+ width: 180,
+ label:'项目金额(元)',
+ align:'right'
+ },
+ {
+ prop:'use_money_total',
+ label:'使用金额',
+ align:'right',
+ width: 180
+ },
{
prop:'rate',
label:'进展率',
@@ -106,12 +118,6 @@ export default {
return value + '%'
}
},
- {
- prop:'use_money_total',
- label:'使用金额',
- align:'right',
- width: 180
- }
]
}
},