20220810

xiaoyong931011

2022-08-10 72c995726194612b74566a9a3fb6f536a8eb79d0

 src/main/resources/templates/febs/views/modules/order/orderList.html

@@ -162,7 +162,11 @@
                    febs.alert.warn('请选择团长');
                    return;
                }
                window.location.href = ctx + "admin/order/confirmOrder?takeUniqueCode="+uniqueCodeValue+"&orderIds="+ids;
                febs.get(ctx + 'admin/order/confirmOrder?takeUniqueCode='+uniqueCodeValue+'&orderIds='+ids, null, function () {
                    febs.alert.success('操作成功');
                    $query.click();
                });
                // window.location.href = ctx + "admin/order/confirmOrder?takeUniqueCode="+uniqueCodeValue+"&orderIds="+ids;
            }
            if (event == 'exportDeliverOne') {
                let uniqueCodeValue = $searchForm.find("select[name='uniqueCode']").val();
@@ -191,17 +195,6 @@
        table.on('tool(orderTable)', function (obj) {
            var data = obj.data,
                layEvent = obj.event;
            // if (layEvent === 'deliverGoods') {
            //     febs.modal.open('发货', 'modules/order/deliverGoods/' + data.id, {
            //         btn: ['确认', '取消'],
            //         yes: function (index, layero) {
            //             $('#deliver-update').find('#submit').trigger('click');
            //         },
            //         btn2: function () {
            //             layer.closeAll();
            //         }
            //     });
            // }
            if (layEvent === 'deliverGoods') {
                febs.modal.open('发货', 'modules/order/deliverGoods/' + data.id, {
                    btn: ['确认', '取消'],