From 72408cc636fa6b8b670bc0df519eefa837cc2e48 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周五, 29 11月 2024 13:41:50 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue
index 187d450..9db41ab 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue
@@ -241,10 +241,11 @@
@sort-change="sortChangeMes_BatchOrderUPI_New"
border="">
<el-table-column type="index" label="搴忓彿" width="55" align="center"/>
- <el-table-column prop="upi" label="閮ㄤ欢鏉＄爜" show-overflow-tooltip="" />
- <el-table-column prop="planNo" label="鎵规鍙�" show-overflow-tooltip="" />
- <el-table-column prop="orderId" label="璁㈠崟鍙�" show-overflow-tooltip="" />
- <el-table-column prop="info5" label="鐢熶骇鍗曞彿" show-overflow-tooltip="" />
+ <el-table-column prop="upi" label="閮ㄤ欢鏉＄爜" width="180" show-overflow-tooltip="" />
+ <el-table-column prop="info5" label="鐢熶骇鍗曞彿" width="130" show-overflow-tooltip="" />
+ <el-table-column prop="packageCode" label="鍖呰缂栫爜" width="180" show-overflow-tooltip="" />
+ <el-table-column prop="planNo" label="鎵规鍙�" width="130" show-overflow-tooltip="" />
+ <el-table-column prop="orderId" label="璁㈠崟鍙�" width="130" show-overflow-tooltip="" />
<el-table-column prop="areaCode" label="鎵�鍦ㄥ尯鍩�" show-overflow-tooltip="" >
<template #default="scope">
<el-tag>{{ getEnumDesc(scope.row.areaCode, getEnumAreaCodeData_Index)}}</el-tag>
@@ -260,7 +261,6 @@
<el-table-column prop="width" label="瀹�" show-overflow-tooltip="" />
<el-table-column prop="thk" label="鍘�" show-overflow-tooltip="" />
<el-table-column prop="isPA" label="鏄惁浼樺寲鍖呰" show-overflow-tooltip="" />
- <el-table-column prop="packageCode" label="鍖呰鍙�" show-overflow-tooltip="" />
<el-table-column prop="machineXCenter" label="鍖呰X鍧愭爣" show-overflow-tooltip="" />
<el-table-column prop="machineYCenter" label="鍖呰Y鍧愭爣" show-overflow-tooltip="" />
<el-table-column prop="machineZCenter" label="鍖呰Z鍧愭爣" show-overflow-tooltip="" />
@@ -274,11 +274,11 @@
<el-table-column prop="info7" label="缁忛攢搴楀悕绉�" show-overflow-tooltip="" />
<el-table-column prop="info8" label="浜у搧鍚嶇О" show-overflow-tooltip="" />
<el-table-column prop="info10" label="瀹㈡埛鍚嶇О" show-overflow-tooltip="" />
- <el-table-column prop="info9" label="鍖呰缂栫爜" show-overflow-tooltip="" />
+
<el-table-column prop="info11" label="鑷彁or鍙戣揣" show-overflow-tooltip="" />
<el-table-column prop="info12" label="鍖呰閮ㄤ欢鎬绘暟閲�" show-overflow-tooltip="" />
<el-table-column prop="info13" label="鍖呰闈㈢Н" show-overflow-tooltip="" />
- <el-table-column prop="info14" label="閮ㄤ欢鍚嶇О" show-overflow-tooltip="" />
+ <!-- <el-table-column prop="info14" label="閮ㄤ欢鍚嶇О" show-overflow-tooltip="" /> -->
<el-table-column prop="info15" label="閮ㄤ欢鏁伴噺" show-overflow-tooltip="" />
<el-table-column prop="info16" label="閮ㄤ欢灏哄" show-overflow-tooltip="" />
<el-table-column prop="info17" label="鏈烘鑷傛槸鍚︽棆杞�" show-overflow-tooltip="" />
--
Gitblit v1.9.3