From 59e703685d36818247da3fcd101ca72e691d86de Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 27 11月 2024 10:05:57 +0800
Subject: [PATCH] 222
---
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue | 100 ++++++++++++++++++--------------------------------
1 files changed, 36 insertions(+), 64 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 03554ee..187d450 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
@@ -5,7 +5,31 @@
<el-row>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
<el-form-item label="鍏抽敭瀛�">
- <el-input v-model="queryParamsMes_BatchOrderUPI_New.searchKey" clearable="" placeholder="鎵规鍙�,璁㈠崟鍙�,閮ㄤ欢鏉＄爜,閮ㄤ欢鍚嶇О,閮ㄤ欢绾圭悊,鍖呰鍙�,閿�鍞悎鍚屽崟鍙�,鐢熶骇鍗曞彿,绗嚑鍖�,缁忛攢搴楀悕绉�,浜у搧鍚嶇О,瀹㈡埛鍚嶇О,鍖呰缂栫爜,鑷彁or鍙戣揣,鍖呰閮ㄤ欢鎬绘暟閲�,鍖呰闈㈢Н,閮ㄤ欢鍚嶇О,閮ㄤ欢灏哄,鍒涘缓浜�,淇敼浜�"/>
+ <el-input v-model="queryParamsMes_BatchOrderUPI_New.searchKey" clearable="" placeholder="閮ㄤ欢鏉＄爜,鎵规鍙�,璁㈠崟鍙�,鐢熶骇鍗曞彿,閮ㄤ欢鍚嶇О,鍖呰鍙�,閿�鍞悎鍚屽崟鍙�,绗嚑鍖�,缁忛攢搴楀悕绉�,浜у搧鍚嶇О,瀹㈡埛鍚嶇О,鍖呰缂栫爜,鑷彁or鍙戣揣,鍖呰閮ㄤ欢鎬绘暟閲�,鍖呰闈㈢Н,閮ㄤ欢鍚嶇О,閮ㄤ欢灏哄,鏈烘鑷傛槸鍚︽棆杞�,鍒涘缓浜�,淇敼浜�"/>
+
+ </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.upi" 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.planNo" 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.orderId" 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.info5" clearable="" placeholder="璇疯緭鍏ョ敓浜у崟鍙�"/>
</el-form-item>
</el-col>
@@ -24,24 +48,6 @@
<el-option v-for="(item,index) in getEnumUpiStatusData_Index" :key="index" :value="item.value" :label="`${item.describe}`" />
</el-select>
-
- </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.planNo" 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.orderId" 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.upi" clearable="" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�"/>
</el-form-item>
</el-col>
@@ -70,32 +76,8 @@
</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.matgrid" 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.isEB" 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.dRNum" 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.isPA" 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.materialIndeX" clearable="" placeholder="璇疯緭鍏ラ敮鍒囧浘鍙�"/>
</el-form-item>
</el-col>
@@ -136,12 +118,6 @@
</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.rotation" 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.info1" clearable="" placeholder="璇疯緭鍏ョ焊绠遍暱"/>
@@ -162,12 +138,6 @@
<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.info4" 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.info5" clearable="" placeholder="璇疯緭鍏ョ敓浜у崟鍙�"/>
</el-form-item>
</el-col>
@@ -237,6 +207,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.info17" clearable="" placeholder="璇疯緭鍏ユ満姊拌噦鏄惁鏃嬭浆"/>
+
+ </el-form-item>
+ </el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb10">
<el-form-item>
<el-button-group style="display: flex; align-items: center;">
@@ -265,6 +241,10 @@
@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="areaCode" label="鎵�鍦ㄥ尯鍩�" show-overflow-tooltip="" >
<template #default="scope">
<el-tag>{{ getEnumDesc(scope.row.areaCode, getEnumAreaCodeData_Index)}}</el-tag>
@@ -275,30 +255,21 @@
<el-tag>{{ getEnumDesc(scope.row.upiStatus, getEnumUpiStatusData_Index)}}</el-tag>
</template>
</el-table-column>
- <el-table-column prop="planNo" label="鎵规鍙�" show-overflow-tooltip="" />
- <el-table-column prop="orderId" label="璁㈠崟鍙�" show-overflow-tooltip="" />
- <el-table-column prop="upi" label="閮ㄤ欢鏉＄爜" show-overflow-tooltip="" />
<el-table-column prop="detailName" 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="" />
- <el-table-column prop="matgrid" label="閮ㄤ欢绾圭悊" show-overflow-tooltip="" />
- <el-table-column prop="isEB" label="鏄惁灏佽竟" show-overflow-tooltip="" />
- <el-table-column prop="dRNum" label="鎵撳瓟璁惧缂栧彿" show-overflow-tooltip="" />
<el-table-column prop="isPA" label="鏄惁浼樺寲鍖呰" show-overflow-tooltip="" />
- <el-table-column prop="materialIndeX" 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="" />
<el-table-column prop="sequence" label="灞傛暟" show-overflow-tooltip="" />
<el-table-column prop="shelf" label="娆″簭" show-overflow-tooltip="" />
- <el-table-column prop="rotation" label="杞悜瑙掑害" show-overflow-tooltip="" />
<el-table-column prop="info1" label="绾哥闀�" show-overflow-tooltip="" />
<el-table-column prop="info2" label="绾哥瀹�" show-overflow-tooltip="" />
<el-table-column prop="info3" label="绾哥楂�" show-overflow-tooltip="" />
<el-table-column prop="info4" label="閿�鍞悎鍚屽崟鍙�" show-overflow-tooltip="" />
- <el-table-column prop="info5" label="鐢熶骇鍗曞彿" show-overflow-tooltip="" />
<el-table-column prop="info6" label="绗嚑鍖�" show-overflow-tooltip="" />
<el-table-column prop="info7" label="缁忛攢搴楀悕绉�" show-overflow-tooltip="" />
<el-table-column prop="info8" label="浜у搧鍚嶇О" show-overflow-tooltip="" />
@@ -310,6 +281,7 @@
<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="" />
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
<el-table-column prop="updateTime" label="淇敼鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
<el-table-column prop="createUserName" label="鍒涘缓浜�" show-overflow-tooltip="" />
--
Gitblit v1.9.3