打印弹窗缩小;批量选择即时库存生成条码;系统默认转工序不允许删除;添康到货确认模块只传入单据id
12个文件已修改
162 ■■■■ 已修改文件
WebTM/views/Baseset/SRM_OpenTmpList.html 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/PublicPage/MaterialInfo.html 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_StockPlace_List.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/质量报表/QC_ProdBadReasonStatistics.html 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/关键件绑定/Sc_KeyElementBinding.html 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_BatchSplit.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/收料入库/Kf_ReciveBill_Fast_TK.html 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/SRM_OpenTmpList.html
@@ -35,7 +35,7 @@
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
                                <table class="layui-hide" id="mainTable"></table>
                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                            </div>
                        </div>
                    </div>
@@ -66,10 +66,10 @@
                , loading: false
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HItemID', width: 150, title: 'ID', hide: true }
                    , { field: 'HNumber', width: 150, title: '模块代码' }
                    , { field: 'HName', width: 150, title: '模块名称', hide: true }
                    , { field: '模板名称', width: 150, title: '模板名称' }
                    , { field: 'HItemID', title: 'ID', hide: true }
                    , { field: 'HNumber', title: '模块代码' }
                    , { field: 'HName', title: '模块名称', hide: true }
                    , { field: '模板名称', title: '模板名称' }
                ]]
                , page: true
                , limits: [50, 500, 5000, 50000]
@@ -78,12 +78,21 @@
            DisPlay_HideColumn();
            table.on('row(mainTable)', function (obj) {////注:test是table原始容器的属性 lay-filter="对应的值"
                obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');//选中行样式
                obj.tr.find('input[lay-type="layTableRadio"]').prop("checked", true);
                form.render('radio');
            });
            //table.on('row(mainTable)', function (obj) {////注:test是table原始容器的属性 lay-filter="对应的值"
            //    obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');//选中行样式
            //    obj.tr.find('input[lay-type="layTableRadio"]').prop("checked", true);
            //    form.render('radio');
            //});
            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
                $(".layui-table-body tr ").attr({ "style": "background:" });    //其他tr恢复原样
                obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');   //选中行样式
                obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");   //选中radio样式
                $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //改变当前tr背景颜色和字体颜色
            })
            //#endregion
            function getUrlVars() {
                var vars = [], hash;
WebTM/views/PublicPage/MaterialInfo.html
@@ -99,7 +99,7 @@
                , page: true
                , cellMinWidth: 90
                , cols: [[
                    { type: 'radio', fixed: 'left' }
                    { type: 'checkbox', fixed: 'left' }
                    , { field: '物料仓库资料代码', title: '物料仓库资料代码', sort: true }
                    , { field: '物料代码', title: '物料代码', sort: true }
                    , { field: '物料名称', title: '物料名称' }
@@ -121,6 +121,27 @@
                ]]
            };
            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据,前面的只是添加或删除选中未选中样式以及设置背景色,字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            })
            //#endregion
            var index = layer.load(0, { shade: false });
            //进入页面显示的缓存列表
@@ -162,7 +183,7 @@
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.alert("查询成功", { icon: 1 });
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
WebTM/views/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Gy_BarCodeBill.html
@@ -676,7 +676,25 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].物料代码, HMaterName: checkStatus.data[0].物料名称, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].计量单位代码, HUnitName: checkStatus.data[0].计量单位, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].数量.toFixed(2), HMinQty: checkStatus.data[0].最小包装数, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"], HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '', "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": "" }]
                        var data = checkStatus.data;
                        var arr = [];
                        for (var i = 0; i < data.length; i++) {
                            arr.push({
                                "HMaterID": data[i].HMaterID, "HMaterCode": "", "HMaterNumber": data[i].物料代码, "HMaterName": data[i].物料名称
                                , "HMaterModel": data[i].规格型号, "HMaterSpec": "", "HBatchNo": data[i].批次, "HUnitID": data[i].HUnitID
                                , "HUnitNumber": data[i].计量单位代码, "HUnitName": data[i].计量单位, "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0
                                , "HQtyMust": 0, "HQty": data[i].数量, "HBQty": 1, "HMinQty": data[i].数量, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0
                                , "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"]
                                , "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "", "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd")
                                , "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": data[i].HISKFPERIOD == false ? 0 : 1
                                , "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"]
                                , "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": data[i].计划跟踪号, "HCusModel": "", "HCusMaterName": ""
                                , "HCheckEmpName": ""
                            })
                        }
                        //同步更新表格和缓存对应的值
                        table.reload('mainTable', {
                            data: arr // è°ƒç”¨table.reload é‡æ–°æ¸²æŸ“显示加载追加了数据的表格
@@ -874,7 +892,7 @@
                    , { field: 'HExpirationDateFlag', title: '是否启用保质期', width: 100, templet: '#switchTp3', unresize: false }
                    , { field: 'HGiveAwayFlag', title: '是否赠品', width: 100, templet: '#switchTpl', unresize: false }
                    , { field: 'HDate', title: '条码日期', width: 100, hide: true }
                    , { field: 'HMTONo', title: '计划跟踪号', width: 100, hide: true }
                    , { field: 'HMTONo', title: '计划跟踪号', width: 100, edit: 'text' }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                ];
                option = {
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_StockPlace_List.html
@@ -502,7 +502,7 @@
                    layer.open({
                        type: 2
                        , area: ['80%', '80%']
                        , area: ['40%', '80%']
                        , title: '打印模版选择'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Warehouse.html
@@ -849,7 +849,7 @@
                    layer.open({
                        type: 2
                        , area: ['80%', '80%']
                        , area: ['40%', '80%']
                        , title: '打印模版选择'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_BarCodeBillList.html
@@ -301,7 +301,7 @@
                            rows = rows.substring(rows.length - 1, 0);
                            layer.open({
                                type: 2
                                , area: ['50%', '50%']
                                , area: ['40%', '80%']
                                , title: '打印模版选择'
                                , shade: 0.6 //遮罩透明度
                                , maxmin: false //允许全屏最小化
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html
@@ -1445,6 +1445,8 @@
                    layer.confirm('真的删除行吗?', function (index) {
                        if (rowIndex === '0') {
                            layer.msg('首行无法删除!!!');
                        } else if (table.cache["mainTable"][obj.tr.data('index')].HProcNo == "9999") {
                            layer.msg('系统转工序,不允许删除!!!');
                        } else {
                            var oldData = table.cache["mainTable"];
                            oldData.splice(obj.tr.data('index'), 1)
WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_ProdBadReasonStatistics.html
@@ -91,6 +91,7 @@
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export"><i class="layui-icon layui-icon-form"></i>导出</button>
                            </div>
                        </script>
                    </form>
@@ -332,6 +333,10 @@
                    case 'HideColumn':
                        get_HideColumn();
                        break;
                    //导出
                    case 'get_export':
                        get_Export();
                        break;
                };
            });
            //重置按钮
@@ -438,6 +443,7 @@
                            option.data = data1.data;
                            table.render(option);
                            ins = table.render(option);
                            layer.close(wait);
                        } else {
                            layer.close(wait);
@@ -472,6 +478,26 @@
                get_FastQuery();
            }
            //#region å¯¼å‡ºExecel
            function get_Export() {
                var data = option.data
                data.forEach((item) => {
                    for (let itemobj in item) {
                        if (item[itemobj] == null) {
                            item[itemobj] = "";
                        }
                        if (item[itemobj].length > 0) {  // å‡è®¾å­—段名为field
                            item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '').replaceAll(",",",");  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                        }
                    }
                });
                table.exportFile(ins.config.id, option.data, "xls");
            }
            //#endregion
            //隐藏列设置
            function get_HideColumn() {
                var colName = "";
WebTM/views/³µ¼ä¹ÜÀí/¹Ø¼ü¼þ°ó¶¨/Sc_KeyElementBinding.html
@@ -516,6 +516,21 @@
            //    option_detail.data.push(option.data[i])
            //}
            if (data.field.HMaterName.indexOf("\"") != -1 || data.field.HMaterName.indexOf(";") != -1) {
                data.field.HMaterName = data.field.HMaterName.replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";")
            }
            if (data.field.HMaterModel.indexOf("\"") != -1 || data.field.HMaterModel.indexOf(";") != -1) {
                data.field.HMaterModel = data.field.HMaterModel.replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";")
            }
            for (var i = 0; i < option.data.length; i++) {
                if (option.data[i].HMaterName.indexOf("\"") != -1 || option.data[i].HMaterName.indexOf(";") != -1) {
                    option.data[i].HMaterName = option.data[i].HMaterName.replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";")
                }
                if (option.data[i].HMaterModel.indexOf("\"") != -1 || option.data[i].HMaterModel.indexOf(";") != -1) {
                    option.data[i].HMaterModel = option.data[i].HMaterModel.replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";")
                }
            }
            //序列化表头信息和子表信息            
            var sMainStr = JSON.stringify(data.field);
            var sSubStr = JSON.stringify(option.data);
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html
@@ -2871,7 +2871,7 @@
                    }
                    layer.open({
                        type: 2
                        , area: ['80%', '80%']
                        , area: ['40%', '80%']
                        , title: '打印模版选择'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill_BatchSplit.html
@@ -586,7 +586,7 @@
                    layer.open({
                        type: 2
                        , area: ['50%', '50%']
                        , area: ['40%', '80%']
                        , title: '打印模版选择'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
WebTM/views/ÁìÁÏ·¢»õ/ÊÕÁÏÈë¿â/Kf_ReciveBill_Fast_TK.html
@@ -239,25 +239,26 @@
            function set_Aduit() {
                var index = layer.load();
                for (var i = 0; i < table.cache["mainTable"].length; i++) {
                    if (table.cache["mainTable"][i].HMaterNum.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterNum.indexOf(";") != -1) {
                        table.cache["mainTable"][i].HMaterNum = table.cache["mainTable"][i].HMaterNum.replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";")
                    }
                    if (table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterName.indexOf(";") != -1) {
                        table.cache["mainTable"][i].HMaterName = table.cache["mainTable"][i].HMaterName.replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";")
                    }
                    if (table.cache["mainTable"][i].HModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HModel.indexOf(";") != -1) {
                        table.cache["mainTable"][i].HModel = table.cache["mainTable"][i].HModel.replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";")
                    }
                }
                //for (var i = 0; i < table.cache["mainTable"].length; i++) {
                //    if (table.cache["mainTable"][i].HMaterNum.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterNum.indexOf(";") != -1) {
                //        table.cache["mainTable"][i].HMaterNum = table.cache["mainTable"][i].HMaterNum.replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";")
                //    }
                //    if (table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterName.indexOf(";") != -1) {
                //        table.cache["mainTable"][i].HMaterName = table.cache["mainTable"][i].HMaterName.replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";")
                //    }
                //    if (table.cache["mainTable"][i].HModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HModel.indexOf(";") != -1) {
                //        table.cache["mainTable"][i].HModel = table.cache["mainTable"][i].HModel.replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";").replace("\"", "”").replace(";", ";")
                //    }
                //}
                var HInterID = $('#HInterID').val();
                var HBillNo = $('#HBillNo').val();
                var sSubStr = table.cache['mainTable'];
                //var HInterID = $('#HInterID').val();
                //var HBillNo = $('#HBillNo').val();
                //var sSubStr = table.cache['mainTable'];
                var FID = table.cache['mainTable'][0].FID;
                $.ajax({
                    url: GetWEBURL() + "/POStockInBillList/AuditPOInStockBillPost_TianKang",
                    type: "Post",
                    data: { "msg": JSON.stringify(sSubStr) },
                    type: "Get",
                    data: { "FID": FID, "user": sessionStorage["HUserName"]},
                    success: function (result) {
                        if (result.code == "1") {
                            layer.msg("审核成功", {