497 【住院医生工作站-检查申请】检查申请列表缺失“申请单状态”列及全流程闭环状态流转逻辑

openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue

@@ -159,13 +159,6 @@
                 </span>
               </template>
             </el-table-column>
-            <el-table-column label="医嘱状态" prop="requestStatus_enumText" width="100" align="center">
-              <template #default="scope">
-                <el-tag :type="getStatusType(scope.row)" size="small">
-                  {{ getStatusDisplayText(scope.row) }}
-                </el-tag>
-              </template>
-            </el-table-column>
             <el-table-column label="医嘱内容" prop="adviceName">
               <template #default="scope">
                 <span>
@@ -191,6 +184,11 @@
               </template>
             </el-table-column>
             <el-table-column label="开始/终止" prop="requestTime" width="200" />
+            <el-table-column label="医嘱状态" align="center" width="100">
+              <template #default="scope">
+                <el-tag v-if="props.exeStatus === 6" type="success" size="small">已执行</el-tag>
+              </template>
+            </el-table-column>
             <el-table-column :label="props.exeStatus == 1 ? '预计执行' : '执行时间'" prop="times">
               <template #default="scope">
                 <div

openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue

@@ -142,7 +142,7 @@
                 </template>
               </template>
             </el-table-column>
-            <el-table-column label="医嘱状态" prop="requestStatus_enumText" width="100">
+            <el-table-column label="医嘱状态" prop="requestStatus_enumText" width="100" align="center">
               <template #default="scope">
                 <el-tag :type="getStatusType(scope.row.requestStatus)" size="small">
                   {{ getStatusDisplayText(scope.row) }}
@@ -211,6 +211,10 @@ const props = defineProps({
     type: Number,
     default: 2,
   },
+  activeTab: {
+    type: String,
+    default: 'unverified',
+  },
 });
 
 function handleRadioChange() {

openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/index.vue

@@ -41,6 +41,7 @@
           <!-- 使用模板引用 -->
           <PrescriptionList
             :requestStatus="requestStatus"
+            :activeTab="activeName"
             :ref="(el) => setPrescriptionRef(el, tab.name)"
           />
         </el-tab-pane>