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 |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/Web/src/views/wcs/wcsTask/index.vue b/Web/src/views/wcs/wcsTask/index.vue
index 50b6eaf..997ec93 100644
--- a/Web/src/views/wcs/wcsTask/index.vue
+++ b/Web/src/views/wcs/wcsTask/index.vue
@@ -84,7 +84,7 @@
             <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="completeQty" 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="" />
@@ -113,7 +113,7 @@
                 <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 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">
@@ -121,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>
@@ -190,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';
 
@@ -319,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