2 Commits

Author SHA1 Message Date
aixianling
b23f8325f4 refactor(xumu): 优化字典数据加载和组件结构
- 移动字典数据加载到父组件 AppDeathManage
- 修复死亡日期和死亡原因的验证规则
- 优化死亡原因的显示逻辑
- 移除子组件中的重复字典数据加载
2025-01-09 11:43:16 +08:00
aixianling
0adb2b1486 feat(AppWeightManage): 更新体重信息显示逻辑
- 在"最近称重时间"字段中,优先显示 todayCreateTime,若为空则显示 lastCreateTime
- 在"最新体重(公斤)"字段中,优先显示 todayWeight,若为空则显示 lastWeight
2025-01-09 11:37:26 +08:00
4 changed files with 8 additions and 10 deletions

View File

@@ -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>

View File

@@ -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"/>

View File

@@ -79,7 +79,6 @@ export default {
}
},
created() {
this.dict.load("auditStatus", "category", "variety")
this.getTableData()
}
}

View File

@@ -102,7 +102,7 @@ export default {
<b v-text="detail.variety"/>
</el-form-item>
<el-form-item label="最近称重时间">
<b v-text="detail.lastCreateTime"/>
<b v-text="detail.todayCreateTime||detail.lastCreateTime"/>
</el-form-item>
<el-form-item label="最新体重(公斤)">
<b v-text="detail.todayWeight||detail.lastWeight"/>