Merge branch 'long-0507'

admin/src/views/tcm/diagnosis/components/DiagnosisTodoList.vue

@@ -3,7 +3,7 @@
         <div class="toolbar">
             <el-button
                 type="primary"
-                :disabled="!props.diagnosisId"
+                :disabled="!props.diagnosisId || !!props.readOnly"
                 @click="handleAdd"
                 v-perms="['tcm.diagnosisTodo/add']"
             >
@@ -51,7 +51,7 @@
             <el-table-column label="操作" width="120" fixed="right" align="center">
                 <template #default="{ row }">
                     <el-button
-                        v-if="row.status === 0 && row.can_cancel"
+                        v-if="!props.readOnly && row.status === 0 && row.can_cancel"
                         link
                         type="danger"
                         @click="handleCancel(row)"
@@ -120,6 +120,7 @@ interface Props {
     diagnosisId: number | null | undefined
     patientId?: number | null
     patientName?: string
+    readOnly?: boolean
 }
 
 const props = defineProps<Props>()
@@ -220,7 +221,7 @@ const disablePastDate = (date: Date) => {
 }
 
 const handleAdd = () => {
-    if (!props.diagnosisId) {
+    if (!props.diagnosisId || props.readOnly) {
         feedback.msgWarning('诊单未保存，无法添加待办')
         return
     }
@@ -248,7 +249,6 @@ const handleAddSubmit = async () => {
             content: addForm.content.trim(),
             remind_time: Math.floor(remindMs / 1000)
         })
-        feedback.msgSuccess('已创建')
         addDialogVisible.value = false
         fetchList()
     } catch {

admin/src/views/tcm/diagnosis/edit.vue

@@ -573,54 +573,16 @@
                     </div>
                     <el-empty v-else description="请先保存诊单后查看" />
                 </el-tab-pane>
-                <!-- 血糖血压记录标签页 -->
-                <el-tab-pane label="血糖血压记录" name="blood" :disabled="!formData.id">
-                    <blood-record-list
-                        v-if="formData.id"
-                        :diagnosis-id="Number(formData.id)"
-                        :patient-id="Number(formData.patient_id)"
-                        :read-only="viewOnly"
-                    />
-                    <el-empty v-else description="请先保存诊单后再添加血糖血压记录" />
-                </el-tab-pane>
-                
-                <!-- 饮食记录标签页 -->
-                <el-tab-pane label="饮食记录" name="diet" :disabled="!formData.id">
-                    <diet-record-list
-                        v-if="formData.id"
-                        :diagnosis-id="Number(formData.id)"
-                        :patient-id="Number(formData.patient_id)"
-                        :read-only="viewOnly"
-                    />
-                    <el-empty v-else description="请先保存诊单后再添加饮食记录" />
-                </el-tab-pane>
-                
-                <!-- 运动打卡记录标签页 -->
-                <el-tab-pane label="运动打卡记录" name="exercise" :disabled="!formData.id">
-                    <exercise-record-list
-                        v-if="formData.id"
-                        :diagnosis-id="Number(formData.id)"
-                        :patient-id="Number(formData.patient_id)"
-                        :read-only="viewOnly"
-                    />
-                    <el-empty v-else description="请先保存诊单后再添加运动打卡记录" />
-                </el-tab-pane>
-
-                <!-- 待办事项标签页（T5：企微推送给创建人本人） -->
-                <el-tab-pane
-                    label="待办事项"
-                    name="todo"
-                    :disabled="!formData.id"
-                    lazy
-                    v-if="hasPermission(['tcm.diagnosisTodo/lists'])"
-                >
-                    <diagnosis-todo-list
+                <el-tab-pane label="日常记录" name="daily" :disabled="!formData.id" lazy>
+                    <daily-matrix
                         v-if="formData.id"
                         :diagnosis-id="Number(formData.id)"
                         :patient-id="Number(formData.patient_id)"
+                        :age="formData.age"
                         :patient-name="formData.patient_name"
+                        :read-only="viewOnly"
                     />
-                    <el-empty v-else description="请先保存诊单后再添加待办事项" />
+                    <el-empty v-else description="请先保存诊单后查看" />
                 </el-tab-pane>
 
                 <!-- 病历记录标签页（开方后自动显示） -->
@@ -746,10 +708,7 @@ import useUserStore from '@/stores/modules/user'
 import useAppStore from '@/stores/modules/app'
 import { ElMessage } from 'element-plus'
 import { QuestionFilled } from '@element-plus/icons-vue'
-import BloodRecordList from './components/BloodRecordList.vue'
-import DietRecordList from './components/DietRecordList.vue'
-import ExerciseRecordList from './components/ExerciseRecordList.vue'
-import DiagnosisTodoList from './components/DiagnosisTodoList.vue'
+import DailyMatrix from './components/DailyMatrix.vue'
 import CaseRecordList from './components/CaseRecordList.vue'
 import CallRecordPanel from './components/CallRecordPanel.vue'
 import ImChatRecordPanel from './components/ImChatRecordPanel.vue'
@@ -1857,4 +1816,3 @@ defineExpose({
     }
 }
 </style>
-