Merge branch 'master' into 'master'

收入量统计优化

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

src/views/operate-monitoring/IncomeStatistics.vue

@@ -13,21 +13,21 @@
         <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="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 label="小计" prop="all_sr" align="center" sortable :sort-method="sortKssrAll" header-align="center"></el-table-column>
+          <el-table-column label="门诊" prop="mz_sr" align="center" sortable :sort-method="sortKssrMz" header-align="center"></el-table-column>
+          <el-table-column label="住院" prop="zy_sr" align="center" sortable :sort-method="sortKssrZy" 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="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="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 label="小计" prop="all_yzb" align="center" sortable :sort-method="sortYzbAll" header-align="center"></el-table-column>
+          <el-table-column label="门诊" prop="mz_yzb" align="center" sortable :sort-method="sortYzbMz" header-align="center"></el-table-column>
+          <el-table-column label="住院" prop="zy_yzb" align="center" sortable :sort-method="sortYzbZy" 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="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="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 label="小计" prop="all_hzb" align="center" sortable :sort-method="sortHzbAll" header-align="center"></el-table-column>
+          <el-table-column label="门诊" prop="mz_hzb" align="center" sortable :sort-method="sortHzbMz" header-align="center"></el-table-column>
+          <el-table-column label="住院" prop="zy_hzb" align="center" sortable :sort-method="sortHzbZy" header-align="center"></el-table-column>
         </el-table-column>
       </el-table>
     </div>
@@ -53,9 +53,9 @@ if (nowDay.getMonth() < 9) {
     yf = nowDay.getMonth() + 1
 }
 if (nowDay.getDate() < 10) {
-    inday = '0' + nowDay.getDate()
+    inday = '0' + (nowDay.getDate() + 1)
 } else {
-    inday = nowDay.getDate()
+    inday = nowDay.getDate() + 1
 }
 let s1 = nowDay.getFullYear() + "-" + yf + "-" + inday
 const start = formatDate(s1);
@@ -271,5 +271,14 @@ const exportData = () => {
 
     Export(data, title, `收入量统计`)
 }
+const sortKssrAll = (f1, f2) => (f1.all_sr-f2.all_sr)
+const sortKssrMz = (f1, f2) => (f1.mz_sr-f2.mz_sr)
+const sortKssrZy = (f1, f2) => (f1.zy_sr-f2.zy_sr)
+const sortYzbAll = (f1, f2) => (f1.all_yzb-f2.all_yzb)
+const sortYzbMz = (f1, f2) => (f1.mz_yzb-f2.mz_yzb)
+const sortYzbZy = (f1, f2) => (f1.zy_yzb-f2.zy_yzb)
+const sortHzbAll = (f1, f2) => (f1.all_hzb-f2.all_hzb)
+const sortHzbMz = (f1, f2) => (f1.mz_hzb-f2.mz_hzb)
+const sortHzbZy = (f1, f2) => (f1.zy_hzb-f2.zy_hzb)
 
 </script>