提交merge1.3

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

@@ -21,7 +21,7 @@
       </div>
       <div>
         <span class="descriptions-item-label">全选：</span>
-        <el-switch v-model="chooseAll" @change="handelSwicthChange" />
+        <el-switch v-model="chooseAll" @change="handelSwitchChange" />
         <el-button class="ml20" type="primary" @click="handleCheck"> 核对通过 </el-button>
         <el-button class="ml20 mr20" type="danger" @click="handleCancel"> 退回 </el-button>
       </div>
@@ -107,8 +107,10 @@
             border
             :ref="'tableRef' + index"
             :header-cell-style="{ background: '#eef9fd !important' }"
+            @select="handleSelectionChange"
           >
             <el-table-column type="selection" align="center" width="50" />
+            <el-table-column label="组" align="center" width="60" prop="groupIcon" />
             <el-table-column label="类型" align="center" prop="therapyEnum_enumText" width="80">
               <template #default="scope">
                 <span :style="scope.row.therapyEnum == '1' ? 'color: #a6745c' : 'color: #3787a5'">
@@ -151,7 +153,7 @@
 </template>
 <script setup>
 import { getPrescriptionList, adviceVerify, cancel } from './api';
-import { patientInfoList } from '../store/patient.js';
+import { patientInfoList } from '../../components/store/patient.js';
 import { formatDateStr } from '@/utils/index';
 
 const activeNames = ref([]);
@@ -199,7 +201,9 @@ function handleGetPrescription() {
       // 将分组结果转换为数组形式
       prescriptionList.value = Object.values(groupedPrescriptions);
       console.log(prescriptionList.value, '1111');
+      console.log('@@@@@=======>', JSON.stringify(prescriptionList.value));
       loading.value = false;
+      getGroupMarkers();
     });
     chooseAll.value = false;
   } else {
@@ -207,6 +211,58 @@ function handleGetPrescription() {
   }
 }
 
+// 分组标记处理
+function getGroupMarkers() {
+  // 初始化所有行的 groupIcon 为 null
+  prescriptionList.value.forEach((item) => {
+    item.forEach((prescription) => {
+      prescription.groupIcon = null;
+    });
+  });
+  console.log('prescriptionList====>', JSON.stringify(prescriptionList.value));
+  // 创建一个映射来存储每个 groupId 对应的行索引
+  const groupMap = {};
+
+  // 遍历处方列表，按 groupId 分组（忽略无 groupId 的项）
+  prescriptionList.value.forEach((item, index) => {
+    item.forEach((prescription, idnexNum) => {
+      if (prescription.groupId) {
+        if (!groupMap[prescription.groupId]) {
+          groupMap[prescription.groupId] = [];
+        }
+        groupMap[prescription.groupId].push(idnexNum);
+      }
+    });
+  });
+  // 为每个组设置 groupIcon
+  Object.values(groupMap).forEach((indices) => {
+    // 只有当组内元素大于1个时才需要显示分组标记
+    if (indices.length > 1) {
+      let iconArrayIndex = 0;
+      indices.forEach((index, i) => {
+        prescriptionList.value.forEach((itemArray, index1) => {
+          itemArray.forEach((item, index2) => {
+            if (index2 === index) {
+              iconArrayIndex++;
+              if (iconArrayIndex == 1) {
+                item.groupIcon = '┏';
+              } else if (iconArrayIndex == indices.length) {
+                item.groupIcon = '┗';
+              } else {
+                item.groupIcon = '┃';
+              }
+            }
+          });
+        });
+      });
+    }
+  });
+  console.log('prescriptionList====>', JSON.stringify(prescriptionList.value));
+}
+
+// 选择框改变时的处理
+function handleSelectionChange(selection, row) {}
+
 /**
  * 核对通过
  */
@@ -257,7 +313,7 @@ function getSelectRows() {
   });
 }
 
-function handelSwicthChange(value) {
+function handelSwitchChange(value) {
   prescriptionList.value.forEach((item, index) => {
     proxy.$refs['tableRef' + index][0].toggleAllSelection();
   });
@@ -318,4 +374,4 @@ defineExpose({
 :deep(.el-table__row:hover > td) {
   background-color: #eef9fd !important;
 }
-</style>
+</style>