fix: #568 门诊日结排版 #571 撤回流程 #579 报表格式

openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue

@@ -37,32 +37,26 @@
         <el-button type="primary" plain icon="Printer" @click="print">打印</el-button>
       </el-form-item>
     </el-form>
-    <div v-loading="loading" style="width: 1300px">
+    <div v-loading="loading" class="day-end-container">
       <div style="text-align: center">
-        <h2>门诊收费日结单</h2>
+        <h2 class="report-title">门诊收费日结单</h2>
       </div>
-      <el-row
+      <el-row :gutter="5" class="data-row">
-        :gutter="5"
-        style="margin: 20px 0; display: flex; align-items: center; justify-content: flex-start; padding: 0 20px"
-      >
         <el-col :span="4">
           <span class="label">经办人姓名：</span>
-          <span class="value">{{ userStore.nickName }}</span>
+          <span class="value">{{ userStore.nickName || '-' }}</span>
         </el-col>
         <el-col :span="4">
           <span class="label">科室：</span>
-          <span class="value">{{ userStore.orgName }}</span>
+          <span class="value">{{ userStore.orgName || '-' }}</span>
         </el-col>
         <el-col :span="7">
           <span class="label">时间：</span>
-          <span class="value">{{ queryTime[0] + '~' + queryTime[1] }}</span>
+          <span class="value">{{ queryTime && queryTime.length === 2 ? queryTime[0] + '~' + queryTime[1] : '-' }}</span>
         </el-col>
       </el-row>
       <div class="divider"></div>
-      <el-row
+      <el-row :gutter="10" class="data-row">
-        :gutter="10"
-        style="margin: 20px 0; display: flex; align-items: center; justify-content: flex-start; padding: 0 20px"
-      >
         <el-col :span="5">
           <span class="label">总收入：</span>
           <span class="value">{{ formatValue(reportValue.cashSum) }}</span>
@@ -81,10 +75,7 @@
         </el-col>
       </el-row>
       <div class="divider"></div>
-      <el-row
+      <el-row :gutter="10" class="data-row">
-        :gutter="10"
-        style="margin: 20px 0; display: flex; align-items: center; justify-content: flex-start; padding: 0 20px"
-      >
         <el-col :span="5">
           <span class="label">统筹支付：</span>
           <span class="value">{{ formatValue(reportValue.tcSum) }}</span>
@@ -99,10 +90,7 @@
         </el-col>
       </el-row>
       <div class="divider"></div>
-      <el-row
+      <el-row :gutter="10" class="data-row">
-        :gutter="10"
-        style="margin: 20px 0; display: flex; align-items: center; justify-content: flex-start; padding: 0 20px"
-      >
         <el-col :span="5">
           <span class="label">诊查费：</span>
           <span class="value">{{ formatValue(reportValue.DIAGNOSTIC_FEE) }}</span>
@@ -120,10 +108,7 @@
           <span class="value">{{ formatValue(reportValue.MEDICAL_EXPENSE_FEE) }}</span>
         </el-col>
       </el-row>
-      <el-row
+      <el-row :gutter="10" class="data-row">
-        :gutter="10"
-        style="margin: 20px 0; display: flex; align-items: center; justify-content: flex-start; padding: 0 20px"
-      >
         <el-col :span="5">
           <span class="label">西药费：</span>
           <span class="value">{{ formatValue(reportValue.WEST_MEDICINE) }}</span>
@@ -141,10 +126,7 @@
           <span class="value">{{ formatValue(reportValue.SANITARY_MATERIALS_FEE) }}</span>
         </el-col>
       </el-row>
-      <el-row
+      <el-row :gutter="10" class="data-row">
-        :gutter="10"
-        style="margin: 20px 0; display: flex; align-items: center; justify-content: flex-start; padding: 0 20px"
-      >
         <el-col :span="5">
           <span class="label">诊疗费：</span>
           <span class="value">{{ formatValue(reportValue.GENERAL_CONSULTATION_FEE) }}</span>
@@ -334,19 +316,50 @@ getList();
 getPharmacyCabinetLists();
 </script>
 <style scoped>
+.day-end-container {
+  width: 1300px;
+  margin: 0 auto;
+  background: #fff;
+  border-radius: 4px;
+  padding: 10px 20px 20px;
+}
+
+.report-title {
+  font-size: 20px;
+  font-weight: 600;
+  margin: 10px 0 15px;
+  color: #303133;
+}
+
+.data-row {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  margin: 15px 0;
+  padding: 0 10px;
+}
+
 .label {
   display: inline-block;
-  width: 120px !important;
+  width: 120px;
+  text-align: right;
+  color: #606266;
+  font-weight: 500;
+  flex-shrink: 0;
 }
+
 .value {
   float: right;
+  color: #303133;
 }
-.el-col {
+
-  margin-right: 50px;
-}
 .divider {
-  height: 3px;
+  height: 2px;
-  background-color: #000;
+  background: linear-gradient(to right, #dcdfe6, #e4e7ed, #dcdfe6);
-  margin: 20px 0;
+  margin: 10px 0;
+}
+
+.el-col {
+  margin-right: 30px;
 }
 </style>

openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/outPatientCharge.vue

@@ -1,5 +1,5 @@
 <template>
-  <div busNo="app-container">
+  <div class="app-container">
     <el-form
       style="margin-top: 20px; margin-left: 20px"
       :model="queryParams"
@@ -97,7 +97,7 @@
 
     <el-row
       :gutter="10"
-      busNo="mb8"
+      class="mb8"
       style="margin-left: 20px; margin-right: 0px; margin-bottom: 5px"
     >
       <el-col :span="1.5">
@@ -268,7 +268,7 @@
     />
     <el-row
       :gutter="10"
-      busNo="mb8"
+      class="mb8"
       style="
         margin-top: 10px;
         display: flex;
@@ -620,7 +620,6 @@ const arraySpanMethod = ({ row, column, rowIndex, columnIndex }) => {
             break;
           }
         }
-        rowspan++;
       }
       
       return { rowspan, colspan: 1 };