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

src/views/elderly/apply/check-in-request/ProcessForm.vue

@@ -1441,6 +1441,7 @@ const pageType = ref()
 const open = async (res, detail, type, tId) => {
   isDetail.value = detail
   pageType.value = type
+  getNurseLevelList()
   if (res) {
     // if (res.relativesList.length < 2) {
     //   for(let i = 0; i <= 2 - res.relativesList.length; i++){
@@ -1466,11 +1467,10 @@ const open = async (res, detail, type, tId) => {
     dataForm.otherFiles = res.otherFiles ? JSON.parse(res.otherFiles) : []
     dataForm.birthdayCareDate = res.birthdayCareDate ? new Date(res.birthdayCareDate) : ''
     dataForm.tenantId = tId
-    dataForm.elderCover = res.elderCover ? JSON.parse(res.elderCover) : []
+    dataForm.elderCover = res.elderCover ? res.elderCover : []
     dataForm.idCard2 = res.papersType != 1 ? res.idCard : '' // 不是居民身份证
     dataForm.idCard = res.papersType == 1 ? res.idCard : ''
   }
-  getNurseLevelList()
 }
 
 /** 查询护理等级列表 */

src/views/elderly/elder/column.ts

@@ -431,6 +431,10 @@ export const WaitElderColumns = reactive([
     field: 'idCard',
   },
   {
+    label: '当前审批人',
+    field: 'assigneeUser.nickname',
+  },
+  {
     label: '审批状态',
     field: 'bpmStatus',
     dictArr: DICT_TYPE.APPROVAL_STATUS,

src/views/elderly/fee/column.ts

@@ -159,8 +159,8 @@ export const BillPayColumns = reactive([
   },
   {
     label: '已缴费用',
-    field: 'payableAmount',
-    type: '17',
+    field: 'paidAmount',
+    // type: '17',
     width: 120
   }
 ])