From d3d35950ee24adaa6ed47d38c5d1e40b742c65a2 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sun, 2 Nov 2025 00:52:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=88=90=E5=93=81=E5=BA=93=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inm/good.vue | 117 ++++++++++++++++++++---------------------
 1 file changed, 56 insertions(+), 61 deletions(-)

diff --git a/src/views/inm/good.vue b/src/views/inm/good.vue
index 0f7d9601..0ad5e017 100644
--- a/src/views/inm/good.vue
+++ b/src/views/inm/good.vue
@@ -41,7 +41,8 @@
 						row-key="id"
 						stripe
 						:params="params"
-						:hExportExcel="hExportExcel"
+						:hExportCols = "hExportCols"
+						:hExportName="'仓库成品库存'"
 					>
 						<el-table-column type="index" width="50" />
 						<el-table-column label="批次" prop="batch">
@@ -102,7 +103,8 @@
 						row-key="id"
 						:params="paramsWm"
 						stripe
-						:hExportExcel="hExportExcel2"
+						:hExportCols = "hExportCols2"
+						:hExportName="'车间成品库存'"
 					>
 						<el-table-column label="批次" prop="batch">
 						</el-table-column>
@@ -158,7 +160,6 @@
 </template>
 <script>
 import printDialog from "./../template/printmaterial.vue";
-import { dataToExcel } from "@/utils/exportExcel";
 export default {
 	name: "halfgood",
 	components: {
@@ -183,6 +184,58 @@ export default {
 			apiObjPrint:this.$API.cm.labelmat.fromMb,
 			wmId:'',
 			showBatch: "",
+			hExportCols:[{
+				header: "批次",
+				key: "batch"
+			}, {
+			    header: "物料名",
+				key: "material_.name"
+			}, {
+				header: "规格",
+				key: "material_.specification"
+			}, {
+				header: "型号",
+				key: "material_.model"
+			}, {
+				header: "已完成工序",
+				key: "material_.process_name"
+			}, {
+				header: "所在仓库",
+				key: "warehouse_name"
+			}, {
+				header: "存量",
+				key: "count"
+			}, {
+				header: "更新时间",
+				key: "update_time"
+			}
+			],
+			hExportCols2:[{
+				header: "批次",
+				key: "batch"
+			}, {
+			    header: "物料名",
+				key: "material_.name"
+			}, {
+				header: "规格",
+				key: "material_.specification"
+			}, {
+				header: "型号",
+				key: "material_.model"
+			}, {
+				header: "已完成工序",
+				key: "material_.process_name"
+			}, {
+				header: "所在车间",
+				key: "belong_dept_name"
+			}, {
+				header: "存量",
+				key: "count"
+			}, {
+				header: "更新时间",
+				key: "update_time"
+			}
+			]
 		};
 	},
 	mounted() {
@@ -230,64 +283,6 @@ export default {
 			    this.$refs.printmaterial.open();
 			})
 		},
-		hExportExcel(tdata) {
-		    let cols = [{
-				header: "批次",
-				key: "batch"
-			}, {
-			    header: "物料名",
-				key: "material_.name"
-			}, {
-				header: "规格",
-				key: "material_.specification"
-			}, {
-				header: "型号",
-				key: "material_.model"
-			}, {
-				header: "已完成工序",
-				key: "material_.process_name"
-			}, {
-				header: "所在仓库",
-				key: "warehouse_name"
-			}, {
-				header: "存量",
-				key: "count"
-			}, {
-				header: "更新时间",
-				key: "update_time"
-			}
-			]
-			dataToExcel(cols, tdata, "成品库库存")
-		},
-		hExportExcel2(tdata) {
-		    let cols = [{
-				header: "批次",
-				key: "batch"
-			}, {
-			    header: "物料名",
-				key: "material_.name"
-			}, {
-				header: "规格",
-				key: "material_.specification"
-			}, {
-				header: "型号",
-				key: "material_.model"
-			}, {
-				header: "已完成工序",
-				key: "material_.process_name"
-			}, {
-				header: "所在车间",
-				key: "belong_dept_name"
-			}, {
-				header: "存量",
-				key: "count"
-			}, {
-				header: "更新时间",
-				key: "update_time"
-			}
-			]
-			dataToExcel(cols, tdata, "车间成品库存")
-		}
 	},
 };
 </script>