Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

zyx

2023-12-25 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078

 src/main/webapp/static/js/wrkCharge/wrkCharge.js

@@ -27,8 +27,8 @@
            // ,{field: 'mk', align: 'center',title: '标记'}
            ,{field: 'wrkSts$', align: 'center',title: '工作状态'}
            // ,{field: 'ioType$', align: 'center',title: '入出库类型'}
            ,{field: 'crnNo$', align: 'center',title: '堆垛机'}
            ,{field: 'steNo$', align: 'center',title: '穿梭车'}
            ,{field: 'shuttleNo', align: 'center',title: '穿梭车'}
            ,{field: 'charge', align: 'center',title: '充电桩'}
            // ,{field: 'outMost', align: 'center',title: '巷道口'}
            // ,{field: 'ioPri', align: 'center',title: '优先级'}
            ,{field: 'locNo$', align: 'center',title: '目标库位'}
@@ -139,6 +139,31 @@
                    })
                });
                break;
            case 'clearReset':
                layer.confirm('确定重置复位任务吗？', {
                    skin: 'layui-layer-admin',
                    shade: .1
                }, function (i) {
                    layer.close(i);
                    var loadIndex = layer.load(2);
                    $.ajax({
                        url: baseUrl+"/wrkCharge/truncate/reset/auth",
                        headers: {'token': localStorage.getItem('token')},
                        method: 'POST',
                        success: function (res) {
                            layer.close(loadIndex);
                            if (res.code === 200){
                                layer.msg(res.msg, {icon: 1});
                                tableReload();
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg, {icon: 2});
                            }
                        }
                    })
                });
                break;
            case 'addData':
                showEditModel();
                break;
@@ -148,7 +173,7 @@
                   return;
               }
               del(checkStatus.map(function (d) {
                   return d.id;
                   return d.wrkNo;
               }));
               break;
            case 'exportData':
@@ -200,7 +225,7 @@
                showEditModel(data);
                break;
            case "del":
                del([data.id]);
                del([data.wrkNo]);
                break;
        }
    });
@@ -251,6 +276,7 @@
        }, function (i) {
            layer.close(i);
            var loadIndex = layer.load(2);
            console.log({ids: ids})
            $.ajax({
                url: baseUrl+"/wrkCharge/delete/auth",
                headers: {'token': localStorage.getItem('token')},