From 4c2306b012351c27fbd457126e65d885478a6fb4 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期三, 30 十月 2024 11:34:42 +0800
Subject: [PATCH] qwe
---
Web/src/views/wcs/wcsTask/index.vue | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/Web/src/views/wcs/wcsTask/index.vue b/Web/src/views/wcs/wcsTask/index.vue
index f569b3a..16ad7d0 100644
--- a/Web/src/views/wcs/wcsTask/index.vue
+++ b/Web/src/views/wcs/wcsTask/index.vue
@@ -68,6 +68,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',
@@ -114,7 +115,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 +127,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>
@@ -148,10 +153,10 @@
<el-row>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" 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="8" :xl="4" class="mb10" style="margin-left: 20px;">
<el-form-item>
<el-button type="primary" icon="ele-Search" @click="handleQuery2"> 鏌ヨ
</el-button>
@@ -195,7 +200,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 +338,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(() => { });
--
Gitblit v1.8.0