From 8bfe5dcf83cdcaa90c45ad86a8b464238748de7c Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周日, 01 12月 2024 16:02:38 +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 |   16 +++++++++-------
 1 files changed, 9 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 6e9d331..846ba5d 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
@@ -58,6 +58,12 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
+            <el-form-item label="鏉愭枡">
+              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info18" clearable="" placeholder="璇疯緭鍏ユ潗鏂�"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
             <el-form-item label="闀�">
               <el-input v-model="queryParamsMes_BatchOrderUPI_New.length" clearable="" placeholder="璇疯緭鍏ラ暱"/>
               
@@ -189,12 +195,7 @@
               
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
-            <el-form-item label="閮ㄤ欢鍚嶇О">
-              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info14" clearable="" placeholder="璇疯緭鍏ラ儴浠跺悕绉�"/>
-              
-            </el-form-item>
-          </el-col>
+        
           <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
             <el-form-item label="閮ㄤ欢鏁伴噺">
               <el-input-number v-model="queryParamsMes_BatchOrderUPI_New.info15"  clearable="" placeholder="璇疯緭鍏ラ儴浠舵暟閲�"/>
@@ -265,6 +266,7 @@
             </template>
           </el-table-column>
         <el-table-column prop="detailName" label="閮ㄤ欢鍚嶇О"  show-overflow-tooltip="" />
+        <el-table-column prop="info18" label="鏉愭枡"  show-overflow-tooltip="" />
         <el-table-column prop="length" label="闀�"  show-overflow-tooltip="" />
         <el-table-column prop="width" label="瀹�"  show-overflow-tooltip="" />
         <el-table-column prop="thk" label="鍘�"  show-overflow-tooltip="" />
@@ -287,7 +289,7 @@
         <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="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