前端最新版本同步

openhis-ui-vue3/src/views/medicationmanagement/pharmacyReconciliation/index.vue

@@ -37,82 +37,82 @@
         style="width: 100%"
         border
       >
-        <el-table-column prop="locationId_dictText" label="库房" width="180" />
-        <el-table-column prop="initialAmount" label="期初金额" width="120" align="right" />
-        <el-table-column prop="finalAmount" label="期末金额" width="120" align="right">
+        <el-table-column prop="locationId_dictText" label="库房" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="initialAmount" label="期初金额" min-width="160" align="right" />
+        <el-table-column prop="finalAmount" label="期末金额" min-width="160" align="right">
           <template #default="scope">
             <div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 1)">
               {{ scope.row.finalAmount }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="expectFinalAmount" label="预期期末金额" width="140" align="right"  />
-        <el-table-column prop="offsetAmount" label="偏移量" width="100" align="right" />
-        <el-table-column prop="purchaseInAmount" label="采购入库金额" width="140" align="right">
+        <el-table-column prop="expectFinalAmount" label="预期期末金额" min-width="160" align="right"  />
+        <el-table-column prop="offsetAmount" label="偏移量" min-width="100" align="right" />
+        <el-table-column prop="purchaseInAmount" label="采购入库金额" min-width="120" align="right">
           <template #default="scope">
             <div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 2)">
               {{ scope.row.purchaseInAmount }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="purchaseInNumber" label="采购入库单据数" width="140" align="right" />
-        <el-table-column prop="purchaseReturnAmount" label="采购出库金额" width="140" align="right">
+        <el-table-column prop="purchaseInNumber" label="采购入库单据数" min-width="120" align="right" />
+        <el-table-column prop="purchaseReturnAmount" label="采购出库金额" min-width="120" align="right">
           <template #default="scope">
             <div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 3)">
               {{ scope.row.purchaseReturnAmount }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="purchaseReturnNumber" label="采购出库单据数" width="140" align="right" />
-        <el-table-column prop="applyOutAmount" label="领用出库金额" width="140" align="right">
+        <el-table-column prop="purchaseReturnNumber" label="采购出库单据数" min-width="120" align="right" />
+        <el-table-column prop="applyOutAmount" label="领用出库金额" min-width="120" align="right">
           <template #default="scope">
             <div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 4)">
               {{ scope.row.applyOutAmount }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="applyOutNumber" label="领用出库单据数" width="140" align="right" />
-        <el-table-column prop="applyReturnAmount" label="领用退货金额" width="140" align="right">
+        <el-table-column prop="applyOutNumber" label="领用出库单据数" min-width="120" align="right" />
+        <el-table-column prop="applyReturnAmount" label="领用退货金额" min-width="120" align="right">
           <template #default="scope">
             <div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 5)">
               {{ scope.row.applyReturnAmount }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="applyReturnNumber" label="领用退货单据数" width="140" align="right" />
-        <el-table-column prop="transferInAmount" label="调拨入库金额" width="140" align="right"  />
-        <el-table-column prop="transferInNumber" label="调拨入库单据数" width="140" align="right">
+        <el-table-column prop="applyReturnNumber" label="领用退货单据数" min-width="120" align="right" />
+        <el-table-column prop="transferInAmount" label="调拨入库金额" min-width="120" align="right">
           <template #default="scope">
             <div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 6)">
-              {{ scope.row.transferInNumber }}
+              {{ scope.row.transferInAmount }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="transferOutAmount" label="调拨出库金额" width="140" align="right">
+        <el-table-column prop="transferInNumber" label="调拨入库单据数" min-width="120" align="right" />
+        <el-table-column prop="transferOutAmount" label="调拨出库金额" min-width="120" align="right">
           <template #default="scope">
-            <div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 6)">
+            <div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 10)">
               {{ scope.row.transferOutAmount }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="transferOutNumber" label="调拨出库单据数" width="140" align="right" />
-        <el-table-column prop="checkProfitLossAmount" label="盘点盈亏金额" width="140" align="right">
+        <el-table-column prop="transferOutNumber" label="调拨出库单据数" min-width="120" align="right" />
+        <el-table-column prop="checkProfitLossAmount" label="盘点盈亏金额" min-width="120" align="right">
           <template #default="scope">
             <div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 7)">
               {{ scope.row.checkProfitLossAmount }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="checkProfitLossNumber" label="盘点盈亏单据数" width="140" align="right" />
-        <el-table-column prop="lossAmount" label="报损金额" width="120" align="right">
+        <el-table-column prop="checkProfitLossNumber" label="盘点盈亏单据数" min-width="120" align="right" />
+        <el-table-column prop="lossAmount" label="报损金额" min-width="100" align="right">
           <template #default="scope">
             <div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 8)">
               {{ scope.row.lossAmount }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="lossNumber" label="报损单据数" width="120" align="right" />
-        <el-table-column prop="drugIssueAmount" label="药品发放金额" width="140" align="right">
+        <el-table-column prop="lossNumber" label="报损单据数" min-width="100" align="right" />
+        <el-table-column prop="drugIssueAmount" label="药品发放金额" min-width="120" align="right">
           <template #default="scope">
             <div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 9)">
               {{ scope.row.drugIssueAmount }}
@@ -198,15 +198,26 @@ const setDefaultDateRange = () => {
 const handleSearch = async () => {
   try {
     loading.value = true;
-    // 构建查询参数
+    // 构建查询参数并拼接时间
     const params = {
-      ...searchParams
+      locationId: searchParams.locationId
     };
+    
+    // 处理开始时间，拼接 00:00:00
+    if (searchParams.startTime) {
+      params.startTime = searchParams.startTime + ' 00:00:00';
+    }
+    
+    // 处理结束时间，拼接 00:00:00
+    if (searchParams.endTime) {
+      params.endTime = searchParams.endTime + ' 00:00:00';
+    }
 
     // 调用API获取数据，实际项目中替换为真实API调用
     const response = await getList(params);
     loading.value = false;
     console.log('查询结果：', response)
+    reconciliationData.value = [];
     reconciliationData.value.push(response.data.data)
 
   } catch (error) {
@@ -252,31 +263,32 @@ const skipToPage = (records, index) => {
   let path = '';
   switch (index) {
     case 1:
-      path = '/medicationmanagement/chkstock/chkstockPart'; // 盘点
+      path = '/aa/4/chkstockPartDetails'; // 库存
       break;
     case 2:
-      path = '/medicationmanagement/medicationmanagement/purchaseDocument'; // 采购入库页
+      path = '/aa/4/purchaseDocumentDetsils'; // 采购入库页
       break;
     case 3:
-      path = '/medicationmanagement/medicationmanagement/returnedPurchase'; // 采购退货页
+      path = '/aa/4/purchaseReturnDetsils'; // 采购退货页
       break;
     case 4:
-      path = '/medicationmanagement/requisitionManagement/requisitionManagement'; // 领用出库页
+      path = '/aa/4/requisitionDetails'; // 领用出库页
       break;
     case 5:
-      path = '/medicationmanagement/requisitionManagement/returningInventory'; // 领用退库页
+      path = '/aa/4/returnOrutboundDetails'; // 领用退库页
       break;
     case 6:
-      path = '/medicationmanagement/transferManagement/transferManagent'; // 调拨页
+    case 10:
+      path = '/aa/4/transferManagentDetails'; // 调拨页
       break;
     case 7:
-      path = '/medicationmanagement/chkstock/chkstockPart'; // 盘点页
+      path = '/aa/4/chkstockPartDetails'; // 盘点页
       break;
     case 8:
-      path = '/medicationmanagement/lossReportingManagement/lossReportingManagement'; // 报损页
+      path = '/aa/4/lossReportingDetails'; // 报损页
       break;
     case 9:
-      path = '/giveGrug/pharmacymanagement'; // 药品发放
+      path = '/aa/3/medicationDetails'; // 药品发放
       break;
     default:
       ElMessage.warning('无效的页面索引');
@@ -284,15 +296,35 @@ const skipToPage = (records, index) => {
   }
 
   // 跳转到对应页面并传递参数
-  router.push({
-    path: path,
-    query: {
-      locationId: locationId,
-      startTime: startTime,
-      endTime: endTime,
-      fromReconciliation: 'true' // 添加标志参数
-    }
-  });
+  if(index === 10) {
+    router.push({
+      path: path,
+      query: {
+        sourceLocationId: locationId,
+        occurrenceTimeSTime: startTime,
+        occurrenceTimeETime: endTime,
+      }
+    });
+  }else if(index ===1) {
+    router.push({
+      path: path,
+      query: {
+        sourceLocationId: locationId,
+        time: endTime,
+        type: '1'
+      }
+    });
+  }else {
+    router.push({
+      path: path,
+      query: {
+        purposeLocationId: locationId,
+        occurrenceTimeSTime: startTime,
+        occurrenceTimeETime: endTime
+      }
+    });
+  }
+
 }