From aa00074986140e57be1f56272311e84abd8566ac Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周六, 30 11月 2024 17:04:28 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/index.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/index.vue
index d10b29e..6c153cb 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/index.vue
@@ -23,7 +23,7 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsRbLineTask">
<el-form-item label="閮ㄤ欢鏉＄爜">
- <el-input v-model="queryParamsWmsRbLineTask.upi" clearable="" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�"/>
+ <el-input v-model="queryParamsWmsRbLineTask.uPI" clearable="" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�"/>
</el-form-item>
</el-col>
@@ -113,13 +113,13 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsRbLineTask">
<el-form-item label="涓嬪彂鏃堕棿">
- <el-date-picker placeholder="璇烽�夋嫨涓嬪彂鏃堕棿" value-format="YYYY/MM/DD" type="daterange" v-model="queryParamsWmsRbLineTask.issueTimeRange" />
+ <el-date-picker placeholder="璇烽�夋嫨涓嬪彂鏃堕棿" value-format="YYYY/MM/DD HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsWmsRbLineTask.issueTimeRange" />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsRbLineTask">
<el-form-item label="浠诲姟瀹屾垚鏃堕棿">
- <el-date-picker placeholder="璇烽�夋嫨浠诲姟瀹屾垚鏃堕棿" value-format="YYYY/MM/DD" type="daterange" v-model="queryParamsWmsRbLineTask.finishedTimeRange" />
+ <el-date-picker placeholder="璇烽�夋嫨浠诲姟瀹屾垚鏃堕棿" value-format="YYYY/MM/DD HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsWmsRbLineTask.finishedTimeRange" />
</el-form-item>
</el-col>
@@ -162,7 +162,7 @@
<el-table-column type="index" label="搴忓彿" width="55" align="center"/>
<el-table-column prop="taskNo" label="浠诲姟鍙�" show-overflow-tooltip="" />
<el-table-column prop="taskName" label="浠诲姟鍚嶇О" show-overflow-tooltip="" />
- <el-table-column prop="upi" label="閮ㄤ欢鏉＄爜" show-overflow-tooltip="" />
+ <el-table-column prop="uPI" 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="" />
@@ -184,8 +184,8 @@
<el-table-column prop="taskStatusName" label="浠诲姟鐘舵�佸悕绉�" show-overflow-tooltip="" />
<el-table-column prop="taskDescribe" label="浠诲姟鎻忚堪" show-overflow-tooltip="" />
<el-table-column prop="taskMsg" label="浠诲姟娑堟伅" show-overflow-tooltip="" />
- <el-table-column prop="issueTime" label="涓嬪彂鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
- <el-table-column prop="finishedTime" label="浠诲姟瀹屾垚鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
+ <el-table-column prop="issueTime" label="涓嬪彂鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
+ <el-table-column prop="finishedTime" label="浠诲姟瀹屾垚鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
<el-table-column prop="isFlagFinish" label="鏄惁鏍囪寮哄埗瀹屾垚" show-overflow-tooltip="">
<template #default="scope">
<el-tag v-if="scope.row.isFlagFinish"> 鏄� </el-tag>
--
Gitblit v1.9.3