Merge branch 'master' into 'master'

收入量指标显示优化

See merge request lighter/vue-intergration-platform!45

src/views/operate-monitoring/IncomeStatistics.vue

@@ -12,19 +12,19 @@
                 <el-table-column type="index" label="序号" align="center" header-align="center"></el-table-column>
                 <el-table-column label="科室收入" prop="kssr" align="center" header-align="center">
                     <el-table-column label="科室" prop="ks_sr" align="center" header-align="center"></el-table-column>
-                    <el-table-column label="全部" prop="all_sr" align="center" header-align="center"></el-table-column>
+                    <el-table-column label="小计" prop="all_sr" align="center" header-align="center"></el-table-column>
                     <el-table-column label="门诊" prop="mz_sr" align="center" header-align="center"></el-table-column>
                     <el-table-column label="住院" prop="zy_sr" align="center" header-align="center"></el-table-column>
                 </el-table-column>
-                <el-table-column label="药占比" prop="yzb" align="center" header-align="center">
+                <el-table-column label="药占比(%)" prop="yzb" align="center" header-align="center">
                     <el-table-column label="科室" prop="ks_yzb" align="center" header-align="center"></el-table-column>
-                    <el-table-column label="全部" prop="all_yzb" align="center" header-align="center"></el-table-column>
+                    <el-table-column label="小计" prop="all_yzb" align="center" header-align="center"></el-table-column>
                     <el-table-column label="门诊" prop="mz_yzb" align="center" header-align="center"></el-table-column>
                     <el-table-column label="住院" prop="zy_yzb" align="center" header-align="center"></el-table-column>
                 </el-table-column>
-                <el-table-column label="耗占比" prop="hzb" align="center" header-align="center">
+                <el-table-column label="耗占比(%)" prop="hzb" align="center" header-align="center">
                     <el-table-column label="科室" prop="ks_hzb" align="center" header-align="center"></el-table-column>
-                    <el-table-column label="全部" prop="all_hzb" align="center" header-align="center"></el-table-column>
+                    <el-table-column label="小计" prop="all_hzb" align="center" header-align="center"></el-table-column>
                     <el-table-column label="门诊" prop="mz_hzb" align="center" header-align="center"></el-table-column>
                     <el-table-column label="住院" prop="zy_hzb" align="center" header-align="center"></el-table-column>
                 </el-table-column>
@@ -245,17 +245,17 @@ const exportData = () => {
 
     const title = {
         ks_sr: '收入科室',
-        all_sr: '全部收入',
+        all_sr: '收入小计',
         mz_sr: '门诊收入',
         zy_sr: '住院收入',
         ks_yzb: '药占比科室',
-        all_yzb: '全部药占比',
-        mz_yzb: '门诊药占比',
-        zy_yzb: '住院药占比',
+        all_yzb: '药占比小计(%)',
+        mz_yzb: '门诊药占比(%)',
+        zy_yzb: '住院药占比(%)',
         ks_hzb: '耗占比科室',
-        all_hzb: '全部耗占比',
-        mz_hzb: '门诊耗占比',
-        zy_hzb: '住院耗占比'
+        all_hzb: '耗占比小计(%)',
+        mz_hzb: '门诊耗占比(%)',
+        zy_hzb: '住院耗占比(%)'
     }
 
     Export(data, title, `收入量统计`)