up

src/views/dashboard/index.vue

@@ -2,6 +2,28 @@
 <template>
   <div class="app-container">
     <div>当前登录人：{{user.name}}</div>
+
+
+    <el-card class="box-card" style="margin: 20px 0;">
+      <div slot="header" class="clearfix">
+    <span>预算总体进展情况</span>
+  </div> <router-link :to="`/statisticalReport/budgetProgress`">
+      <div class="progress-card" >
+        <div class="progress-card-item">
+          <div class="progress-card-item__num">{{moneyFormat(statistic.progress.money_total)}}</div>
+          <div class="progress-card-item__label">预算合计金额</div>
+        </div>
+        <div class="progress-card-item">
+          <div class="progress-card-item__num">{{moneyFormat(statistic.progress.use_money_total)}}</div>
+          <div class="progress-card-item__label">已支付金额</div>
+        </div>
+        <div class="progress-card-item">
+          <div class="progress-card-item__num">{{((statistic.progress.use_money_total/statistic.progress.money_total)*100).toFixed(2)}}%</div>
+          <div class="progress-card-item__label">进展率</div>
+        </div>
+      </div></router-link>
+    </el-card>
+
     <div ref="lxHeader">
       <LxHeader icon="md-apps" text="待办事项" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
         <div slot="content" />
@@ -34,39 +56,16 @@
       </div>
     </div>
 
-    <div ref="lxHeader" v-if="statistic.progress">
-      <LxHeader icon="md-apps" text="预算进展统计" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
-        <div slot="content" />
-        <slot>
-          <div style="width: 100%">
-            <el-card>
-              <div class="progress-card">
-                <div class="progress-card-item">
-                  <div class="progress-card-item__num">{{moneyFormat(statistic.progress.money_total)}}</div>
-                  <div class="progress-card-item__label">合计金额</div>
-                </div>
-                <div class="progress-card-item">
-                  <div class="progress-card-item__num">{{moneyFormat(statistic.progress.use_money_total)}}</div>
-                  <div class="progress-card-item__label">使用金额</div>
-                </div>
-                <div class="progress-card-item">
-                  <div class="progress-card-item__num">{{((statistic.progress.use_money_total/statistic.progress.money_total)*100).toFixed(2)}}%</div>
-                  <div class="progress-card-item__label">进展率</div>
-                </div>
-              </div>
-            </el-card>
-          </div>
-        </slot>
-      </LxHeader>
-    </div>
 
+
+<el-row :gutter="20">
+  <el-col :span="12" :xs="24">
     <div ref="lxHeader" v-if="statistic.departmentList">
-      <LxHeader icon="md-apps" text="科室进展" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+      <LxHeader icon="md-apps" text="科室进展情况" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
         <div slot="content" />
         <slot>
           <div style="width: 100%">
-            <el-card>
+              <xy-table :height="380" :list="statistic.departmentList" :table-item="departmentTable">
-              <xy-table :height="180" :list="statistic.departmentList" :table-item="departmentTable">
                 <template v-slot:btns>
                   <el-table-column :width="80" label="操作" header-align="center" align="center">
                     <template slot-scope="scope">
@@ -75,19 +74,17 @@
                   </el-table-column>
                 </template>
               </xy-table>
-            </el-card>
           </div>
         </slot>
       </LxHeader>
-    </div>
+    </div></el-col>
-
+  <el-col :span="12" :xs="24">
     <div ref="lxHeader" v-if="statistic.typeList">
-      <LxHeader icon="md-apps" text="预算进展" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+      <LxHeader icon="md-apps" text="预算类型进展情况" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
         <div slot="content" />
         <slot>
           <div style="width: 100%">
-            <el-card>
+              <xy-table :height="380" :list="statistic.typeList" :table-item="typeTable">
-              <xy-table :height="180" :list="statistic.typeList" :table-item="typeTable">
                 <template v-slot:btns>
                   <el-table-column :width="80" label="操作" header-align="center" align="center">
                     <template slot-scope="scope">
@@ -96,11 +93,13 @@
                   </el-table-column>
                 </template>
               </xy-table>
-            </el-card>
           </div>
         </slot>
       </LxHeader>
-    </div>
+    </div></el-col>
+</el-row>
+
+
     <detailContract ref="detailContract"></detailContract>
   </div>
 </template>
@@ -145,13 +144,13 @@ export default {
       departmentTable:[
         {
           label:'科室',
-          width:220,
+          width:120,
           prop:'name',
           sortable:false
         },
         {
           label:'合计金额(元)',
-          width: 240,
+          width: 140,
           align:'right',
           sortable:false,
           prop:'money_total',
@@ -161,7 +160,7 @@ export default {
         },
         {
           label:'已使用(元)',
-          width: 240,
+          width: 140,
           align:'right',
           sortable:false,
           prop:'use_money_total',
@@ -186,13 +185,13 @@ export default {
       typeTable:[
         {
           label:'预算类别',
-          width:220,
+          width:140,
           prop:'name',
           sortable:false
         },
         {
           label:'合计金额(元)',
-          width: 240,
+          width: 140,
           align:'right',
           sortable:false,
           prop:'money_total',
@@ -202,7 +201,7 @@ export default {
         },
         {
           label:'已使用(元)',
-          width: 240,
+          width: 140,
           align:'right',
           sortable:false,
           prop:'use_money_total',