提交merge1.3

openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/nursingStatus.vue

@@ -24,7 +24,16 @@
         <el-table-column prop="item" label="项目" width="180" align="center" />
         <el-table-column prop="currentStatus" label="当前状态" width="260" align="center">
           <template #default="scope">
+<<<<<<< HEAD
             <el-tag :type="getStatusType(scope.row.currentStatus)" size="small" class="status-tag">
+=======
+            <el-tag
+              v-if="scope.row.currentStatus"
+              :type="getStatusType(scope.row.currentStatus)"
+              size="small"
+              class="status-tag"
+            >
+>>>>>>> v1.3
               {{ scope.row.currentStatus }}
             </el-tag>
           </template>
@@ -139,8 +148,13 @@
       </el-table>
       <!-- 操作按钮区域 -->
       <div class="nursing-status-actions">
+<<<<<<< HEAD
         <el-button @click="handleCancel" size="small">取消</el-button>
         <el-button type="primary" @click="handleConfirm" size="small">确定</el-button>
+=======
+        <el-button @click="handleCancel" size="medium">取消</el-button>
+        <el-button type="primary" @click="handleConfirm" size="medium">确定</el-button>
+>>>>>>> v1.3
       </div>
     </template>
   </div>
@@ -376,8 +390,22 @@ const fetchNursingStatusData = () => {
       loading.value = false;
 
       if (res.code === 200 && res.data) {
+<<<<<<< HEAD
         // 填充各列表数据
         nursingLevelList.value = res.data.nursingList || [];
+=======
+        let nursingList = [];
+        let nursingOrderNameList = ['I级护理', 'II级护理', 'III级护理', '特级护理'];
+        nursingOrderNameList.forEach((str) => {
+          (res.data.nursingList || []).forEach((item) => {
+            if (item.nursingOrderName == str) {
+              nursingList.push(item);
+            }
+          });
+        });
+        // 填充各列表数据
+        nursingLevelList.value = nursingList || [];
+>>>>>>> v1.3
         conditionList.value = res.data.conditionList || [];
         dietList.value = res.data.dietList || [];
         positionList.value = res.data.positionList || [];