提交merge1.3

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

@@ -6,6 +6,7 @@
           height: 40px;
           display: flex;
           align-items: center;
+<<<<<<< HEAD
           justify-content: flex-end;
           border-bottom: solid 2px #e4e7ed;
         "
@@ -15,6 +16,17 @@
           class="refresh-icon"
           style="cursor: pointer; font-size: 20px; margin-right: 10px"
         >
+=======
+          justify-content: space-between;
+          border-bottom: solid 2px #e4e7ed;
+          padding: 0 10px;
+        "
+      >
+        <!-- <el-icon style="cursor: pointer; font-size: 20px" @click="handleBack">
+          <ArrowLeft />
+        </el-icon> -->
+        <el-icon @click="refresh" class="refresh-icon" style="cursor: pointer; font-size: 20px">
+>>>>>>> v1.3
           <Refresh />
         </el-icon>
       </div>
@@ -22,6 +34,7 @@
         <el-tab-pane label="在科" name="first" style="padding: 15px 10px">
           <PatientList />
         </el-tab-pane>
+<<<<<<< HEAD
         <el-tab-pane label="转科" name="second" style="padding: 0 10px">
           <PatientList />
         </el-tab-pane>
@@ -53,6 +66,17 @@
           </el-button>
         </div>
       </div>
+=======
+        <!-- 隐藏转科列表 
+        <el-tab-pane label="转科" name="second" style="padding: 0 10px">
+          <PatientList />
+        </el-tab-pane>
+        -->
+      </el-tabs>
+    </div>
+    <div style="width: 100%">
+      <!-- <NurseNavBar :navs="navigationButtons" /> -->
+>>>>>>> v1.3
       <div
         style="
           height: 50px;
@@ -124,6 +148,7 @@
 
 <script setup>
 import { getCurrentInstance, ref } from 'vue';
+<<<<<<< HEAD
 import { useRoute, useRouter } from 'vue-router';
 import PatientList from './components/patientList.vue';
 import PrescriptionList from './components/prescriptionList.vue';
@@ -132,6 +157,17 @@ import SummaryMedicineList from './components/summaryMedicineList.vue';
 const { proxy } = getCurrentInstance();
 const router = useRouter();
 const currentRoute = useRoute();
+=======
+import { useRouter } from 'vue-router';
+import PatientList from '../components/patientList.vue';
+import NurseNavBar from '../components/NurseNavBar.vue';
+import PrescriptionList from './components/prescriptionList.vue';
+import SummaryMedicineList from './components/summaryMedicineList.vue';
+import { inpatientNurseNavs } from '../constants/navigation';
+
+const { proxy } = getCurrentInstance();
+const router = useRouter();
+>>>>>>> v1.3
 
 const activeName = ref('preparation');
 const active = ref('first');
@@ -145,6 +181,7 @@ const isDetails = ref('1');
 // 存储子组件引用的对象
 const prescriptionRefs = ref();
 
+<<<<<<< HEAD
 // 导航按钮配置
 const navigationButtons = ref([
   {
@@ -188,6 +225,9 @@ const navigationButtons = ref([
 const navigateTo = (path) => {
   router.push(path);
 };
+=======
+const navigationButtons = inpatientNurseNavs;
+>>>>>>> v1.3
 
 // 定义处方列表tabs配置
 const prescriptionTabs = [
@@ -242,6 +282,13 @@ function handleExecute() {
   proxy.$refs['prescriptionRefs'].handleMedicineSummary();
 }
 
+<<<<<<< HEAD
+=======
+function handleBack() {
+  router.back();
+}
+
+>>>>>>> v1.3
 provide('handleGetPrescription', (value) => {
   prescriptionRefs.value.handleGetPrescription();
 });
@@ -269,6 +316,7 @@ provide('handleGetPrescription', (value) => {
 :deep(.el-tabs__header) {
   margin: 0;
 }
+<<<<<<< HEAD
 
 .nav-button-group {
   display: flex;
@@ -293,4 +341,6 @@ provide('handleGetPrescription', (value) => {
 .nav-button :deep(.el-icon) {
   margin-right: 5px;
 }
+=======
+>>>>>>> v1.3
 </style>