From 013d7277380d535118d83291d937b6cb3b6a5adb Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期三, 11 六月 2025 16:46:33 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu
---
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue | 36 +++++++++++++++++-------------------
1 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue
index 74b4262..923d039 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue
@@ -23,22 +23,11 @@
sortName: "TaskId"
});
const editFormFields = ref({
- "taskNum": "",
- "palletCode": ""
+ "grade": "",
});
const editFormOptions = ref([
[
- { "title": "浠诲姟鍙�", "field": "taskNum", "type": "text" },
- { "title": "鎵樼洏鍙�", "field": "palletCode", "type": "text" },
- { "title": "浠诲姟绫诲瀷", "field": "taskType", "type": "select", dataKey: "TaskType", data: [] },
- { "title": "浠诲姟鐘舵��", "field": "taskState", "type": "select", dataKey: "TaskStatus", data: [] },
-
- ],
- [
- { "title": "璧峰浣嶇疆", "field": "sourceAddress", type: "text" },
- { "title": "褰撳墠浣嶇疆", "field": "currentAddress", type: "text" },
- { "title": "涓嬩竴浣嶇疆", "field": "nextAddress", type: "text" },
- { "title": "鐩爣浣嶇疆", "field": "targetAddress", type: "text" },
+ { "title": "浼樺厛绾�", "field": "grade", type: "text" },
],
]);
const searchFormFields = ref({
@@ -57,11 +46,17 @@
{ "title": "涓嬩竴浣嶇疆", "field": "nextAddress", type: "text" },
{ "title": "鐩爣浣嶇疆", "field": "targetAddress", type: "text" },
],
+ [
+ { "title": "宸烽亾", "field": "roadway", type: "text" },
+ { "title": "鐢熶骇浜х嚎", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
+ { "title": "鍒涘缓浜�", "field": "creater", type: "text" },
+ { "title": "鍒涘缓鏃堕棿", "field": "createDate", type: "datetime" },
+ ],
]);
const columns = ref([{ field: 'TaskId', title: '涓婚敭', type: 'string', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
{ field: 'taskNum', title: '浠诲姟鍙�', type: 'int', width: 110, align: 'left', sort: true },
- { field: 'palletCode', title: '鎵樼洏鍙�', type: 'string', width: 110, align: 'left' },
- { field: 'pnboundNo', title: '鍗曟嵁鍙�', type: 'string', width: 110, align: 'left' },
+ { field: 'palletCode', title: '鎵樼洏鍙�', type: 'string', width: 180, align: 'left' },
+ { field: 'pnboundNo', title: '鍗曟嵁鍙�', type: 'string', width: 110, align: 'left',hidden:true },
{ field: 'groupID', title: '搴撳瓨ID', type: 'int', width: 110, hidden: true, align: 'left' },
{ field: 'groupDetailId', title: '缁勭洏鏄庣粏ID', type: 'int', width: 110, hidden: true, align: 'left' },
{ field: 'roadway', title: '宸烽亾', type: 'string', width: 110, align: 'left' },
@@ -71,16 +66,19 @@
{ field: 'currentAddress', title: '褰撳墠浣嶇疆', type: 'string', width: 110, align: 'left' },
{ field: 'nextAddress', title: '涓嬩竴浣嶇疆', type: 'string', width: 110, align: 'left' },
{ field: 'targetAddress', title: '鐩爣浣嶇疆', type: 'string', width: 110, align: 'left' },
- { field: 'grade', title: '浼樺厛绾�', type: 'int', width: 110, align: 'left' },
+ { field: 'grade', title: '浼樺厛绾�', type: 'int', width: 60, align: 'left' },
+ { field: 'productionLine', title: '浜х嚎', type: 'string', width: 70, align: 'left', bind: { key: "ProductionLine", data: [] } },
+ { field: 'errorMessage', title: '寮傚父淇℃伅', type: 'string', width: 110, align: 'left',sort: true },
{ field: 'dispatchertime', title: '浠诲姟涓嬪彂鏃堕棿', type: 'datetime', width: 150, align: 'left', sort: true },
- { field: 'remark', title: '澶囨敞', type: 'string', width: 110, align: 'left' },
- { field: 'creater', title: '鍒涘缓浜�', type: 'string', sort: true, width: 110, align: 'left' },
+ { field: 'remark', title: '澶囨敞', type: 'string', width: 110, align: 'left',hidden: true, },
{ field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
- { field: 'modifier', title: '淇敼浜�', type: 'string', sort: true, width: 100, align: 'left' },
{ field: 'modifyDate', title: '淇敼鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
+ { field: 'creater', title: '鍒涘缓浜�', type: 'string', sort: true, width: 110, align: 'left' },
+ { field: 'modifier', title: '淇敼浜�', type: 'string', sort: true, width: 100, align: 'left' },
{ field: 'locationCode', title: '璐т綅鍙�', type: 'string', width: 110, hidden: true, align: 'left' },
{ field: 'materialNo', title: '鐗╂枡缂栧彿', type: 'string', width: 110, hidden: true, align: 'left' },
{ field: 'targetAddress', title: '鐩爣鍦板潃', type: 'string', width: 110, hidden: true, align: 'left' },
+ { field: 'processCode', title: '宸ュ簭', type: 'string', width: 90, align: 'left' },
{ field: 'createID', title: '鍒涘缓ID', type: 'int', sort: true, width: 100, hidden: true, align: 'left' },
{ field: 'modifyID', title: '淇敼浜篒D', type: 'int', sort: true, width: 100, hidden: true, align: 'left' },]);
const detail = ref({
--
Gitblit v1.9.3