From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

---
 src/main/webapp/views/agvWrkMastLog/wrkDetlLog.html |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/views/agvWrkMastLog/wrkDetlLog.html b/src/main/webapp/views/agvWrkMastLog/wrkDetlLog.html
index a279de3..9f67944 100644
--- a/src/main/webapp/views/agvWrkMastLog/wrkDetlLog.html
+++ b/src/main/webapp/views/agvWrkMastLog/wrkDetlLog.html
@@ -32,14 +32,16 @@
 <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/locMast/locMast.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/agvLocMast/locMast.js" charset="utf-8"></script>
 <script type="text/javascript">
     var pageCur;
     function getCol() {
         let cols = [
             {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
             ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',width:160}
+            ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
         ];
+        arrRemove(detlCols,  'field', 'zpallet');
         cols.push.apply(cols, detlCols);
         return cols;
     }
@@ -54,7 +56,7 @@
         tableIns1 = table.render({
             elem: '#wrkDetlLogByMast',
             headers: {token: localStorage.getItem('token')},
-            url: baseUrl+'/wrkDetlLogByMast/list/auth',
+            url: baseUrl+'/agv/wrkDetlLogByMast/list/auth',
             where: {wrk_no: parent.wrkNo,ioTime: top.dateToStr(parent.ioTime, true)},
             page: true,
             limit: 16,

--
Gitblit v1.9.1