From d662639715b6f5e56734a3f36a5d43ba433b1cc4 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期日, 15 九月 2024 16:34:57 +0800
Subject: [PATCH] 任务管理任务日志操作列增加上传按钮
---
Web/src/views/wcs/wcsTask/index.vue | 73 ++++++++++++++++++++++++++++++++----
1 files changed, 64 insertions(+), 9 deletions(-)
diff --git a/Web/src/views/wcs/wcsTask/index.vue b/Web/src/views/wcs/wcsTask/index.vue
index b68e9e8..997ec93 100644
--- a/Web/src/views/wcs/wcsTask/index.vue
+++ b/Web/src/views/wcs/wcsTask/index.vue
@@ -35,6 +35,16 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
+ <el-form-item label="鎵樼洏鍙�">
+ <el-input v-model="queryParams.palletNo" clearable="" placeholder="璇疯緭鍏ユ墭鐩樺彿" />
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
+ <el-form-item label="鏉ユ簮">
+ <el-input v-model="queryParams.origin" clearable="" placeholder="璇疯緭鍏ユ潵婧�" />
+ </el-form-item>
+ </el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
<el-form-item>
<el-button-group style="display: flex; align-items: center;">
@@ -70,17 +80,40 @@
scope.row.status)?.name }}</el-tag>
</template>
</el-table-column>
+ <el-table-column prop="origin" label="鏉ユ簮" show-overflow-tooltip="" />
<el-table-column prop="startLocate" label="璧峰浣嶇疆" show-overflow-tooltip="" />
<el-table-column prop="endLocate" label="缁撴潫浣嶇疆" show-overflow-tooltip="" />
<el-table-column prop="palletNo" label="鎵樼洏鍙�" show-overflow-tooltip="" />
+ <el-table-column prop="qty" label="鎷嗗灈绠辨暟" show-overflow-tooltip="" />
+ <el-table-column prop="palletQty" label="鏁磋泛绠辨暟" show-overflow-tooltip="" />
+ <el-table-column prop="lotNo" label="鎵规鍙�" show-overflow-tooltip="" />
+ <el-table-column prop="skuNo" label="鐗╂枡缂栫爜" show-overflow-tooltip="" />
+ <el-table-column prop="skuName" label="鐗╂枡鍚嶇О" show-overflow-tooltip="" />
+ <el-table-column prop="unstackingMode" width="100" label="鎷嗗灈鏂瑰紡" show-overflow-tooltip="">
+ <template #default="scope">
+ <span v-if="scope.row.unstackingMode">
+ <el-tag :type="dv('UnstackingModeEnum', scope.row.unstackingMode)?.tagType"> {{ dv('UnstackingModeEnum',
+ scope.row.unstackingMode)?.name }}</el-tag>
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="isBind" width="85" label="鏄惁缁戝畾" show-overflow-tooltip="">
+ <template #default="scope">
+ <span v-if="scope.row.isBind!=null">
+ <el-tag :type="dv('IsBindEnum', scope.row.isBind)?.tagType"> {{ dv('IsBindEnum',
+ scope.row.isBind)?.name }}</el-tag>
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="stationNum" label="鎷嗗灈宸ヤ綅鍙�" show-overflow-tooltip="" />
<el-table-column prop="cancelDate" label="鍙栨秷鏃堕棿" show-overflow-tooltip="" />
<el-table-column prop="finishDate" label="瀹屾垚鏃堕棿" show-overflow-tooltip="" />
- <el-table-column label="淇敼璁板綍" width="80" align="center" show-overflow-tooltip>
+ <!-- <el-table-column label="淇敼璁板綍" width="80" align="center" show-overflow-tooltip>
<template #default="scope">
<ModifyRecord :data="scope.row" />
</template>
- </el-table-column>
- <el-table-column prop="鎿嶄綔" label="鎿嶄綔" width="130" align="center" fixed="right" show-overflow-tooltip=""
+ </el-table-column> -->
+ <el-table-column prop="鎿嶄綔" label="鎿嶄綔" width="200" align="center" fixed="right" show-overflow-tooltip=""
v-if="auth('wcsTask:complete') || auth('wcsTask:cancell')">
<template #default="scope">
<template v-if="scope.row.status <= 1">
@@ -88,6 +121,10 @@
v-auth="'wcsTask:complete'"> 瀹屾垚 </el-button>
<el-button icon="ele-Close" size="small" text="" type="primary" @click="cancellTask(scope.row)"
v-auth="'wcsTask:cancell'"> 鍙栨秷 </el-button>
+ </template>
+ <template v-if="scope.row.status == 2">
+ <el-button icon="ele-Upload" size="small" text="" type="primary" @click="uploadTask(scope.row)"
+ v-auth="'wcsTask:cancell'"> 涓婁紶 </el-button>
</template>
</template>
</el-table-column>
@@ -126,14 +163,15 @@
border="">
<el-table-column type="index" label="搴忓彿" width="55" align="center" />
<el-table-column prop="taskNo" label="浠诲姟鍙�" show-overflow-tooltip="" />
- <el-table-column prop="plcId" label="浜や簰宸ヤ綅鍙�" show-overflow-tooltip="" />
+ <!-- <el-table-column prop="plcId" label="浜や簰宸ヤ綅鍙�" show-overflow-tooltip="" /> -->
<el-table-column prop="plcName" label="浜や簰浣嶇疆" show-overflow-tooltip="" />
<el-table-column prop="interactiveMsg" label="浜や簰淇℃伅" show-overflow-tooltip="" />
- <el-table-column label="淇敼璁板綍" width="80" align="center" show-overflow-tooltip>
+ <el-table-column prop="createTime" label="浜や簰鏃堕棿" show-overflow-tooltip="" />
+ <!-- <el-table-column label="淇敼璁板綍" width="80" align="center" show-overflow-tooltip>
<template #default="scope">
<ModifyRecord :data="scope.row" />
</template>
- </el-table-column>
+ </el-table-column> -->
</el-table>
<el-pagination v-model:currentPage="tableParams2.page" v-model:page-size="tableParams2.pageSize"
:total="tableParams2.total" :page-sizes="[10, 20, 50, 100, 200, 500]" size="small" background=""
@@ -156,7 +194,7 @@
import printDialog from '/@/views/system/print/component/hiprint/preview.vue'
import editDialog from '/@/views/wcs/wcsTask/component/editDialog.vue'
-import { pageWcsTask, finshWcsTask } from '/@/api/wcs/wcsTask';
+import { pageWcsTask, finshWcsTask,uploadWcsTask } from '/@/api/wcs/wcsTask';
import { pageWcsMonitorTask } from '/@/api/wcs/wcsTaskMonitor';
import { signalR } from './signalR';
@@ -170,12 +208,12 @@
const queryParams2 = ref<any>({});
const tableParams = ref({
page: 1,
- pageSize: 10,
+ pageSize: 20,
total: 0,
});
const tableParams2 = ref({
page: 1,
- pageSize: 10,
+ pageSize: 20,
total: 0,
});
const printWcsTaskTitle = ref("");
@@ -285,6 +323,23 @@
.catch(() => { });
}
+//涓婁紶浠诲姟
+const uploadTask = async (row: any) => {
+ ElMessageBox.confirm(`纭畾瑕佷笂浼犱换鍔″悧?`, "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(async () => {
+ var param = Object.assign(row);
+ await uploadWcsTask(param);
+ handleQuery();
+ handleQuery2();
+ ElMessage.success("涓婁紶浠诲姟鎴愬姛");
+ })
+ .catch(() => { });
+
+}
// 鐐瑰嚮琛ㄦ牸
const handleClick = (row, column, cell, event) => {
if (column.property === '鎿嶄綔') {
--
Gitblit v1.8.0