前端最新版本同步

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

@@ -80,6 +80,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
@@ -199,13 +207,13 @@
       <el-table-column
         label="制单日期"
         align="center"
-        key="createTime"
-        prop="createTime"
+        key="occurrenceTime"
+        prop="occurrenceTime"
         width="160"
         :show-overflow-tooltip="true"
       >
         <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
+          <span>{{ parseTime(scope.row.occurrenceTime) }}</span>
         </template>
       </el-table-column>
        <el-table-column
@@ -258,6 +266,7 @@ const multiple = ref(true);
 const total = ref(0);
 const occurrenceTime = ref([]);
 const locationIdList = ref([]);
+const route = useRoute();
 
 const data = reactive({
   form: {},
@@ -267,14 +276,41 @@ const data = reactive({
     searchKey: undefined, 
     sourceLocationId:undefined,
     purposeLocationId:undefined,
-    createTimeSTime:undefined,
-    createTimeETime:undefined,
+    occurrenceTimeSTime:undefined,
+    occurrenceTimeETime:undefined,
   },
   rules: {},
 });
 
 const { queryParams, form, rules } = toRefs(data);
 
+// 监听路由变化
+watch(
+  () => route.query,
+  (newQuery) => {
+    // 如果路由中包含指定参数，则使用这些参数进行查询
+    if (newQuery.purposeLocationId || newQuery.occurrenceTimeSTime || newQuery.occurrenceTimeETime) {
+      // 设置查询参数
+      if (newQuery.purposeLocationId) {
+        queryParams.value.purposeLocationId = newQuery.purposeLocationId;
+      }
+      if (newQuery.sourceLocationId) {
+        queryParams.value.sourceLocationId = newQuery.sourceLocationId;
+      }
+      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) => {
     locationIdList.value = response.data
@@ -298,11 +334,11 @@ function getList() {
 
 /** 搜索按钮操作 */
 function handleQuery() {
-  queryParams.value.createTimeSTime =
+  queryParams.value.occurrenceTimeSTime =
     occurrenceTime.value && occurrenceTime.value.length == 2
       ? occurrenceTime.value[0] + " 00:00:00"
       : "";
-  queryParams.value.createTimeETime =
+  queryParams.value.occurrenceTimeETime =
     occurrenceTime.value && occurrenceTime.value.length == 2
       ? occurrenceTime.value[1] + " 23:59:59"
       : "";
@@ -313,8 +349,8 @@ function handleQuery() {
 /** 清空条件按钮操作 */
 function handleClear() {
   // 清空查询条件
-  queryParams.value.createTimeSTime = ""
-  queryParams.value.createTimeETime = ""
+  queryParams.value.occurrenceTimeSTime = ""
+  queryParams.value.occurrenceTimeETime = ""
   occurrenceTime.value = ""
   proxy.resetForm("queryRef");
   getList();
@@ -327,6 +363,12 @@ function handleSelectionChange(selection) {
   multiple.value = !selection.length;
 }
 
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.$download.downloadGet("report-manage/transfer/excel-out", {
+    ...queryParams.value
+  }, `dict_${new Date().getTime()}.xlsx`);
+}
 
 getList();
 getPharmacyCabinetLists()