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 | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 1958672..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
@@ -11,7 +11,7 @@
</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.uPI" clearable="" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�"/>
+ <el-input v-model="queryParamsMes_BatchOrderUPI_New.upi" clearable="" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�"/>
</el-form-item>
</el-col>
@@ -54,6 +54,12 @@
<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.detailName" 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.info18" clearable="" placeholder="璇疯緭鍏ユ潗鏂�"/>
</el-form-item>
</el-col>
@@ -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="璇疯緭鍏ラ儴浠舵暟閲�"/>
@@ -250,7 +251,7 @@
@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="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="" />
@@ -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