前端最新版本同步

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

@@ -122,6 +122,14 @@
           >重置</el-button
         >
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
     </el-row>
 
     <el-table
@@ -258,6 +266,18 @@
         prop="supplierId_dictText"
         :show-overflow-tooltip="true"
       />
+      <el-table-column
+        label="制单日期"
+        align="center"
+        key="occurrenceTime"
+        prop="occurrenceTime"
+        width="160"
+        :show-overflow-tooltip="true"
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.occurrenceTime) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="审核人"
         align="center"
@@ -305,6 +325,7 @@ import {
 } from "./statisticalManagent";
 
 const { proxy } = getCurrentInstance();
+const route = useRoute();
 
 const {
   item_type,
@@ -340,6 +361,29 @@ const data = reactive({
 
 const { queryParams, form, rules } = toRefs(data);
 
+// 监听路由变化
+watch(
+  () => route.query,
+  (newQuery) => {
+    // 如果路由中包含指定参数，则使用这些参数进行查询
+    if (newQuery.purposeLocationId || newQuery.occurrenceTimeSTime || newQuery.occurrenceTimeETime) {
+      // 设置查询参数
+      if (newQuery.purposeLocationId) {
+        queryParams.value.sourceLocationId = newQuery.purposeLocationId;
+      }
+      if (newQuery.occurrenceTimeSTime) {
+        queryParams.value.occurrenceTimeSTime = newQuery.occurrenceTimeSTime + ' 00:00:00';
+      }
+      if (newQuery.occurrenceTimeETime) {
+        queryParams.value.occurrenceTimeETime = newQuery.occurrenceTimeETime + ' 23:59:59';
+      }
+      
+      // 执行查询
+      getList();
+    }
+  },
+  { immediate: true }
+);
 
 function getPharmacyCabinetLists() {
   getPharmacyCabinetList().then((response) => {
@@ -398,7 +442,12 @@ function handleSelectionChange(selection) {
   multiple.value = !selection.length;
 }
 
-
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.$download.downloadGet("report-manage/outbound/excel-out", {
+    ...queryParams.value
+  }, `dict_${new Date().getTime()}.xlsx`);
+}
 
 getList();
 getPharmacyCabinetLists()