up

.env.development

@@ -2,8 +2,8 @@
 ENV = 'development'
 
 # base api
-#VUE_APP_DOMIAN=http://192.168.60.99:9003/
+VUE_APP_DOMIAN=http://192.168.60.99:9003/
-VUE_APP_DOMIAN=http://hdcontract.ali251.langye.net/
+#VUE_APP_DOMIAN=http://hdcontract.ali251.langye.net/
 VUE_APP_BASE_API = ''
 
 

src/views/dashboard/index.vue

@@ -77,7 +77,7 @@
               <div style="width: 100%">
                 <xy-table :height="380" :list="statistic.departmentList" :table-item="departmentTable">
                   <template v-slot:btns>
-                    <el-table-column :width="80" label="操作" header-align="center" align="center">
+                    <el-table-column :width="80" fixed="right" label="操作" header-align="center" align="center">
                       <template slot-scope="scope">
                         <router-link
                           :to="`/statisticalReport/budgetProgress?departmentId=${scope.row.plan_department_id}`">查看
@@ -99,7 +99,7 @@
               <div style="width: 100%">
                 <xy-table :height="380" :list="statistic.typeList" :table-item="typeTable">
                   <template v-slot:btns>
-                    <el-table-column :width="80" label="操作" header-align="center" align="center">
+                    <el-table-column :width="80" fixed="right" label="操作" header-align="center" align="center">
                       <template slot-scope="scope">
                         <router-link :to="`/statisticalReport/budgetProgress?typeId=${scope.row.type}`">查看</router-link>
                       </template>
@@ -181,6 +181,30 @@
             sortable: false,
             fixed:"left"
           },
+          {
+            label: '进展情况',
+            sortable: false,
+            align: 'left',
+            width: 320,
+            fixed:"right",
+            customFn: (row) => {
+              let m2=row.money_total_2;
+              let m1=row.money_total_1;
+              let m3=row.use_money_total;
+              let per =0 ;
+
+              if (m2 != 0) {
+                per= ((m3 / m2) * 100).toFixed(2);
+              } else if (m1 != 0) {
+                per= ((m3 / m1) * 100).toFixed(2);
+              }
+              return ( < div >
+                <el-progress percentage = {
+                  Number(per)
+                } > </el-progress> </div >
+              )
+            }
+          },
           {
             label: '年初预算合计金额(元)',
             width: 160,
@@ -210,12 +234,20 @@
             formatter: (cell, data, value) => {
               return moneyFormatter(value)
             }
+          }
+        ],
+        typeTable: [{
+            label: '预算类别',
+            width: 100,
+            prop: 'type_text',
+            sortable: false,
+            fixed:"left",
           },
           {
             label: '进展情况',
             sortable: false,
+            minWidth: 220,
             align: 'left',
-            width: 320,
             fixed:"right",
             customFn: (row) => {
               let m2=row.money_total_2;
@@ -234,14 +266,6 @@
                 } > </el-progress> </div >
               )
             }
-          }
-        ],
-        typeTable: [{
-            label: '预算类别',
-            width: 100,
-            prop: 'type_text',
-            sortable: false,
-            fixed:"left",
           },
           {
             label: '年初预算合计金额(元)',
@@ -263,16 +287,6 @@
               return moneyFormatter(value)
             }
           },
-          {
-            label: '合计金额(元)',
-            width: 140,
-            align: 'right',
-            sortable: false,
-            prop: 'money_total',
-            formatter: (cell, data, value) => {
-              return moneyFormatter(value)
-            }
-          },
           {
             label: '已使用(元)',
             width: 140,
@@ -283,30 +297,6 @@
               return moneyFormatter(value)
             }
           },
-          {
-            label: '进展情况',
-            sortable: false,
-            minWidth: 220,
-            align: 'left',
-            fixed:"right",
-            customFn: (row) => {
-              let m2=row.money_total_2;
-              let m1=row.money_total_1;
-              let m3=row.use_money_total;
-              let per =0 ;
-
-              if (m2 != 0) {
-                per= ((m3 / m2) * 100).toFixed(2);
-              } else if (m1 != 0) {
-                per= ((m3 / m1) * 100).toFixed(2);
-              }
-              return ( < div >
-                <el-progress percentage = {
-                  Number(per)
-                } > </el-progress> </div >
-              )
-            }
-          }
         ]
       }
     },

src/views/statisticalReport/budgetProgress.vue

@@ -61,6 +61,8 @@ export default {
       },
       rateTotal:'0%',
       moneyTotal:0,
+      updateMoneyTotal:0,
+      useMoneyTotal:0,
       total:0,
       list:[],
       table:[
@@ -101,7 +103,13 @@ export default {
         {
           prop:'money',
           width: 180,
-          label:'项目金额(元)',
+          label:'年初预算金额(元)',
+          align:'right'
+        },
+        {
+          prop:'update_money',
+          width: 180,
+          label:'调整后预算金额(元)',
           align:'right'
         },
         {
@@ -113,15 +121,39 @@ export default {
         {
           prop:'rate',
           label:'进展率',
-          width: 120,
+          width: 200,
-          formatter:(cell,data,value)=>{
+          fixed:"right",
-            return value + '%'
+         customFn: (row) => {
+           let m2=row.update_money;
+           let m1=row.money;
+           let m3=row.use_money_total;
+           let per =0 ;
+
+           if (m2 != 0) {
+             per= ((m3 / m2) * 100).toFixed(2);
+           } else if (m1 != 0) {
+             per= ((m3 / m1) * 100).toFixed(2);
+           }
+           return ( < div >
+             <el-progress percentage = {
+               Number(per)
+             } > </el-progress> </div >
+           )
          }
         },
       ]
     }
   },
   methods: {
+    toper(m2,m1,m3){
+      let per =0 ;
+      if (m2 != 0) {
+        per= ((m3 / m2) * 100).toFixed(2);
+      } else if (m1 != 0) {
+        per= ((m3 / m1) * 100).toFixed(2);
+      }
+      return per;
+    },
     //统计
     summary(param){
       this.$nextTick(()=>{
@@ -135,12 +167,21 @@ export default {
           return
         }
         if(column.property === 'rate'){
-          sums[index] = this.rateTotal+'%'
+          sums[index] = this.rateTotal+"%";
           return
         }
         if(column.property === 'use_money_total'){
+          sums[index] = moneyFormatter(this.useMoneyTotal)
+        }
+
+        if(column.property === 'money'){
           sums[index] = moneyFormatter(this.moneyTotal)
         }
+
+
+        if(column.property === 'update_money'){
+          sums[index] = moneyFormatter(this.updateMoneyTotal)
+        }
       })
 
       return sums
@@ -172,8 +213,11 @@ export default {
       })
       this.list = res.list.data
       this.total = res.list.total
-      this.rateTotal = res.rate
+      this.useMoneyTotal = res.use_money_total
-      this.moneyTotal = res.use_money_total
+      this.moneyTotal=res.money;
+      this.updateMoneyTotal=res.update_money;
+      this.rateTotal = this.toper(this.updateMoneyTotal,this.moneyTotal,this.useMoneyTotal)
+
       console.log(res)
     }
   },