zgq
2021-08-20 6d1b94513b9c83d0a4b8ab00b1a02ab0af083d94
修改工序进站接收模块
4个文件已修改
317 ■■■■ 已修改文件
WebTM/layuiadmin/PubCustom.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html 231 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html 80 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/PubCustom.js
@@ -96,11 +96,13 @@
//    var OperationType = params[params[0]];//操作类型
//    var linterid = params[params[1]];//源单id
//    var HSouceBillType = params[params[2]];//源单类型
//    var HBillNo = params[params[3]];//单据号
//}
//固定参数:
//    var OperationType = params[params[0]];//操作类型1.无源单新增2.有源单新增3.编辑4.浏览5.变更
//    var linterid = params[params[1]];//源单id
//    var HSouceBillType = params[params[2]];//源单类型
//    var HBillNo = params[params[3]];//单据号
/**
 *修复layui框架时间控件无效问题,加载时间控制前先调用此方法(如果时间控件没问题就不用调用此方法)
WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,11 +1,11 @@
function GetWEBURL() {
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地
    //var WEBURL = "http://localhost:8085/API/";   //zgq本地
    var WEBURL = "http://localhost:8085/API/";   //zgq本地
    //var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/lubao";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨露本地配置
    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //章紫柔本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //章紫柔本地配置
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
    //var WEBURL = "http://47.96.97.237/API/";   //智云服务器
    //var WEBURL = "http://183.129.128.86:9090/API/";   //凯贝奈特客户服务器
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Cj_StationInBill.html
@@ -30,11 +30,12 @@
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div class="layui-card-header">
                        <div class="layui-btn-group">
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew">新增</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">审核</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck">反审核</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">退出</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">新增</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Modify" id="set_Modify">修改</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver" id="Saver">保存</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">审核</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">反审核</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel" id="Cancel">退出</button>
                        </div>
                    </div>
                    <div class="layui-form-item" style="padding-top: 10px;">
@@ -393,7 +394,8 @@
            } else {
                var OperationType = params[params[0]];//操作类型
                var linterid = params[params[1]];//源单id
                var HBillNo = params[params[2]];  //获取单据号
                var HSouceBillType = params[params[2]];//源单类型
                var HBillNo = params[params[3]];//单据号
            }
            /*固定代码,每张单据都要begin*/
@@ -417,16 +419,121 @@
                        layer.msg("获取单据号失败,请刷新重试!");
                    }
                });
                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//审核按钮默认禁用
                $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//反审核按钮默认禁用
            }
            else if(OperationType == 3){
                $("#eventType").val("Modify");
                RoadBillMain(linterid);
                $('#set_Modify').addClass("layui-btn-disabled").attr("disabled", true);//修改按钮禁用
                $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//保存按钮启用
                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//审核按钮默认禁用
                $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//反审核按钮默认禁用
                //RoadBillSub(linterid);
            }
            else if (OperationType == 4) {
                RoadBillMain(linterid);
                $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//保存后保存按钮禁用
                $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//审核按钮启用
                $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//反审核按钮启用
                //RoadBillSub(linterid);
            }
            //进入页面默认光标在条形码上
            $("#HBarCode").focus();
        //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
            //#region æ–°å¢žæŒ‰é’®
            form.on('submit(set_AddNew)', function () {//提交
                layer.confirm('新增后页面数据将消失?', { icon: 3, title: '提示' }, function (index) {
                    window.location.reload();
                });
            })
            //#endregion
            //#region ä¿®æ”¹æŒ‰é’®
            form.on('submit(set_Modify)', function () {//提交
                //编辑前判断
                set_ShowBillJudge();
            })
            //#endregion
            //#region æäº¤æŒ‰é’®
            form.on('submit(Saver)', function (data) {//提交
                //var tableData = data.field;
                if ($("#lngBillSubKey").val() == 0) {
                    layer.msg("流水号没有选择!请输入流水号后回车!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                var oMain = data.field;
                var index = layer.load();
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Cj_StationInBill/AddBill",
                    async: true,
                    data: { "oMain": oMain },
                    dataType: "json",
                    success: function (result) {
                        if (result.count == 1) {
                            layer.close(index);
                            layer.msg("提交成功");
                            //保存后浏览
                            ReRoadBillMain();
                        }
                        else {
                            layer.close(index);
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    },
                    error: function (err) {
                        layer.close(index);
                        layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
            });
            //#endregion
            //#region é€€å‡ºæŒ‰é’®
            form.on('submit(Cancel)', function () {
                layer.confirm('您确定要退出吗?', { icon: 3, title: '提示' }, function (index) {
                    if (OperationType == 1) {
                        Pub_Close(2);
                    } else if (OperationType == 3) {
                        Pub_Close(1);
                    } else if (OperationType == 4) {
                        Pub_Close(1);
                    }
                });
            })
            //#endregion
            //#region å®¡æ ¸æŒ‰é’®
            form.on('submit(set_CheckBill)', function () {
                //审核方法
                set_CheckBill();
            })
            //#endregion
            //#region åå®¡æ ¸æŒ‰é’®
            form.on('submit(set_AbandonCheck)', function () {
                layer.confirm('您确定要退出吗?', { icon: 3, title: '提示' }, function (index) {
                    parent.layui.admin.events.closeThisTabs(); //关闭页签
                });
            })
            //#endregion
        //#endregion
        //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„æ–¹æ³•
            //#region ä¿å­˜åŽæµè§ˆæ–¹æ³•
            function ReRoadBillMain() {
                location.replace('Cj_StationInBill.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
            }
            //#endregion
            //#region åŠ è½½è¡¨å¤´
            function RoadBillMain(linterid)//加载表头
            {
                var index = layer.load();
@@ -461,6 +568,62 @@
                    }
                })
            }
            //#endregion
            //#region ç¼–辑前判断
            function set_ShowBillJudge() {
                var wait = layer.load();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Cj_StationInBill/set_ShowBillJudge", //方法所在页面和方法名
                    data: { "HBillNo": HBillNo },
                    success: function (result) {
                        if (result.count == 1) {
                            location.replace('Cj_StationInBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&HBillNo=' + HBillNo);
                        } else {
                            layer.alert(result.Message, { icon: 5 });
                        }
                        layer.close(wait);
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //#region å®¡æ ¸æ–¹æ³•
            function set_CheckBill() {
                var wait = layer.load();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Cj_StationInBill/set_CheckBill",
                    data: { "HInterID": linterid, "CurUserName": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.alert(result.Message, { icon: 6 });
                            $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//审核按钮禁用
                            $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//反审核按钮启用
                        } else {
                            layer.alert(result.Message, { icon: 5 });
                        }
                        layer.close(wait);
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //#region ä¿å­˜åŽæµè§ˆæ–¹æ³•
            //#endregion
            //#region ä¿å­˜åŽæµè§ˆæ–¹æ³•
            //#endregion
        //#endregion
            //文件上传
            function PicUpload() {
@@ -669,62 +832,6 @@
                    }
                });
            }
            //新增
            form.on('submit(set_AddNew)', function () {//提交
                layer.confirm('新增后页面数据将消失?', { icon: 3, title: '提示' }, function (index) {
                    window.location.reload();
                });
            })
            //退出-关闭页面方法
            form.on('submit(Cancel)', function () {
                layer.confirm('您确定要退出吗?', { icon: 3, title: '提示' }, function (index) {
                    parent.layui.admin.events.closeThisTabs(); //关闭页签
                });
            })
            //提交
            form.on('submit(Saver)', function (data) {//提交
                //var tableData = data.field;
                if ($("#lngBillSubKey").val() == 0) {
                    layer.msg("流水号没有选择!请输入流水号后回车!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                var oMain = data.field;
                var index = layer.load();
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Cj_StationInBill/AddBill",
                    //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
                    async: true,
                    data: { "oMain": oMain },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {
                            //layer.confirm(data.Message, {
                            //    icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['新增'],
                            //    btn2: function () {
                            //        //parent.layui.admin.events.closeThisTabs();关闭页签
                            //        //window.close();//关闭页面,浏览器有效,PDA无效
                            //        parent.location.href = "../../../views/index.html"
                            //    }//关闭
                            //}, function () { window.location.reload(); });//新增
                            layer.close(index);
                            layer.msg("提交成功");
                        }
                        else {
                            layer.close(index);
                            layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    },
                    error: function (err) {
                        layer.close(index);
                        layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
            });
            //选择生产班组弹窗
            form.on('submit(ProductionTeam-BT)', function () {//选择生产班组
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Cj_StationInBillList.html
@@ -77,8 +77,8 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-FirstPieceCheck" id="btn-FirstPieceCheck">首检</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>保存列宽</button>
@@ -163,6 +163,56 @@
                };
            });
        //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„æ–¹æ³•
            //#region编辑前判断
            function set_ShowBillJudge(data) {
                var HBillNo = data[0].单据号;
                var wait = layer.load();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Cj_StationInBill/set_ShowBillJudge", //方法所在页面和方法名
                    data: { "HBillNo": HBillNo },
                    success: function (result) {
                        if (result.count == 1) {
                            //打开编辑页面
                            set_ShowBill_open(data);
                        } else {
                            layer.alert(result.Message, { icon: 5 });
                        }
                        layer.close(wait);
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //#region æ‰“开编辑页面
            function set_ShowBill_open(data) {
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '工序进站接收单-编辑'
                    , shade: 0.6
                    , maxmin: false
                    , anim: 0
                    , content: ['Cj_StationInBill.html?OperationType=4&linterid=' + data[0].HInterID + '&HSouceBillType=&HBillNo=' + data[0].单据号, 'yes']
                    , resize: false
                    , cancel: function () {
                        btnIs();
                    }
                    , end: function () {
                        get_FastQuery(table, option);
                    }
                })
            }
            //#endregion
        //#endregion
            //功能按钮是否禁用方法,每次加载表格都要调用
            function btnIs() {
                //$('#btn-Add').addClass("layui-btn-disabled").attr("disabled", true);//新增按钮
@@ -235,11 +285,11 @@
                    url: GetWEBURL() + '/Cj_StationInBill/get_Display',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 0) {
                    success: function (result) {
                        if (result.count == 0) {
                            option.data = [];
                        } else {
                            option.data = data1.data;
                            option.data = result.data;
                        }
                        table.render(option);
                        btnIs();
@@ -298,22 +348,10 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '工序进站接收单-编辑'
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['Cj_StationInBill.html?OperationType='+3+'&linterid=' + data[0].HInterID + '&HBillNo=' + data[0].单据号, 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();
                        }
                        , end: function () {
                            get_FastQuery(table, option);
                        }
                    })
                    //编辑前判断
                    //set_ShowBillJudge(data);
                    //打开编辑页面
                    set_ShowBill_open(data);
                } else {
                    layer.msg('请选择一行数据编辑!');
                }