From 655d1cce28ee9add1fbccde5adb9ee0498ae0cd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Fri, 28 Jun 2024 08:38:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=A5=E5=BA=93=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E6=93=8D=E4=BD=9C=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wmsManagement/WmGoodsNowProduction.vue    | 10 +++----
 .../wmsManagement/WmGoodsOutProduction.vue    | 30 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/views/wmsManagement/WmGoodsNowProduction.vue b/src/views/wmsManagement/WmGoodsNowProduction.vue
index 77bc874..c73ad4a 100644
--- a/src/views/wmsManagement/WmGoodsNowProduction.vue
+++ b/src/views/wmsManagement/WmGoodsNowProduction.vue
@@ -44,15 +44,15 @@
 		<!-- 数据区域 -->
 		<el-table :data="dataList" v-loading="loading" ref="table" border highlight-current-row @sort-change="sortChange" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="50" align="center" />
-			<el-table-column prop="partnumber" label="零件号" align="center" :show-overflow-tooltip="true" />
-			<el-table-column prop="description" label="描述" align="center" :show-overflow-tooltip="true" />
-			<el-table-column prop="packageCodeClient" label="批次号" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="partnumber" label="零件号" min-width="120" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="description" label="描述" align="center" min-width="160" :show-overflow-tooltip="true" />
+			<el-table-column prop="packageCodeClient" label="批次号" min-width="140" align="center" :show-overflow-tooltip="true" />
 			<el-table-column prop="locationCode" label="库位编号" align="center" :show-overflow-tooltip="true" />
 			<!-- <el-table-column prop="goodsNumLogic" label="标签零件数" align="center" /> -->
 			<el-table-column prop="goodsNumAction" label="实际库存" align="center" />
-			<el-table-column prop="entryWarehouseTime" label="入库时间" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="entryWarehouseTime" label="入库时间" align="center" min-width="120" :show-overflow-tooltip="true" />
 			<el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" />
-
+			<el-table-column prop="createdBy" label="入库人" align="center" :show-overflow-tooltip="true" />
 			<el-table-column label="操作" align="center" width="140">
 				<template slot-scope="scope">
 					<el-button size="mini" v-hasPermi="['wmsManagement:wmgoodsnowproduction:edit']" type="success" icon="el-icon-edit" title="编辑" @click="handleUpdate(scope.row)"></el-button>
diff --git a/src/views/wmsManagement/WmGoodsOutProduction.vue b/src/views/wmsManagement/WmGoodsOutProduction.vue
index 1cd5fa0..b86ec55 100644
--- a/src/views/wmsManagement/WmGoodsOutProduction.vue
+++ b/src/views/wmsManagement/WmGoodsOutProduction.vue
@@ -50,17 +50,17 @@
 		<!-- 数据区域 -->
 		<el-table :data="dataList" v-loading="loading" ref="table" border highlight-current-row @sort-change="sortChange" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="50" align="center" />
-			<el-table-column prop="fkOutOrderId" label="出库单号" align="center" :show-overflow-tooltip="true" />
-			<el-table-column prop="packageCodeClient" label="批次号" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="fkOutOrderId" label="出库单号" min-width="120" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="packageCodeClient" label="批次号" min-width="140" align="center" :show-overflow-tooltip="true" />
 			<el-table-column prop="locationCode" label="库位编号" align="center" :show-overflow-tooltip="true" />
-			<el-table-column prop="partnumber" label="零件号" align="center" :show-overflow-tooltip="true" />
-			<el-table-column prop="description" label="描述" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="partnumber" label="零件号" min-width="120" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="description" label="描述" min-width="160" align="center" :show-overflow-tooltip="true" />
 			<!-- <el-table-column prop="goodsNumLogic" label="标签零件数" align="center" /> -->
 			<el-table-column prop="goodsNumAction" label="出库数量" align="center" />
 			<el-table-column prop="entryWarehouseTime" label="入库时间" align="center" :show-overflow-tooltip="true" />
-			<el-table-column prop="outTime" label="出库时间" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="outTime" label="出库时间" min-width="120" align="center" :show-overflow-tooltip="true" />
 			<el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" />
-
+			<el-table-column prop="createdBy" label="出库人" align="center" :show-overflow-tooltip="true" />
 			<el-table-column label="操作" align="center" width="140">
 				<template slot-scope="scope">
 					<el-button size="mini" v-hasPermi="['wmsManagement:wmgoodsoutproduction:edit']" type="success" icon="el-icon-edit" title="编辑" @click="handleUpdate(scope.row)"></el-button>
@@ -108,13 +108,13 @@
 							<el-input v-model="form.partnumber" placeholder="请输入零件号" />
 						</el-form-item>
 					</el-col>
-					
+
 					<el-col :lg="12">
 						<el-form-item label="备注" prop="remark">
 							<el-input v-model="form.remark" placeholder="请输入备注" />
 						</el-form-item>
 					</el-col>
-					
+
 					<el-col :lg="12">
 						<el-form-item label="原库存" prop="goodsNumLogic">
 							<el-input v-model.number="form.goodsNumLogic" placeholder="请输入原库存" />
@@ -132,7 +132,7 @@
 							{{ (form.goodsNumLogic - form.goodsNumAction) }}
 						</el-form-item>
 					</el-col>
-					
+
 					<el-col :lg="12">
 						<el-form-item label="入库时间" prop="entryWarehouseTime">
 							<el-date-picker v-model="form.entryWarehouseTime" type="datetime" placeholder="选择日期时间"></el-date-picker>
@@ -145,7 +145,7 @@
 						</el-form-item>
 					</el-col>
 
-					
+
 				</el-row>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
@@ -164,7 +164,7 @@
 		updateWmGoodsOutProduction,
 		getWmGoodsOutProduction,
 	} from '@/api/wmsManagement/wmGoodsOutProduction.js'
-	import { listWmGoodsNowProduction,dictWmGoodsNowProduction } from '@/api/wmsManagement/wmGoodsNowProduction.js'
+	import { listWmGoodsNowProduction, dictWmGoodsNowProduction } from '@/api/wmsManagement/wmGoodsNowProduction.js'
 	import { listWmOutOrder } from '@/api/wmsManagement/wmOutOrder.js'
 	import TheBatchOutProductionDialog from './components/TheBatchOutProductionDialog/TheBatchOutProductionDialog.vue'
 	export default {
@@ -386,7 +386,7 @@
 								.then((res) => {
 									console.log(res);
 									this.msgSuccess('新增成功')
-									
+
 									// this.reset();
 									// this.open = false
 									this.getList()
@@ -418,7 +418,7 @@
 							this.outOrderOptions = res.data.result
 							this.loading1 = false
 						}
-						else{
+						else {
 							this.loading1 = false
 						}
 					})
@@ -442,11 +442,11 @@
 						if (res.code == 200) {
 							this.PackageCodeOptions = res.data.result
 							this.loading2 = false
-						}else{
+						} else {
 							this.loading2 = false
 						}
 					})
-					
+
 				} else {
 					this.PackageCodeOptions = []
 				}