Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yusijie

2024-06-25 c6b1ddcc597daaabb8c17f72af78279d9be20700

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

 WebTM/WebTM.csproj

@@ -378,7 +378,9 @@
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldMaintainBill_PDA.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_MouldMaintainRuleBillList_PDA.html" />
    <Content Include="views\生产管理\异常反馈单\OA_ErrMsgBackSignBill_BrushCard.html" />
    <Content Include="views\生产管理\异常反馈单\Sc_MESExecptFeedBackBillType.html" />
    <Content Include="views\生产管理\报工台工序\开工\Sc_SwipeCardStart.html" />
    <Content Include="views\生产管理\生产报表\Sc_QualityReportBillDay.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatForm_BCP.html" />
    <Content Include="views\系统管理\会计期间\Xt_AccountPeriodAdd.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserRightQuery.html" />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -3,13 +3,13 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    /*var WEBURL = "http://localhost/API/";   */          //颜晓军本地配置
    //var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    var WEBURL = "http://localhost:81/API/";    //王彬本地配置
    /*var WEBURL = "http://localhost:8083/API/";  //陈雯静本地配置*/
   // var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    /*var WEBURL = "http://localhost:8082/API/";   //张瑞广本地配置*/
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW

 WebTM/views/IpadIndex.html

@@ -45,6 +45,7 @@
        var HManagerName = "";      //负责人
        var HGroupName = "";      //班组
        var HProcID = 0;      //工序
        var HSBName = "";   //设备名称

        //注意：选项卡 ä¾èµ– element æ¨¡å—，否则无法进行功能性操作
        layui.config({
@@ -81,8 +82,10 @@
                dataType: "json",//数据类型可以为 text xml json  script  jsonp
                success: function (data) {
                    var LoadData = data.data.h_p_JIT_GetSourceInfoByUser;

                    if (LoadData.length > 0)// è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                    {
                        HSBName = LoadData[0].HSourceName;
                        for (var i = 1; i <= LoadData.length + 1; i++) {
                            if (i <= LoadData.length) {
                                var html1 = '';
@@ -185,7 +188,7 @@
                        var LoadData1 = data.data.h_p_JIT_GetWorkBillListInfoBySource;
                        var LoadData2 = data.data.h_p_JIT_GetWorkBillListInfoBySource1;
                        var LoadData3 = data.data.h_p_JIT_GetWorkBillListInfoBySource2; //时间点产量
                        var LoadData4 = data.data.h_p_JIT_GetWorkBillListInfoBySource3; //不良分析
                        var LoadData4 = data.data.h_p_JIT_GetWorkBillListInfoBySource3; //不良分析                       
                        if (LoadData1.length > 0)  //工单列表数据
                        {

@@ -246,6 +249,7 @@
                        }
                        if (LoadData2.length > 0)  //当前状态数据
                        {
                            HSBName = LoadData2[0].HSourceName;
                            for (var i = 0; i < LoadData2.length; i++) {
                                var html1 = '';
                                html1 += '<div class="layui-col-sm12 layui-col-md12">';
@@ -1138,6 +1142,35 @@
            });
        }

        //异常按钮点击事件
        function Abnormal (event, obj) {
            layer.open({
                type: 2,
                skin: 'layui-layer-rim', //加上边框
                title: '异常反馈类型',
                closeBtn: 1,
                shift: 2,
                area: ['100%', '100%'],
                maxmin: true,
                content: '生产管理/异常反馈单/Sc_MESExecptFeedBackBillType.html',
                end: function () {

                },
                success: function (dom, index) {
                    var data = [];
                    data.push({
                        "HICMOBillNo": HICMOBillNo,//工单号
                        "HSourceName": HSBName //设备
                    });

                    //通过索引获取到当前iframe弹出层
                    var iframe = window['layui-layer-iframe' + index];
                    //调用iframe弹出层内的方法
                    iframe.edit(data);
                },
            });
        }

        //防错验证清单按钮点击事件
        function PreventErrMouldCheck(event, obj) {
            layer.open({
@@ -1370,7 +1403,7 @@
                                    <span class="imgtitle">停工</span>
                                </div>
                            </div>
                            <div class="layui-col-sm12 layui-col-md4">
                            <div class="layui-col-sm12 layui-col-md4" onclick="Abnormal(event,this)">
                                <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%)">
                                    <span class="layui-icon layui-icon-unlink imgicon"></span>
                                    <span class="imgtitle">异常</span>

 WebTM/views/WMSɨÂëÄ£¿é/ÉÏÁÏ·À´íµ¥/Sc_MaterToSourceBill_PDA.html

@@ -333,7 +333,8 @@

                var data = [];
                listOption.cols = [[
                    { field: '条码编号', title: '条码编号', width: 100 }
                    { field: '原材料批次号', title: '原材料批次号', width: 100 }
                    , { field: '条码编号', title: '条码编号', width: 100 }
                    , { field: '物料代码', title: '物料代码', width: 100 }
                    , { field: '物料名称', title: '物料名称', width: 100 }
                    , { field: '规格型号', title: '规格型号', width: 100 }
@@ -1062,7 +1063,8 @@
                        }
                        else {
                            listOption.cols = [[
                                { field: '条码编号', title: '条码编号', width: 100 }
                                { field: '原材料批次号', title: '原材料批次号', width: 100 }
                                ,{ field: '条码编号', title: '条码编号', width: 100 }
                                , { field: '物料代码', title: '物料代码', width: 100 }
                                , { field: '物料名称', title: '物料名称', width: 100 }
                                , { field: '规格型号', title: '规格型号', width: 100 }

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldDotCheckBillList.html

@@ -333,6 +333,10 @@

                        $("#HPlanNo").val(checkStatus.data[0].单据号);
                        $("#HPlanInterID").val(checkStatus.data[0].hmainid);
                        $("#HMouldID").val(checkStatus.data[0].HMouldID);
                        $("#HMouldName").val(checkStatus.data[0].产品模具);
                        $("#HMouldDotCheckRuleID").val(checkStatus.data[0].HMouldDotCheckRuleID);
                        $("#HMouldDotCheckRuleName").val(checkStatus.data[0].HMouldDotCheckRuleNo);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                        //$.ajax({
                        //    url: GetWEBURL() + 'Sc_MouldDotCheckBill/Sc_MouldDotCheckSubBillListByPlan',
@@ -453,6 +457,8 @@
                        console.log(checkStatus);
                        $("#HMouldDotCheckRuleName").val(checkStatus.data[0].单据号);
                        $("#HMouldDotCheckRuleID").val(checkStatus.data[0].hmainid);
                        $("#HMouldID").val(checkStatus.data[0].HMouldID);
                        $("#HMouldName").val(checkStatus.data[0].模具名称);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                        get_DocCheckItem2(checkStatus.data[0].hmainid);
                    }
@@ -806,8 +812,8 @@
                        if (result != null) {
                            if (result.count == 1) {
                                var BYData = result.list[0];//点检
                                var PJData = result.list[1];//配件
                                var rowdate1 = layui.table.cache["mainTable"];
                                //var PJData = result.list[1];//配件
                                //var rowdate1 = layui.table.cache["mainTable"];
                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
                                table.render(option);

@@ -816,9 +822,9 @@
                                    buttonArr = [];//清空数组
                                    for (var i = 0; i < BYData.length; i++) {
                                        var checkrow = {
                                            "HDotCheckItemID": BYData[i].HDotCheckItemID, "HDotCheckItem": BYData[i].HDotCheckItem, "HDotCheckPart": BYData[i].HDotCheckPart,
                                            "HClaim": BYData[i].HClaim, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerCode,
                                            "HManagerName": BYData[i].HManagerName, "HRemark": BYData[i].HRemark, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
                                            "HDotCheckItemID": BYData[i].点检项目ID, "HDotCheckItem": BYData[i].点检项目, "HDotCheckPart": BYData[i].点检部位,
                                            "HClaim": BYData[i].具体要求, "HManagerID": BYData[i].负责人ID, "HManagerNumber": BYData[i].负责代码,
                                            "HManagerName": BYData[i].负责人名称, "HRemark": BYData[i].表体备注, "HDotCheckItemClassID": BYData[i].HDotCheckItemClassID, "HDotCheckItemClassName": BYData[i].点检项目分类名称, "HDotCheckItemMethodID": BYData[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": BYData[i].点检方法名称, "HDotCheckResult": "Y"
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }
@@ -845,8 +851,8 @@
                        if (result != null) {
                            if (result.count == 1) {
                                var BYData = result.list[0];//点检
                                var PJData = result.list[1];//配件
                                var rowdate1 = layui.table.cache["mainTable"];
                                //var PJData = result.list[1];//配件
                                //var rowdate1 = layui.table.cache["mainTable"];
                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
                                table.render(option);

@@ -855,9 +861,9 @@
                                    buttonArr = [];//清空数组
                                    for (var i = 0; i < BYData.length; i++) {
                                        var checkrow = {
                                            "HDotCheckItemID": BYData[i].HDotCheckItemID, "HDotCheckItem": BYData[i].HDotCheckItem, "HDotCheckPart": BYData[i].HDotCheckPart,
                                            "HClaim": BYData[i].HClaim, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
                                            "HManagerName": BYData[i].HManagerName, "HRemark": BYData[i].HRemark, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
                                            "HDotCheckItemID": BYData[i].点检项目ID, "HDotCheckItem": BYData[i].点检项目, "HDotCheckPart": BYData[i].点检部位,
                                            "HClaim": BYData[i].具体要求, "HManagerID": BYData[i].负责人ID, "HManagerNumber": BYData[i].负责人代码,
                                            "HManagerName": BYData[i].负责人名称, "HRemark": BYData[i].子备注, "HDotCheckItemClassID": BYData[i].HDotCheckItemClassID, "HDotCheckItemClassName": BYData[i].点检项目分类名称, "HDotCheckItemMethodID": BYData[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": BYData[i].点检方法名称, "HDotCheckResult": "Y"
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }

 WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/Sc_Add_MESExecptFeedBackBillList.html

@@ -105,7 +105,7 @@
                                            <div class="layui-tab-item layui-show">
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">单据号:</label>
                                                        <label class="layui-form-label">单据号:<label style="color:red"> * </label></label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled autocomplete="off">
                                                            <input id="HInterID" name="HInterID" type="hidden" />
@@ -113,13 +113,13 @@
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">单据日期:</label>
                                                        <label class="layui-form-label">单据日期:<label style="color:red"> * </label></label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HDate" id="HDate" disabled autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">主题:</label>
                                                        <label class="layui-form-label">主题:<label style="color:red"> * </label></label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off" style="width:485px">
                                                        </div>
@@ -127,7 +127,7 @@
                                                </div>
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">发送人:</label>
                                                        <label class="layui-form-label">发送人:<label style="color:red"> * </label></label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HSendMan" id="HSendMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSendManList" id="HSendManList" style="width:40px;">
@@ -136,7 +136,7 @@
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">接收人:</label>
                                                        <label class="layui-form-label">接收人:<label style="color:red"> * </label></label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HReceiveMan" id="HReceiveMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HReceiveManList" id="HReceiveManList" style="width:40px;">
@@ -168,7 +168,7 @@
                                                <div class="layui-form-item">

                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">抄送:</label>
                                                        <label class="layui-form-label">抄送:<label style="color:red"> * </label></label>
                                                        <div>
                                                            <input type="text" name="HCopyMan" id="HCopyMan" class="layui-input" value="" style="float:left;width:1035px;" disabled>
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HCopyManList" id="HCopyManList" style="width:40px;">
@@ -199,7 +199,7 @@
                                                </div>-->
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">详细类容:</label>
                                                        <label class="layui-form-label">详细类容:<label style="color:red"> * </label></label>
                                                        <div class="layui-input-inline">
                                                            <textarea placeholder="请输入详细内容" class="layui-textarea" name="HDescription" id="HDescription" style="width:1080px;"></textarea>
                                                        </div>
@@ -215,27 +215,27 @@
                                                </div>
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">产品编码:</label>
                                                        <label class="layui-form-label">产品编码:<label style="color:red"> * </label></label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HMaterNumber" lay-verify="HMaterNumber" id="HMaterNumber">
                                                            <input class="layui-input" name="HMaterNumber" lay-verify="HMaterNumber" value="" id="HMaterNumber">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">产品名称:</label>
                                                        <label class="layui-form-label">产品名称:<label style="color:red"> * </label></label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName">
                                                            <input class="layui-input" name="HMaterName" lay-verify="HMaterName" value="" id="HMaterName">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">规格型号:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HMaterModel" lay-verify="HMaterModel" id="HMaterModel">
                                                            <input class="layui-input" name="HMaterModel" lay-verify="HMaterModel" value="" id="HMaterModel">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">涉及数量:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HQty" lay-verify="HQty" id="HQty" autocomplete="off">
                                                            <input class="layui-input" name="HQty" lay-verify="HQty" id="HQty" value="" autocomplete="off">
                                                        </div>
                                                    </div>
                                                </div>
@@ -373,6 +373,16 @@
    </div>
    <script>
        //获取参数
        var HICMOBillNo = "";  //工单号
        var HSourceName = "";  //设备
        var HType = ""; //异常类型


        var edit = function (data) {
            HICMOBillNo = data[0].HICMOBillNo;
            HSourceName = data[0].HSourceName;
            HType = data[0].HType;
        }
        var HBillType = "";  //单据类型
        var HMainSourceInterID = ""; //源单主内码
        var HMainSourceEntryID = "";  //源单子内码
@@ -380,21 +390,8 @@
        var HMainSourceBillType = "";  //源单类型
        var refSav = "";   //提交类型
        var Qty = "";
        //获取页面跳转参数  //单据编辑状态： 1.无源单新增  Â 2.有源单新增  Â 3.编辑  4.浏览  5.变更
        var params = get_UrlVars();
        if (typeof (params[params[0]]) == "undefined") {
            var OperationType = 1;//操作类型
        } else {
            var OperationType = params[params[0]];//操作类型
            var linterid = params[params[1]];//源单id
            var HEntryID = params[params[2]];//源单子id
            var HSBillType = params[params[3]];//源单类型
            var HBillType = params[params[3]];
            var HSourceInterID = params[params[4]];
            var HSourceEntryID = params[params[5]];
            var HSourceBillNo = params[params[6]];
            var HSourceBillType = params[params[7]];
        }
       
     

        //var edit = function (data) {
        //    HBillType = data[0].HBillType;
@@ -422,6 +419,21 @@

            window.HDeptType = 0;
            //#endregion
            //获取页面跳转参数  //单据编辑状态： 1.无源单新增  Â 2.有源单新增  Â 3.编辑  4.浏览  5.变更
            var params = get_UrlVars();
            if (typeof (params[params[0]]) == "undefined") {
                var OperationType = 1;//操作类型
            } else {
                var OperationType = params[params[0]];//操作类型
                var linterid = params[params[1]];//源单id
                var HEntryID = params[params[2]];//源单子id
                var HSBillType = params[params[3]];//源单类型
                var HBillType = params[params[3]];
                var HSourceInterID = params[params[4]];
                var HSourceEntryID = params[params[5]];
                var HSourceBillNo = params[params[6]];
                var HSourceBillType = params[params[7]];
            }

            //初始化表单插件
            set_InitFrom();
@@ -436,6 +448,12 @@
            else if (OperationType == 3) {//编辑

                set_EditFromGrid();
            } else if (OperationType == 4) {
                set_AddFNew();
                var Datetime = Format(new Date(), "yyyy-MM-dd hh:mm:ss");
                var Person = sessionStorage["HUserName"];              
                //报工台跳转页面自动生成内容
                $("#HDescription").val(generateString(Datetime, Person, HSourceName, HICMOBillNo, HType));
            }
            else {
                layer.alert("未知操作类型！", { icon: 5 });
@@ -636,16 +654,12 @@
                }
            });





            //保存提交
            form.on('submit(Saver)', function (data) {

                var sMainStr = JSON.stringify(data.field);
                var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
                if (!AllowLoadData())//数据验证
                if (!AllowLoadData(OperationType))//数据验证
                {
                    return false;
                }
@@ -998,11 +1012,20 @@
                });
            });

          

            //报工太异常跳转自动生成内容
            function generateString(Datetime, Person, HSourceName, HICMOBillNo, HType) {
                // æ‹¼æŽ¥å­—符串
                var result = Datetime + ', ' + Person + '在' + HSourceName + '上生产工单为' + HICMOBillNo + ', å‘生异常类型为:' + HType;
                return result;
            }
       
          
            //以上为layui模块
        });

        function AllowLoadData() {  //非空验证
        function AllowLoadData(OperationType) {  //非空验证
            var Result = true;
            if ($("#HBillNo").val() == '' || $("#HBillNo").val() == null) {
                layer.msg("单据号不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
@@ -1013,6 +1036,10 @@
                return Result = false;
            }
            if ($("#HMaterName").val() == '' || $("#HMaterName").val() == null) {
                layer.msg("产品名称不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HMaterNumber").val() == '' || $("#HMaterName").val() == null) {
                layer.msg("产品编码不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }

 WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/Sc_MESExecptFeedBackBillType.html

New file
@@ -0,0 +1,251 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>异常反馈单类型</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <!--引用layui样式文件-->
    <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>
    <style type="text/css">
        .layui-form-label {
            width: 85px;
        }

        .maintitle {
            background-color: #1492ff;
            color: #fff;
            padding: 5px 10px;
            border: none;
            border-radius: 4px;
        }

        .title {
            border-left: 4px solid #1492ff;
            padding-left: 6px;
            margin: 20px 10px 4px;
            font-size: 16px;
            color: #333;
        }

        .buttom_box_little {
            width: 60px;
            height: 36px;
            color: #fff;
            background-color: #1492ff;
            border-radius: 4px;
            border: none;
            margin: 10px;
        }

        .layui-input {
            width: 93%;
        }

        .layui-inline, img {
            display: block;
            vertical-align: middle
        }

        .layui-input, .layui-textarea {
            display: inline-block;
            width: 100%;
            padding-left: 10px;
        }

        .laydate-time-list ol {
            overflow-x: hidden !important;
            overflow-y: auto !important;
        }

        .layui-form-label {
            padding: 9px 5px;
        }

        .layui-input-block {
            margin-left: 85px;
            min-height: 36px;
        }

        .radio-label {
            font-size: 30px; /* è®¾ç½®æ‚¨æƒ³è¦çš„字体大小 */
            display: inline-block;
            margin-right: 20px; /* æ ¹æ®éœ€è¦è°ƒæ•´é—´è· */
        }
    </style>
</head>
<body>

    <div id="layout1" class="layui-fluid">
        <div class="layui-row layui-col-space15">
            <div class="layui-col-md12">
                <div class="layui-card">
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                        <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="Exit">退出</button>
                            </div>
                        </div>
                        <div class="layui-card-body">
                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                                <h1 style="text-align:center;"><b>异常类型</b></h1>
                                <div class="layui-tab-content">
                                    <div class="layui-tab layui-tab-card">
                                        <ul class="layui-tab-title">
                                            <li class="layui-this">基本信息</li>
                                        </ul>
                                        <div class="layui-tab-content" style="height: 700px;">
                                            <div class="layui-tab-item layui-show">
                                                <div class="layui-form-item" style="margin-top:30px">
                                                    <div class="layui-inline">
                                                        <div class="layui-input-inline" style="margin-left:200px">
                                                            <label class="radio-label">
                                                                <input type="radio" name="faultType" value="环境故障">环境故障
                                                            </label>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <div class="layui-input-inline" style="margin-left:400px">
                                                            <label class="radio-label">
                                                                <input type="radio" name="faultType" value="声音异常">声音异常
                                                            </label>
                                                        </div>
                                                    </div>
                                                </div>

                                                <div class="layui-form-item" style="margin-top:60px">
                                                    <div class="layui-inline">
                                                        <div class="layui-input-inline" style="margin-left:200px">
                                                            <label class="radio-label">
                                                                <input type="radio" name="faultType" value="性能异常">性能异常
                                                            </label>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <div class="layui-input-inline" style="margin-left:400px">
                                                            <label class="radio-label">
                                                                <input type="radio" name="faultType" value="液压故障">液压故障
                                                            </label>
                                                        </div>
                                                    </div>
                                                </div>

                                                <div class="layui-form-item" style="margin-top:90px">
                                                    <div class="layui-inline">
                                                        <div class="layui-input-inline" style="margin-left:200px">
                                                            <label class="radio-label">
                                                                <input type="radio" name="faultType" value="人为故障">人为故障
                                                            </label>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <div class="layui-input-inline" style="margin-left:400px">
                                                            <label class="radio-label">
                                                                <input type="radio" name="faultType" value="硬件故障">硬件故障
                                                            </label>
                                                        </div>
                                                    </div>
                                                </div>


                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script>
        //获取参数
        var HICMOBillNo = "";  //工单号
        var HSourceName = "";  //设备


        var edit = function (data) {
            HICMOBillNo = data[0].HICMOBillNo;
            HSourceName = data[0].HSourceName;
        }

        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
            //#region å…¬ç”¨å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , laydate = layui.laydate
                , element = layui.element;


            //#endregion


            //退出
            form.on('submit(Exit)', function (data) {
                if (linterid == undefined) {
                    //关闭页签
                    Pub_Close(2);
                }
                else {
                    //关闭页签
                    Pub_Close(1);
                }
            });

            document.querySelectorAll('input[name="faultType"]').forEach(function (radio) {
                radio.addEventListener('change', function () {
                    if (this.checked) { // åªæœ‰è¢«é€‰ä¸­çš„radio才会触发  
                        var value = this.value; // èŽ·å–选中的radio的值  
                        layer.open({
                            type: 2,
                            skin: 'layui-layer-rim', //加上边框
                            title: '异常反馈单',
                            closeBtn: 1,
                            shift: 2,
                            area: ['100%', '100%'],
                            maxmin: true,
                            content: './Sc_Add_MESExecptFeedBackBillList.html?OperationType=4&linterid=&HSouceBillType=',
                            end: function () {

                            },
                            success: function (dom, index) {
                                var data = [];
                                data.push({
                                    "HICMOBillNo": HICMOBillNo,//工单号
                                    "HSourceName": HSourceName, //设备
                                    "HType": value      //异常类型
                                });

                                //通过索引获取到当前iframe弹出层
                                var iframe = window['layui-layer-iframe' + index];
                                //调用iframe弹出层内的方法
                                iframe.edit(data);
                            },
                        });
                    }
                });
            });


            //以上为layui模块
        });
    </script>
</body>
</html>

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²»Á¼²É¼¯/Sc_QualityReportStepBill_New.html

@@ -584,7 +584,7 @@
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                            }
                            $("#HOrgID").append(Organization);
                            if (OperationType == 1 || OperationType == 4) {
                            if (OperationType == 1 || OperationType == 4 || OperationType == 3) {
                                HOrgIDBar = sessionStorage["OrganizationID"];
                            }
                            $("#HOrgID").val(HOrgIDBar);

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/¿ª¹¤/Sc_SwipeCardStart.html

@@ -150,7 +150,7 @@
</html>
<script>
    layui.config({
        base: '../../layuiadmin/' //静态资源所在路径
        base: '../../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index' //主入口模块
    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÍ£¹¤µ¥/Sc_Add_MESStopWorkBillList.html

@@ -87,7 +87,7 @@
                        <div class="layui-card-header">
                            <div class="layui-btn-group">

                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">审核</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                            </div>
@@ -359,6 +359,7 @@
    </div>
    <script>
        //获取参数
        var OptionData = [];
        var HBillType = "";  //单据类型
        var HSourceInterID = ""; //源单主内码
        var HSourceEntryID = "";  //源单子内码
@@ -647,6 +648,65 @@
            //保存提交
            form.on('submit(Saver)', function (data) {
                if (AllowLoadData(data)) {
                    //禁用保存按钮
                    $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
                    //判断系统参数是否勾选
                    Xt_AllowLoadData(data);
                }
            });

            //判断系统参数是否选中
            function Xt_AllowLoadData(data2) {
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Sc_MESBeginWorkBill/Xt_AllowLoadData", //方法所在页面和方法名
                    async: false,
                    data: { "HKey": "Sc_MESBeginWorkBill_SwipeCardStart" },
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            if (data.Verify == "Y") //刷卡验证
                            {
                                layer.msg("需要进行刷卡验证!", { time: 1 * 1000, icon: 1 }, function (index) {
                                    layer.open({
                                        type: 2,
                                        skin: 'layui-layer-rim', //加上边框
                                        title: 'IC刷卡',
                                        closeBtn: 1,
                                        shift: 2,
                                        area: ['50%', '80%'],
                                        maxmin: true,
                                        content: '../../生产管理/报工台工序/开工/Sc_SwipeCardStart.html?HSourceInterID=' + HSourceInterID,
                                        end: function () {
                                            if (OptionData.length > 0) {
                                                if (OptionData[0]["data"] == "1") {
                                                    save(data2);
                                                } else if (OptionData[0]["data"] == "0") {
                                                    layer.msg("因为技能不匹配,无法保存!")
                                                }
                                                OptionData = [];
                                            } else {
                                                $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);
                                            }
                                        }
                                    });
                                });
                            }
                            else {
                                save(data2);
                            }
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 })
                        }
                    },
                    error: function (err) {
                        layer.alert(err, { icon: 5 })
                    }
                })
            }

            function save(data) {
              
                    var index = layer.load();
                    var sMainStr = JSON.stringify(data.field);
                    var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
@@ -694,10 +754,8 @@
                            layer.alert(err, { icon: 5 })
                        }
                    })
                }

           
            });
             
            }

            //审核按钮提交
            form.on('submit(VerIfySaver)', function (data) {
@@ -1018,6 +1076,9 @@
            $("#HGroupName").val(obj[0].班组名称);
            $("#HGroupID").val(obj[0].HItemID);
        }
        function GetSwipeCardStart(obj) {
            OptionData[0] = obj;
        }
    </script>
</body>
</html>

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú±¨±í/Sc_QualityReportBillDay.html

New file
@@ -0,0 +1,476 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>生产质量日汇报单</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>

</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">

                    <form class="layui-form" action="" lay-filter="component-form-group">

                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">产品代码</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">产品名称</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HName" id="HName">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>                               
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">                              
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>                              
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>
                        </script>

                    </form>
                </div>
            </div>
        </div>
    </div>
    <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>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
            //查询条件
            var sWhere = "";
            var option = [];
            var HModName = "Sc_QualityReportBillDay";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HMaterID", "HProcID", "HGroupID", "HSourceID", "HBadReasonID"];


            var ins;                        //用于导出excel
            //#endregion

            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½
            //初始化界面
            set_ClearBill();
            //#endregion

            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);
                switch (obj.event) {                 
                    //刷新
                    case 'get_Refresh': get_Refresh();
                        break;
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
                        break;                 
                    //导出excel
                    case 'get_export':
                        get_Export();
                        break;
                    //列设置
                    case 'set_HideColumn': get_HideColumn();
                        break;
                    case 'set_HideButton':
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        var HBillType = "Sc_QualityReportBillDay";
                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                        break;
                };
            });
            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery(1);
            });
            // é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //#endregion

            //#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     
                  
            //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
            // åˆå§‹åŒ–界面
            function set_ClearBill() {
                //初始化表格
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                set_InitGrid();
                get_FastQuery();

            }
            //初始化表格
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , limits: [50, 500, 5000, 50000]
                    , limit: 50
                    , cellMinWidth: 90
                   
                };
            }
            //查询
            function get_Display(sWhere) {
                var index = layer.load(0, { shade: false });
                var ajaxLoad = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    
                    url: GetWEBURL() + '/Sc_QualityReportBill/getSc_QualityReportBillDay',
                    type: "GET",
                    async:false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 'full-80'
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                            }
                            ins = table.render(option);
                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            var HBillType = "Sc_QualityReportBillDay";
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);

                            //刷新表格数据
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }

                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                layer.close(index);
            }
            //快速查询
            function get_FastQuery() {
                var HBeginDate = $("#HBeginDate").val();
                var HEndDate = $("#HEndDate").val();
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();                              

                sWhere = {
                    HBeginDate: HBeginDate
                    , HEndDate: HEndDate
                    , HNumber: HNumber
                    , HName: HName
                }
                get_Display(JSON.stringify(sWhere));
                sWhere = "";//调用接口后清空sWhere缓存

            }
            //重置快速查询
            function set_ClearQuery() {
                $("#HNumber").val("");
                $("#HName").val("");
                $("#btnSearch").click();
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                form.render('select');

                sWhere = "";
            }
            //刷新
            function get_Refresh() {
                $("#btnSearch").trigger('click');
            }

            //#region å¯¼å‡ºExecel
            function get_Export() {
                var ModRightNameCheck = "Gy_ProjectMoney_ExportExcel";

                //逻辑审核方法
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //方法所在页面和方法名
                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            table.exportFile(ins.config.id, option.data, "xls");
                        } else {
                            layer.alert("当前模块没有导出权限!", { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //#region èŽ·å–参数
            function getUrlVars() {
                var vars = [], hash;
                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
                for (var i = 0; i < hashes.length; i++) {
                    hash = hashes[i].split('=');
                    vars.push(hash[0]);
                    vars[hash[0]] = hash[1];
                }
                return vars;
            }
            //#endregion
            //#region éšè—åˆ—设置
            function get_HideColumn() {
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                }
                var urlStr = window.document.location.pathname;//获取文件路径
                var urlLen = urlStr.split('/');
                for (var i = 0; i < urlLen.length - 4; i++) {
                    contentUrl += "../";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码

                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;

                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "隐藏列设置"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["50%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: [contentUrl, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据
                        DisPlay_HideColumn();
                        //更新表格缓存的数据
                        layer.close(index);//关闭弹窗
                    }
                })
            }
            //#endregion
            //#region æ˜¾ç¤ºåˆ—数据
            function DisPlay_HideColumn() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    async: false,
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {

                            var dataCol = [];//数据库查询出的列数据
                            //var titleData = ["单据ID", "HMouldID", "hsubid", "HManagerID", "源单主内码", "源单子内码"];//不需要显示的字段 å¯æ‰©å±•

                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                var dataCols = dataCol[i].split('|');
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //设置列宽
                                //if (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }

                            //取消冻结列
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            table.render(option);
                        } else {
                            table.render(option);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
            //#endregion

            //#region åˆ—明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                    }
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                form.render('select');
            }
            //#endregion

            //以上是layui模块
        });
    </script>

</body>
</html>

 WebTM/views/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBill.html

@@ -593,7 +593,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_QualityReportBill/set_SaveBill',
                    type: "GET",
                    data: { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HChecker": sessionStorage["HUserName"] },
                    data: { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HChecker": sessionStorage["HUserName"], "HBadReasonHQty": $("HBadReasonHQty").val() },
                    success: function (result) {
                        if (result.count == 1) {
                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/RetrospectiveQueryReport.html

@@ -257,6 +257,7 @@
                        }
                        //在列表左边添加勾选框
                        col.push({ type: 'checkbox', fixed: 'left' });
                        col.push({ type: 'numbers', title: '序号' });
                        for (var i = 0; i < data.length; i++) {
                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                            if ($.inArray(data[i].name, titleData) > -1) {

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill.html

@@ -108,12 +108,19 @@
                                                <input type="text" class="layui-input" value="0" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">生产组织</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs4 layui-inline">
                            <label class="layui-form-label">订单跟踪号</label>
                            <div class="layui-input-inline">
                                <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
                            </div>
                        </div>-->
        <label class="layui-form-label">订单跟踪号</label>
        <div class="layui-input-inline">
            <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
        </div>
    </div>-->
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
@@ -164,10 +171,9 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">生产组织</label>
                                            <label class="layui-form-label">遗失数量</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
                                                <input type="text" class="layui-input" value="0" name="HLossQty" id="HLossQty" onfocus="this.select();">
                                            </div>
                                        </div>
                                    </div>
@@ -183,17 +189,23 @@
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs4 layui-inline">
                            <label class="layui-form-label">核算工序</label>
                            <div class="layui-input-inline">
                                <input type="text" class="layui-input" name="HPayProcID" id="HPayProcID" style="background-color:#efefef4d;" readonly>
                                <input type="hidden" value="0" name="HPayProcID" id="HPayProcID">
                            </div>
                        </div>-->
        <label class="layui-form-label">核算工序</label>
        <div class="layui-input-inline">
            <input type="text" class="layui-input" name="HPayProcID" id="HPayProcID" style="background-color:#efefef4d;" readonly>
            <input type="hidden" value="0" name="HPayProcID" id="HPayProcID">
        </div>
    </div>-->
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label"></label>
                                            <div class="layui-input-inline">
                                                <input type="checkbox" name="checkboxHLastSubProc" id="checkboxHLastSubProc" title="转下道" lay-skin="primary" lay-filter="checkboxHLastSubProc" checked disabled>
                                                <input type="hidden" value="true" name="HLastSubProc" id="HLastSubProc">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">取样数量</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" value="0" name="HToCheckQty" id="HToCheckQty" onfocus="this.select();">
                                            </div>
                                        </div>
                                    </div>
@@ -897,6 +909,8 @@
                                "HBackWorkQty": data.返工数量,
                                "HShiftsID": data.HShiftsID,
                                "HShiftsName": data.班次名称,
                                "HToCheckQty": data.取样数量,
                                "HLossQty": data.遗失数量,
                            });
                            if (data.是否审核 == "true") {
                                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//审核按钮禁用

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill_CurrentWork.html

@@ -203,7 +203,27 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">穴号</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
                                                <input type="text" class="layui-input" name="HMouldNum" id="HMouldNum" style="width: 150px;" >
                                                <input type="text" class="layui-input" name="HMouldNum" id="HMouldNum" style="width: 150px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">不良数量</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
                                                <input type="text" class="layui-input" name="HBadCount" id="HBadCount" value="0" style="width: 150px;">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-bottom: 15px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">遗失数量</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
                                                <input type="text" class="layui-input" name="HLossQty" id="HLossQty" value="0" style="width: 150px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">取样数量</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
                                                <input type="text" class="layui-input" name="HToCheckQty" id="HToCheckQty" value="0" style="width: 150px;">
                                            </div>
                                        </div>
                                    </div>
@@ -1030,8 +1050,9 @@
                layer.msg("请扫流转卡！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return;
            }
            if ($("#HQty").val() == 0) {
                layer.msg("数量不能为0！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            if ($("#HQty").val() == 0 && $("#HBadCount").val() == 0) {

                layer.msg("不良和合格数量不能同时为0！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return;
            }


 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationOutBill_PDA.html

@@ -1515,7 +1515,7 @@
                        }
                        , end: function () {
                            var sProcNo = $('#HProcNo').val();
                            var sBillNo = $('#HBarCode').val();
                            var sBillNo = $('#HProcExchBillNo').val();
                            if (sProcNo != "") {
                                txtHProcNo_KeyDown(sBillNo, sProcNo);
                            }

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html

@@ -174,12 +174,18 @@
                                                <input type="hidden" name="HUnitID" id="HUnitID" value="0">
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">材质</label>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">批次号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
                                                <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" value="">
                                            </div>
                                        </div>-->
                                        </div>
                                        <!--<div class="layui-col-xs3 layui-inline">
        <label class="layui-form-label">材质</label>
        <div class="layui-input-inline">
            <input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
        </div>
    </div>-->
                                    </div>
                                    <div class="layui-row">
                                        <!--<div class="layui-col-xs3 layui-inline">
@@ -1024,7 +1030,7 @@
            //判断操作类型
            if (OperationType == 1 ) {//无源单新增
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    url: GetWEBURL() + "/Web/GetMAXNumPDA",
                    type: "GET",
                    data: { "HBillType": '3772' },
                    success: function (d) {
@@ -1062,7 +1068,7 @@
                            layer.alert(result.Message, { icon: 5 });
                        } else {
                            $.ajax({
                                url: GetWEBURL() + "/Web/GetMAXNum",
                                url: GetWEBURL() + "/Web/GetMAXNumPDA",
                                type: "GET",
                                data: { "HBillType": '3772' },
                                success: function (d) {
@@ -2269,6 +2275,7 @@
                                , "HMaterModel": data.材料规格
                                , "HWidth": data.幅宽
                                , "HWeight": data.克重
                                , "HBatchNo": data.批号

                                , "HAuxQty": data.辅数量
                                , "HAuxUnit": data.HAuxUnit

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill_CF.html

@@ -81,7 +81,7 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label">批号</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" style="background-color:#efefef4d;" readonly>
                                                    <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" style="">
                                                </div>
                                            </div>
                                            <div class="layui-inline">