yusijie
2023-04-16 db2680cc2a5d4900231f87d599982736215bb027
界面优化,条码批量删除
7个文件已修改
228 ■■■■■ 已修改文件
WebTM/views/home/console.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html 145 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html 65 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessSendWorkList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/领料出库/Kf_MateOutBill_FastList.html 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/外购入库/Kf_POStockInBill_FastList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/home/console.html
@@ -62,9 +62,9 @@
                                                </a>
                                            </li>
                                            <li class="layui-col-xs3">
                                                <a lay-href="基础资料/公用基础资料/Gy_WorkCenter.html">
                                                <a lay-href="模治具管理/模治具管理/Gy_BarCodeBillList.html">
                                                    <i class="layui-icon layui-icon-addition"></i>
                                                    <cite>工作中心列表</cite>
                                                    <cite>条码主档维护</cite>
                                                </a>
                                            </li>
                                            <li class="layui-col-xs3">
WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBill_Fast.html
@@ -123,7 +123,7 @@
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">单据类型</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <select name=" HBillSubType" id="HBillSubType">
                                            <select name="HBillSubType" id="HBillSubType">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
@@ -465,9 +465,52 @@
            var HSourceBillType = params[params[1]]; //用于判断源单类型
            var lSourceBillType = params[params[2]];  //从单据获取 æºå•类型
            //判断是否新增
            if (linterid == null || linterid == 0) {
                //获取最大单据号 new
                $("#HInterID").val("");
                $("#HBillNo").val("");
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNumPDA",
                    type: "GET",
                    data: { "HBillType": '1207' },
                    success: function (d) {
                        //console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                    }
                });
                //获取单据子类型
                var HBillSubType = '';
                var HStockOutOrgID = $("#HStockOutOrgID").val()//调出组织
                $.ajax({
                    url: GetWEBURL() + "/WEBSController/GetBillSubType_Json",
                    type: "GET",
                    data: { "HBillType": '1207', "HStockOrgID": HStockOutOrgID },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HBillSubType += '<option value="' + data[i].HNumber + '">' + data[i].HName + '</option>';
                            }
                            $("#HBillSubType").append(HBillSubType);
                            if (HSourceBillType == 1402) { //发货通知单
                                $("#HBillSubType").val("ZJDB02_SYS"); //单据类型默认为寄售
                            }
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }
            else {//如果修改则走下面 new
                RoadBillMain(linterid);
                RoadBillSub(linterid);
            }
            if (HSourceBillType == 1402) { //发货通知单
                $("#HBillType").val(1402);
            } else if (HSourceBillType == 1243) { //调拨申请单
                $("#HBillType").val(1243);
@@ -621,49 +664,7 @@
                        layer.closeAll("loading");
                    }
                });
            }
            //判断是否新增
            if (linterid == null || linterid == 0) {
                //获取最大单据号 new
                $("#HInterID").val("");
                $("#HBillNo").val("");
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNumPDA",
                    type: "GET",
                    data: { "HBillType": '1207' },
                    success: function (d) {
                        //console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                    }
                });
                //获取单据子类型
                var HBillSubType = '';
                var HStockOutOrgID = $("#HStockOutOrgID").val()//调出组织
                $.ajax({
                    url: GetWEBURL() + "/WEBSController/GetBillSubType_Json",
                    type: "GET",
                    data: { "HBillType": '1207', "HStockOrgID": HStockOutOrgID },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HBillSubType += '<option value="' + data[i].HNumber + '">' + data[i].HName + '</option>';
                            }
                            $("#HBillSubType").append(HBillSubType);
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }
            else {//如果修改则走下面 new
                RoadBillMain(linterid);
                RoadBillSub(linterid);
            }
            }
            //选择先进先出仓库
            form.on('submit(HFIFOWHID-BT)', function () {//选择调出仓库
@@ -1151,10 +1152,13 @@
                                $("#HSourceBillNo").attr("readonly", "readonly");
                            }
                            layer.load(3);
                            element.tabChange('tab-MoveStockBill', '3');
                            //扫源单成功后,光标显示到条码上
                            $("#HBarCode").focus();
                            if (HSourceBillType == 1402 || HSourceBillType == 1214) { //发货通知单||生产发料通知单
                                element.tabChange('tab-MoveStockBill', '2');
                                //扫源单成功后,光标显示到条码上
                                $("#HWHNAME").focus();
                            }
                            $.ajax({
                                url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
                                type: "GET",
@@ -1457,7 +1461,50 @@
                                //$("#HStockPlaceID").val(result.data[0].HItemID);
                                $("#HWHID").val(result.data[0].HItemID);
                                $("#HWHNAME").val(result.data[0].HName);
                                element.tabChange('tab-POStockInBill', '2');
                                //element.tabChange('tab-POStockInBill', '2');
                                if (HSourceBillType == 1402 || HSourceBillType == 1214) { //发货通知单||生产发料通知单
                                    element.tabChange('tab-MoveStockBill', '2');
                                    //扫源单成功后,光标显示到条码上
                                    $("#HWHNAME").focus();
                                }
                            }
                            else {
                                // $("#verifycode").click();
                                //layer.msg(result.Message, { icon: 5 });
                                layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                            layer.closeAll("loading");
                        }
                    });
                    // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
                }
            });
            //扫调出仓库
            $('#HSCWHNAME').on('keydown', function (event) {
                var HBarCode = $('#HSCWHNAME').val()
                if (event.keyCode == 13) {
                    if (!HBarCode) {
                        layer.msg('无仓库条码信息!');
                        return;
                    }
                    //判断文本框是否有数据    new
                    $.ajax({
                        url: GetWEBURL() + "/LookingFor/getWHName_Json",
                        type: "GET",
                        data: { "HBarCode": HBarCode },
                        success: function (result) {
                            if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                //$("#HStockPlaceName").val(result.data[0].HName);
                                //$("#HStockPlaceID").val(result.data[0].HItemID);
                                $("#HSCWHID").val(result.data[0].HItemID);
                                $("#HSCWHNAME").val(result.data[0].HName);
                                //element.tabChange('tab-POStockInBill', '2');
                                if (HSourceBillType == 1402 || HSourceBillType == 1214) { //发货通知单||生产发料通知单
                                    element.tabChange('tab-MoveStockBill', '2');
                                    //扫源单成功后,光标显示到条码上
                                    $("#HSCWHNAME").focus();
                                }
                            }
                            else {
                                // $("#verifycode").click();
WebTM/views/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Gy_BarCodeBill.html
@@ -506,7 +506,10 @@
                                    HBatchNo = result.list[0].HBatchNo;
                                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                        for (let i = 0; i < result.list.length; i++) {
                                            result.list[i].HQty = result.list[i].HQty.toString().match(/^\d+(?:\.\d{0,2})?/)[0]  //保留小数点后两位小数
                                            result.list[i].HQty = result.list[i].HQty.toString().match(/^\d+(?:\.\d{0,2})?/)[0]  //保留小数点后两位小数
                                            if (result.list[i].HMinQty != 0) {
                                                result.list[i].HBQty = Math.ceil(result.list[i].HQty / result.list[i].HMinQty)
                                            }
                                        }
                                                                             
                                        BatchNoArray = result.list;  //获取批号,用来给批次按钮功能中的批号赋值
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_BarCodeBillList.html
@@ -134,40 +134,45 @@
                    //列设置
                    case 'set_HideColumn': get_HideColumn();
                        break;
                    case 'btn-Delete':
                    case 'btn-Delete':
                        var checkStatus = table.checkStatus('mainTable')
                            , data = checkStatus.data;
                        if (checkStatus.data.length === 1) {
                            var InterID = data[0].hmainid.toString();
                            //逻辑删除方法
                            layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                                $.ajax({
                                    type: "GET",
                                    url: GetWEBURL() + "Gy_MaterialController/DeltetBarCodeBill", //方法所在页面和方法名
                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                                    success: function (result) {
                                        if (result.count == 1) {
                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                                // å¾—到frame索引
                                                var index = layer.getFrameIndex(window.name);
                                                //关闭当前frame
                                                layer.close(index);
                                                //修改为功后刷新界面
                                                window.location.reload();
                                            });
                        if (checkStatus.data.length == 0) {
                            layer.msg('请选择要删除的数据!');
                            return;
                        }
                        var mainid = "";
                        for (i = 0; i < data.length; i++) {
                            mainid += data[i].hmainid.toString() + ",";
                        }
                        mainid = mainid.substring(0, mainid.length - 1)
                        var oData = JSON.stringify(mainid) + ";" + sessionStorage["HUserName"];
                                        } else {
                                            layer.alert(result.code + result.Message, { icon: 5 });
                                        }
                                    }, error: function () {
                                        layer.alert("接口请求失败!", { icon: 5 });
                        //逻辑删除方法
                        layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                            $.ajax({
                                type: "POST",
                                url: GetWEBURL() + "Gy_MaterialController/DeltetBarCodeBill", //方法所在页面和方法名
                                data: { "oData": oData },
                                success: function (result) {
                                    if (result.count == 1) {
                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                            // å¾—到frame索引
                                            var index = layer.getFrameIndex(window.name);
                                            //关闭当前frame
                                            layer.close(index);
                                            //修改为功后刷新界面
                                            window.location.reload();
                                        });
                                    } else {
                                        layer.alert(result.code + result.Message, { icon: 5 });
                                    }
                                });
                            })
                        }
                        else {
                            layer.msg('请选择一行数据删除!');
                        }
                                }, error: function () {
                                    layer.alert("接口请求失败!", { icon: 5 });
                                }
                            });
                        })
                        break;
                    case 'btn-print':
                        var checkStatus = table.checkStatus('mainTable')
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessSendWorkList.html
@@ -137,7 +137,7 @@
            , laypage = layui.laypage
            , laydate = layui.laydate
        var sWhere = "";
        var titleData = ["hmainid", "HICMOInterID", "HWorkShopID", "HUnitID", "HPRDORGID", "HCenterID", "HProcID", "HDeptID","HEmpID"];
        var titleData = ["hmainid", "HICMOInterID", "HWorkShopID", "HUnitID", "HPRDORGID", "HCenterID", "HProcID", "HDeptID","HEmpID","hentryid","生产车间ID","组织ID","产品ID","单位ID","生产资源ID","操作工ID","班组ID","HWWOrderEntryID","HWWOrderInterID","ieid"];
        var option = [];
        var HModName = "Sc_ProcessSendWorkList";
WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBill_FastList.html
@@ -237,12 +237,15 @@
        form.on('submit(cmdRescind)', function () {
            var checkStatus = table.checkStatus('yd-table');
            var checkStatus2 = table.checkStatus('sy-table');
            var checkStatus3 = table.checkStatus('dj-table');
            var data = "";
            if (checkStatus.data.length != 0) {
                data = checkStatus.data;
            } else if (checkStatus2.data.length != 0) {
                data = checkStatus2.data;
            } else {
            } else if (checkStatus3.data.length != 0) {
                data = checkStatus3.data;
            }  else {
                return layer.msg("请选择一条数据");
            }
            var sInterID = data[0].HInterID
WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBill_FastList.html
@@ -234,7 +234,7 @@
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
                                //关闭当前frame