wtt
2025-04-09 aa8a50258acf5e1aa640eafa935de995106af3a5
pda报工平台添加质量页面
3个文件已修改
164 ■■■■ 已修改文件
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBillList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/报工平台_PDA/IpadIndex_PDA.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/报工平台_PDA/质量汇报/Sc_QualityReportBill_PDA.html 158 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²»Á¼²É¼¯/Sc_QualityReportStepBillList.html
@@ -753,10 +753,10 @@
                    sWhere += " and " + ColName2 + " " + com2;
                }
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HBeginDate + "'";
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
                }
                if (HBillNo) {
                    sWhere += " and å•据号 like '%" + HBillNo + "%'";
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Æ½Ì¨_PDA/IpadIndex_PDA.html
@@ -1038,7 +1038,7 @@
                , shade: 0.6
                , maxmin: false
                , anim: 0
                , content: ['生产管理/质量汇报单/Sc_QualityReportBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID, 'yes']
                , content: ['../../生产管理/报工平台_PDA/质量汇报/Sc_QualityReportBill_PDA.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID, 'yes']
                , resize: false
                , cancel: function () {
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Æ½Ì¨_PDA/ÖÊÁ¿»ã±¨/Sc_QualityReportBill_PDA.html
@@ -7,15 +7,15 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <!--引用layui样式文件-->
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
    <!--引用layui js文件-->
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <!--自定义样式-->
    <style>     
        .layui-form-label {
@@ -78,7 +78,7 @@
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <div class="layui-form-item" style="padding:0px;margin:0px">
                                        <div class="layui-row">
                                        <div class="layui-row" style="display:none">
                                            <div class="layui-col-xs2">
                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">条形码</label>
                                            </div>
@@ -93,7 +93,7 @@
                                        </div>
                                    </div>
                                    <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-form-item" style="padding: 0px; margin: 0px; display: none">
                                        <div class="layui-row">
                                            <div class="layui-col-xs2">
                                                <label class="layui-form-label"  style="width:60px;padding-left:0px;">流水号</label>
@@ -109,7 +109,7 @@
                                        </div>
                                    </div>
                                    <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-form-item" style="padding: 0px; margin: 0px; display: none">
                                        <div class="layui-row">
                                            <div class="layui-col-xs2">
                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">当前工序</label>
@@ -204,7 +204,7 @@
                                    <div class="layui-form-item" style="padding:0px;margin:0px">
                                        <div class="layui-row">
                                            <div class="layui-col-xs2">
                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">产品名称</label>
                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">规格型号</label>
                                            </div>
                                            <div class="layui-col-xs10">
                                                <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="规格型号" style="border-radius: 50px;background-color:#efefef4d;" readonly>
@@ -411,7 +411,7 @@
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
            base: '../../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element', 'upload'], function () {
@@ -457,7 +457,12 @@
            if (typeof (params[params[0]]) == "undefined") {
                var OperationType = 1;//操作类型
                var closeType = 2;  //关闭类型
            }
            } else {
                var OperationType = params[params[0]];//操作类型
                var linterid = params[params[1]];//源单id
                var HSouceBillType = params[params[2]];//源单类型
                var HBillSubType = decodeURI(params[params[4]] == undefined ? '' : params[params[4]]);//单据子类型   ç”¨äºŽåŒºåˆ†ç”Ÿäº§è®°å½•单
            }
            /*固定代码,每张单据都要begin*/
            //流转卡是否扫描标记
@@ -481,6 +486,7 @@
                GetDefValByUser();
                //初始化表格
                set_InitGrid();
                set_AddNew(linterid);
            }            
       
            //#region é€šè¿‡ç™»å½•用户获取默认值
@@ -494,8 +500,8 @@
                        var data = result.data[0];
                        form.val("formData", {
                            "HSourceID": data.HSourceID,
                            "HSourceName": data.生产资源名称,
                            //"HSourceID": data.HSourceID,
                            //"HSourceName": data.生产资源名称,
                            "HGroupID": data.HGroupID,
                            "HGroupName": data.生产班组名称,
                            "HEmpID": data.HEmpID,
@@ -512,12 +518,70 @@
            }
            //#endregion
            //初始基本信息赋值
            $("#HMaker").val(sessionStorage["HUserName"]);
            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
            $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
            //#region æ ¹æ®æºå•id获取源单信息
            function set_AddNew(linterid) {
                //初始基本信息赋值
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //单据日期
                $("#HBeginWorkTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //开始时间
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //制单日期
                $("#HMaker").val(sessionStorage["HUserName"]);     //制单人
                $("#HSTOCKORGID").val(sessionStorage["OrganizationID"]); //组织ID
                $("#HSTOCKORG").val(sessionStorage["Organization"]); //组织名称
                //加源单类型区分(可以写不同的方法)
                $('#HProcName').attr("disabled", true);
                $('#HSourceName').attr("disabled", true);
                $('#ProductionResources-BT').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HMainSourceBillNo').attr("disabled", true);
                $('#HICMOBillNo').attr("disabled", true);
                $('#HDeptName').attr("disabled", true);
                $('#HDept-BT').addClass("layui-btn-disabled").attr("disabled", true);
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + "/Sc_QualityReportBill/get_ICMOBillStatus_Tmp",
                    type: "GET",
                    data: { "HInterID": linterid, "HEntryID": 0, "HBillType": HSouceBillType },
                    success: function (result) {
                        var data = result.data[0];
                        if (result.count == 1) {
                            $("#HICMOBillNo").val(data.HICMOBillNo);
                            $("#HICMOInterID").val(data.HICMOInterID);
                            $("#HMainSourceBillType").val(HSouceBillType);
                            $("#HMainSourceInterID").val(data.HICMOInterID);
                            $("#HMainSourceEntryID").val(data.HICMOEntryID);
                            $("#HMainSourceBillNo").val(data.HICMOBillNo);
                            $("#HMaterNumber").val(data.HMaterNumber);
                            $("#HMaterName").val(data.HMaterName);
                            $("#HMaterID").val(data.HMaterID);
                            $("#HMaterModel").val(data.HMaterModel);
                            $("#HICMOEntryID").val(data.HICMOEntryID);
                            $("#HDeptID").val(data.HDeptID);
                            $("#HDeptName").val(data.HDeptName);
                            $("#HSourceID").val(data.HSourceID);
                            $("#HSourceName").val(data.HSourceName);
                            $("#HUnitID").val(data.HUnitID);
                            $("#HUnitName").val(data.HUnitName);
                            $("#HProcID").val(data.HProcID); //工序ID
                            $("#HProcNo").val(data.HProcName); //工序名称
                            if (HSouceBillType == "3772") {
                                $("#HQty").val(data.HDatePlanQty);
                                $("#HProcExchBillNo").val(data.HSourceBillNo);
                                $("#HProcExchInterID").val(data.HSourceInterID);
                                $("#HProcExchEntryID").val(data.HSourceEntryID);
                            }
                        } else {
                            layer.alert(result.Message, { icon: 5 });
                        }
                        layer.close(ajaxLoad);
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //条形码回车方法  æµè½¬å¡
            $('#HBarCode').on('keydown', function (event) {
@@ -542,10 +606,10 @@
                        layer.msg("条形码不能为空!")
                        return;
                    }
                    if (!HProcName) {
                        layer.msg("工序不能为空!")
                        return;
                    }
                    //if (!HProcName) {
                    //    layer.msg("工序不能为空!")
                    //    return;
                    //}
                    if (!HSourceName) {
                        layer.msg("生产资源不能为空!")
                        return;
@@ -792,9 +856,29 @@
           
            //提交
            form.on('submit(Saver)', function (data) {//提交
                if ($("#HProcNo").val() == "") {
                    layer.msg("流水号没有选择!请输入流水号后回车!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                if ($("#HSourceID").val() == '' || $("#HSourceID").val() == null || $("#HSourceID").val() == 0) {
                    layer.msg("生产资源不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
                if ($("#HMainSourceInterID").val() == '' || $("#HMainSourceInterID").val() == null || $("#HMainSourceInterID").val() == 0) {
                    layer.msg("源单单号不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
                if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null || $("#HEmpID").val() == '0') {
                    layer.msg("操作员不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
                if ($("#HGroupID").val() == '' || $("#HGroupID").val() == null || $("#HGroupID").val() == '0') {
                    layer.msg("班组不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
                if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null || $("#HDeptID").val() == '0') {
                    layer.msg("车间不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
                if ($("#HICMOInterID").val() == '' || $("#HICMOInterID").val() == null || $("#HICMOInterID").val() == '0') {
                    layer.msg("生产订单不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
                //获取子表数据
                var num = [];
@@ -896,7 +980,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '部门列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -925,7 +1009,7 @@
                        , shade: 0.6 //遮罩透明度
                        //, maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: [`../../Baseset/基础资料/Gy_GetProcNoList.html?HInterID=${value}`, 'yes']
                        , content: [`../../../Baseset/基础资料/Gy_GetProcNoList.html?HInterID=${value}`, 'yes']
                        , resize: false
                        , cancel: function (index, layero) {
                        }
@@ -951,7 +1035,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../Baseset/基础资料/Gy_GetProductionTeamList.html', 'yes']
                    , content: ['../../../Baseset/基础资料/Gy_GetProductionTeamList.html', 'yes']
                    , resize: false
                    , cancel: function (index, layero) {
                    }
@@ -967,7 +1051,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../Baseset/基础资料/Gy_EmployeeList.html?Type=HWorker', 'yes']
                    , content: ['../../../Baseset/基础资料/Gy_EmployeeList.html?Type=HWorker', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -994,7 +1078,7 @@
                    , shade: 0.6 //遮罩透明度
                    //, maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../Baseset/基础资料/Gy_GetProductionResourcesList.html', 'yes']
                    , content: ['../../../Baseset/基础资料/Gy_GetProductionResourcesList.html', 'yes']
                    , resize: false
                    , cancel: function (index, layero) {
                    }
@@ -1003,16 +1087,12 @@
           
            // æ–°å¢žæŒ‰é’®
            form.on('submit(Add)', function () {//提交
                layer.confirm('新增后页面数据将消失?', { icon: 3, title: '提示' }, function (index) {
                    location.replace('Sc_QualityReportBill_PDA.html');
                });
                Pub_Close2(1);
            })           
            
            //退出--全屏版
            form.on('submit(Cancel)', function () {
                layer.confirm('您确定要退出吗?', { icon: 3, title: '提示' }, function (index) {
                    parent.location.href = "../../../views/index_Mobile.html";
                });
                Pub_Close2(1);
            })