解决合并冲突

openhis-ui-vue3/src/template/nursingRecordSheet.vue

@@ -60,7 +60,7 @@
 
       <!-- 基本信息记录表格 -->
       <div class="vital-signs-table">
-        <el-table :data="state.vitalSigns" border style="width: 100%">
+        <el-table :data="state.formData.vitalSigns" border style="width: 100%">
           <el-table-column label="日期" width="100">
             <template #default="scope">
               <el-date-picker
@@ -128,7 +128,7 @@
           <el-table-column label="氧疗L/min" width="200">
             <el-table-column label="方式" >
               <template #default="scope">
-                <el-select v-model="scope.row.oxygenMethod" placeholder="选择">
+                <el-select v-model="scope.row.intake" placeholder="选择">
                   <el-option label="鼻导管" value="鼻导管"></el-option>
                   <el-option label="面罩" value="面罩"></el-option>
                   <el-option label="无" value="无"></el-option>
@@ -144,7 +144,7 @@
            <el-table-column label="入量" width="200">
             <el-table-column label="名称" >
               <template #default="scope">
-                <el-select v-model="scope.row.oxygenMethod" placeholder="选择">
+                <el-select v-model="scope.row.intake" placeholder="选择">
                   <el-option label="鼻导管" value="鼻导管"></el-option>
                   <el-option label="面罩" value="面罩"></el-option>
                   <el-option label="无" value="无"></el-option>
@@ -165,7 +165,7 @@
              <el-table-column label="出量" width="200">
             <el-table-column label="名称" >
               <template #default="scope">
-                <el-select v-model="scope.row.oxygenMethod" placeholder="选择">
+                <el-select v-model="scope.row.intake" placeholder="选择">
                   <el-option label="鼻导管" value="鼻导管"></el-option>
                   <el-option label="面罩" value="面罩"></el-option>
                   <el-option label="无" value="无"></el-option>
@@ -245,7 +245,7 @@ const props = defineProps({
 });
 
 // 表单数据
-const state = reactive({
+const state = ref({
   formData: {
     name: '',
     age: '',
@@ -254,8 +254,7 @@ const state = reactive({
     bedNumber: '',
     hospitalNumber: '',
     diagnosis: '',
-  },
-  vitalSigns: [
+    vitalSigns: [
     {
       date: new Date().toISOString().split('T')[0],
       time: new Date().toTimeString().slice(0, 5),
@@ -264,17 +263,19 @@ const state = reactive({
       heartRate: '',
       respiratoryRate: '',
       bloodPressure: '',
-      oxygenMethod: '无',
+      intake: '',
       flowRate: '',
       nurseSignature: '',
     },
   ],
+  },
+ 
   
 });
 
 // 添加生命体征记录
 const addVitalSign = () => {
-  state.vitalSigns.push({
+  state.value.formData.vitalSigns.push({
     date: new Date().toISOString().split('T')[0],
     time: new Date().toTimeString().slice(0, 5),
     consciousness: '清醒',
@@ -282,16 +283,17 @@ const addVitalSign = () => {
     heartRate: '',
     respiratoryRate: '',
     bloodPressure: '',
-    oxygenMethod: '无',
+    intake: '',
     flowRate: '',
     nurseSignature: '',
+
   });
 };
 
 // 删除生命体征记录
 const removeVitalSign = (index) => {
-  state.vitalSigns.splice(index, 1);
-  if (state.vitalSigns.length === 0) {
+  state.value.formData.vitalSigns.splice(index, 1);
+  if (state.value.formData.vitalSigns.length === 0) {
     addVitalSign();
   }
 };
@@ -300,7 +302,7 @@ const removeVitalSign = (index) => {
 
 // 重置表单
 const resetForm = () => {
-  state.formData = {
+  state.value.formData = {
     name: '',
     age: '',
     gender: '',
@@ -308,21 +310,9 @@ const resetForm = () => {
     bedNumber: '',
     hospitalNumber: '',
     diagnosis: '',
+    vitalSigns:[]
   };
-  state.vitalSigns = [
-    {
-      date: new Date().toISOString().split('T')[0],
-      time: new Date().toTimeString().slice(0, 5),
-      consciousness: '清醒',
-      temperature: '',
-      heartRate: '',
-      respiratoryRate: '',
-      bloodPressure: '',
-      oxygenMethod: '无',
-      flowRate: '',
-      nurseSignature: '',
-    },
-  ];
+ 
 };
 
 onBeforeMount(() => {
@@ -335,8 +325,16 @@ onBeforeMount(() => {
 onMounted(() => {
   // 组件挂载后的逻辑
 });
-
-defineExpose({ state });
+const submit = () => {
+  // ElMessage.success('提交成功');
+  emits('submitOk', state.formData);
+};
+const setFormData = (data) => {
+  if (data) {
+    state.value.formData = data;
+  }
+};
+defineExpose({ state, submit, setFormData });
 </script>
 
 <style lang="scss" scoped>