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

zyx

2024-07-08 0caed17a984ea21a0b92478f52cf90c101d1085e

 src/main/webapp/views/pla/sellout.html

@@ -85,24 +85,12 @@
                </div>
            </div>
        </div>

        <div class="layui-form layui-card-header" >
            <label class="layui-form-label"><span class="not-null">*</span>选择发货时间：</label> </br>
            <i class="layui-icon layui-icon-date" style="font-size: 30px; color: #3F3F3F;"></i>
            <div class="layui-form-item">
                <button id="btn-day1-am" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">今天下午 80 ✔</button>
                <button id="btn-day2-am" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">明天下午</button>
                <button id="btn-day3-am" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">后天下午</button>
                <button id="btn-day4-am" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">后天下午</button>
            </div>
            <div class="layui-form-item ">
                <button id="btn-day1-pm" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">今天下午</button>
                <button id="btn-day2-pm" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">明天下午</button>
                <button id="btn-day3-pm" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">后天下午</button>
                <button id="btn-day4-pm" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">后天下午</button>
        <div class="layui-inline"  style="width:83%; margin-bottom: 5px;">
            <label class="layui-form-label"><span class="not-null">*</span>发货时间：</label>
            <div class="layui-input-inline">
                <input type="text" class="layui-input" id="pakoutTime">
            </div>
        </div>

        <div id="data-detail-btn" class="layui-btn-container layui-form-item">
            <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">保存</div>
            <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">修改</div>
@@ -201,6 +189,12 @@
        var form = layui.form;
        var layer = layui.layer;
        var table = layui.table;
        var laydate = layui.laydate;
        // 日期时间选择器
        laydate.render({
            elem: '#pakoutTime',
            type: 'datetime'
        });

        form.on('submit(edit)', function () {
            var dataList = [];
@@ -219,7 +213,7 @@
                type: 1,
                title: "数量修改",
                content: $('#editDialog').html(),
                area: '700px',
                area: ['700px', top.detailHeight],
                success: function (layero, dIndex) {
                    // 明细表格
                    tableIns = table.render({
@@ -227,6 +221,7 @@
                        data: dataList,
                        limit: 100,
                        even: true,
                        height: '400px',
                        cellMinWidth: 50,
                        cols: [[
                            {field: 'batch', title: '批号', width: 160},
@@ -247,18 +242,17 @@
            }

            for (var i in checkData){
                checkData[i].type = 'sellOut';
                checkData[i].orderNo = $('#orderNoV').val();
                checkData[i].customer = $('#customer').val();
                checkData[i].phone = $('#phone').val();
                checkData[i].addr = $('#addr').val();
                checkData[i].orderWeight = detailData[i] ? detailData[i].weight : checkData[i].weightAnfme;
                checkData[i].orderWeight = detailData[i] ? detailData[i].weight : checkData[i].weightAnfme - checkData[i].qtyAnfme;
                checkData[i].allocate = $('#allocate').val();
                checkData[i].memo = $('#memo').val();
                checkData[i].pakoutTime = deliveryTime;
                checkData[i].pakoutTime = $('#pakoutTime').val();
            }

            if(!deliveryTime){
            if(!$('#pakoutTime').val()){
                layer.msg("请选择发货时间");
                return;
            }
@@ -274,6 +268,7 @@
                    if (res.code === 200){
                        layer.msg("修改成功");
                        tableReload(true);
                        parent.clearTable();
                    } else if (res.code === 403){
                        layer.msg(res.msg, {icon: 2})
                        return;