From e8734db76fbbb3149ba663beff3b4f7451012b03 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 03 12月 2024 13:28:34 +0800
Subject: [PATCH] 11
---
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue | 204 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 144 insertions(+), 60 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 7889af6..2e605d8 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="鎵规鍙�,璁㈠崟鍙�,閮ㄤ欢鏉＄爜,閮ㄤ欢鍚嶇О,閮ㄤ欢绾圭悊,鍖呰鍙�,鍒涘缓浜�,淇敼浜�"/>
+ <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>
@@ -28,26 +52,14 @@
</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>
- <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>
@@ -70,32 +82,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 +124,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="璇疯緭鍏ョ焊绠遍暱"/>
@@ -156,6 +138,88 @@
<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.info3" 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.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.info6" 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.info7" 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.info8" 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.info10" 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.info9" 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="鑷彁or鍙戣揣">
+ <el-input v-model="queryParamsMes_BatchOrderUPI_New.info11" clearable="" placeholder="璇疯緭鍏ヨ嚜鎻恛r鍙戣揣"/>
+
+ </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.info12" 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.info13" 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="璇疯緭鍏ラ儴浠舵暟閲�"/>
+
+ </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.info16" 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.info17" 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-select clearable="" v-model="queryParamsMes_BatchOrderUPI_New.upiFlag" placeholder="璇烽�夋嫨鏍囪">
+ <el-option v-for="(item,index) in getEnumUpiFlagData_Index" :key="index" :value="item.value" :label="`${item.describe}`" />
+
+ </el-select>
</el-form-item>
</el-col>
@@ -187,6 +251,13 @@
@sort-change="sortChangeMes_BatchOrderUPI_New"
border="">
<el-table-column type="index" label="搴忓彿" width="55" align="center"/>
+ <el-table-column prop="upi" label="閮ㄤ欢鏉＄爜" width="180" show-overflow-tooltip="" />
+ <el-table-column prop="shelf" label="娆″簭" show-overflow-tooltip="" />
+ <el-table-column prop="sequence" label="灞傛暟" show-overflow-tooltip="" />
+ <el-table-column prop="packageCode" label="鍖呰鍙�" width="180" show-overflow-tooltip="" />
+ <el-table-column prop="planNo" label="鎵规鍙�" width="120" show-overflow-tooltip="" />
+ <el-table-column prop="orderId" label="璁㈠崟鍙�" show-overflow-tooltip="" />
+ <el-table-column prop="info5" label="鐢熶骇鍗曞彿" width="120" 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>
@@ -197,32 +268,42 @@
<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="閮ㄤ欢鏉＄爜" width="200px" show-overflow-tooltip="" />
<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="" />
- <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="info6" label="绗嚑鍖�" show-overflow-tooltip="" />
+ <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="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="" />
<el-table-column prop="updateUserName" label="淇敼浜�" show-overflow-tooltip="" />
+ <el-table-column prop="upiFlag" label="鏍囪" show-overflow-tooltip="" >
+ <template #default="scope">
+ <el-tag>{{ getEnumDesc(scope.row.upiFlag, getEnumUpiFlagData_Index)}}</el-tag>
+ </template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('mes_BatchOrderUPI_New:update') || auth('mes_BatchOrderUPI_New:delete')">
<template #default="scope">
<el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditMes_BatchOrderUPI_New(scope.row)" v-auth="'mes_BatchOrderUPI_New:update'"> 缂栬緫 </el-button>
@@ -279,6 +360,7 @@
const getEnumAreaCodeData_Index = ref<any>([]);
const getEnumUpiStatusData_Index = ref<any>([]);
+ const getEnumUpiFlagData_Index = ref<any>([]);
const { getEnumDesc } = commonFunction();
@@ -406,6 +488,7 @@
const functionMapMes_BatchOrderUPI_New = {
getEnumAreaCodeData_Index,
getEnumUpiStatusData_Index,
+ getEnumUpiFlagData_Index,
formatDate_T_Date,
formatDate_T_Time
};
@@ -432,6 +515,7 @@
onMounted(async () => {
getEnumAreaCodeData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('AreaCodeEnum')).data.result ?? [];
getEnumUpiStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiStatusEnum')).data.result ?? [];
+ getEnumUpiFlagData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiFlagEnum')).data.result ?? [];
});
handleQueryMes_BatchOrderUPI_New();
--
Gitblit v1.9.3