From 175a863aa0fcf837ef407724a43d3f9d7cc0dabd Mon Sep 17 00:00:00 2001
From: Ranyunqiao <2499115710@qq.com>
Date: Fri, 22 May 2026 10:00:07 +0800
Subject: [PATCH] =?UTF-8?q?497=20=E3=80=90=E4=BD=8F=E9=99=A2=E5=8C=BB?=
 =?UTF-8?q?=E7=94=9F=E5=B7=A5=E4=BD=9C=E7=AB=99-=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E3=80=91=E6=A3=80=E6=9F=A5=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BC=BA=E5=A4=B1=E2=80=9C=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E2=80=9D=E5=88=97=E5=8F=8A=E5=85=A8?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=97=AD=E7=8E=AF=E7=8A=B6=E6=80=81=E6=B5=81?=
 =?UTF-8?q?=E8=BD=AC=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/prescriptionList.vue                  | 12 +++++-------
 .../components/prescriptionList.vue                  |  6 +++++-
 .../inpatientNurse/medicalOrderProofread/index.vue   |  1 +
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue
index 3426d5c6..cf5db304 100755
--- a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue
+++ b/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
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue
index a22f73d0..6ed0552f 100755
--- a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue
+++ b/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() {
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/index.vue b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/index.vue
index 5e1ebaaa..1c23676e 100755
--- a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/index.vue
+++ b/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>