From f63d5e9591f8ade8fa7ccb4523d27ff26be81feb Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周三, 07 5月 2025 14:10:14 +0800 Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo --- HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/Config.ts | 65 ++++++++++++++------------------ 1 files changed, 28 insertions(+), 37 deletions(-) diff --git a/HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/Config.ts b/HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/Config.ts index 76e143b..4c70305 100644 --- a/HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/Config.ts +++ b/HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/Config.ts @@ -35,19 +35,19 @@ // { // field: 'dodeviceId', // title: '鍫嗗灈鏈篒D', - // width: 100, // }, + { + field: 'dodevicetype', + title: '璁惧绫诲瀷', + }, { field: 'taskDodeviceStatus', title: '璁惧鐘舵��', }, { field: 'isRead', - title: 'WCS鍙', - }, - { - field: 'taskLevel', - title: '浼樺厛绾�', + title: 'WCS鍙鍙�', + formatter: ({ cellValue }) => 12222, }, { field: 'sonTaskTypeDesc', @@ -57,41 +57,32 @@ field: 'sourceOrderNo', title: '鏉ユ簮鍗曞彿', }, + // { + // field: 'isNextTask', + // title: '涓嬩釜浠诲姟鏄惁鐢熸垚鎴愬姛', + // }, { - field: 'isNextTask', - title: '鍚庣画浠诲姟', + field: 'taskLevel', + title: '浠诲姟绛夌骇', }, - { - field: 'dodevicetype', - title: '璁惧绫诲瀷', - }, - + // { + // field: 'mutableParam1', + // title: '鍙彉鍙橀噺1', + // }, + // { + // field: 'mutableParam2', + // title: '鍙彉鍙橀噺2', + // }, + // { + // field: 'mutableParam3', + // title: '鍙彉鍙橀噺3', + // }, + // { + // field: 'sort', + // title: '鎺掑簭', + // }, { field: 'creationTime', title: '鍒涘缓鏃堕棿', }, - // { - // field: 'sort', - // title: '鎺掑簭', - // width: 80, - // }, - // // 浠ヤ笅涓烘瑕佷俊鎭斁鍦ㄦ渶鍚� - // { - // field: 'mutableParam1', - // title: '鍙橀噺1', - // width: 100, - // showOverflow: true, // 闀挎枃鏈樉绀虹渷鐣ュ彿 - // }, - // { - // field: 'mutableParam2', - // title: '鍙橀噺2', - // width: 100, - // showOverflow: true, - // }, - // { - // field: 'mutableParam3', - // title: '鍙橀噺3', - // width: 100, - // showOverflow: true, - // }, ] -- Gitblit v1.9.3