From ed82ad3a75afb740911cd9128fbada56566a571f Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 23 12月 2024 09:15:33 +0800
Subject: [PATCH] 040310 许工说这个工位机器人达不到，强行锁定 【Editby shaocx,2024-12-23】
---
LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/index.vue | 85 +++++++++++++++++++++++++++++-------------
1 files changed, 59 insertions(+), 26 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..685d171 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/index.vue
@@ -5,19 +5,13 @@
<el-row>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
<el-form-item label="鍏抽敭瀛�">
- <el-input v-model="queryParamsWmsRbLineTask.searchKey" clearable="" placeholder="浠诲姟鍙�,浠诲姟鍚嶇О,閮ㄤ欢鏉＄爜,鎵规鍙�,璁㈠崟鍙�,鍖呰鍙�,搴撲綅缂栫爜,浠诲姟绫诲瀷鍚嶇О,浠诲姟鐘舵�佸悕绉�,浠诲姟鎻忚堪,浠诲姟娑堟伅,鍒涘缓浜�,淇敼浜�"/>
+ <el-input v-model="queryParamsWmsRbLineTask.searchKey" clearable="" placeholder="浠诲姟鍙�,閮ㄤ欢鏉＄爜,鎵规鍙�,璁㈠崟鍙�,鍖呰鍙�,搴撲綅缂栫爜,浠诲姟鎻忚堪,浠诲姟娑堟伅,鏈烘鑷傛槸鍚︽棆杞�,鍒涘缓浜�,淇敼浜�"/>
</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-input v-model="queryParamsWmsRbLineTask.taskNo" clearable="" placeholder="璇疯緭鍏ヤ换鍔″彿"/>
-
- </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-input v-model="queryParamsWmsRbLineTask.taskName" clearable="" placeholder="璇疯緭鍏ヤ换鍔″悕绉�"/>
</el-form-item>
</el-col>
@@ -79,23 +73,11 @@
</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-input v-model="queryParamsWmsRbLineTask.rbTaskTypeEnumName" clearable="" placeholder="璇疯緭鍏ヤ换鍔＄被鍨嬪悕绉�"/>
-
- </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-select clearable="" v-model="queryParamsWmsRbLineTask.taskStatus" placeholder="璇烽�夋嫨浠诲姟鐘舵��">
<el-option v-for="(item,index) in getEnumTaskStatusData_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="showAdvanceQueryUIWmsRbLineTask">
- <el-form-item label="浠诲姟鐘舵�佸悕绉�">
- <el-input v-model="queryParamsWmsRbLineTask.taskStatusName" clearable="" placeholder="璇疯緭鍏ヤ换鍔＄姸鎬佸悕绉�"/>
</el-form-item>
</el-col>
@@ -113,13 +95,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>
@@ -129,6 +111,54 @@
<el-option v-for="(item,index) in getEnumIsFlagFinishData_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="showAdvanceQueryUIWmsRbLineTask">
+ <el-form-item label="鏄惁鏈澘">
+ <el-input-number v-model="queryParamsWmsRbLineTask.lastNum" clearable="" placeholder="璇疯緭鍏ユ槸鍚︽湯鏉�"/>
+
+ </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-input v-model="queryParamsWmsRbLineTask.info17" clearable="" placeholder="璇疯緭鍏ユ満姊拌噦鏄惁鏃嬭浆"/>
+
+ </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="鍖呰X鍧愭爣">
+ <el-input v-model="queryParamsWmsRbLineTask.machineXCenter" clearable="" placeholder="璇疯緭鍏ュ寘瑁匵鍧愭爣"/>
+
+ </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="鍖呰Y鍧愭爣">
+ <el-input v-model="queryParamsWmsRbLineTask.machineYCenter" clearable="" placeholder="璇疯緭鍏ュ寘瑁匶鍧愭爣"/>
+
+ </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="鍖呰Z鍧愭爣">
+ <el-input v-model="queryParamsWmsRbLineTask.machineZCenter" clearable="" placeholder="璇疯緭鍏ュ寘瑁匷鍧愭爣"/>
+
+ </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-input-number v-model="queryParamsWmsRbLineTask.sequence" clearable="" placeholder="璇疯緭鍏ュ眰鏁�"/>
+
+ </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 HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsWmsRbLineTask.createTimeRange" />
+
+ </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 HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsWmsRbLineTask.updateTimeRange" />
</el-form-item>
</el-col>
@@ -161,7 +191,6 @@
border="">
<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="length" label="闀�" show-overflow-tooltip="" />
<el-table-column prop="width" label="瀹�" show-overflow-tooltip="" />
@@ -175,17 +204,15 @@
<el-tag>{{ getEnumDesc(scope.row.rbTaskType, getEnumRbTaskTypeData_Index)}}</el-tag>
</template>
</el-table-column>
- <el-table-column prop="rbTaskTypeEnumName" label="浠诲姟绫诲瀷鍚嶇О" show-overflow-tooltip="" />
<el-table-column prop="taskStatus" label="浠诲姟鐘舵��" show-overflow-tooltip="" >
<template #default="scope">
<el-tag>{{ getEnumDesc(scope.row.taskStatus, getEnumTaskStatusData_Index)}}</el-tag>
</template>
</el-table-column>
- <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>
@@ -194,6 +221,12 @@
</template>
</el-table-column>
+ <el-table-column prop="lastNum" label="鏄惁鏈澘" show-overflow-tooltip="" />
+ <el-table-column prop="info17" 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="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