From 96b1afcbf80cd6b12c1108b61ba2cef1345b1398 Mon Sep 17 00:00:00 2001
From: xxyy <cathay_xy@163.com>
Date: 星期三, 12 二月 2025 17:33:20 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu
---
Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
index a744063..65e0050 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
@@ -66,6 +66,7 @@
],
[
{ title: "宸烽亾鍙�", field: "roadway", type: "like" },
+ { "title": "鐢熶骇浜х嚎", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
{ title: "鍒涘缓浜�", field: "creater", type: "like" },
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
],
@@ -147,6 +148,13 @@
align: "left",
},
{
+ field: "productionLine",
+ title: "浜х嚎",
+ type: "string",
+ width: 70,
+ align: "left",
+ },
+ {
field: "exceptionMessage",
title: "寮傚父淇℃伅",
type: "string",
@@ -158,7 +166,7 @@
field: "grade",
title: "浼樺厛绾�",
type: "int",
- width: 80,
+ width: 60,
align: "left",
},
{
@@ -176,6 +184,22 @@
align: "left",
hidden: true,
},
+
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 150,
+ align: "left",
+ },
+
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
{
field: "creater",
title: "鍒涘缓浜�",
@@ -184,24 +208,10 @@
align: "left",
},
{
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 150,
- align: "left",
- },
- {
field: "modifier",
title: "淇敼浜�",
type: "string",
width: 90,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
align: "left",
},
{
--
Gitblit v1.9.3