diff --git a/src/views/order/outWarehouse/index.vue b/src/views/order/outWarehouse/index.vue
index f0e217e..d072208 100644
--- a/src/views/order/outWarehouse/index.vue
+++ b/src/views/order/outWarehouse/index.vue
@@ -33,6 +33,7 @@
 			  </template>
 			</el-table-column>
 			<el-table-column label="理货员" align="center" prop="operatorName"  />
+			<el-table-column label="出库类型" align="center" prop="operationTypeName" width="150"/>
 			<el-table-column label="出库时间" align="center" prop="operationTime" width="170">
 			  <template #default="scope">
 				<span>{{ parseTime(scope.row.operationTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -81,16 +82,19 @@
 			<el-table-column label="库位码" align="center" prop="pcode" width="120"/>
 			<el-table-column label="托盘码" align="center" prop="trayCode" />
 			<el-table-column label="身份码" align="center" prop="entityId" width="200"/>
-			<el-table-column label="出库类型" align="center" prop="operationTypeName" width="150"/>
+			<!-- <el-table-column label="出库类型" align="center" prop="operationTypeName" width="150"/> -->
 			<el-table-column label="物资类型" align="center" prop="wlTypeName" width="120"/>
-			<el-table-column label="所属仓库" align="center" prop="cangkuName" width="150"/>
-			<el-table-column label="操作时间" align="center" prop="operationTime" width="200">
-			  <template #default="scope">
-				<span>{{ parseTime(scope.row.lyTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-			  </template>
+			<el-table-column label="所属仓库" align="center" prop="cangkuName" width="150">
+				<template #default="scope">
+					<span>{{ scope.row.parentWarehouseName }}-{{ scope.row.warehouseName }}</span>
+				</template>
 			</el-table-column>
+			<!-- <el-table-column label="操作时间" align="center" prop="operationTime" width="200">
+			  <template #default="scope">
+				<span>{{ parseTime(scope.row.operationTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+			  </template>
+			</el-table-column> -->
 			<!-- <el-table-column label="库龄" align="center" prop="stockAge" /> -->
-			<el-table-column label="理货员" align="center" prop="lihuoYName" />
 			<el-table-column label="备注" align="center" prop="remark" width="200"/>
 		  </el-table>
 
@@ -389,8 +393,8 @@
 	delieryData.value.goodsSize = 0
 	if(selection.length>0){
 		for(let i=0;i<selection.length;i++){
-			delieryData.value.deliveryTon += Number(selection[i].deliveryTon) 
-			delieryData.value.goodsSize += Number(selection[i].goodsSize) 
+			delieryData.value.deliveryTon += Number(selection[i].weightKg) 
+			delieryData.value.goodsSize += Number(selection[i].volumeM3) 
 			selection[i].rkInfoId = selection[i].id
 			
 		}
diff --git a/src/views/order/waitDelivery/index.vue b/src/views/order/waitDelivery/index.vue
index 99a57fc..156edb9 100644
--- a/src/views/order/waitDelivery/index.vue
+++ b/src/views/order/waitDelivery/index.vue
@@ -89,7 +89,7 @@
       <el-table-column label="配送单号" align="center" prop="orderNo"  width="200"/>
       <el-table-column label="出库单据号" align="center" prop="billNoCk"  width="150">
         <template #default="scope">
-					<span v-if="scope.row.billNoCk">{{ scope.row.billNoCk }}</span>
+					<span v-if="scope.row.billNo">{{ scope.row.billNo }}</span>
 					<el-tag type="danger" v-else>手动创建</el-tag>
 				</template>
         <!-- <template #default="scope">