From e97843b6eb4174acc2f38d37c84632d45f0dc924 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期一, 30 九月 2024 10:14:30 +0800
Subject: [PATCH] 修改测试问题
---
Web/src/views/wcs/wcsTask/index.vue | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/Web/src/views/wcs/wcsTask/index.vue b/Web/src/views/wcs/wcsTask/index.vue
index 997ec93..f569b3a 100644
--- a/Web/src/views/wcs/wcsTask/index.vue
+++ b/Web/src/views/wcs/wcsTask/index.vue
@@ -1,8 +1,8 @@
锘�<template>
<div class="wcsTask-container">
<el-row :gutter="8" style="width: 100%; height: 100%; flex: 1">
- <el-col :span="12" :xs="24" style="display: flex; height: 100%; flex: 1">
- <el-card class="full-table" shadow="hover" ::body-style="{ height: 'calc(100% - 51px)' }">
+ <el-col :span="14" :xs="24" style="display: flex; height: 100%; flex: 1">
+ <el-card class="full-table" shadow="hover" :body-style="{ height: 'calc(100% - 51px)' }">
<template #header>
<el-icon size="16"
style="margin-right: 3px; display: inline; vertical-align: middle"><ele-Collection /></el-icon>浠诲姟鏃ュ織
@@ -67,7 +67,7 @@
<el-table :data="tableData" style="width: 100%" v-loading="loading" tooltip-effect="light" row-key="id"
@cell-click="handleClick" @sort-change="sortChange" border="">
<el-table-column type="index" label="搴忓彿" width="55" align="center" />
- <el-table-column prop="taskNo" label="浠诲姟鍙�" show-overflow-tooltip="" />
+ <el-table-column prop="taskNo" label="浠诲姟鍙�" width="130" 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',
@@ -89,20 +89,21 @@
<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="">
+ <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>
+ <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="">
+ <el-table-column prop="isBind" width="85" label="鏄惁缁戝畾" show-overflow-tooltip="">
<template #default="scope">
- <span v-if="scope.row.isBind!=null">
+ <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>
+ scope.row.isBind)?.name }}</el-tag>
+ </span>
</template>
</el-table-column>
<el-table-column prop="stationNum" label="鎷嗗灈宸ヤ綅鍙�" show-overflow-tooltip="" />
@@ -113,7 +114,7 @@
<ModifyRecord :data="scope.row" />
</template>
</el-table-column> -->
- <el-table-column prop="鎿嶄綔" label="鎿嶄綔" width="200" align="center" fixed="right" show-overflow-tooltip=""
+ <el-table-column prop="鎿嶄綔" label="鎿嶄綔" width="150" 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">
@@ -122,9 +123,9 @@
<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">
+ <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>
+ v-auth="'wcsTask:cancell'"> 涓婁紶 </el-button>
</template>
</template>
</el-table-column>
@@ -137,7 +138,7 @@
<editDialog ref="editDialogRef" :title="editWcsTaskTitle" @reloadTable="handleQuery" />
</el-card>
</el-col>
- <el-col :span="12" :xs="24" style="display: flex; height: 100%; flex: 1">
+ <el-col :span="10" :xs="24" style="display: flex; height: 100%; flex: 1">
<el-card class="full-table" shadow="hover" :body-style="{ height: 'calc(100% - 51px)' }">
<template #header>
<el-icon size="16"
@@ -194,7 +195,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 } from '/@/api/wcs/wcsTask';
import { pageWcsMonitorTask } from '/@/api/wcs/wcsTaskMonitor';
import { signalR } from './signalR';
--
Gitblit v1.8.0