From b23f8325f4838d99c53e78af9bd560707bb96d10 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 9 Jan 2025 11:43:16 +0800
Subject: [PATCH] =?UTF-8?q?refactor(xumu):=20=E4=BC=98=E5=8C=96=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E6=95=B0=E6=8D=AE=E5=8A=A0=E8=BD=BD=E5=92=8C=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移动字典数据加载到父组件 AppDeathManage
- 修复死亡日期和死亡原因的验证规则
- 优化死亡原因的显示逻辑
- 移除子组件中的重复字典数据加载
---
 project/xumu/AppDeathManage/AppDeathManage.vue | 8 ++++----
 project/xumu/AppDeathManage/add.vue            | 7 +++----
 project/xumu/AppDeathManage/list.vue           | 1 -
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/project/xumu/AppDeathManage/AppDeathManage.vue b/project/xumu/AppDeathManage/AppDeathManage.vue
index 19df0ebb..49d76f3e 100644
--- a/project/xumu/AppDeathManage/AppDeathManage.vue
+++ b/project/xumu/AppDeathManage/AppDeathManage.vue
@@ -12,19 +12,19 @@ export default {
   },
   computed: {
     currentPage() {
-      let {hash} = this.$route
+      let { hash } = this.$route
       return hash == "#add" ? add : list
     }
   },
-  data() {
-    return {}
+  created() {
+    this.dict.load("yesOrNo", "category", "variety", "deathReason", "auditStatus")
   }
 }
 </script>
 
 <template>
   <section class="AppDeathManage">
-    <component :is="currentPage" v-bind="$props"/>
+    <component :is="currentPage" v-bind="$props" />
   </section>
 </template>
 
diff --git a/project/xumu/AppDeathManage/add.vue b/project/xumu/AppDeathManage/add.vue
index 3e38fc93..9ad5d609 100644
--- a/project/xumu/AppDeathManage/add.vue
+++ b/project/xumu/AppDeathManage/add.vue
@@ -74,7 +74,6 @@ export default {
     }
   },
   created() {
-    this.dict.load("yesOrNo", "category", "variety", "deathReason")
     this.getDetail(this.$route.query.id)
   }
 }
@@ -122,13 +121,13 @@ export default {
       </ai-card>
       <ai-card title="死亡录入">
         <div class="grid">
-          <el-form-item label="死亡日期" prop="deathTime" :rules="[{required:true,message:'请选择死亡日期'}]">
+          <el-form-item label="死亡日期" prop="deathTime" :rules="[{required:isAdd||isEdit,message:'请选择死亡日期'}]">
             <el-date-picker v-if="isAdd||isEdit" v-model="detail.deathTime"/>
             <b v-text="detail.deathTime"/>
           </el-form-item>
-          <el-form-item label="死亡原因" prop="reason" :rules="[{required:true,message:'请选择死亡原因'}]">
+          <el-form-item label="死亡原因" prop="reason" :rules="[{required:isAdd||isEdit,message:'请选择死亡原因'}]">
             <ai-select v-if="isAdd||isEdit" v-model="detail.reason" dict="deathReason"/>
-            <b v-text="detail.reason"/>
+            <b v-text="dict.getLabel('deathReason',detail.reason)"/>
           </el-form-item>
           <el-form-item label="备注" prop="remark" class="row">
             <ai-input type="textarea" :row="3" v-model="detail.remark" :edit="isAdd||isEdit"/>
diff --git a/project/xumu/AppDeathManage/list.vue b/project/xumu/AppDeathManage/list.vue
index 15b0d7e5..c67c9289 100644
--- a/project/xumu/AppDeathManage/list.vue
+++ b/project/xumu/AppDeathManage/list.vue
@@ -79,7 +79,6 @@ export default {
     }
   },
   created() {
-    this.dict.load("auditStatus", "category", "variety")
     this.getTableData()
   }
 }