Merge branch 'ryzhwcs' of http://47.97.1.152:5880/r/zy-wcs into ryzhwcs

zyx

2024-01-31 ca8f5a8f133e7f5b00b9d35ff6d15720804569af

 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) {}
                  });
               },