前端最新版本同步

openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/medicationDetails.vue

@@ -466,7 +466,7 @@ import { watch } from "vue";
 import { endsWith } from "lodash";
 const userStore = useUserStore();
 
-const router = useRouter();
+const route = useRoute();
 const { proxy } = getCurrentInstance();
 const totalAmount = ref(0);
 const {
@@ -526,6 +526,29 @@ watch(
   },
   { immediate: true }
 );
+// 监听路由变化
+watch(
+  () => route.query,
+  (newQuery) => {
+    // 如果路由中包含指定参数，则使用这些参数进行查询
+    if (newQuery.purposeLocationId || newQuery.occurrenceTimeSTime || newQuery.occurrenceTimeETime) {
+      // 设置查询参数
+      if (newQuery.purposeLocationId) {
+        queryParams.value.locationId = newQuery.purposeLocationId;
+      }
+      if (newQuery.occurrenceTimeSTime) {
+        queryParams.value.dispenseTimeSTime = newQuery.occurrenceTimeSTime + ' 00:00:00';
+      }
+      if (newQuery.occurrenceTimeETime) {
+        queryParams.value.dispenseTimeETime = newQuery.occurrenceTimeETime + ' 23:59:59';
+      }
+      queryParams.value.flag = 1
+      // 执行查询
+      getList();
+    }
+  },
+  { immediate: true }
+);
 /**计算合计金额 */
 function handleTotalAmount() {
   totalAmount.value = purchaseinventoryList.value.reduce(
@@ -668,6 +691,7 @@ function getList(type) {
         getAmbPractitionerDetail(queryParams.value).then((res) => {
           purchaseinventoryList.value = res.data.records
           total.value = res.data.total;
+          loading.value = false;
           if(purchaseinventoryList.value.length==0){
             return
           }
@@ -690,7 +714,6 @@ function getList(type) {
               purchaseinventoryList.value.push({practitionerName:'合计',dispensePrice:dispensePrice,refundPrice:refundPrice})
             }
           }
-          loading.value = false;
             // 带分页数据
           if(total.value&&total.value>queryParams.value.pageSize){
             let queryParamsValue = {