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

src/views/elderly/fee/balance/Form.vue

@@ -63,7 +63,11 @@
           </el-table-column>
           <el-table-column prop="type" label="类型">
             <template #default="scope">
-              <TgSelect v-model="scope.row.type" :list="getDictOptions(DICT_TYPE.BALANCE_TYPE)" disabled>
+              <TgSelect
+                v-model="scope.row.type"
+                :list="getDictOptions(DICT_TYPE.BALANCE_TYPE)"
+                disabled
+              >
                 <el-option
                   v-for="(n, i) in getIntDictOptions(DICT_TYPE.BALANCE_TYPE)"
                   :key="i"
@@ -194,7 +198,7 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
-  if(formLoading.value){
+  if (formLoading.value) {
     return
   }
   // 提交请求
@@ -215,9 +219,9 @@ const submitForm = async () => {
       emit('success')
     }
   } finally {
-    setTimeout(()=>{
+    setTimeout(() => {
       formLoading.value = false
-    },500)
+    }, 500)
   }
 }
 

src/views/elderly/fee/deposit/Print.vue

@@ -125,6 +125,7 @@ const open = async (elderId, id, type = 1, single = true) => {
   dialogVisible.value = true
   pageType.value = type
   singleType.value = single
+  /** 押金 */
   if (type == 1) {
     pageTitle.value = '押金'
     const res = await getDepositDetail(elderId)
@@ -153,6 +154,7 @@ const open = async (elderId, id, type = 1, single = true) => {
       })
     }
   } else if (type == 2) {
+    /** 账单余额预存打印 */
     pageTitle.value = '余额预存'
     const res = await getBalanceDetail(elderId)
     // 如果有id就过滤只显示那一条的数据
@@ -163,7 +165,8 @@ const open = async (elderId, id, type = 1, single = true) => {
         ...res,
         list: [item],
         orderNumber: item.orderNumber,
-        createdBy: item.createdBy
+        createdBy: item.createdBy,
+        createdTime: item.createdTime
       }
     }
   }