From ea3e27a9b7cb6d0524073fb0c67000fba875b5fb Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 12 五月 2026 08:58:20 +0800
Subject: [PATCH] fix:发货分批发货

---
 src/views/inventoryManagement/dispatchLog/Record.vue       |  897 ++++++++++++++++---------------
 src/views/salesManagement/deliveryLedger/index.vue         |  636 ++++++++++++++--------
 src/views/salesManagement/salesLedger/index.vue            |   86 +++
 src/views/inventoryManagement/receiptManagement/Record.vue |   12 
 4 files changed, 945 insertions(+), 686 deletions(-)

diff --git a/src/views/inventoryManagement/dispatchLog/Record.vue b/src/views/inventoryManagement/dispatchLog/Record.vue
index f41eaaa..dd47cb4 100644
--- a/src/views/inventoryManagement/dispatchLog/Record.vue
+++ b/src/views/inventoryManagement/dispatchLog/Record.vue
@@ -1,117 +1,110 @@
 <template>
-	<div>
-		<div class="search_form" style="margin-bottom: 10px;">
-			<div>
-				<span class="search_title ml10">鍑哄簱鏃ユ湡锛�</span>
-				<el-date-picker
-					v-model="searchForm.timeStr"
-					type="date"
-					placeholder="璇烽�夋嫨鏃ユ湡"
-					value-format="YYYY-MM-DD"
-					format="YYYY-MM-DD"
-					clearable
-					@change="handleQuery"
-				/>
-        <span class="search_title ml10">鏉ユ簮锛�</span>
-        <el-select v-model="searchForm.recordType"
-                   style="width: 240px"
-                   placeholder="璇烽�夋嫨"
-                   clearable>
-          <el-option v-for="item in stockRecordTypeOptions"
-                     :key="item.value"
-                     :label="item.label"
-                     :value="item.value"/>
-        </el-select>
-				<el-button type="primary" @click="handleQuery" style="margin-left: 10px"
-				>鎼滅储</el-button
-				>
-			</div>
-			<div>
-				<el-button type="primary" @click="handleBatchApprove">瀹℃壒</el-button>
-				<el-button @click="handleOut">瀵煎嚭</el-button>
-				<el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
-				<el-button type="primary" plain @click="handlePrint">鎵撳嵃</el-button>
-			</div>
-		</div>
-		<div class="table_list">
-			<el-table
-				:data="tableData"
-				border
-				v-loading="tableLoading"
-				@selection-change="handleSelectionChange"
-				:expand-row-keys="expandedRowKeys"
-				:row-key="(row) => row.id"
-				style="width: 100%"
-				height="calc(100vh - 18.5em)"
-			>
-				<el-table-column align="center" type="selection" width="55" />
-				<el-table-column align="center" label="搴忓彿" type="index" width="60" />
-        <el-table-column
-            label="鍑哄簱鎵规"
-            prop="outboundBatches"
-            min-width="100"
-            show-overflow-tooltip
+  <div>
+    <div class="search_form" style="margin-bottom: 10px">
+      <div>
+        <span class="search_title ml10">鍑哄簱鏃ユ湡锛�</span>
+        <el-date-picker
+          v-model="searchForm.timeStr"
+          type="date"
+          placeholder="璇烽�夋嫨鏃ユ湡"
+          value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD"
+          clearable
+          @change="handleQuery"
         />
-				<el-table-column
-					label="鍑哄簱鏃ユ湡"
-					prop="createTime"
-					show-overflow-tooltip
-				/>
-				<el-table-column
-					label="浜у搧澶х被"
-					prop="productName"
-					show-overflow-tooltip
-				/>
-				<el-table-column
-					label="瑙勬牸鍨嬪彿"
-					prop="model"
-					show-overflow-tooltip
-				/>
-				<el-table-column
-					label="鎵瑰彿"
-					prop="batchNo"
-					show-overflow-tooltip
-				/>
-				<el-table-column
-					label="鍗曚綅"
-					prop="unit"
-					show-overflow-tooltip
-				/>
-				<el-table-column
-					label="鍑哄簱鏁伴噺"
-					prop="stockOutNum"
-					show-overflow-tooltip
-				/>
-				<el-table-column
-					label="鍑哄簱浜�"
-					prop="createBy"
-					show-overflow-tooltip
-				/>
-        <el-table-column label="鏉ユ簮"
-                         prop="recordType"
-                         show-overflow-tooltip>
+        <span class="search_title ml10">鏉ユ簮锛�</span>
+        <el-select
+          v-model="searchForm.recordType"
+          style="width: 240px"
+          placeholder="璇烽�夋嫨"
+          clearable
+        >
+          <el-option
+            v-for="item in stockRecordTypeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+        <el-button type="primary" @click="handleQuery" style="margin-left: 10px"
+          >鎼滅储</el-button
+        >
+      </div>
+      <div>
+        <el-button type="primary" @click="handleBatchApprove">瀹℃壒</el-button>
+        <el-button @click="handleOut">瀵煎嚭</el-button>
+        <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
+        <el-button type="primary" plain @click="handlePrint">鎵撳嵃</el-button>
+      </div>
+    </div>
+    <div class="table_list">
+      <el-table
+        :data="tableData"
+        border
+        v-loading="tableLoading"
+        @selection-change="handleSelectionChange"
+        :expand-row-keys="expandedRowKeys"
+        :row-key="(row) => row.id"
+        style="width: 100%"
+        height="calc(100vh - 18.5em)"
+      >
+        <el-table-column align="center" type="selection" width="55" />
+        <el-table-column align="center" label="搴忓彿" type="index" width="60" />
+        <el-table-column
+          label="鍑哄簱鎵规"
+          prop="outboundBatches"
+          min-width="100"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="鍑哄簱鏃ユ湡"
+          prop="createTime"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="浜у搧澶х被"
+          prop="productName"
+          show-overflow-tooltip
+        />
+        <el-table-column label="瑙勬牸鍨嬪彿" prop="model" show-overflow-tooltip />
+        <el-table-column label="鎵瑰彿" prop="batchNo" show-overflow-tooltip />
+        <el-table-column label="鍗曚綅" prop="unit" show-overflow-tooltip />
+        <el-table-column
+          label="鍑哄簱鏁伴噺"
+          prop="stockOutNum"
+          show-overflow-tooltip
+        />
+        <el-table-column label="鍑哄簱浜�" prop="createBy" show-overflow-tooltip />
+        <el-table-column label="鏉ユ簮" prop="recordType" show-overflow-tooltip>
           <template #default="scope">
             {{ getRecordType(scope.row.recordType) }}
           </template>
         </el-table-column>
-				<el-table-column label="瀹℃壒鐘舵��" prop="approvalStatus" show-overflow-tooltip>
-					<template #default="scope">
-						<el-tag :type="getApprovalStatusTagType(scope.row.approvalStatus)" size="small">
-							{{ getApprovalStatusLabel(scope.row.approvalStatus) }}
-						</el-tag>
-					</template>
-				</el-table-column>
-			</el-table>
-			<pagination
-				v-show="total > 0"
-				:total="total"
-				layout="total, sizes, prev, pager, next, jumper"
-				:page="page.current"
-				:limit="page.size"
-				@pagination="paginationChange"
-			/>
-		</div>
-	</div>
+        <el-table-column
+          label="瀹℃壒鐘舵��"
+          prop="approvalStatus"
+          show-overflow-tooltip
+        >
+          <template #default="scope">
+            <el-tag
+              :type="getApprovalStatusTagType(scope.row.approvalStatus)"
+              size="small"
+            >
+              {{ getApprovalStatusLabel(scope.row.approvalStatus) }}
+            </el-tag>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        :page="page.current"
+        :limit="page.size"
+        @pagination="paginationChange"
+      />
+    </div>
+  </div>
 </template>
 
 <script setup>
@@ -121,12 +114,13 @@
 import useUserStore from "@/store/modules/user";
 import { getCurrentDate } from "@/utils/index.js";
 import {
-	getStockOutPage,
-	delPendingStockOut,
-	batchApproveStockOutRecords,
+  getStockOutPage,
+  delPendingStockOut,
+  batchApproveStockOutRecords,
 } from "@/api/inventoryManagement/stockOut.js";
 import {
-  findAllQualifiedStockOutRecordTypeOptions, findAllUnQualifiedStockOutRecordTypeOptions,
+  findAllQualifiedStockOutRecordTypeOptions,
+  findAllUnQualifiedStockOutRecordTypeOptions,
 } from "@/api/basicData/enum.js";
 
 const userStore = useUserStore();
@@ -137,8 +131,8 @@
 // 鏉ユ簮绫诲瀷閫夐」
 const stockRecordTypeOptions = ref([]);
 const page = reactive({
-	current: 1,
-	size: 100,
+  current: 1,
+  size: 100,
 });
 const total = ref(0);
 
@@ -146,13 +140,13 @@
   type: {
     type: String,
     required: true,
-    default: '0'
+    default: "0",
   },
   topParentProductId: {
     type: [String, Number],
-    default: undefined
-  }
-})
+    default: undefined,
+  },
+});
 
 // 鎵撳嵃鐩稿叧
 const printPreviewVisible = ref(false);
@@ -160,193 +154,215 @@
 
 // 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
 const data = reactive({
-	searchForm: {
-		supplierName: "",
-		timeStr: "",
+  searchForm: {
+    supplierName: "",
+    timeStr: "",
     recordType: "",
-	}
+  },
 });
 const { searchForm } = toRefs(data);
 
 // 鏌ヨ鍒楄〃
 /** 鎼滅储鎸夐挳鎿嶄綔 */
 const handleQuery = () => {
-	page.current = 1;
-	getList();
+  page.current = 1;
+  getList();
 };
 const paginationChange = (obj) => {
-	page.current = obj.page;
-	page.size = obj.limit;
-	getList();
+  page.current = obj.page;
+  page.size = obj.limit;
+  getList();
 };
 const getList = () => {
-	tableLoading.value = true;
-	getStockOutPage({ ...searchForm.value, ...page,  topParentProductId: props.topParentProductId })
-		.then((res) => {
-			tableLoading.value = false;
-			tableData.value = res.data.records;
-			tableData.value.map((item) => {
-				item.children = [];
-			});
-			total.value = res.data.total;
-		})
-		.catch(() => {
-			tableLoading.value = false;
-		});
+  tableLoading.value = true;
+  getStockOutPage({
+    ...searchForm.value,
+    ...page,
+    topParentProductId: props.topParentProductId,
+  })
+    .then((res) => {
+      tableLoading.value = false;
+      tableData.value = res.data.records;
+      tableData.value.map((item) => {
+        item.children = [];
+      });
+      total.value = res.data.total;
+    })
+    .catch(() => {
+      tableLoading.value = false;
+    });
 };
 
 const getRecordType = (recordType) => {
-  return stockRecordTypeOptions.value.find(item => item.value === recordType)?.label || ''
-}
+  return (
+    stockRecordTypeOptions.value.find((item) => item.value === recordType)
+      ?.label || ""
+  );
+};
 
 const approvalStatusLabelMap = {
-	0: "寰呭鎵�",
-	1: "閫氳繃",
-	2: "椹冲洖",
-	pending: "寰呭鎵�",
-	approved: "閫氳繃",
-	rejected: "椹冲洖",
-	PENDING: "寰呭鎵�",
-	APPROVED: "閫氳繃",
-	REJECTED: "椹冲洖",
+  0: "寰呭鎵�",
+  1: "閫氳繃",
+  2: "椹冲洖",
+  3: "寰呯‘璁�",
+  pending: "寰呭鎵�",
+  approved: "閫氳繃",
+  rejected: "椹冲洖",
+  PENDING: "寰呭鎵�",
+  APPROVED: "閫氳繃",
+  REJECTED: "椹冲洖",
 };
 
 const getApprovalStatusLabel = (status) => {
-	if (status === null || status === undefined || status === "") {
-		return "寰呭鎵�";
-	}
-	return approvalStatusLabelMap[status] || "寰呭鎵�";
+  if (status === null || status === undefined || status === "") {
+    return "寰呭鎵�";
+  }
+  return approvalStatusLabelMap[status] || "寰呭鎵�";
 };
 
 // 閫氳繃/椹冲洖鍥哄畾鑹诧紱鍏朵綑锛堝惈寰呭鎵广�佺┖鍊笺�佹湭鏄犲皠浣嗘枃妗堜负寰呭鎵癸級缁熶竴鐢� warning 棰勮鑹�
 const getApprovalStatusTagType = (status) => {
-	if (status === 1 || status === "1" || status === "approved" || status === "APPROVED") return "success";
-	if (status === 2 || status === "2" || status === "rejected" || status === "REJECTED") return "danger";
-	return "warning";
+  if (
+    status === 1 ||
+    status === "1" ||
+    status === "approved" ||
+    status === "APPROVED"
+  )
+    return "success";
+  if (
+    status === 2 ||
+    status === "2" ||
+    status === "rejected" ||
+    status === "REJECTED"
+  )
+    return "danger";
+  return "warning";
 };
 
 // 鑾峰彇鏉ユ簮绫诲瀷閫夐」
 const fetchStockRecordTypeOptions = () => {
-  if (props.type === '0') {
-    findAllQualifiedStockOutRecordTypeOptions()
-        .then(res => {
-          stockRecordTypeOptions.value = res.data;
-        })
-    return
+  if (props.type === "0") {
+    findAllQualifiedStockOutRecordTypeOptions().then((res) => {
+      stockRecordTypeOptions.value = res.data;
+    });
+    return;
   }
-  findAllUnQualifiedStockOutRecordTypeOptions()
-      .then(res => {
-        stockRecordTypeOptions.value = res.data;
-      })
-}
+  findAllUnQualifiedStockOutRecordTypeOptions().then((res) => {
+    stockRecordTypeOptions.value = res.data;
+  });
+};
 
 // 琛ㄦ牸閫夋嫨鏁版嵁
 const handleSelectionChange = (selection) => {
-	// 杩囨护鎺夊瓙鏁版嵁
-	selectedRows.value = selection.filter((item) => item.id);
-	console.log("selection", selectedRows.value);
+  // 杩囨护鎺夊瓙鏁版嵁
+  selectedRows.value = selection.filter((item) => item.id);
+  console.log("selection", selectedRows.value);
 };
 const expandedRowKeys = ref([]);
 
 const handleBatchApprove = () => {
-	if (selectedRows.value.length === 0) {
-		proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
-		return;
-	}
-	const ids = selectedRows.value.map((item) => item.id);
-	ElMessageBox.confirm("璇烽�夋嫨瀹℃壒缁撴灉", "瀹℃壒", {
-		confirmButtonText: "閫氳繃",
-		cancelButtonText: "椹冲洖",
-		type: "warning",
-		distinguishCancelAndClose: true,
-	})
-		.then(() => {
-			batchApproveStockOutRecords({ ids, approvalStatus: 1 })
-				.then(() => {
-					proxy.$modal.msgSuccess("瀹℃壒閫氳繃鎴愬姛");
-					getList();
-				})
-				.catch(() => {
-					proxy.$modal.msgError("瀹℃壒閫氳繃澶辫触");
-				});
-		})
-		.catch((action) => {
-			if (action === "cancel") {
-				batchApproveStockOutRecords({ ids, approvalStatus: 2 })
-					.then(() => {
-						proxy.$modal.msgSuccess("瀹℃壒椹冲洖鎴愬姛");
-						getList();
-					})
-					.catch(() => {
-						proxy.$modal.msgError("瀹℃壒椹冲洖澶辫触");
-					});
-				return;
-			}
-			proxy.$modal.msg("宸插彇娑�");
-		});
+  if (selectedRows.value.length === 0) {
+    proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
+    return;
+  }
+  const ids = selectedRows.value.map((item) => item.id);
+  ElMessageBox.confirm("璇烽�夋嫨瀹℃壒缁撴灉", "瀹℃壒", {
+    confirmButtonText: "閫氳繃",
+    cancelButtonText: "椹冲洖",
+    type: "warning",
+    distinguishCancelAndClose: true,
+  })
+    .then(() => {
+      batchApproveStockOutRecords({ ids, approvalStatus: 1 })
+        .then(() => {
+          proxy.$modal.msgSuccess("瀹℃壒閫氳繃鎴愬姛");
+          getList();
+        })
+        .catch(() => {
+          proxy.$modal.msgError("瀹℃壒閫氳繃澶辫触");
+        });
+    })
+    .catch((action) => {
+      if (action === "cancel") {
+        batchApproveStockOutRecords({ ids, approvalStatus: 2 })
+          .then(() => {
+            proxy.$modal.msgSuccess("瀹℃壒椹冲洖鎴愬姛");
+            getList();
+          })
+          .catch(() => {
+            proxy.$modal.msgError("瀹℃壒椹冲洖澶辫触");
+          });
+        return;
+      }
+      proxy.$modal.msg("宸插彇娑�");
+    });
 };
 
 // 瀵煎嚭
 const handleOut = () => {
-	ElMessageBox.confirm("鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
-		confirmButtonText: "纭",
-		cancelButtonText: "鍙栨秷",
-		type: "warning",
-	})
-		.then(() => {
-			proxy.download("/stockOutRecord/exportStockOutRecord", {type: props.type}, props.type === '0' ? "鍚堟牸鍑哄簱鍙拌处.xlsx" : "涓嶅悎鏍煎嚭搴撳彴璐�.xlsx");
-		})
-		.catch(() => {
-			proxy.$modal.msg("宸插彇娑�");
-		});
+  ElMessageBox.confirm("鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
+    confirmButtonText: "纭",
+    cancelButtonText: "鍙栨秷",
+    type: "warning",
+  })
+    .then(() => {
+      proxy.download(
+        "/stockOutRecord/exportStockOutRecord",
+        { type: props.type },
+        props.type === "0" ? "鍚堟牸鍑哄簱鍙拌处.xlsx" : "涓嶅悎鏍煎嚭搴撳彴璐�.xlsx"
+      );
+    })
+    .catch(() => {
+      proxy.$modal.msg("宸插彇娑�");
+    });
 };
 
 // 鍒犻櫎
 const handleDelete = () => {
-	let ids = [];
-	if (selectedRows.value.length > 0) {
-		ids = selectedRows.value.map((item) => item.id);
-	} else {
-		proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
-		return;
-	}
-	ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "瀵煎嚭", {
-		confirmButtonText: "纭",
-		cancelButtonText: "鍙栨秷",
-		type: "warning",
-	})
-		.then(() => {
-			delPendingStockOut(ids).then((res) => {
-				proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-				getList();
-			});
-		})
-		.catch(() => {
-			proxy.$modal.msg("宸插彇娑�");
-		});
+  let ids = [];
+  if (selectedRows.value.length > 0) {
+    ids = selectedRows.value.map((item) => item.id);
+  } else {
+    proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
+    return;
+  }
+  ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "瀵煎嚭", {
+    confirmButtonText: "纭",
+    cancelButtonText: "鍙栨秷",
+    type: "warning",
+  })
+    .then(() => {
+      delPendingStockOut(ids).then((res) => {
+        proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+        getList();
+      });
+    })
+    .catch(() => {
+      proxy.$modal.msg("宸插彇娑�");
+    });
 };
 
 // 鎵撳嵃鍔熻兘
 const handlePrint = () => {
-	if (selectedRows.value.length === 0) {
-		proxy.$modal.msgWarning("璇烽�夋嫨瑕佹墦鍗扮殑鏁版嵁");
-		return;
-	}
-	printData.value = [...selectedRows.value];
-	console.log('鎵撳嵃鏁版嵁:', printData.value);
-	printPreviewVisible.value = true;
+  if (selectedRows.value.length === 0) {
+    proxy.$modal.msgWarning("璇烽�夋嫨瑕佹墦鍗扮殑鏁版嵁");
+    return;
+  }
+  printData.value = [...selectedRows.value];
+  console.log("鎵撳嵃鏁版嵁:", printData.value);
+  printPreviewVisible.value = true;
 };
 
 // 鎵ц鎵撳嵃
 const executePrint = () => {
-	console.log('寮�濮嬫墽琛屾墦鍗帮紝鏁版嵁鏉℃暟:', printData.value.length);
-	console.log('鎵撳嵃鏁版嵁:', printData.value);
-	
-	// 鍒涘缓涓�涓柊鐨勬墦鍗扮獥鍙�
-	const printWindow = window.open('', '_blank', 'width=800,height=600');
-	
-	// 鏋勫缓鎵撳嵃鍐呭
-	let printContent = `
+  console.log("寮�濮嬫墽琛屾墦鍗帮紝鏁版嵁鏉℃暟:", printData.value.length);
+  console.log("鎵撳嵃鏁版嵁:", printData.value);
+
+  // 鍒涘缓涓�涓柊鐨勬墦鍗扮獥鍙�
+  const printWindow = window.open("", "_blank", "width=800,height=600");
+
+  // 鏋勫缓鎵撳嵃鍐呭
+  let printContent = `
     <!DOCTYPE html>
     <html>
     <head>
@@ -480,10 +496,10 @@
     </head>
     <body>
   `;
-	
-	// 涓烘瘡鏉℃暟鎹敓鎴愭墦鍗伴〉闈�
-	printData.value.forEach((item, index) => {
-		printContent += `
+
+  // 涓烘瘡鏉℃暟鎹敓鎴愭墦鍗伴〉闈�
+  printData.value.forEach((item, index) => {
+    printContent += `
       <div class="print-page">
         <div class="delivery-note">
           <div class="header">
@@ -503,7 +519,7 @@
             </div>
             <div class="info-row">
               <span class="label">鍗曞彿锛�</span>
-              <span class="value">${item.code || ''}</span>
+              <span class="value">${item.code || ""}</span>
             </div>
           </div>
 
@@ -521,12 +537,12 @@
               </thead>
               <tbody>
                 <tr>
-                  <td>${item.productName || '鐮傜伆鐮�'}</td>
-                  <td>${item.model || '鏍囧噯'}</td>
-                  <td>${item.unit || '鍧�'}</td>
-                  <td>${item.taxInclusiveUnitPrice || '0'}</td>
-                  <td>${item.inboundNum || '2000'}</td>
-                  <td>${item.taxInclusiveTotalPrice || '0'}</td>
+                  <td>${item.productName || "鐮傜伆鐮�"}</td>
+                  <td>${item.model || "鏍囧噯"}</td>
+                  <td>${item.unit || "鍧�"}</td>
+                  <td>${item.taxInclusiveUnitPrice || "0"}</td>
+                  <td>${item.inboundNum || "2000"}</td>
+                  <td>${item.taxInclusiveTotalPrice || "0"}</td>
                 </tr>
               </tbody>
               <tfoot>
@@ -535,8 +551,10 @@
                   <td class="total-value"></td>
                   <td class="total-value"></td>
                   <td class="total-value"></td>
-                  <td class="total-value">${item.inboundNum || '2000'}</td>
-                  <td class="total-value">${item.taxInclusiveTotalPrice || '0'}</td>
+                  <td class="total-value">${item.inboundNum || "2000"}</td>
+                  <td class="total-value">${
+                    item.taxInclusiveTotalPrice || "0"
+                  }</td>
                 </tr>
               </tfoot>
             </table>
@@ -560,7 +578,7 @@
             <div class="footer-row">
               <div class="footer-item">
                 <span class="label">鎿嶄綔鍛橈細</span>
-                <span class="value">${userStore.nickName || '鎾曞紑鍓�'}</span>
+                <span class="value">${userStore.nickName || "鎾曞紑鍓�"}</span>
               </div>
               <div class="footer-item">
                 <span class="label">鎵撳嵃鏃ユ湡锛�</span>
@@ -571,51 +589,49 @@
         </div>
       </div>
     `;
-	});
-	
-	printContent += `
+  });
+
+  printContent += `
     </body>
     </html>
   `;
-	
-	// 鍐欏叆鍐呭鍒版柊绐楀彛
-	printWindow.document.write(printContent);
-	printWindow.document.close();
-	
-	// 绛夊緟鍐呭鍔犺浇瀹屾垚鍚庢墦鍗�
-	printWindow.onload = () => {
-		setTimeout(() => {
-			printWindow.print();
-			printWindow.close();
-			printPreviewVisible.value = false;
-		}, 500);
-	};
+
+  // 鍐欏叆鍐呭鍒版柊绐楀彛
+  printWindow.document.write(printContent);
+  printWindow.document.close();
+
+  // 绛夊緟鍐呭鍔犺浇瀹屾垚鍚庢墦鍗�
+  printWindow.onload = () => {
+    setTimeout(() => {
+      printWindow.print();
+      printWindow.close();
+      printPreviewVisible.value = false;
+    }, 500);
+  };
 };
-
-
 
 // 鏍煎紡鍖栨棩鏈�
 const formatDate = (dateString) => {
-	if (!dateString) return getCurrentDate();
-	const date = new Date(dateString);
-	const year = date.getFullYear();
-	const month = String(date.getMonth() + 1).padStart(2, "0");
-	const day = String(date.getDate()).padStart(2, "0");
-	return `${year}/${month}/${day}`;
+  if (!dateString) return getCurrentDate();
+  const date = new Date(dateString);
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  return `${year}/${month}/${day}`;
 };
 
 // 鏍煎紡鍖栨棩鏈熸椂闂�
 const formatDateTime = (date) => {
-	const year = date.getFullYear();
-	const month = String(date.getMonth() + 1).padStart(2, "0");
-	const day = String(date.getDate()).padStart(2, "0");
-	const hours = String(date.getHours()).padStart(2, "0");
-	const minutes = String(date.getMinutes()).padStart(2, "0");
-	const seconds = String(date.getSeconds()).padStart(2, "0");
-	return `${year}/${month}/${day} ${hours}:${minutes}:${seconds}`;
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  const hours = String(date.getHours()).padStart(2, "0");
+  const minutes = String(date.getMinutes()).padStart(2, "0");
+  const seconds = String(date.getSeconds()).padStart(2, "0");
+  return `${year}/${month}/${day} ${hours}:${minutes}:${seconds}`;
 };
 onMounted(() => {
-	getList();
+  getList();
   fetchStockRecordTypeOptions();
 });
 
@@ -630,169 +646,170 @@
 
 <style scoped lang="scss">
 .print-preview-dialog {
-	.el-dialog__body {
-		padding: 0;
-		max-height: 80vh;
-		overflow-y: auto;
-	}
+  .el-dialog__body {
+    padding: 0;
+    max-height: 80vh;
+    overflow-y: auto;
+  }
 }
 
 .print-preview-container {
-	.print-preview-header {
-		padding: 15px;
-		border-bottom: 1px solid #e4e7ed;
-		text-align: center;
-		
-		.el-button {
-			margin: 0 10px;
-		}
-	}
-	
-	.print-preview-content {
-		padding: 20px;
-		background-color: #f5f5f5;
-		min-height: 400px;
-	}
+  .print-preview-header {
+    padding: 15px;
+    border-bottom: 1px solid #e4e7ed;
+    text-align: center;
+
+    .el-button {
+      margin: 0 10px;
+    }
+  }
+
+  .print-preview-content {
+    padding: 20px;
+    background-color: #f5f5f5;
+    min-height: 400px;
+  }
 }
 
 .print-page {
-	width: 220mm;
-	height: 90mm;
-	padding: 10mm;
-	margin: 0 auto;
-	background: white;
-	box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-	margin-bottom: 10px;
-	box-sizing: border-box;
+  width: 220mm;
+  height: 90mm;
+  padding: 10mm;
+  margin: 0 auto;
+  background: white;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+  margin-bottom: 10px;
+  box-sizing: border-box;
 }
 
 .delivery-note {
-	width: 100%;
-	height: 100%;
-	font-family: "SimSun", serif;
-	font-size: 10px;
-	line-height: 1.2;
-	display: flex;
-	flex-direction: column;
+  width: 100%;
+  height: 100%;
+  font-family: "SimSun", serif;
+  font-size: 10px;
+  line-height: 1.2;
+  display: flex;
+  flex-direction: column;
 }
 
 .header {
-	text-align: center;
-	margin-bottom: 8px;
-	
-	.company-name {
-		font-size: 18px;
-		font-weight: bold;
-		margin-bottom: 4px;
-	}
-	
-	.document-title {
-		font-size: 16px;
-		font-weight: bold;
-	}
+  text-align: center;
+  margin-bottom: 8px;
+
+  .company-name {
+    font-size: 18px;
+    font-weight: bold;
+    margin-bottom: 4px;
+  }
+
+  .document-title {
+    font-size: 16px;
+    font-weight: bold;
+  }
 }
 
 .info-section {
-	margin-bottom: 8px;
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	
-	.info-row {
-		line-height: 20px;
-		
-		.label {
-			font-weight: bold;
-			width: 60px;
-			font-size: 14px;
-		}
-		
-		.value {
-			margin-right: 20px;
-			min-width: 80px;
-			font-size: 14px;
-		}
-	}
+  margin-bottom: 8px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  .info-row {
+    line-height: 20px;
+
+    .label {
+      font-weight: bold;
+      width: 60px;
+      font-size: 14px;
+    }
+
+    .value {
+      margin-right: 20px;
+      min-width: 80px;
+      font-size: 14px;
+    }
+  }
 }
 
 .table-section {
-	margin-bottom: 4px;
-	flex: 1;
-	
-	.product-table {
-		width: 100%;
-		border-collapse: collapse;
-		border: 1px solid #000;
-		
-		th, td {
-			border: 1px solid #000;
-			padding: 6px;
-			text-align: center;
-			font-size: 14px;
-			line-height: 1.4;
-		}
-		
-		th {
-			font-weight: bold;
-		}
-		
-		.total-label {
-			text-align: right;
-			font-weight: bold;
-		}
-		
-		.total-value {
-			font-weight: bold;
-		}
-	}
+  margin-bottom: 4px;
+  flex: 1;
+
+  .product-table {
+    width: 100%;
+    border-collapse: collapse;
+    border: 1px solid #000;
+
+    th,
+    td {
+      border: 1px solid #000;
+      padding: 6px;
+      text-align: center;
+      font-size: 14px;
+      line-height: 1.4;
+    }
+
+    th {
+      font-weight: bold;
+    }
+
+    .total-label {
+      text-align: right;
+      font-weight: bold;
+    }
+
+    .total-value {
+      font-weight: bold;
+    }
+  }
 }
 
 .footer-section {
-	.footer-row {
-		display: flex;
-		margin-bottom: 3px;
-		line-height: 20px;
-		justify-content: space-between;
-		
-		.footer-item {
-			display: flex;
-			margin-right: 20px;
-			
-			.label {
-				font-weight: bold;
-				width: 80px;
-				font-size: 14px;
-			}
-			
-			.value {
-				min-width: 80px;
-				font-size: 14px;
-			}
-			
-			&.address-item {
-				.address-value {
-					min-width: 200px;
-				}
-			}
-		}
-	}
+  .footer-row {
+    display: flex;
+    margin-bottom: 3px;
+    line-height: 20px;
+    justify-content: space-between;
+
+    .footer-item {
+      display: flex;
+      margin-right: 20px;
+
+      .label {
+        font-weight: bold;
+        width: 80px;
+        font-size: 14px;
+      }
+
+      .value {
+        min-width: 80px;
+        font-size: 14px;
+      }
+
+      &.address-item {
+        .address-value {
+          min-width: 200px;
+        }
+      }
+    }
+  }
 }
 
 @media print {
-	.app-container {
-		display: none;
-	}
-	
-	.print-page {
-		box-shadow: none;
-		margin: 0;
-		padding: 10mm;
-		padding-left: 20mm;
-		page-break-inside: avoid;
-		page-break-after: always;
-	}
-	.print-page:last-child {
-		page-break-after: avoid;
-	}
+  .app-container {
+    display: none;
+  }
+
+  .print-page {
+    box-shadow: none;
+    margin: 0;
+    padding: 10mm;
+    padding-left: 20mm;
+    page-break-inside: avoid;
+    page-break-after: always;
+  }
+  .print-page:last-child {
+    page-break-after: avoid;
+  }
 }
 </style>
diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index c9cb6ee..78ba5bb 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -50,6 +50,7 @@
                 height="calc(100vh - 18.5em)">
         <el-table-column align="center"
                          type="selection"
+                         :selectable="isRowSelectableForApprove"
                          width="55"/>
         <el-table-column align="center"
                          label="搴忓彿"
@@ -181,6 +182,7 @@
   APPROVED: "閫氳繃",
   REJECTED: "椹冲洖",
 };
+approvalStatusLabelMap[3] = "寰呯‘璁�";
 
 const getApprovalStatusLabel = (status) => {
   if (status === null || status === undefined || status === "") {
@@ -194,6 +196,14 @@
   if (status === 1 || status === "1" || status === "approved" || status === "APPROVED") return "success";
   if (status === 2 || status === "2" || status === "rejected" || status === "REJECTED") return "danger";
   return "warning";
+};
+
+const isPendingApproval = status => {
+  return status === 0 || status === "0" || status === "pending" || status === "PENDING" || status === null || status === undefined || status === "";
+};
+
+const isRowSelectableForApprove = row => {
+  return isPendingApproval(row?.approvalStatus);
 };
 
 const pageProductChange = obj => {
@@ -234,7 +244,7 @@
 
 // 琛ㄦ牸閫夋嫨鏁版嵁
 const handleSelectionChange = selection => {
-  selectedRows.value = selection.filter(item => item.id);
+  selectedRows.value = selection.filter(item => item.id && isPendingApproval(item.approvalStatus));
 };
 
 const expandedRowKeys = ref([]);
diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index f93731b..d65727d 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -3,19 +3,34 @@
     <div class="search_form">
       <el-form :model="searchForm" :inline="true">
         <el-form-item label="閿�鍞鍗曞彿锛�">
-          <el-input v-model="searchForm.salesContractNo" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
-                    style="width: 200px"
-                    @change="handleQuery"/>
+          <el-input
+            v-model="searchForm.salesContractNo"
+            placeholder="璇疯緭鍏�"
+            clearable
+            prefix-icon="Search"
+            style="width: 200px"
+            @change="handleQuery"
+          />
         </el-form-item>
         <el-form-item label="杞︾墝鍙凤細">
-          <el-input v-model="searchForm.shippingCarNumber" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
-                    style="width: 200px"
-                    @change="handleQuery"/>
+          <el-input
+            v-model="searchForm.shippingCarNumber"
+            placeholder="璇疯緭鍏�"
+            clearable
+            prefix-icon="Search"
+            style="width: 200px"
+            @change="handleQuery"
+          />
         </el-form-item>
         <el-form-item label="蹇�掑崟鍙凤細">
-          <el-input v-model="searchForm.expressNumber" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
-                    style="width: 200px"
-                    @change="handleQuery"/>
+          <el-input
+            v-model="searchForm.expressNumber"
+            placeholder="璇疯緭鍏�"
+            clearable
+            prefix-icon="Search"
+            style="width: 200px"
+            @change="handleQuery"
+          />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="handleQuery"> 鎼滅储</el-button>
@@ -30,20 +45,68 @@
           <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
         </div>
       </div>
-      <el-table :data="tableData" border v-loading="tableLoading" @selection-change="handleSelectionChange"
-                :row-key="(row) => row.id" style="width: 100%" height="calc(100vh - 21.5em)">
-        <el-table-column align="center" type="selection" width="55"/>
-        <el-table-column align="center" label="搴忓彿" type="index" width="60"/>
-        <el-table-column label="閿�鍞鍗�" prop="salesContractNo" show-overflow-tooltip/>
-        <el-table-column label="鍙戣揣璁㈠崟鍙�" prop="shippingNo" show-overflow-tooltip/>
-        <el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" show-overflow-tooltip/>
-        <el-table-column label="浜у搧鍚嶇О" prop="productName" show-overflow-tooltip/>
-        <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip/>
-        <el-table-column label="鍙戣揣鏃堕棿" prop="shippingDate" show-overflow-tooltip/>
-        <el-table-column label="鍙戣揣杞︾墝鍙�" prop="shippingCarNumber" show-overflow-tooltip/>
-        <el-table-column label="蹇�掑叕鍙�" prop="expressCompany" show-overflow-tooltip/>
-        <el-table-column label="蹇�掑崟鍙�" prop="expressNumber" show-overflow-tooltip/>
-        <el-table-column label="瀹℃牳鐘舵��" prop="status" align="center" width="120">
+      <el-table
+        :data="tableData"
+        border
+        v-loading="tableLoading"
+        @selection-change="handleSelectionChange"
+        :row-key="(row) => row.id"
+        style="width: 100%"
+        height="calc(100vh - 21.5em)"
+      >
+        <el-table-column align="center" type="selection" width="55" />
+        <el-table-column align="center" label="搴忓彿" type="index" width="60" />
+        <el-table-column
+          label="閿�鍞鍗�"
+          prop="salesContractNo"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="鍙戣揣璁㈠崟鍙�"
+          prop="shippingNo"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="瀹㈡埛鍚嶇О"
+          prop="customerName"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="浜у搧鍚嶇О"
+          prop="productName"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="瑙勬牸鍨嬪彿"
+          prop="specificationModel"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="鍙戣揣鏃堕棿"
+          prop="shippingDate"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="鍙戣揣杞︾墝鍙�"
+          prop="shippingCarNumber"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="蹇�掑叕鍙�"
+          prop="expressCompany"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="蹇�掑崟鍙�"
+          prop="expressNumber"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="瀹℃牳鐘舵��"
+          prop="status"
+          align="center"
+          width="120"
+        >
           <template #default="scope">
             <el-tag :type="getApprovalStatusType(scope.row.status)">
               {{ getApprovalStatusText(scope.row.status) }}
@@ -52,46 +115,62 @@
         </el-table-column>
         <el-table-column fixed="right" label="鎿嶄綔" width="220" align="center">
           <template #default="scope">
+            <!--            <el-button-->
+            <!--                link-->
+            <!--                type="primary"-->
+            <!--                :disabled="!isApproved(scope.row.status)"-->
+            <!--                @click="openForm('edit', scope.row)">鍙戣揣-->
+            <!--            </el-button>-->
             <el-button
-                link
-                type="primary"
-                :disabled="!isApproved(scope.row.status)"
-                @click="openForm('edit', scope.row)">鍙戣揣
+              link
+              type="primary"
+              style="color: #67c23a"
+              @click="openDetail(scope.row)"
+              >璇︽儏
             </el-button>
             <el-button
-                link
-                type="primary"
-                style="color: #67C23A"
-                @click="openDetail(scope.row)"
-            >璇︽儏
-            </el-button>
-            <el-button
-                link
-                type="danger"
-                :disabled="isApproving(scope.row.status)"
-                @click="handleDeleteSingle(scope.row)">鍒犻櫎
+              link
+              type="danger"
+              :disabled="isApproving(scope.row.status)"
+              @click="handleDeleteSingle(scope.row)"
+              >鍒犻櫎
             </el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper"
-                  :page="page.current" :limit="page.size" @pagination="paginationChange"/>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        :page="page.current"
+        :limit="page.size"
+        @pagination="paginationChange"
+      />
     </div>
-    <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板鍙戣揣鍙拌处' : '缂栬緫鍙戣揣鍙拌处'"
-               width="40%"
-               @close="closeDia">
-      <el-form :model="form" label-width="120px" label-position="top" :rules="rules" ref="formRef">
+    <el-dialog
+      v-model="dialogFormVisible"
+      :title="operationType === 'add' ? '鏂板鍙戣揣鍙拌处' : '缂栬緫鍙戣揣鍙拌处'"
+      width="40%"
+      @close="closeDia"
+    >
+      <el-form
+        :model="form"
+        label-width="120px"
+        label-position="top"
+        :rules="rules"
+        ref="formRef"
+      >
         <el-row :gutter="30">
           <el-col :span="24">
             <el-form-item label="鍙戣揣绫诲瀷锛�" prop="type">
               <el-select
-                  v-model="form.type"
-                  placeholder="璇烽�夋嫨鍙戣揣绫诲瀷"
-                  style="width: 100%"
-                  @change="handleShippingTypeChange"
+                v-model="form.type"
+                placeholder="璇烽�夋嫨鍙戣揣绫诲瀷"
+                style="width: 100%"
+                @change="handleShippingTypeChange"
               >
-                <el-option label="璐ц溅" value="璐ц溅"/>
-                <el-option label="蹇��" value="蹇��"/>
+                <el-option label="璐ц溅" value="璐ц溅" />
+                <el-option label="蹇��" value="蹇��" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -100,13 +179,13 @@
           <el-col :span="24">
             <el-form-item label="鍙戣揣鏃ユ湡锛�" prop="shippingDate">
               <el-date-picker
-                  style="width: 100%"
-                  v-model="form.shippingDate"
-                  value-format="YYYY-MM-DD"
-                  format="YYYY-MM-DD"
-                  type="date"
-                  placeholder="璇烽�夋嫨鍙戣揣鏃ユ湡"
-                  clearable
+                style="width: 100%"
+                v-model="form.shippingDate"
+                value-format="YYYY-MM-DD"
+                format="YYYY-MM-DD"
+                type="date"
+                placeholder="璇烽�夋嫨鍙戣揣鏃ユ湡"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -115,18 +194,18 @@
           <el-col :span="24" v-if="form.type === '璐ц溅'">
             <el-form-item label="鍙戣揣杞︾墝鍙凤細" prop="shippingCarNumber">
               <el-input
-                  v-model="form.shippingCarNumber"
-                  placeholder="璇疯緭鍏ュ彂璐ц溅鐗屽彿"
-                  clearable
+                v-model="form.shippingCarNumber"
+                placeholder="璇疯緭鍏ュ彂璐ц溅鐗屽彿"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="24" v-else>
             <el-form-item label="蹇�掑叕鍙革細" prop="expressCompany">
               <el-input
-                  v-model="form.expressCompany"
-                  placeholder="璇疯緭鍏ュ揩閫掑叕鍙�"
-                  clearable
+                v-model="form.expressCompany"
+                placeholder="璇疯緭鍏ュ揩閫掑叕鍙�"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -135,9 +214,9 @@
           <el-col :span="24">
             <el-form-item label="蹇�掑崟鍙凤細" prop="expressNumber">
               <el-input
-                  v-model="form.expressNumber"
-                  placeholder="璇疯緭鍏ュ揩閫掑崟鍙�"
-                  clearable
+                v-model="form.expressNumber"
+                placeholder="璇疯緭鍏ュ揩閫掑崟鍙�"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -145,7 +224,7 @@
         <el-row :gutter="30">
           <el-col :span="24">
             <el-form-item label="鍙戣揣鍥剧墖锛�">
-              <ImageUpload v-model:file-list="deliveryFileList" :limit="9"/>
+              <ImageUpload v-model:file-list="deliveryFileList" :limit="9" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -159,42 +238,79 @@
     </el-dialog>
 
     <!-- 璇︽儏寮规 -->
-    <el-dialog v-model="detailDialogVisible" title="鍙戣揣鍙拌处璇︽儏" width="55%" @close="closeDetail">
+    <el-dialog
+      v-model="detailDialogVisible"
+      title="鍙戣揣鍙拌处璇︽儏"
+      width="55%"
+      @close="closeDetail"
+    >
       <div v-if="detailRow" class="detail-wrapper">
         <el-descriptions :column="2" border>
-          <el-descriptions-item label="閿�鍞鍗�">{{ detailRow.salesContractNo || '--' }}</el-descriptions-item>
-          <el-descriptions-item label="鍙戣揣璁㈠崟鍙�">{{ detailRow.shippingNo || '--' }}</el-descriptions-item>
-          <el-descriptions-item label="瀹㈡埛鍚嶇О">{{ detailRow.customerName || '--' }}</el-descriptions-item>
-          <el-descriptions-item label="浜у搧鍚嶇О">{{ detailRow.productName || '--' }}</el-descriptions-item>
-          <el-descriptions-item label="瑙勬牸鍨嬪彿">{{ detailRow.specificationModel || '--' }}</el-descriptions-item>
-          <el-descriptions-item label="鍙戣揣绫诲瀷">{{ detailRow.type || '--' }}</el-descriptions-item>
-          <el-descriptions-item label="鍙戣揣鏃ユ湡">{{ detailRow.shippingDate || '--' }}</el-descriptions-item>
-          <el-descriptions-item label="瀹℃牳鐘舵��">{{ getApprovalStatusText(detailRow.status) }}</el-descriptions-item>
-          <el-descriptions-item label="鍙戣揣杞︾墝鍙�">{{ detailRow.shippingCarNumber || '--' }}</el-descriptions-item>
-          <el-descriptions-item label="蹇�掑叕鍙�">{{ detailRow.expressCompany || '--' }}</el-descriptions-item>
-          <el-descriptions-item label="蹇�掑崟鍙�" :span="2">{{ detailRow.expressNumber || '--' }}</el-descriptions-item>
+          <el-descriptions-item label="閿�鍞鍗�">{{
+            detailRow.salesContractNo || "--"
+          }}</el-descriptions-item>
+          <el-descriptions-item label="鍙戣揣璁㈠崟鍙�">{{
+            detailRow.shippingNo || "--"
+          }}</el-descriptions-item>
+          <el-descriptions-item label="瀹㈡埛鍚嶇О">{{
+            detailRow.customerName || "--"
+          }}</el-descriptions-item>
+          <el-descriptions-item label="浜у搧鍚嶇О">{{
+            detailRow.productName || "--"
+          }}</el-descriptions-item>
+          <el-descriptions-item label="瑙勬牸鍨嬪彿">{{
+            detailRow.specificationModel || "--"
+          }}</el-descriptions-item>
+          <el-descriptions-item label="鍙戣揣绫诲瀷">{{
+            detailRow.type || "--"
+          }}</el-descriptions-item>
+          <el-descriptions-item label="鍙戣揣鏃ユ湡">{{
+            detailRow.shippingDate || "--"
+          }}</el-descriptions-item>
+          <el-descriptions-item label="瀹℃牳鐘舵��">{{
+            getApprovalStatusText(detailRow.status)
+          }}</el-descriptions-item>
+          <el-descriptions-item label="鍙戣揣杞︾墝鍙�">{{
+            detailRow.shippingCarNumber || "--"
+          }}</el-descriptions-item>
+          <el-descriptions-item label="蹇�掑叕鍙�">{{
+            detailRow.expressCompany || "--"
+          }}</el-descriptions-item>
+          <el-descriptions-item label="蹇�掑崟鍙�" :span="2">{{
+            detailRow.expressNumber || "--"
+          }}</el-descriptions-item>
         </el-descriptions>
-        <el-table :data="getDeliveryProductInfoList()"
-                  border
-                  size="small"
-                  class="delivery-product-table"
-                  style="width: 100%; margin-top: 16px;">
-          <el-table-column label="鎵瑰彿"
-                           prop="batchNo"
-                           min-width="160"
-                           show-overflow-tooltip/>
-          <el-table-column label="浜у搧鍚嶇О"
-                           prop="productName"
-                           min-width="160"
-                           show-overflow-tooltip/>
-          <el-table-column label="瑙勬牸鍨嬪彿"
-                           prop="specificationModel"
-                           min-width="160"
-                           show-overflow-tooltip/>
-          <el-table-column label="鍙戣揣鏁伴噺"
-                           prop="deliveryQuantity"
-                           min-width="120"
-                           align="center"/>
+        <el-table
+          :data="getDeliveryProductInfoList()"
+          border
+          size="small"
+          class="delivery-product-table"
+          style="width: 100%; margin-top: 16px"
+        >
+          <el-table-column
+            label="鎵瑰彿"
+            prop="batchNo"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="浜у搧鍚嶇О"
+            prop="productName"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="瑙勬牸鍨嬪彿"
+            prop="specificationModel"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="鍙戣揣鏁伴噺"
+            prop="deliveryQuantity"
+            min-width="120"
+            align="center"
+          />
         </el-table>
         <ImagePreview :file-list="detailRow.storageBlobVOs || []" />
       </div>
@@ -209,21 +325,20 @@
 
 <script setup>
 import pagination from "@/components/PIMTable/Pagination.vue";
-import {onMounted, ref, reactive, toRefs, getCurrentInstance} from "vue";
-import {ElMessageBox} from "element-plus";
-import {getCurrentDate} from "@/utils/index.js";
+import { onMounted, ref, reactive, toRefs, getCurrentInstance } from "vue";
+import { ElMessageBox } from "element-plus";
+import { getCurrentDate } from "@/utils/index.js";
 import {
   deliveryLedgerListPage,
   delDeliveryLedger,
   deductStock,
   getDeliveryDetail,
 } from "@/api/salesManagement/deliveryLedger.js";
-import {delLedgerFile} from "@/api/salesManagement/salesLedger.js";
+import { delLedgerFile } from "@/api/salesManagement/salesLedger.js";
 import ImageUpload from "@/components/AttachmentUpload/image/index.vue";
 import ImagePreview from "@/components/AttachmentPreview/image/index.vue";
 
-
-const {proxy} = getCurrentInstance();
+const { proxy } = getCurrentInstance();
 const tableData = ref([]);
 const selectedRows = ref([]);
 const tableLoading = ref(false);
@@ -261,23 +376,34 @@
     expressNumber: "", // 蹇�掑崟鍙�
   },
   rules: {
-    salesContractNo: [{required: true, message: "璇烽�夋嫨閿�鍞鍗�", trigger: "change"}],
-    customerName: [{required: true, message: "璇疯緭鍏ュ鎴峰悕绉�", trigger: "blur"}],
-    type: [
-      {required: true, message: "璇烽�夋嫨鍙戣揣绫诲瀷", trigger: "change"}
+    salesContractNo: [
+      { required: true, message: "璇烽�夋嫨閿�鍞鍗�", trigger: "change" },
     ],
-    shippingDate: [{required: true, message: "璇烽�夋嫨鍙戣揣鏃堕棿", trigger: "change"}],
+    customerName: [
+      { required: true, message: "璇疯緭鍏ュ鎴峰悕绉�", trigger: "blur" },
+    ],
+    type: [{ required: true, message: "璇烽�夋嫨鍙戣揣绫诲瀷", trigger: "change" }],
+    shippingDate: [
+      { required: true, message: "璇烽�夋嫨鍙戣揣鏃堕棿", trigger: "change" },
+    ],
     shippingCarNumber: [
-      {validator: (_, value, callback) => validateShippingCarNumber(value, callback), trigger: "blur"}
+      {
+        validator: (_, value, callback) =>
+          validateShippingCarNumber(value, callback),
+        trigger: "blur",
+      },
     ],
     expressCompany: [
-      {validator: (_, value, callback) => validateExpressCompany(value, callback), trigger: "blur"}
+      {
+        validator: (_, value, callback) =>
+          validateExpressCompany(value, callback),
+        trigger: "blur",
+      },
     ],
   },
 });
-const {form, rules} = toRefs(data);
-const {searchForm} = toRefs(data);
-
+const { form, rules } = toRefs(data);
+const { searchForm } = toRefs(data);
 
 // 鏌ヨ鍒楄〃
 const handleQuery = () => {
@@ -293,20 +419,22 @@
 
 const getList = () => {
   tableLoading.value = true;
-  deliveryLedgerListPage({...searchForm.value, ...page})
-      .then((res) => {
-        tableLoading.value = false;
-        tableData.value = res.data.records || [];
-        total.value = res.data.total || 0;
-      })
-      .catch(() => {
-        tableLoading.value = false;
-      });
+  deliveryLedgerListPage({ ...searchForm.value, ...page })
+    .then((res) => {
+      tableLoading.value = false;
+      tableData.value = res.data.records || [];
+      total.value = res.data.total || 0;
+    })
+    .catch(() => {
+      tableLoading.value = false;
+    });
 };
 
 // 閿�鍞鍗曞彉鍖栨椂鑷姩濉厖瀹㈡埛鍚嶇О
 const handleSalesOrderChange = (value) => {
-  const selectedOrder = salesOrderOptions.value.find(item => item.salesContractNo === value);
+  const selectedOrder = salesOrderOptions.value.find(
+    (item) => item.salesContractNo === value
+  );
   if (selectedOrder) {
     form.value.customerName = selectedOrder.customerName;
   }
@@ -320,14 +448,14 @@
 // 鎵撳紑寮规
 const openForm = async (type, row) => {
   // 鍙戣揣锛氫粎鈥滃鏍搁�氳繃鈥濆厑璁哥紪杈�
-  if (type === 'edit' && row && !isApproved(row.status)) {
+  if (type === "edit" && row && !isApproved(row.status)) {
     proxy.$modal.msgWarning("鍙湁瀹℃牳閫氳繃鐨勬暟鎹墠鍙互鍙戣揣");
     return;
   }
 
   operationType.value = type;
 
-  if (type === 'edit' && row) {
+  if (type === "edit" && row) {
     form.value = {
       id: row.id ?? null,
       salesContractNo: row.salesContractNo ?? "",
@@ -362,62 +490,69 @@
     proxy.$modal.msgError("鍔犺浇鍙戣揣鍙拌处璇︽儏澶辫触");
   }
 };
-const resolveDeliveryDetailList = data => {
+const resolveDeliveryDetailList = (data) => {
   if (Array.isArray(data)) return data;
   if (!data || typeof data !== "object") return [];
-  return [
-    data.batchNoDetailList,
-    data.batchNoList,
-    data.shippingBatchList,
-    data.shippingInfoDetailList,
-    data.detailList,
-    data.batchDetailList,
-    data.rows,
-    data.records,
-    data.list,
-    data.data,
-  ].find(value => Array.isArray(value) && value.length) || [];
+  return (
+    [
+      data.batchNoDetailList,
+      data.batchNoList,
+      data.shippingBatchList,
+      data.shippingInfoDetailList,
+      data.detailList,
+      data.batchDetailList,
+      data.rows,
+      data.records,
+      data.list,
+      data.data,
+    ].find((value) => Array.isArray(value) && value.length) || []
+  );
 };
 const getDeliveryProductInfoList = () => {
   const row = detailRow.value;
   if (!row) return [];
-  const normalizeBatchNoList = value => {
+  const normalizeBatchNoList = (value) => {
     if (Array.isArray(value)) return value;
     if (typeof value === "string" && value.includes(",")) {
-      return value.split(",").map(item => item.trim()).filter(Boolean);
+      return value
+        .split(",")
+        .map((item) => item.trim())
+        .filter(Boolean);
     }
     return value ? [value] : [];
   };
-  const detailList = detailProductList.value.length ? detailProductList.value : [
-    row.batchNoDetailList,
-    row.batchNoList,
-    row.shippingBatchList,
-    row.shippingInfoDetailList,
-    row.detailList,
-    row.batchDetailList,
-  ].find(value => Array.isArray(value) && value.length);
+  const detailList = detailProductList.value.length
+    ? detailProductList.value
+    : [
+        row.batchNoDetailList,
+        row.batchNoList,
+        row.shippingBatchList,
+        row.shippingInfoDetailList,
+        row.detailList,
+        row.batchDetailList,
+      ].find((value) => Array.isArray(value) && value.length);
   const batchNoList = normalizeBatchNoList(row.batchNo);
   const toTableRow = (item = {}) => ({
     batchNo:
-        typeof item === "string" || typeof item === "number"
-            ? item
-            : item.batchNo ?? item.batchNumber ?? row.batchNo ?? "--",
+      typeof item === "string" || typeof item === "number"
+        ? item
+        : item.batchNo ?? item.batchNumber ?? row.batchNo ?? "--",
     productName: item.productName ?? row.productName ?? "--",
     specificationModel:
-        item.specificationModel ?? item.model ?? row.specificationModel ?? "--",
+      item.specificationModel ?? item.model ?? row.specificationModel ?? "--",
     deliveryQuantity:
-        item.deliveryQuantity ??
-        item.quantity ??
-        item.shippingQuantity ??
-        row.deliveryQuantity ??
-        row.quantity ??
-        "--",
+      item.deliveryQuantity ??
+      item.quantity ??
+      item.shippingQuantity ??
+      row.deliveryQuantity ??
+      row.quantity ??
+      "--",
   });
   if (detailList?.length) {
     return detailList.map(toTableRow);
   }
   if (batchNoList.length) {
-    return batchNoList.map(batchNo => toTableRow({batchNo}));
+    return batchNoList.map((batchNo) => toTableRow({ batchNo }));
   }
   return [toTableRow()];
 };
@@ -435,9 +570,12 @@
         id: form.value.id,
         type: form.value.type,
         shippingDate: form.value.shippingDate,
-        shippingCarNumber: form.value.type === "璐ц溅" ? form.value.shippingCarNumber : "",
-        expressCompany: form.value.type === "蹇��" ? form.value.expressCompany : "",
-        expressNumber: form.value.type === "蹇��" ? form.value.expressNumber : "",
+        shippingCarNumber:
+          form.value.type === "璐ц溅" ? form.value.shippingCarNumber : "",
+        expressCompany:
+          form.value.type === "蹇��" ? form.value.expressCompany : "",
+        expressNumber:
+          form.value.type === "蹇��" ? form.value.expressNumber : "",
         storageBlobDTOs: deliveryFileList.value || [],
       };
       deductStock(payload).then((res) => {
@@ -463,12 +601,12 @@
     cancelButtonText: "鍙栨秷",
     type: "warning",
   })
-      .then(() => {
-        proxy.download("/shippingInfo/export", {}, "鍙戣揣鍙拌处.xlsx");
-      })
-      .catch(() => {
-        proxy.$modal.msg("宸插彇娑�");
-      });
+    .then(() => {
+      proxy.download("/shippingInfo/export", {}, "鍙戣揣鍙拌处.xlsx");
+    })
+    .catch(() => {
+      proxy.$modal.msg("宸插彇娑�");
+    });
 };
 
 // 鎵归噺鍒犻櫎
@@ -479,7 +617,9 @@
   }
 
   // 妫�鏌ラ�変腑鐨勮鏄惁鏈�"瀹℃牳涓�"鐘舵��
-  const approvingRows = selectedRows.value.filter(row => isApproving(row.status));
+  const approvingRows = selectedRows.value.filter((row) =>
+    isApproving(row.status)
+  );
   if (approvingRows.length > 0) {
     proxy.$modal.msgWarning("瀹℃牳涓殑鏁版嵁涓嶈兘鍒犻櫎");
     return;
@@ -491,15 +631,15 @@
     cancelButtonText: "鍙栨秷",
     type: "warning",
   })
-      .then(() => {
-        delDeliveryLedger(ids).then((res) => {
-          proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-          getList();
-        });
-      })
-      .catch(() => {
-        proxy.$modal.msg("宸插彇娑�");
+    .then(() => {
+      delDeliveryLedger(ids).then((res) => {
+        proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+        getList();
       });
+    })
+    .catch(() => {
+      proxy.$modal.msg("宸插彇娑�");
+    });
 };
 
 // 鍗曚釜鍒犻櫎
@@ -515,15 +655,15 @@
     cancelButtonText: "鍙栨秷",
     type: "warning",
   })
-      .then(() => {
-        delDeliveryLedger([row.id]).then((res) => {
-          proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-          getList();
-        });
-      })
-      .catch(() => {
-        proxy.$modal.msg("宸插彇娑�");
+    .then(() => {
+      delDeliveryLedger([row.id]).then((res) => {
+        proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+        getList();
       });
+    })
+    .catch(() => {
+      proxy.$modal.msg("宸插彇娑�");
+    });
 };
 
 // 鍙戣揣绫诲瀷鏍￠獙锛氳揣杞︽椂瑕佹眰杞︾墝锛屽揩閫掓椂瑕佹眰蹇�掑叕鍙�
@@ -543,7 +683,10 @@
 // 鍙戣揣鍥剧墖涓婁紶鍓嶆牎妫�
 function handleDeliveryBeforeUpload(file) {
   // 鏍℃鏂囦欢绫诲瀷
-  const isImage = file.type === 'image/png' || file.type === 'image/jpeg' || file.type === 'image/jpg';
+  const isImage =
+    file.type === "image/png" ||
+    file.type === "image/jpeg" ||
+    file.type === "image/jpg";
   if (!isImage) {
     proxy.$modal.msgError("鍙兘涓婁紶 jpg銆乯peg銆乸ng 鏍煎紡鐨勫浘鐗�!");
     return false;
@@ -578,24 +721,30 @@
 
 // 绉婚櫎鍙戣揣鍥剧墖
 function handleDeliveryRemove(file) {
-  console.log('file--', file)
+  console.log("file--", file);
   // 濡傛灉鏄紪杈戞ā寮忎笖鏂囦欢鏈� id锛岄渶瑕佽皟鐢ㄦ帴鍙ｅ垹闄�
   if (operationType.value === "edit") {
     let ids = [];
     ids.push(file.uid);
-    delLedgerFile(ids).then((res) => {
-      proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-      // 浠庢枃浠跺垪琛ㄤ腑绉婚櫎
-      const index = deliveryFileList.value.findIndex(item => item.uid === file.uid);
-      if (index > -1) {
-        deliveryFileList.value.splice(index, 1);
-      }
-    }).catch(() => {
-      proxy.$modal.msgError("鍒犻櫎澶辫触");
-    });
+    delLedgerFile(ids)
+      .then((res) => {
+        proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+        // 浠庢枃浠跺垪琛ㄤ腑绉婚櫎
+        const index = deliveryFileList.value.findIndex(
+          (item) => item.uid === file.uid
+        );
+        if (index > -1) {
+          deliveryFileList.value.splice(index, 1);
+        }
+      })
+      .catch(() => {
+        proxy.$modal.msgError("鍒犻櫎澶辫触");
+      });
   } else {
     // 鏂板妯″紡鎴栨病鏈� id 鐨勬枃浠讹紝鐩存帴浠庡垪琛ㄤ腑绉婚櫎
-    const index = deliveryFileList.value.findIndex(item => item.uid === file.uid);
+    const index = deliveryFileList.value.findIndex(
+      (item) => item.uid === file.uid
+    );
     if (index > -1) {
       deliveryFileList.value.splice(index, 1);
     }
@@ -614,92 +763,92 @@
 
 // 鑾峰彇瀹℃牳鐘舵�佹枃鏈�
 const getApprovalStatusText = (status) => {
-  if (status === null || status === undefined || status === '') {
-    return '寰呭鏍�';
+  if (status === null || status === undefined || status === "") {
+    return "寰呭鏍�";
   }
   // 濡傛灉鏄暟瀛�
-  if (typeof status === 'number') {
+  if (typeof status === "number") {
     const statusMap = {
-      0: '寰呭鏍�',
-      1: '瀹℃牳涓�',
-      2: '瀹℃牳鎷掔粷',
-      3: '瀹℃牳閫氳繃'
+      0: "寰呭鏍�",
+      1: "瀹℃牳涓�",
+      2: "瀹℃牳鎷掔粷",
+      3: "瀹℃牳閫氳繃",
     };
-    return statusMap[status] || '寰呭鏍�';
+    return statusMap[status] || "寰呭鏍�";
   }
   // 濡傛灉鏄瓧绗︿覆锛岀洿鎺ヨ繑鍥炴垨鏄犲皠
   const statusStr = String(status).trim();
   const statusTextMap = {
-    '寰呭鏍�': '寰呭鏍�',
-    '瀹℃牳涓�': '瀹℃牳涓�',
-    '瀹℃牳鎷掔粷': '瀹℃牳鎷掔粷',
-    '瀹℃牳閫氳繃': '瀹℃牳閫氳繃',
-    '宸插彂璐�': '宸插彂璐�',
-    '0': '寰呭鏍�',
-    '1': '瀹℃牳涓�',
-    '2': '瀹℃牳鎷掔粷',
-    '3': '瀹℃牳閫氳繃'
+    寰呭鏍�: "寰呭鏍�",
+    瀹℃牳涓�: "瀹℃牳涓�",
+    瀹℃牳鎷掔粷: "瀹℃牳鎷掔粷",
+    瀹℃牳閫氳繃: "瀹℃牳閫氳繃",
+    宸插彂璐�: "宸插彂璐�",
+    0: "寰呭鏍�",
+    1: "瀹℃牳涓�",
+    2: "瀹℃牳鎷掔粷",
+    3: "瀹℃牳閫氳繃",
   };
-  return statusTextMap[statusStr] || statusStr || '寰呭鏍�';
+  return statusTextMap[statusStr] || statusStr || "寰呭鏍�";
 };
 
 // 鑾峰彇瀹℃牳鐘舵�佹爣绛剧被鍨嬶紙棰滆壊锛�
 const getApprovalStatusType = (status) => {
-  if (status === null || status === undefined || status === '') {
-    return 'info';
+  if (status === null || status === undefined || status === "") {
+    return "info";
   }
   // 濡傛灉鏄暟瀛�
-  if (typeof status === 'number') {
+  if (typeof status === "number") {
     const typeMap = {
-      0: 'info',      // 寰呭鏍� - 鐏拌壊
-      1: 'warning',   // 瀹℃牳涓� - 榛勮壊
-      2: 'danger',    // 瀹℃牳鎷掔粷 - 绾㈣壊
-      3: 'success'    // 瀹℃牳閫氳繃 - 缁胯壊
+      0: "info", // 寰呭鏍� - 鐏拌壊
+      1: "warning", // 瀹℃牳涓� - 榛勮壊
+      2: "danger", // 瀹℃牳鎷掔粷 - 绾㈣壊
+      3: "success", // 瀹℃牳閫氳繃 - 缁胯壊
     };
-    return typeMap[status] || 'info';
+    return typeMap[status] || "info";
   }
   // 濡傛灉鏄瓧绗︿覆
   const statusStr = String(status).trim();
   const typeTextMap = {
-    '寰呭鏍�': 'info',
-    '瀹℃牳涓�': 'warning',
-    '瀹℃牳鎷掔粷': 'danger',
-    '瀹℃牳閫氳繃': 'success',
-    '宸插彂璐�': 'success',
-    '0': 'info',
-    '1': 'warning',
-    '2': 'danger',
-    '3': 'success'
+    寰呭鏍�: "info",
+    瀹℃牳涓�: "warning",
+    瀹℃牳鎷掔粷: "danger",
+    瀹℃牳閫氳繃: "success",
+    宸插彂璐�: "success",
+    0: "info",
+    1: "warning",
+    2: "danger",
+    3: "success",
   };
-  return typeTextMap[statusStr] || 'info';
+  return typeTextMap[statusStr] || "info";
 };
 
 // 妫�鏌ュ鏍哥姸鎬佹槸鍚︿负"瀹℃牳閫氳繃"
 const isApproved = (status) => {
-  if (status === null || status === undefined || status === '') {
+  if (status === null || status === undefined || status === "") {
     return false;
   }
   // 濡傛灉鏄暟瀛楋紝3 琛ㄧず瀹℃牳閫氳繃
-  if (typeof status === 'number') {
+  if (typeof status === "number") {
     return status === 3;
   }
   // 濡傛灉鏄瓧绗︿覆
   const statusStr = String(status).trim();
-  return statusStr === '瀹℃牳閫氳繃' || statusStr === '3';
+  return statusStr === "瀹℃牳閫氳繃" || statusStr === "3";
 };
 
 // 妫�鏌ュ鏍哥姸鎬佹槸鍚︿负"瀹℃牳涓�"
 const isApproving = (status) => {
-  if (status === null || status === undefined || status === '') {
+  if (status === null || status === undefined || status === "") {
     return false;
   }
   // 濡傛灉鏄暟瀛楋紝1 琛ㄧず瀹℃牳涓�
-  if (typeof status === 'number') {
+  if (typeof status === "number") {
     return status === 1;
   }
   // 濡傛灉鏄瓧绗︿覆
   const statusStr = String(status).trim();
-  return statusStr === '瀹℃牳涓�' || statusStr === '1';
+  return statusStr === "瀹℃牳涓�" || statusStr === "1";
 };
 
 onMounted(() => {
@@ -752,4 +901,3 @@
   color: #909399;
 }
 </style>
-
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 8d25f53..4e2d84e 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -898,7 +898,8 @@
                           prop="type">
               <el-select v-model="deliveryForm.type"
                          placeholder="璇烽�夋嫨鍙戣揣绫诲瀷"
-                         style="width: 100%">
+                         style="width: 100%"
+                         @change="handleDeliveryTypeChange">
                 <el-option label="璐ц溅"
                            value="璐ц溅" />
                 <el-option label="蹇��"
@@ -910,6 +911,41 @@
             <el-form-item label="寰呭彂璐ф暟閲忥細">
               <el-input :model-value="currentDeliveryRow?.noQuantity"
                         disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="24" v-if="deliveryForm.type === '璐ц溅'">
+            <el-form-item label="鍙戣揣杞︾墝鍙凤細"
+                          prop="shippingCarNumber">
+              <el-input v-model="deliveryForm.shippingCarNumber"
+                        placeholder="璇疯緭鍏ュ彂璐ц溅鐗屽彿"
+                        clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-else>
+            <el-form-item label="蹇�掑叕鍙革細"
+                          prop="expressCompany">
+              <el-input v-model="deliveryForm.expressCompany"
+                        placeholder="璇疯緭鍏ュ揩閫掑叕鍙�"
+                        clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30" v-if="deliveryForm.type === '蹇��'">
+          <el-col :span="24">
+            <el-form-item label="蹇�掑崟鍙凤細"
+                          prop="expressNumber">
+              <el-input v-model="deliveryForm.expressNumber"
+                        placeholder="璇疯緭鍏ュ揩閫掑崟鍙�"
+                        clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="24">
+            <el-form-item label="鍙戣揣鍥剧墖锛�">
+              <ImageUpload v-model:file-list="deliveryFileList" :limit="9" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -990,6 +1026,7 @@
   import useFormData from "@/hooks/useFormData.js";
   import dayjs from "dayjs";
   import FileUpload from "@/components/AttachmentUpload/file/index.vue";
+  import ImageUpload from "@/components/AttachmentUpload/image/index.vue";
   import { getCurrentDate } from "@/utils/index.js";
   import { listCustomer } from "@/api/basicData/customer.js";
 
@@ -1017,6 +1054,7 @@
   });
   const total = ref(0);
   const fileList = ref([]);
+  const deliveryFileList = ref([]);
 
   // 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
   const operationType = ref("");
@@ -1195,11 +1233,30 @@
         deliveryQuantity: 0,
       }));
   };
+  const validateDeliveryShippingCarNumber = (_rule, value, callback) => {
+    if (deliveryForm.value.type === "璐ц溅" && !value) {
+      return callback(new Error("璇疯緭鍏ュ彂璐ц溅鐗屽彿"));
+    }
+    callback();
+  };
+  const validateDeliveryExpressCompany = (_rule, value, callback) => {
+    if (deliveryForm.value.type === "蹇��" && !value) {
+      return callback(new Error("璇疯緭鍏ュ揩閫掑叕鍙�"));
+    }
+    callback();
+  };
   const deliveryFormData = reactive({
     deliveryForm: {
+      shippingCarNumber: "",
+      expressCompany: "",
+      expressNumber: "",
       type: "璐ц溅", // 璐ц溅, 蹇��
     },
     deliveryRules: {
+      shippingCarNumber: [
+        { validator: validateDeliveryShippingCarNumber, trigger: "blur" },
+      ],
+      expressCompany: [{ validator: validateDeliveryExpressCompany, trigger: "blur" }],
       type: [{ required: true, message: "璇烽�夋嫨鍙戣揣绫诲瀷", trigger: "change" }],
     },
   });
@@ -2621,10 +2678,14 @@
       row.productModelId || row.modelId
     );
     deliveryForm.value = {
+      shippingCarNumber: "",
+      expressCompany: "",
+      expressNumber: "",
       type: "璐ц溅",
       batchNo: [],
       batchNoList,
     };
+    deliveryFileList.value = [];
     deliveryFormVisible.value = true;
   };
 
@@ -2662,6 +2723,19 @@
           salesLedgerId: salesLedgerId,
           salesLedgerProductId: currentDeliveryRow.value.id,
           type: deliveryForm.value.type,
+          shippingCarNumber:
+            deliveryForm.value.type === "璐ц溅"
+              ? deliveryForm.value.shippingCarNumber
+              : "",
+          expressCompany:
+            deliveryForm.value.type === "蹇��"
+              ? deliveryForm.value.expressCompany
+              : "",
+          expressNumber:
+            deliveryForm.value.type === "蹇��"
+              ? deliveryForm.value.expressNumber
+              : "",
+          storageBlobDTOs: deliveryFileList.value || [],
           batchNo: deliveryForm.value.batchNo,
           batchNoDetailList: selectedBatchRows.map(item => ({
             stockInventoryId: item.id,
@@ -2701,8 +2775,18 @@
   };
 
   // 鍏抽棴鍙戣揣寮规
+  const handleDeliveryTypeChange = val => {
+    if (val === "璐ц溅") {
+      deliveryForm.value.expressCompany = "";
+      deliveryForm.value.expressNumber = "";
+    } else {
+      deliveryForm.value.shippingCarNumber = "";
+    }
+  };
+
   const closeDeliveryDia = () => {
     proxy.resetForm("deliveryFormRef");
+    deliveryFileList.value = [];
     deliveryFormVisible.value = false;
     currentDeliveryRow.value = null;
   };

--
Gitblit v1.9.3