From 344680022c0c46a1bb108e7d2e81bf2296d79d15 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 18 12月 2024 15:52:09 +0800
Subject: [PATCH] 22
---
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/index.vue | 53 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/index.vue
index 12069b7..5922d74 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/index.vue
@@ -5,7 +5,7 @@
<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_Order_Gather.searchKey" clearable="" placeholder="鐢熶骇鍗曞彿,鎵规鍙�,璁㈠崟鍙�,鍒涘缓浜�,淇敼浜�"/>
+ <el-input v-model="queryParamsMes_Order_Gather.searchKey" clearable="" placeholder="鐢熶骇鍗曞彿,鎵规鍙�,璁㈠崟鍙�,涓嬬嚎浜�,鍒涘缓浜�,淇敼浜�"/>
</el-form-item>
</el-col>
@@ -28,20 +28,23 @@
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
- <el-form-item label="鏄惁榻愬">
- <el-select clearable="" v-model="queryParamsMes_Order_Gather.isKitting" placeholder="璇烽�夋嫨鏄惁榻愬">
- <el-option v-for="(item,index) in getEnumIsKittingData_Index" :key="index" :value="item.value" :label="`${item.describe}`" />
+ <el-form-item label="鏄惁涓嬬嚎">
+ <el-select clearable="" v-model="queryParamsMes_Order_Gather.isUnline" placeholder="璇烽�夋嫨鏄惁涓嬬嚎">
+ <el-option v-for="(item,index) in getEnumIsUnlineData_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_Order_Gather">
- <el-form-item label="鏄惁涓嬬嚎">
- <el-select clearable="" v-model="queryParamsMes_Order_Gather.isUnline" placeholder="璇烽�夋嫨鏄惁涓嬬嚎">
- <el-option v-for="(item,index) in getEnumIsUnlineData_Index" :key="index" :value="item.value" :label="`${item.describe}`" />
-
- </el-select>
+ <el-form-item label="涓嬬嚎鏃堕棿">
+ <el-date-picker placeholder="璇烽�夋嫨涓嬬嚎鏃堕棿" value-format="YYYY/MM/DD HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsMes_Order_Gather.unlineTimeRange" />
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
+ <el-form-item label="涓嬬嚎浜�">
+ <el-input v-model="queryParamsMes_Order_Gather.unlinePerson" clearable="" placeholder="璇疯緭鍏ヤ笅绾夸汉"/>
</el-form-item>
</el-col>
@@ -64,6 +67,12 @@
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
+ <el-form-item label="NG鍖呮暟">
+ <el-input-number v-model="queryParamsMes_Order_Gather.ngPackageNum" clearable="" placeholder="璇疯緭鍏G鍖呮暟"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
<el-form-item label="鎬诲寘瑁呴潰绉�">
<el-input v-model="queryParamsMes_Order_Gather.allPackageArea" clearable="" placeholder="璇疯緭鍏ユ�诲寘瑁呴潰绉�"/>
@@ -78,6 +87,18 @@
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
<el-form-item label="鏈壂鎻忓寘瑁呴潰绉�">
<el-input v-model="queryParamsMes_Order_Gather.noScanPackageArea" clearable="" placeholder="璇疯緭鍏ユ湭鎵弿鍖呰闈㈢Н"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
+ <el-form-item label="鍒涘缓鏃堕棿">
+ <el-date-picker placeholder="璇烽�夋嫨鍒涘缓鏃堕棿" value-format="YYYY/MM/DD HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsMes_Order_Gather.createTimeRange" />
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
+ <el-form-item label="淇敼鏃堕棿">
+ <el-date-picker placeholder="璇烽�夋嫨淇敼鏃堕棿" value-format="YYYY/MM/DD HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsMes_Order_Gather.updateTimeRange" />
</el-form-item>
</el-col>
@@ -111,14 +132,6 @@
<el-table-column prop="info5" 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="isKitting" label="鏄惁榻愬" show-overflow-tooltip="">
- <template #default="scope">
- <el-tag v-if="scope.row.isKitting"> 鏄� </el-tag>
- <el-tag type="danger" v-else> 鍚� </el-tag>
-
- </template>
-
- </el-table-column>
<el-table-column prop="isUnline" label="鏄惁涓嬬嚎" show-overflow-tooltip="">
<template #default="scope">
<el-tag v-if="scope.row.isUnline"> 鏄� </el-tag>
@@ -127,9 +140,12 @@
</template>
</el-table-column>
+ <el-table-column prop="unlineTime" label="涓嬬嚎鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
+ <el-table-column prop="unlinePerson" label="涓嬬嚎浜�" show-overflow-tooltip="" />
<el-table-column prop="packageNum" label="鍖呮暟" show-overflow-tooltip="" />
<el-table-column prop="unLinePackageNum" label="宸蹭笅绾垮寘鏁�" show-overflow-tooltip="" />
<el-table-column prop="noUnLinePackageNum" label="鏈笅绾垮寘鏁�" show-overflow-tooltip="" />
+ <el-table-column prop="ngPackageNum" label="NG鍖呮暟" show-overflow-tooltip="" />
<el-table-column prop="allPackageArea" label="鎬诲寘瑁呴潰绉�" show-overflow-tooltip="" />
<el-table-column prop="scanPackageArea" label="宸叉壂鎻忓寘瑁呴潰绉�" show-overflow-tooltip="" />
<el-table-column prop="noScanPackageArea" label="鏈壂鎻忓寘瑁呴潰绉�" show-overflow-tooltip="" />
@@ -184,7 +200,6 @@
import { SysEnumApi } from '/@/api-services/api';
import commonFunction from '/@/utils/commonFunction';
- const getEnumIsKittingData_Index = ref<any>([]);
const getEnumIsUnlineData_Index = ref<any>([]);
@@ -288,7 +303,6 @@
/***************************************************[璁㈠崟鏁版嵁瀵煎嚭]寮�濮�***************************************************/
//瀹氫箟褰撳墠椤甸潰鐨勬柟娉曠粍
const functionMapMes_Order_Gather = {
- getEnumIsKittingData_Index,
getEnumIsUnlineData_Index,
formatDate_T_Date,
formatDate_T_Time
@@ -314,7 +328,6 @@
/***************************************************[璁㈠崟鏁版嵁瀵煎嚭]缁撴潫***************************************************/
// 璁㈠崟鏁版嵁椤甸潰鍔犺浇鏃�
onMounted(async () => {
- getEnumIsKittingData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('TrueFalseEnum')).data.result ?? [];
getEnumIsUnlineData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('TrueFalseEnum')).data.result ?? [];
});
--
Gitblit v1.9.3