From ca8f5a8f133e7f5b00b9d35ff6d15720804569af Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 31 一月 2024 10:15:32 +0800
Subject: [PATCH] Merge branch 'ryzhwcs' of http://47.97.1.152:5880/r/zy-wcs into ryzhwcs
---
src/main/webapp/views/taskWrkLog/taskWrkLog.html | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/views/taskWrkLog/taskWrkLog.html b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
index a8831d4..f99e294 100644
--- a/src/main/webapp/views/taskWrkLog/taskWrkLog.html
+++ b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
@@ -59,6 +59,8 @@
</el-table-column>
<el-table-column property="crnNo" label="鍫嗗灈鏈哄彿">
</el-table-column>
+ <el-table-column property="barcode" label="鏉＄爜">
+ </el-table-column>
</el-table>
<div style="margin-top: 10px;">
@@ -169,7 +171,7 @@
maxmin: true,
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
- content: 'commandManage.html?taskNo=' + row.taskNo + "&wrkNo=" + wrkNo,
+ content: 'commandManageLog.html?taskNo=' + row.taskNo + "&wrkNo=" + wrkNo,
success: function(layero, index) {}
});
},
--
Gitblit v1.9.1