From c70512cd0424ab059d51f37e51a941aa6c96395a Mon Sep 17 00:00:00 2001
From: zhangjinbo <zhangjinbo1989@126.com>
Date: Fri, 6 Feb 2026 10:57:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/historyDelivery/index.vue | 2 +-
 src/views/order/outWarehouse/index.vue    | 7 ++++---
 src/views/order/waitDelivery/index.vue    | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/order/historyDelivery/index.vue b/src/views/order/historyDelivery/index.vue
index f8e024b..204bafd 100644
--- a/src/views/order/historyDelivery/index.vue
+++ b/src/views/order/historyDelivery/index.vue
@@ -49,7 +49,7 @@
 		<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
 			<!-- <el-table-column type="selection" width="55" align="center" /> -->
 			<el-table-column label="配送单号" align="center" prop="orderNo" width="200" />
-			<el-table-column label="出库单据号" align="center" prop="billNoCk" width="150" >
+			<el-table-column label="出库单据号" align="center" prop="billNoCk" width="200" >
 				<template #default="scope">
 					<span v-if="scope.row.billNoCk">{{ scope.row.billNoCk }}</span>
 					<el-tag type="danger" v-else>手动创建</el-tag>
diff --git a/src/views/order/outWarehouse/index.vue b/src/views/order/outWarehouse/index.vue
index d072208..63e9b47 100644
--- a/src/views/order/outWarehouse/index.vue
+++ b/src/views/order/outWarehouse/index.vue
@@ -26,7 +26,7 @@
 			</el-form>
 
 		  <el-table v-loading="loading" highlight-current-row :data="billList" @row-dblclick="billClick" >
-			<el-table-column label="单据号" align="center" prop="billNo" width="150" />
+			<el-table-column label="单据号" align="center" prop="billNo" width="200" />
 			<el-table-column label="库存状态" align="center" >
 			  <template #default="scope">
 				<span>{{ isChukuFun(scope.row.isDelivery) }}</span>
@@ -395,8 +395,8 @@
 		for(let i=0;i<selection.length;i++){
 			delieryData.value.deliveryTon += Number(selection[i].weightKg) 
 			delieryData.value.goodsSize += Number(selection[i].volumeM3) 
-			selection[i].rkInfoId = selection[i].id
-			
+			// selection[i].rkInfoId = selection[i].id
+			selection[i].rkRecordId = selection[i].id
 		}
 		delieryData.value.items = selection
 		// selection.forEach(element => {
@@ -496,6 +496,7 @@ function reset() {
 			addDelivery(delieryData.value).then(response => {
 				proxy.$modal.msgSuccess("操作成功")
               dialogPicDetailVisible.value = false
+			  stockList.value = []
               getList()
             })
         }
diff --git a/src/views/order/waitDelivery/index.vue b/src/views/order/waitDelivery/index.vue
index 156edb9..130bc36 100644
--- a/src/views/order/waitDelivery/index.vue
+++ b/src/views/order/waitDelivery/index.vue
@@ -87,9 +87,9 @@
     <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="配送单号" align="center" prop="orderNo"  width="200"/>
-      <el-table-column label="出库单据号" align="center" prop="billNoCk"  width="150">
+      <el-table-column label="出库单据号" align="center" prop="billNoCk"  width="200">
         <template #default="scope">
-					<span v-if="scope.row.billNo">{{ scope.row.billNo }}</span>
+					<span v-if="scope.row.billNoCk">{{ scope.row.billNoCk }}</span>
 					<el-tag type="danger" v-else>手动创建</el-tag>
 				</template>
         <!-- <template #default="scope">
@@ -656,7 +656,7 @@ function handleDetail(row) {
 }
 
 function statusFun(status){
-  if(status==1){
+  if(status==0 || status==1){
     return "待配送"
   }else if(status==2){
     return "配送中"