Merge branch 'master' of http://47.107.245.0:3000/xiongxing/kyj-yanglao-web-new

src/views/elderly/consumption-coupon/column.ts

@@ -300,6 +300,10 @@ export const expenseAllowanceColumn = [
     label: '长者姓名',
     field: 'elderName'
   },
+  {
+    label: '床位号',
+    field: 'bedName'
+  },
   {
     label: '账单归属月',
     field: 'billingMonth'

src/views/elderly/elder/column.ts

@@ -152,6 +152,13 @@ export const ElderFileColumns = reactive([
     dictArr: DICT_TYPE.IN_STATUS_ARR,
     type: '1'
   },
+  {
+    label: '供养类型',
+    field: 'careType',
+    dictArr: DICT_TYPE.CARE_TYPE,
+    type: '1',
+    width: 120
+  },
   {
     label: '入住日期',
     field: 'checkInTime',

src/views/elderly/elder/elder-file/index.vue

@@ -37,6 +37,16 @@
       <el-form-item label="床位号" prop="bedId">
         <SelectRoom v-model="queryParams.bedId" class="!w-240px" :tId="queryParams.tenantIds"/>
       </el-form-item>
+      <el-form-item label="供养类型" prop="careType">
+        <el-select v-model="queryParams.careType" placeholder="请选择" class="!w-240px" clearable>
+          <el-option
+            v-for="(dict, index) in getStrDictOptions(DICT_TYPE.CARE_TYPE)"
+            :key="index"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -174,6 +184,7 @@ const queryParams = reactive({
   elderName: undefined,
   inStatus: '1',
   bedId: undefined,
+  careType: undefined,
   tenantIds: userStore.orgTenantId,
 })
 const queryFormRef = ref() // 搜索的表单

src/views/elderly/fee/bill-pay/unpay-preview.vue

@@ -72,8 +72,12 @@
             <td>{{ item.description }}</td>
           </tr>
           <tr align="center">
-            <td>合计未缴总额</td>
-            <td :colspan="8">{{ formatNum(unPayTotal) }}元</td>
+            <td>合计</td>
+            <td :colspan="8">
+              金额：{{ billTotalPrice }}元；已缴费&nbsp;{{ formatNum(payTotal) }}&nbsp;元；剩余未缴费&nbsp;{{ formatNum(unPayTotal) }}&nbsp;元
+            </td>
+            <!-- <td>合计未缴总额</td>
+            <td :colspan="8">{{ formatNum(unPayTotal) }}元</td> -->
           </tr>
         </table>
       </div>