From a701d2fc7c3c822c581add45b6d4e0ff360fb053 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 07 六月 2025 11:37:57 +0800
Subject: [PATCH] 修改问题
---
Web/src/views/wcs/wcsTask/index.vue | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/Web/src/views/wcs/wcsTask/index.vue b/Web/src/views/wcs/wcsTask/index.vue
index f569b3a..f1d7806 100644
--- a/Web/src/views/wcs/wcsTask/index.vue
+++ b/Web/src/views/wcs/wcsTask/index.vue
@@ -41,6 +41,11 @@
</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.orderNo" 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>
@@ -68,6 +73,7 @@
@cell-click="handleClick" @sort-change="sortChange" border="">
<el-table-column type="index" label="搴忓彿" width="55" align="center" />
<el-table-column prop="taskNo" label="浠诲姟鍙�" width="130" show-overflow-tooltip="" />
+ <el-table-column prop="levels" label="浼樺厛绾�" width="55" show-overflow-tooltip="" />
<el-table-column prop="taskType" width="85" label="浠诲姟绫诲瀷" show-overflow-tooltip="">
<template #default="scope">
<el-tag :type="dv('TaskTypeEnum', scope.row.taskType)?.tagType"> {{ dv('TaskTypeEnum',
@@ -84,11 +90,12 @@
<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="orderNo" 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="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">
@@ -114,7 +121,7 @@
<ModifyRecord :data="scope.row" />
</template>
</el-table-column> -->
- <el-table-column prop="鎿嶄綔" label="鎿嶄綔" width="150" align="center" fixed="right" show-overflow-tooltip=""
+ <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">
@@ -126,6 +133,10 @@
<template v-if="scope.row.status == 2 && scope.row.origin == 'WMS'">
<el-button icon="ele-Upload" size="small" text="" type="primary" @click="uploadTask(scope.row)"
v-auth="'wcsTask:cancell'"> 涓婁紶 </el-button>
+ </template>
+ <template v-if="scope.row.status == 0">
+ <el-button icon="ele-Top" size="small" text="" type="primary" @click="topUpTask(scope.row)"
+ v-auth="'wcsTask:cancell'"> 缃《 </el-button>
</template>
</template>
</el-table-column>
@@ -146,12 +157,12 @@
</template>
<el-form :model="queryParams2" ref="queryForm2" labelWidth="90">
<el-row>
- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
+ <el-col :xs="24" :sm="12" :md="12" :lg="10" :xl="8" class="mb10">
<el-form-item label="浠诲姟鍙�">
- <el-input v-model="queryParams2.taskNo" clearable="" placeholder="璇疯緭鍏ヤ换鍔″彿" />
+ <el-input v-model="queryParams2.taskNo" clearable="" placeholder="璇疯緭鍏ヤ换鍔″彿" style="width: 130px;" />
</el-form-item>
</el-col>
- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
+ <el-col :xs="24" :sm="12" :md="12" :lg="10" :xl="8" class="mb10" style="margin-left: 20px;">
<el-form-item>
<el-button type="primary" icon="ele-Search" @click="handleQuery2"> 鏌ヨ
</el-button>
@@ -195,7 +206,7 @@
import printDialog from '/@/views/system/print/component/hiprint/preview.vue'
import editDialog from '/@/views/wcs/wcsTask/component/editDialog.vue'
-import { pageWcsTask, finshWcsTask, uploadWcsTask } from '/@/api/wcs/wcsTask';
+import { pageWcsTask, finshWcsTask, uploadWcsTask,topUpWcsTask } from '/@/api/wcs/wcsTask';
import { pageWcsMonitorTask } from '/@/api/wcs/wcsTaskMonitor';
import { signalR } from './signalR';
@@ -333,10 +344,27 @@
})
.then(async () => {
var param = Object.assign(row);
- await uploadWcsTask(param);
+ await topUpTask(param);
handleQuery();
handleQuery2();
- ElMessage.success("涓婁紶浠诲姟鎴愬姛");
+ ElMessage.success("涓婁紶浠诲姟鎴愬姛锛�");
+ })
+ .catch(() => { });
+
+}
+//缃《浠诲姟
+const topUpTask = async (row: any) => {
+ ElMessageBox.confirm(`纭畾瑕佺疆椤朵换鍔″悧?`, "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(async () => {
+ var param = Object.assign(row);
+ await topUpWcsTask(param);
+ handleQuery();
+ handleQuery2();
+ ElMessage.success("缃《浠诲姟鎴愬姛");
})
.catch(() => { });
@@ -380,4 +408,9 @@
:deep(.el-input-number) {
width: 100%;
}
+
+/* :deep(.el-input__inner)
+{
+ width: 50%;
+} */
</style>
--
Gitblit v1.8.0