前端最新版本同步

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

@@ -83,6 +83,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
@@ -107,6 +115,14 @@
          width="140"
         :show-overflow-tooltip="true"
       />
+      <el-table-column
+        label="单据号"
+        align="center"
+        key="supplyBusno"
+        prop="supplyBusno"
+         width="200"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column
         label="项目名称"
         align="center"
@@ -149,6 +165,13 @@
         prop="locationName"
         :show-overflow-tooltip="true"
       />
+      <el-table-column
+        label="货位"
+        align="center"
+        key="locationStoreName"
+        prop="locationStoreName"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column
         label="单位"
         align="center"
@@ -156,15 +179,50 @@
         prop="unitCode_dictText"
         :show-overflow-tooltip="true"
       />
+      <el-table-column
+        label="采购单价"
+        align="center"
+        key="price"
+        prop="price"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column
         label="报损数量"
         align="center"
         key="itemQuantity"
         prop="itemQuantity"
         :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="报损金额"
+        align="center"
+        key="totalPrice"
+        prop="totalPrice"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="供应商"
+        align="center"
+        key="supplier"
+        prop="supplier"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="审核人"
+        align="center"
+        key="approverId_dictText"
+        prop="approverId_dictText"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="制单日期"
+        align="center"
+        key="occurrenceTime"
+        prop="occurrenceTime"
+        :show-overflow-tooltip="true"
       />
        <el-table-column
-        label="报损日期"
+        label="审批日期"
         align="center"
         key="approvalTime"
         prop="approvalTime"
@@ -194,6 +252,7 @@ import {
 } from "./statisticalManagent";
 
 const { proxy } = getCurrentInstance();
+const route = useRoute();
 
 const purchaseinventoryList = ref([]);
 const loading = ref(true);
@@ -219,6 +278,30 @@ 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.purposeLocationId = 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) => {
     locationIdList.value = response.data
@@ -268,6 +351,13 @@ function handleSelectionChange(selection) {
   multiple.value = !selection.length;
 }
 
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.$download.downloadGet("report-manage/loss/excel-out", {
+    ...queryParams.value
+  }, `dict_${new Date().getTime()}.xlsx`);
+}
+
 getList();
 getPharmacyCabinetLists()
 </script>