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

chenhaozhe

2025-09-24 17993abe49cebdb93cec2cf9fda3ff7711c3ddca

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

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -7,11 +7,11 @@
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    // var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
   /* var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置*/
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
   /* var WEBURL = "http://localhost:8082/LuBaoAPI/";  //余思杰本地配置*/
    var WEBURL = "http://localhost:81/API/";            // é™ˆé•å“²æœ¬åœ°é…ç½®
    /*var WEBURL = "http://localhost:81/API/";   */         // é™ˆé•å“²æœ¬åœ°é…ç½®
    // var WEBURL = "http://localhost:8082/LuBaoAPI/";  //李林俊本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //奥邦

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_BadPhenomena.html

@@ -301,7 +301,7 @@
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                            $("#btnSearch").trigger('click');
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -601,7 +601,7 @@
                    content: '../公用基础资料/Add_Edit_Gy_BadPhenomena.html?OperationType=1&linterid=&HSouceBillType=',
                    end: function () {
                        //刷新页面,
                        location.reload();
                        $("#btnSearch").trigger('click');
                    },
                    success: function (layero, index) {

@@ -626,7 +626,7 @@
                        }
                        ,end: function () {
                            //刷新页面,
                            location.reload();
                            $("#btnSearch").trigger('click');
                        }
                    })

@@ -665,7 +665,7 @@
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                            $("#btnSearch").trigger('click');
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -695,7 +695,7 @@
                                        //关闭当前frame
                                        layer.close(index);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                        $("#btnSearch").trigger('click');
                                    });

                                } else {

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_CheckItem.html

@@ -327,7 +327,7 @@
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                            $("#btnSearch").trigger('click');
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -594,7 +594,7 @@
                    content: ['../公用基础资料/Add_Edit_Gy_CheckItem.html?hID=' + TagId + '&HType=1&TagParentId=' + Level + ''],
                    end: function () {
                        //刷新页面,
                        location.reload();
                        $("#btnSearch").trigger('click');
                    },
                    success: function (layero, index) {

@@ -623,7 +623,7 @@
                                            //关闭当前frame
                                            layer.close(index);
                                            //修改为功后刷新界面
                                            window.location.reload();
                                            $("#btnSearch").trigger('click');
                                            //重载tree
                                            tree.reload('treeDepartment', {});
                                        });
@@ -658,7 +658,7 @@
                                                //关闭当前frame
                                                layer.close(index);
                                                //修改为功后刷新界面
                                                window.location.reload();
                                                $("#btnSearch").trigger('click');
                                                //重载tree
                                                tree.reload('treeDepartment', {});
                                            });
@@ -699,7 +699,7 @@
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                            $("#btnSearch").trigger('click');
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -726,7 +726,7 @@
                            , resize: false,
                            end: function () {
                                //刷新页面,
                                location.reload();
                                $("#btnSearch").trigger('click');
                            }
                            , cancel: function () {
                                //$(".layui-btn").removeClass("layui-btn-disabled");

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_InspectBasis.html

@@ -478,7 +478,7 @@
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }
                if (HNumber) {
                if (HOrgID) {
                    sWhere += " and HUSEORGID ='" + HOrgID + "'";
                }
                if (HNumber) {
@@ -632,7 +632,7 @@
                    content: '../公用基础资料/Add_Edit_Gy_InspectBasis.html?OperationType=1&linterid=&HSouceBillType=',
                    end: function () {
                        //刷新页面,
                        location.reload();
                        $("#btnSearch").trigger('click');
                    },
                    success: function (layero, index) {

@@ -680,7 +680,7 @@
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                            $("#btnSearch").trigger('click');
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -711,7 +711,7 @@
                                        //关闭当前frame
                                        layer.close(index);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                        $("#btnSearch").trigger('click');
                                    });

                                } else {

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_InspectInstruMent.html

@@ -594,7 +594,7 @@
                    content: '../公用基础资料/Add_Edit_Gy_InspectInstruMent.html?OperationType=1&linterid=&HSouceBillType=',
                    end: function () {
                        //刷新页面,
                        location.reload();
                        $("#btnSearch").trigger('click');
                    },
                    success: function (layero, index) {

@@ -618,7 +618,7 @@
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                            $("#btnSearch").trigger('click');
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -676,7 +676,7 @@
                                        //关闭当前frame
                                        layer.close(index);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                        $("#btnSearch").trigger('click');
                                    });

                                } else {

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_InspectMethod.html

@@ -632,7 +632,7 @@
                    content: '../公用基础资料/Add_Edit_Gy_InspectMethod.html?OperationType=1&linterid=&HSouceBillType=',
                    end: function () {
                        //刷新页面,
                        location.reload();
                        $("#btnSearch").trigger('click');
                    },
                    success: function (layero, index) {

@@ -668,7 +668,7 @@
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                            $("#btnSearch").trigger('click');
                        }
                        , cancel: function () {
                        }
@@ -696,7 +696,7 @@
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                            $("#btnSearch").trigger('click');
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -727,7 +727,7 @@
                                        //关闭当前frame
                                        layer.close(index);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                        $("#btnSearch").trigger('click');
                                    });

                                } else {

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_InspectValue.html

@@ -655,7 +655,7 @@
                    content: '../公用基础资料/Add_Edit_Gy_InspectValue.html?OperationType=1&linterid=&HSouceBillType=',
                    end: function () {
                        //刷新页面,
                        location.reload();
                        $("#btnSearch").trigger('click');
                    },
                    success: function (layero, index) {

@@ -679,7 +679,7 @@
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                            $("#btnSearch").trigger('click');
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -710,7 +710,7 @@
                                        //关闭当前frame
                                        layer.close(index);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                        $("#btnSearch").trigger('click');
                                    });

                                } else {
@@ -894,7 +894,7 @@
                            //隐藏显示过滤方案的标签信息
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            //执行查询方法
                            get_FastQuery();
                            //get_FastQuery();
                            form.render("select");
                        }
                    }, error: function () {

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_QCCheckClass.html

@@ -384,7 +384,7 @@
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                            $("#btnSearch").trigger('click');
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -458,7 +458,7 @@
                set_InitGrid();

                //查询
                get_Display(sWhere);
                get_FastQuery();
                get_DefaultModule();
            }

@@ -762,7 +762,7 @@
                    content: ['../公用基础资料/Add_Edit_Gy_QCCheckClass.html?hID=' + TagId + '&HType=1&TagParentId='],
                    end: function () {
                        //刷新页面,
                        location.reload();
                        $("#btnSearch").trigger('click');;
                    },
                    success: function (layero, index) {

@@ -818,7 +818,7 @@
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                            $("#btnSearch").trigger('click');;
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -845,7 +845,7 @@
                            , resize: false,
                            end: function () {
                                //刷新页面,
                                location.reload();
                                $("#btnSearch").trigger('click');;
                            }
                            , cancel: function () {
                                //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1003,7 +1003,7 @@
                                            //关闭当前frame
                                            layer.close(index);
                                            //修改为功后刷新界面
                                            window.location.reload();
                                            $("#btnSearch").trigger('click');
                                            //重载tree
                                            tree.reload('treeDepartment', {});
                                        });
@@ -1040,7 +1040,7 @@
                                                //关闭当前frame
                                                layer.close(index);
                                                //修改为功后刷新界面
                                                window.location.reload();
                                                $("#btnSearch").trigger('click');
                                                //重载tree
                                                tree.reload('treeDepartment', {});
                                            });

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_QualityStd.html

@@ -635,7 +635,7 @@
                    content: '../公用基础资料/Add_Edit_Gy_QualityStd.html?OperationType=1&linterid=&HSouceBillType=',
                    end: function () {
                        //刷新页面,
                        location.reload();
                        $("#btnSearch").trigger('click');
                    },
                    success: function (layero, index) {

@@ -661,7 +661,7 @@
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                            $("#btnSearch").trigger('click');
                        }
                        , cancel: function () {
                        }
@@ -689,7 +689,7 @@
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                            $("#btnSearch").trigger('click');
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -720,7 +720,7 @@
                                        //关闭当前frame
                                        layer.close(index);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                        $("#btnSearch").trigger('click');
                                    });

                                } else {

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_BadReason.html

@@ -318,7 +318,7 @@
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                            $("#btnSearch").trigger('click');
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -679,7 +679,7 @@
                    content: '../生产基础资料/Add_Edit_Gy_BadReason.html?OperationType=1&linterid=&HSouceBillType=',
                    end: function () {
                        //刷新页面,
                        location.reload();
                        $("#btnSearch").trigger('click');
                    },
                    success: function (layero, index) {

@@ -744,7 +744,7 @@
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                            $("#btnSearch").trigger('click');
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -798,7 +798,7 @@
                                        //关闭当前frame
                                        layer.close(index);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                        $("#btnSearch").trigger('click');
                                    });

                                } else {

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_BadType.html

@@ -300,7 +300,7 @@
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                            $("#btnSearch").trigger('click');
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -630,7 +630,7 @@
                    content: '../生产基础资料/Add_Edit_Gy_BadType.html?OperationType=1&linterid=&HSouceBillType=',
                    end: function () {
                        //刷新页面,
                        location.reload();
                        $("#btnSearch").trigger('click');
                    },
                    success: function (layero, index) {

@@ -694,7 +694,7 @@
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                            $("#btnSearch").trigger('click');
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -725,7 +725,7 @@
                                        //关闭当前frame
                                        layer.close(index);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                        $("#btnSearch").trigger('click');
                                    });

                                } else {

 WebTM/views/¹¤×ʹÜÀí/¿¼Çڻ㱨µ¥/Pay_WorkTimesBillEdit.html

@@ -574,7 +574,7 @@
                        , { field: 'HWorkTypeID', title: 'HWorkTypeID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
                        , { field: 'HWorkTypeNumber', title: '工种代码', width: 100, edit: 'text', event: "HWorkTypeNumber" }         //F7
                        , { field: 'HWorkTypeName', title: '工种名称', width: 100, style: 'background-color:#efefef4d;' }
                        , { field: 'HPayMoney', title: '小时工资', width: 100, edit: 'text' }
                        , { field: 'HPayMoney', title: '小时工资', width: 100 }
                        , { field: 'HMoney', title: '工资', width: 100,totalRow: true }
                        , { field: 'HRemark', title: '备注', width: 100, edit: 'text' }
                        , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 70 }
@@ -705,6 +705,7 @@
                            layer.confirm('列表中已经存在职员,是否要覆盖？', { icon: 3, title: '提示' }, function (index) {
                                set_InitGrid();     //初始化子表
                                GetEmployee();      //根据班组返回职员信息
                                DisPlay_HideColumn();//列设置
                                layer.close(index); //关闭弹窗  å®ƒèŽ·å–的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                            });
                        }
@@ -1298,7 +1299,7 @@
                                        , "HWorkTypeNumber": OptionData.工种代码
                                        , "HWorkTypeName": OptionData.工种名称
                                        , "HPayMoney": OptionData.小时工资
                                        , "HMoney": (obj.data["HBaseTimes"] == "" ? 0 : obj.data["HBaseTimes"])* OptionData.小时工资
                                        , "HMoney": (obj.data["HBaseTimes"] == "" ? 0 : (obj.data["HBaseTimes"]) * OptionData.小时工资).toFixed(4)
                                    })
                                }
                            })
@@ -1526,8 +1527,8 @@
                        var HAMTimes = HBaseTimes / 2;                                      //上午工时
                        var HPMTimes = HBaseTimes / 2;                                      //下午工时
                        var HPayMoney = isNaN(obj.data.HPayMoney) ? 0 : obj.data.HPayMoney; //小时工资
                        var HMoney = HPayMoney * HBaseTimes;                                //工资=小时工资*基本工时

                        var HMoney = (HPayMoney * HBaseTimes).toFixed(4);                                //工资=小时工资*基本工时
                        debugger
                        //同步更新表格和缓存对应的值
                        obj.update({
                            HBaseTimes: HBaseTimes

 WebTM/views/Éú²ú¹ÜÀí/Èռƻ®±¨±í/ReportWorkDemandPlanBillList.html

@@ -5,14 +5,16 @@
    <title>要料计划报表</title>
    <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/ext/soulTable.css" media="all">
    <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/soulTable.slim.js"></script>
    <!--<script src="../../../layuiadmin/soulTable.slim.js"></script>-->
    <script src="../../../layuiadmin/SetColumn.js"></script>
    <script src="../../../layuiadmin/xm-select.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -278,18 +280,18 @@
        function set_InitGrid() {
            var columns = [];

            columns.push({ type: 'checkbox', fixed: 'left', sort: true});
            columns.push({ field: '组织', title: '生产组织', sort: true});
            columns.push({ field: '部门', title: '生产车间', sort: true});
            columns.push({ field: 'FSUMQTY', title: '合计', sort: true });
            columns.push({ field: '客户订单号', title: '客户订单号', sort: true });
            columns.push({ field: '物料名称', title: '物料名称', sort: true});
            columns.push({ field: '规格型号', title: '物料规格', sort: true});
            columns.push({ field: 'HICMOBillNo', title: '生产订单号', sort: true});
            columns.push({ field: 'HSeOrderBillNo', title: '需求单号', sort: true});
            columns.push({ field: '物料代码', title: '物料编码', sort: true});
            columns.push({ field: '计量单位名称', title: '计量单位', sort: true});
            columns.push({ field: 'TQSUM', title: '要料拖期数量', sort: true, totalRow: true});
            columns.push({ type: 'checkbox', fixed: 'left', sort: true, filter: true});
            columns.push({ field: '组织', title: '生产组织', sort: true, filter: true});
            columns.push({ field: '部门', title: '生产车间', sort: true, filter: true});
            columns.push({ field: 'FSUMQTY', title: '合计', sort: true, filter: true});
            columns.push({ field: '客户订单号', title: '客户订单号', sort: true, filter: true });
            columns.push({ field: '物料名称', title: '物料名称', sort: true, filter: true});
            columns.push({ field: '规格型号', title: '物料规格', sort: true, filter: true});
            columns.push({ field: 'HICMOBillNo', title: '生产订单号', sort: true, filter: true});
            columns.push({ field: 'HSeOrderBillNo', title: '需求单号', sort: true, filter: true});
            columns.push({ field: '物料代码', title: '物料编码', sort: true, filter: true});
            columns.push({ field: '计量单位名称', title: '计量单位', sort: true, filter: true});
            columns.push({ field: 'TQSUM', title: '要料拖期数量', sort: true, totalRow: true, filter: true});
            //获取两个月期之间的相差
            var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//开始时间
            var time2 = Date.parse(new Date($("#HENDDATE").val()));//结束时间

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -316,6 +316,8 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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="btn-FirstPieceCheck" id="btn-FirstPieceCheck">首检</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PatrolProcCheck" id="btn-PatrolProcCheck">巡检</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-LastProcCheck" id="btn-LastProcCheck">末检</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Remark" id="set_Remark"><i class="layui-icon layui-icon-form"></i>包装备注</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>保存方案</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>读取方案</button>
@@ -352,10 +354,10 @@
            var sWhere = "";
            var sWhere = "";
            var HModName = "Sc_ICMOBillList";
            var HDeptID = 0;
            //var HDeptID = 0;

            var params = getUrlVars();
            var HDeptID = params[params[0]];
            //var HDeptID = params[params[0]];
            var option = [];
            var page = 1;//分页数据
            var size = 50;
@@ -416,9 +418,9 @@
                            }
                        }
                        $("#HDeptName").append(HDeptName);
                        if (!isNaN(HDeptID)) {
                            $("#HDeptName").val(HDeptID);
                        }
                        //if (!isNaN(HDeptID)) {
                        //    $("#HDeptName").val(HDeptID);
                        //}
                        form.render('select');
                    }
                    layer.closeAll("loading");
@@ -617,6 +619,12 @@
                        break;
                    //首检
                    case 'btn-FirstPieceCheck': set_FirstPieceCheck();
                        break;
                    //巡检
                    case 'btn-PatrolProcCheck': set_PatrolProcCheck();
                        break;
                    //巡检
                    case 'btn-LastProcCheck': set_LastProcCheck();
                        break;
                    //包装备注
                    case 'set_Remark': set_Remark();
@@ -1345,9 +1353,9 @@
                }

                //传递的参数不为NAN
                if (!isNaN(HDeptID) && HDeptName == 0) {
                    HDeptName = HDeptID;
                }
                //if (!isNaN(HDeptID) && HDeptName == 0) {
                //    HDeptName = HDeptID;
                //}
                //if (!isNaN(HDeptID)) {
                //    HStatus = "开工";
                //}
@@ -2033,8 +2041,60 @@
                    layer.msg('请选择一行数据编辑！');
                }
            }


            //巡检
            function set_PatrolProcCheck() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var OperationType = 2;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '巡检检验单-编辑'
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=0', 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();
                        }
                        , end: function () {
                            get_FastQuery(table, option);
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }
            //末检
            function set_LastProcCheck() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var OperationType = 2;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '末检检验单-编辑'
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../质量管理/工序检验单/QC_ProcessCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=0', 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();
                        }
                        , end: function () {
                            get_FastQuery(table, option);
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }
            //包装备注
            function set_Remark() {
                var checkStatus = table.checkStatus('mainTable')

 WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Xt_UserListEdit.html

@@ -415,7 +415,7 @@
            form.on('submit(CzyyzList)', function () {
                $('#Czmm').val("");
                $('#Czyyz').val("");
                $('#Czmm').attr("disabled", false);
                $('#Czmm').attr("readonly", false);
                $('#Czyyz').attr("disabled", false);
                Psv="Update"
            });

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ѳ¼ì¼Ç¼µ¥/QC_Add_Edit_PatrolProcCheckOtherill.html

@@ -188,11 +188,11 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">判断结论</label>
                                            <div class="layui-input-block">
                                                <input type="radio" name="HLastResult" id="HLastResult" value="true" title="合格">
                                                <input type="radio" name="HLastResult" id="HLastResult" value="false" title="不合格" checked>
                                                <input type="radio" name="HLastResult" id="HLastResult" value="true" title="合格" checked>
                                                <input type="radio" name="HLastResult" id="HLastResult" value="false" title="不合格">
                                            </div>
                                        </div>
                                        <div class="layui-inline" id="hidediv1">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">工序</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -1581,10 +1581,10 @@
                    layer.msg("任务单数量不能为空且不能小于等于0！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) {
                    layer.msg("流转卡数量不能为空且不能小于等于0！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                //if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) {
                //    layer.msg("流转卡数量不能为空且不能小于等于0！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}
                if ($("#HFirstCheckEmp").val() == 0) {
                    layer.msg("检验员未选择！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
@@ -2268,7 +2268,7 @@
                        $("#HMaterNumber").val(checkStatus.data[0].产品代码);
                        $("#HMaterName").val(checkStatus.data[0].产品名称);
                        $("#HMaterID").val(checkStatus.data[0].HMaterID);
                        $("#HICMOQty").val(checkStatus.data[0].计划生产数量);
                        $("#HICMOQty").val(checkStatus.data[0].生产任务单数量);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
@@ -4319,7 +4319,10 @@
            $("#HICMOInterID").val(obj[0].hmainid);
            $("#HICMOEntryID").val(obj[0].HEntryID);
            $("#HICMOBillNo").val(obj[0].单据号);
            $("#HICMOQty").val(obj[0].计划生产数量);
            $("#HICMOQty").val(obj[0].生产任务单数量);
            $("#HMaterNumber").val(obj[0].产品代码);
            $("#HMaterName").val(obj[0].产品名称);
            $("#HMaterID").val(obj[0].HMaterID);
        }

        function GetProcExValue(obj) {  //流转卡

 WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBill.html

@@ -116,7 +116,7 @@
                                                <input type="text" class="layui-input" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                        <div class="layui-inline" id="hidediv2">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">流转卡号</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -127,7 +127,7 @@
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                        <div class="layui-inline" id="hidediv1">
                                            <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="HProcExchQty" id="HProcExchQty" value="0" style="background-color:#efefef4d;" readonly>
@@ -839,6 +839,12 @@
                        LoadingInformation_StationOutBill();
                        //自动带出检验方案
                        GetCheckItemID();
                    }//生产订单列表末检
                    else if (HSouceBillType == 3710) {
                        //根据源单id获取源单信息
                        LoadingInformation_ICMO();
                        //自动带出检验方案
                        GetCheckItemID();
                    }
                    //工序流转卡列表工序检
                    else if (HSouceBillType == 3772) {
@@ -988,6 +994,42 @@
                            HCenterID = data.HCenterID == null ? sessionStorage["HWorkCenterID"] : data.HCenterID;//工作中心id
                            //获取表体检验项目信息
                            get_CheckItem();
                        } else {
                            layer.alert(result.Message, { icon: 5 });
                        }
                        layer.close(wait);
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }

            //根据源单id获取源单信息--生产订单
            function LoadingInformation_ICMO() {
                $("#hidediv1").attr({ "style": "display:none" });
                $("#hidediv2").attr({ "style": "display:none" });

                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
                    type: "GET",
                    async: false,
                    data: { "sWhere": "and hmainid = " + linterid, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
                        if (result.count == 1) {
                            $("#HICMOBillNo").val(data.单据号);
                            $("#HICMOInterID").val(data.hmainid);
                            $("#HICMOQty").val(data.生产任务单数量);
                            $("#HSourceName").val(data.生产资源);
                            $("#HSourceID").val(data.HSourceID);
                            $("#HMaterID").val(data.HMaterID);
                            $("#HMaterName").val(data.产品名称);
                            $("#HMainSourceBillNo").val(data.单据号);
                            $("#HMainSourceBillType").val(data.单据类型);
                            $("#HMainSourceInterID").val(data.hmainid);
                            $("#HICMOEntryID").val(data.HEntryID);
                        } else {
                            layer.alert(result.Message, { icon: 5 });
                        }
@@ -1479,10 +1521,10 @@
                    layer.msg("任务单数量不能为空且不能小于等于0！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) {
                    layer.msg("流转卡数量不能为空且不能小于等于0！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                //if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) {
                //    layer.msg("流转卡数量不能为空且不能小于等于0！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}
                if ($("#HFirstCheckEmp").val() == 0) {
                    layer.msg("检验员未选择！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
@@ -2265,7 +2307,7 @@
                        $("#HMaterNumber").val(checkStatus.data[0].产品代码);
                        $("#HMaterName").val(checkStatus.data[0].产品名称);
                        $("#HMaterID").val(checkStatus.data[0].HMaterID)
                        $("#HICMOQty").val(checkStatus.data[0].计划生产数量);
                        $("#HICMOQty").val(checkStatus.data[0].生产任务单数量);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
@@ -4293,7 +4335,10 @@
            $("#HICMOInterID").val(obj[0].hmainid);
            $("#HICMOEntryID").val(obj[0].HEntryID);
            $("#HICMOBillNo").val(obj[0].单据号);
            $("#HICMOQty").val(obj[0].计划生产数量);
            $("#HICMOQty").val(obj[0].生产任务单数量);
            $("#HMaterNumber").val(obj[0].产品代码);
            $("#HMaterName").val(obj[0].产品名称);
            $("#HMaterID").val(obj[0].HMaterID);
        }

        function GetProcExValue(obj) {  //流转卡

 WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBillList.html

@@ -801,7 +801,7 @@
                                        //关闭当前frame
                                        layer.close(wait);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                        $("#btnSearch").trigger('click');
                                    });
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });

 WebTM/views/ÖÊÁ¿¹ÜÀí/¼ìÑé·½°¸µ¥/QC_CheckProjectList.html

@@ -540,6 +540,7 @@
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    async: false,
                    success: function (result) {
                        var Organization = "";
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
@@ -772,7 +773,7 @@
                    content: '../检验方案单/QC_Add_CheckProject.html?OperationType=1&linterid=&HSouceBillType=',
                    end: function () {
                        //刷新页面,
                        location.reload();
                        $("#btnSearch").trigger('click');
                    },
                    success: function (layero, index) {

@@ -794,7 +795,7 @@
                        , content: '../检验方案单/QC_Add_CheckProject.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
                        , end: function () {
                            //刷新页面,
                            location.reload();
                            $("#btnSearch").trigger('click');
                        }
                    })
                } else {
@@ -823,7 +824,7 @@
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                            $("#btnSearch").trigger('click');
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -857,7 +858,7 @@
                                        //关闭当前frame
                                        layer.close(index);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                        $("#btnSearch").trigger('click');
                                    });

                                } else {

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_Add_Edit_FirstPieceCheckBill.html

@@ -194,7 +194,7 @@
                                                <input type="radio" name="HLastResult" value="false" title="不合格">
                                            </div>
                                        </div>
                                        <div class="layui-inline" id="hidediv1" style="margin-left:20px;">
                                        <div class="layui-inline" style="margin-left:20px;">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">工序</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -1545,10 +1545,10 @@
                    layer.msg("任务单数量不能为空且不能小于等于0！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) {
                    layer.msg("流转卡数量不能为空且不能小于等于0！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                //if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) {
                //    layer.msg("流转卡数量不能为空且不能小于等于0！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}
                if ($("#HFirstCheckEmp").val() == 0) {
                    layer.msg("检验员未选择！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
@@ -2307,7 +2307,7 @@
                        $("#HMaterNumber").val(checkStatus.data[0].产品代码);
                        $("#HMaterName").val(checkStatus.data[0].产品名称);
                        $("#HMaterID").val(checkStatus.data[0].HMaterID);
                        $("#HICMOQty").val(checkStatus.data[0].计划生产数量);
                        $("#HICMOQty").val(checkStatus.data[0].生产任务单数量);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
@@ -4459,7 +4459,10 @@
            $("#HICMOInterID").val(obj[0].hmainid);
            $("#HICMOEntryID").val(obj[0].HEntryID);
            $("#HICMOBillNo").val(obj[0].单据号);
            $("#HICMOQty").val(obj[0].计划生产数量);
            $("#HICMOQty").val(obj[0].生产任务单数量);
            $("#HMaterNumber").val(obj[0].产品代码);
            $("#HMaterName").val(obj[0].产品名称);
            $("#HMaterID").val(obj[0].HMaterID);
        }

        function GetProcExValue(obj) {  //流转卡

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_FirstPieceCheckBillList.html

@@ -384,7 +384,7 @@
                                                //关闭当前frame
                                                layer.close(index);
                                                //修改为功后刷新界面
                                                window.location.reload();
                                                $("#btnSearch").trigger('click');
                                            });

                                        } else {