解决合并冲突

openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue

@@ -36,8 +36,10 @@
       <el-table-column label="单次剂量" align="center">
         <template #default="scope">
           <span>
-            {{ 
-              parseFloat(scope.row.dose).toFixed(2) === '0.00'
+            {{
+              !scope.row.dose || isNaN(parseFloat(scope.row.dose))
+                ? '-'
+                : parseFloat(scope.row.dose).toFixed(2) === '0.00'
                 ? '-'
                 : parseFloat(scope.row.dose).toFixed(2) + scope.row.doseUnitCode_dictText
             }}
@@ -46,8 +48,13 @@
       </el-table-column>
       <el-table-column label="规格" align="center" prop="volume" />
       <el-table-column label="用法" align="center" prop="methodCode_dictText" />
-      <el-table-column label="库存名称" align="center">
-        <template #default="scope">{{ getLocationName(scope.row) }}</template>
+      <!-- 修改价格列，从inventoryList中获取价格 -->
+      <el-table-column label="价格" align="center">
+        <template #default="scope">
+          <span>
+            {{ getPriceFromInventory(scope.row) }}
+          </span>
+        </template>
       </el-table-column>
       <el-table-column label="库存数量" align="center">
         <template #default="scope">{{ handleQuantity(scope.row) }}</template>
@@ -199,19 +206,31 @@ watch(
       // 全部类型
       queryParams.value.adviceTypes = '1,2,3';
     }
-    
-    // 设置categoryCode筛选条件（用于筛选西药和中成药）
-    if (newValue.categoryCode) {
-      queryParams.value.categoryCode = newValue.categoryCode;
-    } else {
-      queryParams.value.categoryCode = undefined;
-    }
-    
-    console.log('发送请求参数:', queryParams.value);
-    getList();
+    throttledGetList();
   },
-  { deep: true, immediate: true }
+  { deep: true }
 );
+
+getList();
+function getList() {
+  queryParams.value.organizationId = props.patientInfo.orgId;
+  getAdviceBaseInfo(queryParams.value).then((res) => {
+    if (res.data.records.length > 0) {
+      adviceBaseList.value = res.data.records.filter((item) => {
+        if (item.adviceType == 1 || item.adviceType == 2) {
+          return handleQuantity(item) != 0;
+        } else {
+          return true;
+        }
+      });
+      total.value = res.data.total;
+      nextTick(() => {
+        currentIndex.value = 0;
+        // adviceBaseRef.value.setCurrentRow(adviceBaseList.value[0]);
+      });
+    }
+  });
+}
 // 从priceList列表中获取价格
 function getPriceFromInventory(row) {
   if (row.priceList && row.priceList.length > 0) {
@@ -441,6 +460,7 @@ defineExpose({
 
 <style scoped>
 .popover-table-wrapper:focus {
-  outline: 2px solid #409eff; /* 聚焦时的高亮效果 */
+  outline: 2px solid #409eff;
+  /* 聚焦时的高亮效果 */
 }
 </style>