1

wtt

2024-10-10 42dc047a6667c6fd93fbb732618e3405591bb851

1

 WebTM/WebTM.csproj.user

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_GetProductionTeamList.html

@@ -105,9 +105,11 @@
                }
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetProductionTeamList_Json",
                    async: true,
                    data: { "sWhere": Value },
                    //url: GetWEBURL() + "/Web/GetProductionTeamList_Json",     //原返回数据调用方法
                    url: GetWEBURL() + "/Web/GetGroupListByUser_Json",
                    async: false,
                    //data: { "sWhere": Value },
                    data: { "sWhere": Value, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('mainTable', {

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

@@ -592,8 +592,10 @@
                        }
                        $("#HGroupName").val(checkStatus.data[0].班组名称);
                        $("#HGroupID").val(checkStatus.data[0].HItemID);
                        $("#HDeptID").val(checkStatus.data[0].HDeptID);//部门代码
                        $("#HDeptName").val(checkStatus.data[0].部门名称);//部门名称
                        if (checkStatus.data[0].HDeptID != 0) {
                            $("#HDeptID").val(checkStatus.data[0].HDeptID);
                            $("#HDeptName").val(checkStatus.data[0].部门名称);
                        }
                        layer.close(index); //关闭弹窗  å®ƒèŽ·å–的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
@@ -614,6 +616,10 @@
            }

            function GetEmployee() {
                if ($("#HGroupName").val() == '') {
                    return;
                }

                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Gy_EmployeeController/GetEmpInfoByGroup_Json",
@@ -1532,8 +1538,10 @@
        {
            $("#HGroupName").val(obj[0].班组名称);
            $("#HGroupID").val(obj[0].HItemID);
            $("#HDeptID").val(obj[0].HDeptID);//部门代码
            $("#HDeptName").val(obj[0].部门名称);//部门名称
            if (obj[0].HDeptID != 0) {
                $("#HDeptID").val(obj[0].HDeptID);
                $("#HDeptName").val(obj[0].部门名称);
            }
        }
        //双击返回基础资料数据    åˆ—表
        function GetHEmpListValue(data)  //返回职员

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

@@ -231,9 +231,9 @@
                    <script type="text/html" id="toolbarDemo">
                        <div class="layui-btn-container">
                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>增加一行</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-InsertLine"><i class="layui-icon layui-icon-form"></i>插入一行</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-InsertLine"><i class="layui-icon layui-icon-form"></i>插入一行</button>-->
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>复制一行</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Up"><i class="layui-icon layui-icon-form"></i>上移</button>
                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Up"><i class="layui-icon layui-icon-form"></i>上移</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Under"><i class="layui-icon layui-icon-form"></i>下移</button>-->
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                        </div>
@@ -414,7 +414,7 @@
            //#region å­è¡¨1：头工具栏按钮触发事件
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;;
                    , data = checkStatus.data;

                //新增行表格数据
                var NewRow = {

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_BadProductsReport.html

@@ -49,130 +49,39 @@
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">物料代码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber" style="width:215px;">
                                    </div>
                                </div>
                                </div>                              
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">规格型号</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HMaterModel" id="HMaterModel" style="width:215px;">
                                        <label class="layui-form-label" style="width: 85px;">是否量产</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
                                                <option value="">请选择</option>
                                                <option value="1">量产</option>
                                                <option value="0">非量产</option>
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">发现工序</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HProcessName" id="HProcessName" style="width:190px;">
                                        <label class="layui-form-label" style="width: 85px;">项目号</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">处置方式</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HDealingType" id="HDealingType" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">登记人</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HSendManName" id="HSendManName" style="width:100px;">
                                        <label class="layui-form-label" style="width: 85px;">事业部</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
                                                <!--动态渲染组织-->
                                            </select>
                                        </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 class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;margin-left:5%;">

                                    </div>
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                    <div class="layui-row" style=" margin-top: 10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>

                                    <div class="layui-row" style=" margin-top: 10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
                                </div>                               
                            </div>
                        </div>
                        <div class="layui-tab layui-tab-card">
@@ -288,6 +197,8 @@
            //根据日期间隔设置开始时间与结束时间
            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
            Get_HProject(); //获取项目号
            GetGy_Division();//获取事业部
            //查询
            get_FastQuery();
        }
@@ -394,95 +305,17 @@
        function get_FastQuery() {
            var HBeginDate = $("#HBeginDate").val();
            var HEndDate = $("#HEndDate").val();
            var HMaterNumber = $("#HMaterNumber").val();
            var HMaterModel = $("#HMaterModel").val();
            var HProcessName = $("#HProcessName").val();
            var HDealingType = $("#HDealingType").val();
            var HSendManName = $("#HSendManName").val();
            var HProject = $("#HProject").val();//项目号
            var HBatchWork = $("#HBatchWork").val();//是否量产
            var HDivisionName = $("#HDivisionName").val();//事业部

            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
            var ColContent = $("#ColContent").val();
            var ColName1 = $("#ColName1").val();//复选框
            var Comparator1 = $("#Comparator1").val()
            var ColContent1 = $("#ColContent1").val();
            var ColName2 = $("#ColName2").val();//复选框
            var Comparator2 = $("#Comparator2").val()
            var ColContent2 = $("#ColContent2").val();

            if (ColName != 0 && Comparator != 0) {
                var com = "";
                switch (Comparator) {
                    case "7":
                        com = "like''%" + ColContent + "%''";
                        break;
                    case "8":
                        com = "like''%" + ColContent + "''";
                        break;
                    case "9":
                        com = "like''" + ColContent + "%''";
                        break;
                    case "10":
                        com = "not like''%" + ColContent + "%''";
                        break;
                    default:
                        com = "" + Comparator + "''" + ColContent + "''";
                        break;
                }
                sWhere += " and " + ColName + " " + com;
            }
            if (ColName1 != 0 && Comparator1 != 0) {
                var com1 = "";
                switch (Comparator1) {
                    case "7":
                        com1 = "like''%" + ColContent1 + "%''";
                        break;
                    case "8":
                        com1 = "like''%" + ColContent1 + "''";
                        break;
                    case "9":
                        com1 = "like''" + ColContent1 + "%''";
                        break;
                    case "10":
                        com1 = "not like''%" + ColContent1 + "%''";
                        break;
                    default:
                        com1 = "" + Comparator1 + "''" + ColContent1 + "''";
                        break;
                }
                sWhere += " and " + ColName1 + " " + com1;
            }
            if (ColName2 != 0 && Comparator2 != 0) {
                var com2 = "";
                switch (Comparator2) {
                    case "7":
                        com2 = "like''%" + ColContent2 + "%''";
                        break;
                    case "8":
                        com2 = "like''%" + ColContent2 + "''";
                        break;
                    case "9":
                        com2 = "like''" + ColContent2 + "%''";
                        break;
                    case "10":
                        com2 = "not like''%" + ColContent2 + "%''";
                        break;
                    default:
                        com2 = "" + Comparator2 + "''" + ColContent2 + "''";
                        break;
                }
                sWhere += " and " + ColName2 + " " + com2;
            }

           
            sWhere = {
                HBeginDate: HBeginDate
                , HEndDate: HEndDate
                , HMaterNumber: HMaterNumber
                , HMaterModel: HMaterModel
                , HProcessName: HProcessName
                , HDealingType: HDealingType
                , HSendManName: HSendManName
                , HCustomize: sWhere
                , HProject: HProject
                , HBatchWork: HBatchWork
                , HDivisionName: HDivisionName
            }
            set_InitGrid();
            get_Display(JSON.stringify(sWhere));
@@ -493,25 +326,65 @@
            var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //开始日期
            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));  //结束日期
            $("#HMaterNumber").val("");
            $("#HMaterModel").val("");
            $("#HProcessName").val("");
            $("#HDealingType").val("");
            $("#HSendManName").val("");
            $("#ColContent1").val("");
            $("#ColName1").val("0");
            $("#Comparator1").val("0");
            $("#ColContent2").val("");
            $("#ColName2").val("0");
            $("#Comparator2").val("0");
            $("#ColContent").val("");
            $("#ColName").val("0");
            $("#Comparator").val("0");
            $("#HProject").val("");
            $("#HBatchWork").val("");
            $("#HDivisionName").val("");          
            form.render('select');

            sWhere = "";
        }

        //#region èŽ·å–项目号
        function Get_HProject() {
            //获取项目号
            var HProjectList = '<option value="" style="color:red;" selected></option>';
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Gy_Material/Get_HProject",
                async: false,
                data: { "HOrgID": sessionStorage["OrganizationID"] },
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            HProjectList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                        }
                        $("#HProject").append(HProjectList);
                        form.render('select');

                    }
                    layer.closeAll("loading");
                }
            })
        }
        //#endregion

        //#region èŽ·å–事业部
        function GetGy_Division() {
            //获取事业部
            var HDivisionList = '<option value="" style="color:red;" selected></option>';
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
                async: false,
                data: { "HOrgID": sessionStorage["OrganizationID"] },
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            HDivisionList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                        }
                        $("#HDivisionName").append(HDivisionList);
                        form.render('select');

                    }
                    layer.closeAll("loading");
                }
            })
        }
        //#endregion


        //隐藏列设置
        function get_HideColumn() {
            var colName = "";

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_ErrManagerLedgerReport.html

@@ -60,121 +60,37 @@
                                </div>
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">规格型号</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HMaterModel" id="HMaterModel" style="width:215px;">
                                        <label class="layui-form-label" style="width: 85px;">是否量产</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
                                                <option value="">请选择</option>
                                                <option value="1">量产</option>
                                                <option value="0">非量产</option>
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">生产资源</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HSourceName" id="HSourceName" style="width:190px;">
                                        <label class="layui-form-label" style="width: 85px;">项目号</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">问题来源</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HProSource" id="HProSource" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">班次</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HShiftsName" id="HShiftsName" style="width:128px;">
                                        <label class="layui-form-label" style="width: 85px;">事业部</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
                                                <!--动态渲染组织-->
                                            </select>
                                        </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 class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;margin-left:5%;">

                                    </div>
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                    <div class="layui-row" style=" margin-top: 10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>

                                    <div class="layui-row" style=" margin-top: 10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
                                </div>                          
                            </div>
                        </div>
                        <div class="layui-tab layui-tab-card">
@@ -291,6 +207,8 @@
            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
            DeptName();
            Get_HProject(); //获取项目号
            GetGy_Division();//获取事业部
            //查询
            get_FastQuery();
        }
@@ -420,99 +338,24 @@
            });
        }


        // å¿«é€Ÿè¿‡æ»¤
        function get_FastQuery() {
            var HBeginDate = $("#HBeginDate").val();
            var HEndDate = $("#HEndDate").val();
            var HDeptID = $("#HDeptName").val();
            var HMaterModel = $("#HMaterModel").val();
            var HSourceName = $("#HSourceName").val();
            var HProSource = $("#HProSource").val();
            var HShiftsName = $("#HShiftsName").val();
            var HDeptID = $("#HDeptName").val();           

            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
            var ColContent = $("#ColContent").val();
            var ColName1 = $("#ColName1").val();//复选框
            var Comparator1 = $("#Comparator1").val()
            var ColContent1 = $("#ColContent1").val();
            var ColName2 = $("#ColName2").val();//复选框
            var Comparator2 = $("#Comparator2").val()
            var ColContent2 = $("#ColContent2").val();

            if (ColName != 0 && Comparator != 0) {
                var com = "";
                switch (Comparator) {
                    case "7":
                        com = "like''%" + ColContent + "%''";
                        break;
                    case "8":
                        com = "like''%" + ColContent + "''";
                        break;
                    case "9":
                        com = "like''" + ColContent + "%''";
                        break;
                    case "10":
                        com = "not like''%" + ColContent + "%''";
                        break;
                    default:
                        com = "" + Comparator + "''" + ColContent + "''";
                        break;
                }
                sWhere += " and " + ColName + " " + com;
            }
            if (ColName1 != 0 && Comparator1 != 0) {
                var com1 = "";
                switch (Comparator1) {
                    case "7":
                        com1 = "like''%" + ColContent1 + "%''";
                        break;
                    case "8":
                        com1 = "like''%" + ColContent1 + "''";
                        break;
                    case "9":
                        com1 = "like''" + ColContent1 + "%''";
                        break;
                    case "10":
                        com1 = "not like''%" + ColContent1 + "%''";
                        break;
                    default:
                        com1 = "" + Comparator1 + "''" + ColContent1 + "''";
                        break;
                }
                sWhere += " and " + ColName1 + " " + com1;
            }
            if (ColName2 != 0 && Comparator2 != 0) {
                var com2 = "";
                switch (Comparator2) {
                    case "7":
                        com2 = "like''%" + ColContent2 + "%''";
                        break;
                    case "8":
                        com2 = "like''%" + ColContent2 + "''";
                        break;
                    case "9":
                        com2 = "like''" + ColContent2 + "%''";
                        break;
                    case "10":
                        com2 = "not like''%" + ColContent2 + "%''";
                        break;
                    default:
                        com2 = "" + Comparator2 + "''" + ColContent2 + "''";
                        break;
                }
                sWhere += " and " + ColName2 + " " + com2;
            }

            var HProject = $("#HProject").val();//项目号
            var HBatchWork = $("#HBatchWork").val();//是否量产
            var HDivisionName = $("#HDivisionName").val();//事业部
          
            sWhere = {
                HBeginDate: HBeginDate
                , HEndDate: HEndDate
                , HDeptID: HDeptID
                , HMaterModel: HMaterModel
                , HSourceName: HSourceName
                , HProSource: HProSource
                , HShiftsName: HShiftsName
                , HCustomize: sWhere
                , HProject: HProject
                , HBatchWork: HBatchWork
                , HDivisionName: HDivisionName
            }
            set_InitGrid();
            get_Display(JSON.stringify(sWhere));
@@ -524,24 +367,65 @@
            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //开始日期
            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));  //结束日期
            $("#HDeptName").val("0");
            $("#HMaterModel").val("");
            $("#HSourceName").val("");
            $("#HProSource").val("");
            $("#HShiftsName").val("");
            $("#ColContent1").val("");
            $("#ColName1").val("0");
            $("#Comparator1").val("0");
            $("#ColContent2").val("");
            $("#ColName2").val("0");
            $("#Comparator2").val("0");
            $("#ColContent").val("");
            $("#ColName").val("0");
            $("#Comparator").val("0");
            $("#HProject").val("");
            $("#HBatchWork").val("");
            $("#HDivisionName").val("");          
            form.render('select');

            sWhere = "";
        }


        //#region èŽ·å–项目号
        function Get_HProject() {
            //获取项目号
            var HProjectList = '<option value="" style="color:red;" selected></option>';
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Gy_Material/Get_HProject",
                async: false,
                data: { "HOrgID": sessionStorage["OrganizationID"] },
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            HProjectList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                        }
                        $("#HProject").append(HProjectList);
                        form.render('select');

                    }
                    layer.closeAll("loading");
                }
            })
        }
        //#endregion

        //#region èŽ·å–事业部
        function GetGy_Division() {
            //获取事业部
            var HDivisionList = '<option value="" style="color:red;" selected></option>';
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
                async: false,
                data: { "HOrgID": sessionStorage["OrganizationID"] },
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            HDivisionList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                        }
                        $("#HDivisionName").append(HDivisionList);
                        form.render('select');

                    }
                    layer.closeAll("loading");
                }
            })
        }
        //#endregion

        //隐藏列设置
        function get_HideColumn() {
            var colName = "";

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_ErrManagerLedgerReport_EquipTop3Issue.html

@@ -41,12 +41,38 @@
                                            <!--动态渲染年份-->
                                        </select>
                                    </div>
                                </div>                                
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">月份：</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
                                        <select name="HMonth" id="HMonth" lay-verify="HMonth">
                                            <!--动态渲染月份-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">是否量产</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
                                            <option value="">请选择</option>
                                            <option value="1">量产</option>
                                            <option value="0">非量产</option>
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">项目号</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">事业部</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
@@ -379,6 +405,8 @@
            function set_ClearBill() {
                Year();
                Month();
                Get_HProject(); //获取项目号
                GetGy_Division();//获取事业部
                //初始化表格
                set_InitGrid();
                //加载数据到网格
@@ -428,15 +456,13 @@
            }

            //加载网格
            function get_Display(DateYear) {
                var HYear = $("#HYear").val();
                var HMonth = $("#HMonth").val();
            function get_Display(sWhere) {
                var wait = layer.load();//遮罩
                $.ajax({
                    url: GetWEBURL() + '/QC_CustomerAppealReport/QC_ErrManagerLedgerReport_EquipTop3Issue',
                    type: "GET",
                    async: false,
                    data: { "HYear": HYear, "HMonth": HMonth, "user": sessionStorage["HUserName"] },
                    data: { "sWhere": sWhere,"user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        var col = [];
                        if (data1.count == 1) {
@@ -492,7 +518,19 @@

            //快速过滤
            function get_FastQuery() {
                get_Display(sWhere);
                var HYear = $("#HYear").val();
                var HMonth = $("#HMonth").val();
                var HProject = $("#HProject").val();//项目号
                var HBatchWork = $("#HBatchWork").val();//是否量产
                var HDivisionName = $("#HDivisionName").val();//事业部
                sWhere = {
                    HYear: HYear
                    , HMonth: HMonth
                    , HProject: HProject
                    , HBatchWork: HBatchWork
                    , HDivisionName: HDivisionName
                }
                get_Display(JSON.stringify(sWhere));
                //调用接口后清空sWhere缓存
                sWhere = "";
                set_Graphics();
@@ -510,6 +548,56 @@
                get_FastQuery();
            }

            //#region èŽ·å–项目号
            function Get_HProject() {
                //获取项目号
                var HProjectList = '<option value="" style="color:red;" selected></option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Gy_Material/Get_HProject",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HProjectList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                            }
                            $("#HProject").append(HProjectList);
                            form.render('select');

                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#endregion

            //#region èŽ·å–事业部
            function GetGy_Division() {
                //获取事业部
                var HDivisionList = '<option value="" style="color:red;" selected></option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HDivisionList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                            }
                            $("#HDivisionName").append(HDivisionList);
                            form.render('select');

                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#endregion

            //隐藏列设置
            function get_HideColumn() {
                var colName = "";

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_ErrManagerLedgerReport_Issue.html

@@ -41,12 +41,38 @@
                                            <!--动态渲染年份-->
                                        </select>
                                    </div>
                                </div>                                
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">月份：</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
                                        <select name="HMonth" id="HMonth" lay-verify="HMonth">
                                            <!--动态渲染月份-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">是否量产</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
                                            <option value="">请选择</option>
                                            <option value="1">量产</option>
                                            <option value="0">非量产</option>
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">项目号</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">事业部</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
@@ -379,6 +405,8 @@
            function set_ClearBill() {
                Year();
                Month();
                Get_HProject(); //获取项目号
                GetGy_Division();//获取事业部
                //初始化表格
                set_InitGrid();
                //加载数据到网格
@@ -428,15 +456,13 @@
            }

            //加载网格
            function get_Display(DateYear) {
                var HYear = $("#HYear").val();
                var HMonth = $("#HMonth").val();
            function get_Display(sWhere) {
                var wait = layer.load();//遮罩
                $.ajax({
                    url: GetWEBURL() + '/QC_CustomerAppealReport/QC_ErrManagerLedgerReport_Issue',
                    type: "GET",
                    async: false,
                    data: { "HYear": HYear, "HMonth": HMonth, "user": sessionStorage["HUserName"] },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        var col = [];
                        if (data1.count == 1) {
@@ -492,7 +518,19 @@

            //快速过滤
            function get_FastQuery() {
                get_Display(sWhere);
                var HYear = $("#HYear").val();
                var HMonth = $("#HMonth").val();
                var HProject = $("#HProject").val();//项目号
                var HBatchWork = $("#HBatchWork").val();//是否量产
                var HDivisionName = $("#HDivisionName").val();//事业部
                sWhere = {
                    HYear: HYear
                    , HMonth: HMonth
                    , HProject: HProject
                    , HBatchWork: HBatchWork
                    , HDivisionName: HDivisionName
                }
                get_Display(JSON.stringify(sWhere));
                //调用接口后清空sWhere缓存
                sWhere = "";
                set_Graphics();
@@ -503,13 +541,66 @@
                var yyyy = new Date().getFullYear();
                $("#HYear").val(yyyy);
                var mm = new Date().getMonth() + 1;
                $("#HMonth").val(mm)
                $("#HMonth").val(mm);
                $("#HProject").val("");
                $("#HBatchWork").val("");
                $("#HDivisionName").val("");
                form.render('select');

                sWhere = "";
                get_FastQuery();
            }

            //#region èŽ·å–项目号
            function Get_HProject() {
                //获取项目号
                var HProjectList = '<option value="" style="color:red;" selected></option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Gy_Material/Get_HProject",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HProjectList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                            }
                            $("#HProject").append(HProjectList);
                            form.render('select');

                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#endregion

            //#region èŽ·å–事业部
            function GetGy_Division() {
                //获取事业部
                var HDivisionList = '<option value="" style="color:red;" selected></option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HDivisionList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                            }
                            $("#HDivisionName").append(HDivisionList);
                            form.render('select');

                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#endregion

            //隐藏列设置
            function get_HideColumn() {
                var colName = "";

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_ErrManagerLedgerReport_Source.html

@@ -41,12 +41,38 @@
                                            <!--动态渲染年份-->
                                        </select>
                                    </div>
                                </div>                                
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">月份：</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
                                        <select name="HMonth" id="HMonth" lay-verify="HMonth">
                                            <!--动态渲染月份-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">是否量产</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
                                            <option value="">请选择</option>
                                            <option value="1">量产</option>
                                            <option value="0">非量产</option>
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">项目号</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">事业部</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
@@ -378,7 +404,9 @@
            //初始化界面
            function set_ClearBill() {
                Year();
                Month();               
                Month();
                Get_HProject(); //获取项目号
                GetGy_Division();//获取事业部
                //初始化表格
                set_InitGrid();
                //加载数据到网格
@@ -428,15 +456,13 @@
            }

            //加载网格
            function get_Display(DateYear) {
                var HYear = $("#HYear").val();
                var HMonth = $("#HMonth").val();
            function get_Display(sWhere) {             
                var wait = layer.load();//遮罩
                $.ajax({
                    url: GetWEBURL() + '/QC_CustomerAppealReport/QC_ErrManagerLedgerReport_Source',
                    type: "GET",
                    async: false,
                    data: { "HYear": HYear, "HMonth": HMonth, "user": sessionStorage["HUserName"] },
                    data: { "sWhere": sWhere,"user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        var col = [];
                        if (data1.count == 1) {
@@ -492,7 +518,19 @@

            //快速过滤
            function get_FastQuery() {
                get_Display(sWhere);
                var HYear = $("#HYear").val();
                var HMonth = $("#HMonth").val();
                var HProject = $("#HProject").val();//项目号
                var HBatchWork = $("#HBatchWork").val();//是否量产
                var HDivisionName = $("#HDivisionName").val();//事业部
                sWhere = {
                    HYear: HYear
                    , HMonth: HMonth
                    , HProject: HProject
                    , HBatchWork: HBatchWork
                    , HDivisionName: HDivisionName
                }
                get_Display(JSON.stringify(sWhere));
                //调用接口后清空sWhere缓存
                sWhere = "";
                set_Graphics();
@@ -504,12 +542,65 @@
                $("#HYear").val(yyyy);
                var mm = new Date().getMonth() + 1;
                $("#HMonth").val(mm)
                $("#HProject").val("");
                $("#HBatchWork").val("");
                $("#HDivisionName").val("");
                form.render('select');

                sWhere = "";
                get_FastQuery();
            }

            //#region èŽ·å–项目号
            function Get_HProject() {
                //获取项目号
                var HProjectList = '<option value="" style="color:red;" selected></option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Gy_Material/Get_HProject",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HProjectList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                            }
                            $("#HProject").append(HProjectList);
                            form.render('select');

                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#endregion

            //#region èŽ·å–事业部
            function GetGy_Division() {
                //获取事业部
                var HDivisionList = '<option value="" style="color:red;" selected></option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HDivisionList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                            }
                            $("#HDivisionName").append(HDivisionList);
                            form.render('select');

                        }
                        layer.closeAll("loading");
                    }
                })
            }
        //#endregion

            //隐藏列设置
            function get_HideColumn() {
                var colName = "";

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_ErrManagerLedgerReport_SourceOfTheProblem.html

@@ -41,12 +41,38 @@
                                            <!--动态渲染年份-->
                                        </select>
                                    </div>
                                </div>                                
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">月份：</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
                                        <select name="HMonth" id="HMonth" lay-verify="HMonth">
                                            <!--动态渲染月份-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">是否量产</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
                                            <option value="">请选择</option>
                                            <option value="1">量产</option>
                                            <option value="0">非量产</option>
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">项目号</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">事业部</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
@@ -378,7 +404,9 @@
            //初始化界面
            function set_ClearBill() {
                Year();
                Month();               
                Month();
                Get_HProject(); //获取项目号
                GetGy_Division();//获取事业部
                //初始化表格
                set_InitGrid();
                //加载数据到网格
@@ -428,15 +456,13 @@
            }

            //加载网格
            function get_Display(DateYear) {
                var HYear = $("#HYear").val();
                var HMonth = $("#HMonth").val();
            function get_Display(sWhere) {               
                var wait = layer.load();//遮罩
                $.ajax({
                    url: GetWEBURL() + '/QC_CustomerAppealReport/QC_ErrManagerLedgerReport_SourceOfTheProblem',
                    type: "GET",
                    async: false,
                    data: { "HYear": HYear, "HMonth": HMonth, "user": sessionStorage["HUserName"] },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        var col = [];
                        if (data1.count == 1) {
@@ -492,7 +518,19 @@

            //快速过滤
            function get_FastQuery() {
                get_Display(sWhere);
                var HYear = $("#HYear").val();
                var HMonth = $("#HMonth").val();
                var HProject = $("#HProject").val();//项目号
                var HBatchWork = $("#HBatchWork").val();//是否量产
                var HDivisionName = $("#HDivisionName").val();//事业部
                sWhere = {
                    HYear: HYear
                    , HMonth: HMonth
                    , HProject: HProject
                    , HBatchWork: HBatchWork
                    , HDivisionName: HDivisionName
                }
                get_Display(JSON.stringify(sWhere));
                //调用接口后清空sWhere缓存
                sWhere = "";
                set_Graphics();
@@ -503,13 +541,66 @@
                var yyyy = new Date().getFullYear();
                $("#HYear").val(yyyy);
                var mm = new Date().getMonth() + 1;
                $("#HMonth").val(mm)
                $("#HMonth").val(mm);
                $("#HProject").val("");
                $("#HBatchWork").val("");
                $("#HDivisionName").val("");
                form.render('select');

                sWhere = "";
                get_FastQuery();
            }

            //#region èŽ·å–项目号
            function Get_HProject() {
                //获取项目号
                var HProjectList = '<option value="" style="color:red;" selected></option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Gy_Material/Get_HProject",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HProjectList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                            }
                            $("#HProject").append(HProjectList);
                            form.render('select');

                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#endregion

            //#region èŽ·å–事业部
            function GetGy_Division() {
                //获取事业部
                var HDivisionList = '<option value="" style="color:red;" selected></option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HDivisionList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                            }
                            $("#HDivisionName").append(HDivisionList);
                            form.render('select');

                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#endregion

            //隐藏列设置
            function get_HideColumn() {
                var colName = "";

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_MoistureContentDataLedger.html

@@ -67,93 +67,34 @@
                                    <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 class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;margin-left:5%;">

                                    </div>
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">是否量产</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
                                                <option value="">请选择</option>
                                                <option value="1">量产</option>
                                                <option value="0">非量产</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                    <div class="layui-row" style=" margin-top: 10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">项目号</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>

                                    <div class="layui-row" style=" margin-top: 10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">事业部</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>-->
                                </div>
                            </div>
                        </div>
                        <div class="layui-tab layui-tab-card">
@@ -243,7 +184,8 @@
        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_HProject(); //获取项目号
            GetGy_Division();//获取事业部
            //查询
            get_FastQuery();
        }
@@ -290,14 +232,10 @@
                , toolbar: '#toolbarDemo1'
                , height: 'full-50'
                , page: true
                //, cellMinWidth: 'auto'
                , totalRow: true
                , limit: 500
                , data:[]
                , limits: [50, 500, 5000, 20000]
                //, done: function (res, curr, count) {
                //    soulTable.render(this);
                //}
                , limits: [50, 500, 5000, 20000]               
                , cols: [columns]
            };
            table.render(option);
@@ -355,10 +293,7 @@
                                , totalRow: true
                                , limit: 500
                                , data: data1.data
                                , limits: [50, 500, 5000, 20000]
                                //, done: function (res, curr, count) {
                                //    soulTable.render(this);
                                //}
                                , limits: [50, 500, 5000, 20000]                               
                                , cols: [col]
                            };
                        } else {
@@ -370,11 +305,6 @@

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

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

                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
@@ -393,87 +323,18 @@
            var HEndDate = $("#HEndDate").val();
            var HResult = $("#HResult").val();
            var HSourceID = $("#HSourceID").val();

            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
            var ColContent = $("#ColContent").val();
            var ColName1 = $("#ColName1").val();//复选框
            var Comparator1 = $("#Comparator1").val()
            var ColContent1 = $("#ColContent1").val();
            var ColName2 = $("#ColName2").val();//复选框
            var Comparator2 = $("#Comparator2").val()
            var ColContent2 = $("#ColContent2").val();

            if (ColName != 0 && Comparator != 0) {
                var com = "";
                switch (Comparator) {
                    case "7":
                        com = "like'%" + ColContent + "%'";
                        break;
                    case "8":
                        com = "like'%" + ColContent + "'";
                        break;
                    case "9":
                        com = "like'" + ColContent + "%'";
                        break;
                    case "10":
                        com = "not like'%" + ColContent + "%'";
                        break;
                    default:
                        com = "" + Comparator + "'" + ColContent + "'";
                        break;
                }
                sWhere += " and " + ColName + " " + com;
            }
            if (ColName1 != 0 && Comparator1 != 0) {
                var com1 = "";
                switch (Comparator1) {
                    case "7":
                        com1 = "like'%" + ColContent1 + "%'";
                        break;
                    case "8":
                        com1 = "like'%" + ColContent1 + "'";
                        break;
                    case "9":
                        com1 = "like'" + ColContent1 + "%'";
                        break;
                    case "10":
                        com1 = "not like'%" + ColContent1 + "%'";
                        break;
                    default:
                        com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                        break;
                }
                sWhere += " and " + ColName1 + " " + com1;
            }
            if (ColName2 != 0 && Comparator2 != 0) {
                var com2 = "";
                switch (Comparator2) {
                    case "7":
                        com2 = "like'%" + ColContent2 + "%'";
                        break;
                    case "8":
                        com2 = "like'%" + ColContent2 + "'";
                        break;
                    case "9":
                        com2 = "like'" + ColContent2 + "%'";
                        break;
                    case "10":
                        com2 = "not like'%" + ColContent2 + "%'";
                        break;
                    default:
                        com2 = "" + Comparator2 + "'" + ColContent2 + "'";
                        break;
                }
                sWhere += " and " + ColName2 + " " + com2;
            }


            var HProject = $("#HProject").val();//项目号
            var HBatchWork = $("#HBatchWork").val();//是否量产
            var HDivisionName = $("#HDivisionName").val();//事业部
        
            sWhere = {
                HBeginDate: HBeginDate
                ,HEndDate: HEndDate
                , HResult: HResult
                , HSourceID: HSourceID
                , HProject: HProject
                , HBatchWork: HBatchWork
                , HDivisionName: HDivisionName
            }
            //set_InitGrid();
            get_Display(JSON.stringify(sWhere));
@@ -481,23 +342,69 @@
        }

        function set_ClearQuery() {
            $("#HICMOBillNo").val("");
            $("#HBardCode").val("");
            $("#HProcExchBillNo").val("");
            $("#ColContent1").val("");
            $("#ColName1").val("0");
            $("#Comparator1").val("0");
            $("#ColContent2").val("");
            $("#ColName2").val("0");
            $("#Comparator2").val("0");
            $("#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"));
            $("#HResult").val("");
            $("#HSourceID").val("");
            $("#HProject").val("");
            $("#HBatchWork").val("");
            $("#HDivisionName").val("");           
            form.render('select');

            sWhere = "";
        }

        //#region èŽ·å–项目号
        function Get_HProject() {
            //获取项目号
            var HProjectList = '<option value="" style="color:red;" selected></option>';
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Gy_Material/Get_HProject",
                async: false,
                data: { "HOrgID": sessionStorage["OrganizationID"] },
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            HProjectList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                        }
                        $("#HProject").append(HProjectList);
                        form.render('select');

                    }
                    layer.closeAll("loading");
                }
            })
        }
        //#endregion

        //#region èŽ·å–事业部
        function GetGy_Division() {
            //获取事业部
            var HDivisionList = '<option value="" style="color:red;" selected></option>';
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
                async: false,
                data: { "HOrgID": sessionStorage["OrganizationID"] },
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            HDivisionList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                        }
                        $("#HDivisionName").append(HDivisionList);
                        form.render('select');

                    }
                    layer.closeAll("loading");
                }
            })
        }
        //#endregion


        //隐藏列设置
        function get_HideColumn() {
            var colName = "";

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_PPMReport.html

@@ -59,6 +59,32 @@
                                        </select>
                                    </div>
                                </div>-->
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">是否量产</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
                                            <option value="">请选择</option>
                                            <option value="1">量产</option>
                                            <option value="0">非量产</option>
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">项目号</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">事业部</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
                                            <!--动态渲染组织-->
                                        </select>
                                    </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>
@@ -131,6 +157,8 @@
                //set_StockOrg();
                //初始化表单时间
                set_InitDate();
                Get_HProject(); //获取项目号
                GetGy_Division();//获取事业部
                //初始化表格
                set_InitGrid();

@@ -456,8 +484,23 @@

            //快速查询
            function get_FastQuery() {
                sDate = $("#HDate").val();                  //日期
                get_Display(sWhere);
                //文本框为空时，清空对应ID
                if ($("#HDeptName").val() == '') {
                    $("#HDeptID").val("0");
                }
                var HDeptID = $("#HDeptID").val()
                var HYear = $("#HDate").val(); //日期
                var HProject = $("#HProject").val();//项目号
                var HBatchWork = $("#HBatchWork").val();//是否量产
                var HDivisionName = $("#HDivisionName").val();//事业部
                sWhere = {
                    HYear: HYear
                    , HDeptID: HDeptID
                    , HProject: HProject
                    , HBatchWork: HBatchWork
                    , HDivisionName: HDivisionName
                }
                get_Display(JSON.stringify(sWhere));
                //加载柱状图
                set_Graphics();
            }
@@ -466,19 +509,13 @@

            //#region åˆ—表刷新
            function get_Display(sWhere) {
                var HDate = sDate;          //日期
                //文本框为空时，清空对应ID
                if ($("#HDeptName").val() == '') {
                    $("#HDeptID").val("0");
                }
                var HDeptID = $("#HDeptID").val()

              
                var ajaxLoad = layer.load();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/QC_QualityReportsController/GetQC_PPMReport_Json',
                    async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                    data: { "HYear": HDate, "HDeptID": HDeptID },
                    data: { "sWhere": sWhere},
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
@@ -840,9 +877,58 @@
            ////#endregion
            //#endregion

        });
            //#region èŽ·å–项目号
            function Get_HProject() {
                //获取项目号
                var HProjectList = '<option value="" style="color:red;" selected></option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Gy_Material/Get_HProject",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HProjectList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                            }
                            $("#HProject").append(HProjectList);
                            form.render('select');

                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#endregion

            //#region èŽ·å–事业部
            function GetGy_Division() {
                //获取事业部
                var HDivisionList = '<option value="" style="color:red;" selected></option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HDivisionList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                            }
                            $("#HDivisionName").append(HDivisionList);
                            form.render('select');

                        }
                        layer.closeAll("loading");
                    }
                })
            }
        //#endregion
        });      
        //#endregion
       
        //以上是layui模块

        //双击返回基础资料数据    è¡¨å¤´
@@ -851,6 +937,7 @@
            $("#HDeptName").val(obj[0].部门名称);
            $("#HDeptID").val(obj[0].HItemID);
        }

    </script>

</body>

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_PerformanceScrapLedger.html

@@ -25,12 +25,7 @@
                <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-colla-item">                                
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
@@ -63,93 +58,34 @@
                                    <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 class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
        <div class="layui-row" style="margin-top:10px;margin-left:5%;">

        </div>
        <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
            <div class="layui-inline">
                <label class="layui-form-label">过滤</label>
                <div class="layui-input-block">
                    <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                    </select>
                </div>
            </div>
            <div class="layui-inline">
                <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                    <option value="0" selected="selected"></option>
                    <option value="=">=</option>
                    <option value=">=">>=</option>
                    <option value=">">></option>
                    <option value="<="><=</option>
                    <option value="<"><</option>
                    <option value="<>"><></option>
                    <option value="7">包含</option>
                    <option value="8">左包含</option>
                    <option value="9">右包含</option>
                    <option value="10">不包含</option>
                </select>
            </div>
            <div class="layui-inline">
                <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
            </div>
        </div>
        <div class="layui-row" style=" margin-top: 10px;">
            <div class="layui-inline">
                <label class="layui-form-label">过滤</label>
                <div class="layui-input-block">
                    <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
                    </select>
                </div>
            </div>
            <div class="layui-inline">
                <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
                    <option value="0" selected="selected"></option>
                    <option value="=">=</option>
                    <option value=">=">>=</option>
                    <option value=">">></option>
                    <option value="<="><=</option>
                    <option value="<"><</option>
                    <option value="<>"><></option>
                    <option value="7">包含</option>
                    <option value="8">左包含</option>
                    <option value="9">右包含</option>
                    <option value="10">不包含</option>
                </select>
            </div>
            <div class="layui-inline">
                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
            </div>
        </div>

        <div class="layui-row" style=" margin-top: 10px;">
            <div class="layui-inline">
                <label class="layui-form-label">过滤</label>
                <div class="layui-input-block">
                    <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                    </select>
                </div>
            </div>
            <div class="layui-inline">
                <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
                    <option value="0" selected="selected"></option>
                    <option value="=">=</option>
                    <option value=">=">>=</option>
                    <option value=">">></option>
                    <option value="<="><=</option>
                    <option value="<"><</option>
                    <option value="<>"><></option>
                    <option value="7">包含</option>
                    <option value="8">左包含</option>
                    <option value="9">右包含</option>
                    <option value="10">不包含</option>
                </select>
            </div>
            <div class="layui-inline">
                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
            </div>
        </div>
    </div>-->
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">是否量产</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
                                                <option value="">请选择</option>
                                                <option value="1">量产</option>
                                                <option value="0">非量产</option>
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">项目号</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">事业部</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <div class="layui-tab layui-tab-card">
@@ -239,7 +175,8 @@
        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_HProject(); //获取项目号
            GetGy_Division();//获取事业部
            //查询
            get_FastQuery();
        }
@@ -303,7 +240,6 @@

        // æŸ¥è¯¢
        function get_Display(sWhere) {

            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/QC_CustomerAppealReport/QC_PerformanceScrapLedger',
@@ -391,111 +327,87 @@
            var HEndDate = $("#HEndDate").val();
            var HMaterID = $("#HMaterID").val();
            var HBatchNo = $("#HBatchNo").val();

            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
            var ColContent = $("#ColContent").val();
            var ColName1 = $("#ColName1").val();//复选框
            var Comparator1 = $("#Comparator1").val()
            var ColContent1 = $("#ColContent1").val();
            var ColName2 = $("#ColName2").val();//复选框
            var Comparator2 = $("#Comparator2").val()
            var ColContent2 = $("#ColContent2").val();

            if (ColName != 0 && Comparator != 0) {
                var com = "";
                switch (Comparator) {
                    case "7":
                        com = "like'%" + ColContent + "%'";
                        break;
                    case "8":
                        com = "like'%" + ColContent + "'";
                        break;
                    case "9":
                        com = "like'" + ColContent + "%'";
                        break;
                    case "10":
                        com = "not like'%" + ColContent + "%'";
                        break;
                    default:
                        com = "" + Comparator + "'" + ColContent + "'";
                        break;
                }
                sWhere += " and " + ColName + " " + com;
            }
            if (ColName1 != 0 && Comparator1 != 0) {
                var com1 = "";
                switch (Comparator1) {
                    case "7":
                        com1 = "like'%" + ColContent1 + "%'";
                        break;
                    case "8":
                        com1 = "like'%" + ColContent1 + "'";
                        break;
                    case "9":
                        com1 = "like'" + ColContent1 + "%'";
                        break;
                    case "10":
                        com1 = "not like'%" + ColContent1 + "%'";
                        break;
                    default:
                        com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                        break;
                }
                sWhere += " and " + ColName1 + " " + com1;
            }
            if (ColName2 != 0 && Comparator2 != 0) {
                var com2 = "";
                switch (Comparator2) {
                    case "7":
                        com2 = "like'%" + ColContent2 + "%'";
                        break;
                    case "8":
                        com2 = "like'%" + ColContent2 + "'";
                        break;
                    case "9":
                        com2 = "like'" + ColContent2 + "%'";
                        break;
                    case "10":
                        com2 = "not like'%" + ColContent2 + "%'";
                        break;
                    default:
                        com2 = "" + Comparator2 + "'" + ColContent2 + "'";
                        break;
                }
                sWhere += " and " + ColName2 + " " + com2;
            }


            var HProject = $("#HProject").val();//项目号
            var HBatchWork = $("#HBatchWork").val();//是否量产
            var HDivisionName = $("#HDivisionName").val();//事业部
          
            sWhere = {
                HBeginDate: HBeginDate
                ,HEndDate: HEndDate
                , HMaterID: HMaterID
                , HBatchNo: HBatchNo
                , HProject: HProject
                , HBatchWork: HBatchWork
                , HDivisionName: HDivisionName
            }
            //set_InitGrid();
            get_Display(JSON.stringify(sWhere));
            sWhere = "";//调用接口后清空sWhere缓存
        }

        function set_ClearQuery() {
            $("#HICMOBillNo").val("");
            $("#HBardCode").val("");
            $("#HProcExchBillNo").val("");
            $("#ColContent1").val("");
            $("#ColName1").val("0");
            $("#Comparator1").val("0");
            $("#ColContent2").val("");
            $("#ColName2").val("0");
            $("#Comparator2").val("0");
            $("#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"));
            $("#HMaterID").val("0");
            $("#HBatchNo").val("");
            $("#HProject").val("");
            $("#HBatchWork").val("");
            $("#HDivisionName").val("");          
            form.render('select');

            sWhere = "";
        }

        //#region èŽ·å–项目号
        function Get_HProject() {
            //获取项目号
            var HProjectList = '<option value="" style="color:red;" selected></option>';
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Gy_Material/Get_HProject",
                async: false,
                data: { "HOrgID": sessionStorage["OrganizationID"] },
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            HProjectList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                        }
                        $("#HProject").append(HProjectList);
                        form.render('select');

                    }
                    layer.closeAll("loading");
                }
            })
        }
        //#endregion

        //#region èŽ·å–事业部
        function GetGy_Division() {
            //获取事业部
            var HDivisionList = '<option value="" style="color:red;" selected></option>';
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
                async: false,
                data: { "HOrgID": sessionStorage["OrganizationID"] },
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            HDivisionList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                        }
                        $("#HDivisionName").append(HDivisionList);
                        form.render('select');

                    }
                    layer.closeAll("loading");
                }
            })
        }
        //#endregion


        //隐藏列设置
        function get_HideColumn() {
            var colName = "";

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_QualityMonthSumReport.html

@@ -59,6 +59,32 @@
                                        </select>
                                    </div>
                                </div>-->
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">是否量产</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
                                            <option value="">请选择</option>
                                            <option value="1">量产</option>
                                            <option value="0">非量产</option>
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">项目号</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">事业部</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
                                            <!--动态渲染组织-->
                                        </select>
                                    </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>
@@ -131,6 +157,8 @@
                //set_StockOrg();
                //初始化表单时间
                set_InitDate();
                Get_HProject(); //获取项目号
                GetGy_Division();//获取事业部
                //初始化表格
                set_InitGrid();

@@ -456,8 +484,23 @@

            //快速查询
            function get_FastQuery() {
                sDate = $("#HDate").val();                  //日期
                get_Display(sWhere);
                //文本框为空时，清空对应ID
                if ($("#HDeptName").val() == '') {
                    $("#HDeptID").val("0");
                }
                var HDeptID = $("#HDeptID").val()
                var HYear = $("#HDate").val(); //日期
                var HProject = $("#HProject").val();//项目号
                var HBatchWork = $("#HBatchWork").val();//是否量产
                var HDivisionName = $("#HDivisionName").val();//事业部
                sWhere = {
                    HYear: HYear
                    , HDeptID: HDeptID
                    , HProject: HProject
                    , HBatchWork: HBatchWork
                    , HDivisionName: HDivisionName
                }
                get_Display(JSON.stringify(sWhere));
                //加载柱状图
                set_Graphics();
            }
@@ -465,20 +508,13 @@
            //#endregion

            //#region åˆ—表刷新
            function get_Display(sWhere) {
                var HDate = sDate;          //日期
                //文本框为空时，清空对应ID
                if ($("#HDeptName").val() == '') {
                    $("#HDeptID").val("0");
                }
                var HDeptID = $("#HDeptID").val()

            function get_Display(sWhere) {               
                var ajaxLoad = layer.load();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/QC_QualityReportsController/GetQC_QualityMonthSumReport_Json',
                    async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                    data: { "HYear": HDate, "HDeptID": HDeptID },
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
@@ -800,6 +836,56 @@
            ////#endregion
            //#endregion

            //#region èŽ·å–项目号
            function Get_HProject() {
                //获取项目号
                var HProjectList = '<option value="" style="color:red;" selected></option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Gy_Material/Get_HProject",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HProjectList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                            }
                            $("#HProject").append(HProjectList);
                            form.render('select');

                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#endregion

            //#region èŽ·å–事业部
            function GetGy_Division() {
                //获取事业部
                var HDivisionList = '<option value="" style="color:red;" selected></option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HDivisionList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                            }
                            $("#HDivisionName").append(HDivisionList);
                            form.render('select');

                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#endregion

        });

        //#endregion

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_QualityStatisticsDailyReport.html

@@ -26,11 +26,7 @@
                    <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; width: 85px;">
@@ -65,7 +61,7 @@
                                            <!--动态渲染年份-->
                                        </select>
                                    </div>
                                </div>
                                </div>                            
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">组织</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 125px;">
@@ -78,90 +74,31 @@
                                    <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 class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;margin-left:5%;">

                                    </div>
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">是否量产</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
                                                <option value="">请选择</option>
                                                <option value="1">量产</option>
                                                <option value="0">非量产</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                    <div class="layui-row" style=" margin-top: 10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">项目号</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>

                                    <div class="layui-row" style=" margin-top: 10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">事业部</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
@@ -250,7 +187,8 @@
            Year();
            DeptName();
            Organ();
            //set_InitGrid();
            Get_HProject(); //获取项目号
            GetGy_Division();//获取事业部
            //查询
            get_FastQuery();
        }
@@ -397,87 +335,17 @@
            var HMonth = $("#HMonth").val();
            var HDeptName = $("#HDeptName").val();
            var HOrgID = $("#HOrgID").val();

            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
            var ColContent = $("#ColContent").val();
            var ColName1 = $("#ColName1").val();//复选框
            var Comparator1 = $("#Comparator1").val()
            var ColContent1 = $("#ColContent1").val();
            var ColName2 = $("#ColName2").val();//复选框
            var Comparator2 = $("#Comparator2").val()
            var ColContent2 = $("#ColContent2").val();

            if (ColName != 0 && Comparator != 0) {
                var com = "";
                switch (Comparator) {
                    case "7":
                        com = "like'%" + ColContent + "%'";
                        break;
                    case "8":
                        com = "like'%" + ColContent + "'";
                        break;
                    case "9":
                        com = "like'" + ColContent + "%'";
                        break;
                    case "10":
                        com = "not like'%" + ColContent + "%'";
                        break;
                    default:
                        com = "" + Comparator + "'" + ColContent + "'";
                        break;
                }
                sWhere += " and " + ColName + " " + com;
            }
            if (ColName1 != 0 && Comparator1 != 0) {
                var com1 = "";
                switch (Comparator1) {
                    case "7":
                        com1 = "like'%" + ColContent1 + "%'";
                        break;
                    case "8":
                        com1 = "like'%" + ColContent1 + "'";
                        break;
                    case "9":
                        com1 = "like'" + ColContent1 + "%'";
                        break;
                    case "10":
                        com1 = "not like'%" + ColContent1 + "%'";
                        break;
                    default:
                        com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                        break;
                }
                sWhere += " and " + ColName1 + " " + com1;
            }
            if (ColName2 != 0 && Comparator2 != 0) {
                var com2 = "";
                switch (Comparator2) {
                    case "7":
                        com2 = "like'%" + ColContent2 + "%'";
                        break;
                    case "8":
                        com2 = "like'%" + ColContent2 + "'";
                        break;
                    case "9":
                        com2 = "like'" + ColContent2 + "%'";
                        break;
                    case "10":
                        com2 = "not like'%" + ColContent2 + "%'";
                        break;
                    default:
                        com2 = "" + Comparator2 + "'" + ColContent2 + "'";
                        break;
                }
                sWhere += " and " + ColName2 + " " + com2;
            }
         

            var HProject = $("#HProject").val();//项目号
            var HBatchWork = $("#HBatchWork").val();//是否量产
            var HDivisionName = $("#HDivisionName").val();//事业部
            sWhere = {
                HYear: HYear
                , HMonth: HMonth
                , HDeptName: HDeptName
                , HOrgID: HOrgID
                , HProject: HProject
                , HBatchWork: HBatchWork
                , HDivisionName: HDivisionName
            }
            set_InitGrid();
            get_Display(JSON.stringify(sWhere));
@@ -488,15 +356,9 @@
            $("#HICMOBillNo").val("");
            $("#HBardCode").val("");
            $("#HProcExchBillNo").val("");
            $("#ColContent1").val("");
            $("#ColName1").val("0");
            $("#Comparator1").val("0");
            $("#ColContent2").val("");
            $("#ColName2").val("0");
            $("#Comparator2").val("0");
            $("#ColContent").val("");
            $("#ColName").val("0");
            $("#Comparator").val("0");
            $("#HProject").val("");
            $("#HBatchWork").val("0");
            $("#HDivisionName").val("0");           
            form.render('select');

            sWhere = "";
@@ -636,6 +498,56 @@
        }
        //#endregion

        //#region èŽ·å–项目号
        function Get_HProject() {
            //获取项目号
            var HProjectList = '<option value="" style="color:red;" selected></option>';
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Gy_Material/Get_HProject",
                async: false,
                data: { "HOrgID": sessionStorage["OrganizationID"] },
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            HProjectList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                        }
                        $("#HProject").append(HProjectList);
                        form.render('select');

                    }
                    layer.closeAll("loading");
                }
            })
        }
        //#endregion

        //#region èŽ·å–事业部
        function GetGy_Division() {
            //获取事业部
            var HDivisionList = '<option value="" style="color:red;" selected></option>';
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
                async: false,
                data: { "HOrgID": sessionStorage["OrganizationID"] },
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            HDivisionList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                        }
                        $("#HDivisionName").append(HDivisionList);
                        form.render('select');

                    }
                    layer.closeAll("loading");
                }
            })
        }
        //#endregion

        //以上是layui模块
    });


 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_RegistrationForTestingReport.html

@@ -63,93 +63,34 @@
                                    <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 class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;margin-left:5%;">

                                    </div>
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">是否量产</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
                                                <option value="">请选择</option>
                                                <option value="1">量产</option>
                                                <option value="0">非量产</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                    <div class="layui-row" style=" margin-top: 10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">项目号</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>

                                    <div class="layui-row" style=" margin-top: 10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">事业部</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>-->
                                </div>
                            </div>
                        </div>
                        <div class="layui-tab layui-tab-card">
@@ -239,7 +180,8 @@
        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_HProject(); //获取项目号
            GetGy_Division();//获取事业部
            //查询
            get_FastQuery();
        }
@@ -398,110 +340,88 @@
            var HMaterID = $("#HMaterID").val();
            var HBatchNo = $("#HBatchNo").val();

            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
            var ColContent = $("#ColContent").val();
            var ColName1 = $("#ColName1").val();//复选框
            var Comparator1 = $("#Comparator1").val()
            var ColContent1 = $("#ColContent1").val();
            var ColName2 = $("#ColName2").val();//复选框
            var Comparator2 = $("#Comparator2").val()
            var ColContent2 = $("#ColContent2").val();

            if (ColName != 0 && Comparator != 0) {
                var com = "";
                switch (Comparator) {
                    case "7":
                        com = "like'%" + ColContent + "%'";
                        break;
                    case "8":
                        com = "like'%" + ColContent + "'";
                        break;
                    case "9":
                        com = "like'" + ColContent + "%'";
                        break;
                    case "10":
                        com = "not like'%" + ColContent + "%'";
                        break;
                    default:
                        com = "" + Comparator + "'" + ColContent + "'";
                        break;
                }
                sWhere += " and " + ColName + " " + com;
            }
            if (ColName1 != 0 && Comparator1 != 0) {
                var com1 = "";
                switch (Comparator1) {
                    case "7":
                        com1 = "like'%" + ColContent1 + "%'";
                        break;
                    case "8":
                        com1 = "like'%" + ColContent1 + "'";
                        break;
                    case "9":
                        com1 = "like'" + ColContent1 + "%'";
                        break;
                    case "10":
                        com1 = "not like'%" + ColContent1 + "%'";
                        break;
                    default:
                        com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                        break;
                }
                sWhere += " and " + ColName1 + " " + com1;
            }
            if (ColName2 != 0 && Comparator2 != 0) {
                var com2 = "";
                switch (Comparator2) {
                    case "7":
                        com2 = "like'%" + ColContent2 + "%'";
                        break;
                    case "8":
                        com2 = "like'%" + ColContent2 + "'";
                        break;
                    case "9":
                        com2 = "like'" + ColContent2 + "%'";
                        break;
                    case "10":
                        com2 = "not like'%" + ColContent2 + "%'";
                        break;
                    default:
                        com2 = "" + Comparator2 + "'" + ColContent2 + "'";
                        break;
                }
                sWhere += " and " + ColName2 + " " + com2;
            }


            var HProject = $("#HProject").val();//项目号
            var HBatchWork = $("#HBatchWork").val();//是否量产
            var HDivisionName = $("#HDivisionName").val();//事业部
        
            sWhere = {
                HBeginDate: HBeginDate
                ,HEndDate: HEndDate
                , HMaterID: HMaterID
                , HBatchNo: HBatchNo
                , HProject: HProject
                , HBatchWork: HBatchWork
                , HDivisionName: HDivisionName
            }
            //set_InitGrid();
            get_Display(JSON.stringify(sWhere));
            sWhere = "";//调用接口后清空sWhere缓存
        }

        function set_ClearQuery() {
            $("#HICMOBillNo").val("");
            $("#HBardCode").val("");
            $("#HProcExchBillNo").val("");
            $("#ColContent1").val("");
            $("#ColName1").val("0");
            $("#Comparator1").val("0");
            $("#ColContent2").val("");
            $("#ColName2").val("0");
            $("#Comparator2").val("0");
            $("#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"));
            $("#HMaterID").val("0");
            $("#HBatchNo").val("");
            $("#HProject").val("");
            $("#HBatchWork").val("");
            $("#HDivisionName").val("");
            form.render('select');

            sWhere = "";
        }


        //#region èŽ·å–项目号
        function Get_HProject() {
            //获取项目号
            var HProjectList = '<option value="" style="color:red;" selected></option>';
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Gy_Material/Get_HProject",
                async: false,
                data: { "HOrgID": sessionStorage["OrganizationID"] },
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            HProjectList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                        }
                        $("#HProject").append(HProjectList);
                        form.render('select');

                    }
                    layer.closeAll("loading");
                }
            })
        }
        //#endregion

        //#region èŽ·å–事业部
        function GetGy_Division() {
            //获取事业部
            var HDivisionList = '<option value="" style="color:red;" selected></option>';
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
                async: false,
                data: { "HOrgID": sessionStorage["OrganizationID"] },
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            HDivisionList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                        }
                        $("#HDivisionName").append(HDivisionList);
                        form.render('select');

                    }
                    layer.closeAll("loading");
                }
            })
        }
        //#endregion


        //隐藏列设置
        function get_HideColumn() {
            var colName = "";

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_SkillExamMonthSumReport.html

@@ -51,7 +51,32 @@
                                        </button>
                                    </div>
                                </div>
                              
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">是否量产</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
                                            <option value="">请选择</option>
                                            <option value="1">量产</option>
                                            <option value="0">非量产</option>
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">项目号</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">事业部</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
                                            <!--动态渲染组织-->
                                        </select>
                                    </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>
@@ -124,6 +149,8 @@
                //set_StockOrg();
                //初始化表单时间
                set_InitDate();
                Get_HProject(); //获取项目号
                GetGy_Division();//获取事业部
                //初始化表格
                set_InitGrid();

@@ -449,8 +476,23 @@

            //快速查询
            function get_FastQuery() {
                sDate = $("#HDate").val();                  //日期
                get_Display(sWhere);
                 //文本框为空时，清空对应ID
                if ($("#HDeptName").val() == '') {
                    $("#HDeptID").val("0");
                }
                var HDeptID = $("#HDeptID").val()
                var HYear = $("#HDate").val(); //日期
                var HProject = $("#HProject").val();//项目号
                var HBatchWork = $("#HBatchWork").val();//是否量产
                var HDivisionName = $("#HDivisionName").val();//事业部
                sWhere = {
                    HYear: HYear
                    ,HDeptID: HDeptID
                    , HProject: HProject
                    , HBatchWork: HBatchWork
                    , HDivisionName: HDivisionName
                }
                get_Display(JSON.stringify(sWhere));
                //加载柱状图
                set_Graphics();
            }
@@ -459,19 +501,12 @@

            //#region åˆ—表刷新
            function get_Display(sWhere) {
                var HDate = sDate;          //日期
                //文本框为空时，清空对应ID
                if ($("#HDeptName").val() == '') {
                    $("#HDeptID").val("0");
                }
                var HDeptID = $("#HDeptID").val()

                var ajaxLoad = layer.load();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/QC_QualityReportsController/GetQC_SkillExamMonthSumReport_Json',
                    async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                    data: { "HYear": HDate, "HDeptID": HDeptID },
                    data: { "sWhere": sWhere},
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
@@ -806,6 +841,56 @@
            ////#endregion
            //#endregion

            //#region èŽ·å–项目号
            function Get_HProject() {
                //获取项目号
                var HProjectList = '<option value="" style="color:red;" selected></option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Gy_Material/Get_HProject",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HProjectList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                            }
                            $("#HProject").append(HProjectList);
                            form.render('select');

                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#endregion

            //#region èŽ·å–事业部
            function GetGy_Division() {
                //获取事业部
                var HDivisionList = '<option value="" style="color:red;" selected></option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HDivisionList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                            }
                            $("#HDivisionName").append(HDivisionList);
                            form.render('select');

                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#endregion

        });

        //#endregion

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/Sc_StationOutBil_HProc.html

@@ -61,6 +61,14 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">项目号</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">事业部</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
@@ -69,24 +77,46 @@
                                    </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="HMaterName" id="HMaterName">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">工序名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" value="" style="background-color: #efefef4d; width: 65%; display: inline-block;" readonly>
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    <label class="layui-form-label" style="width: 85px;">是否量产</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
                                            <option value="">请选择</option>
                                            <option value="1">量产</option>
                                            <option value="0">非量产</option>
                                        </select>
                                    </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>                                
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">部门</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HDeptName" id="HDeptName" lay-verify="HDeptName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                            <input type="hidden" class="layui-input" name="HDeptID" lay-verify="HDeptID" id="HDeptID" value="0">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHDept" style="width:20px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                            </button>
                                        </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="HMaterName" id="HMaterName">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">工序名称</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" value="" style="background-color: #efefef4d; width: 65%; display: inline-block;" readonly>
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                            </button>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <div>
@@ -176,6 +206,38 @@
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //#region é€‰æ‹©éƒ¨é—¨æŒ‰é’®
            form.on('submit(btnHDept)', function () {
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim"   //加上边框
                    , title: "部门列表"         //标题
                    , closeBtn: 1               //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2                  //弹出动画
                    , area: ["90%", "90%"]      //窗体大小
                    , maxmin: true              //设置最大最小按钮是否显示
                    , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html', 'yes']
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //按钮一  çš„回调
                        var iframeWindow = window["layui-layer-iframe" + index];                //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");    //获取选中的数据

                        if (checkStatus.data.length != 1) {
                            return layer.msg("请选择一条数据");
                        }
                        $("#HDeptName").val(checkStatus.data[0].部门名称);
                        $("#HDeptID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //关闭弹窗  å®ƒèŽ·å–的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function () {
                        //刷新列表
                        get_FastQuery();
                    }
                })
            });
            //#endregion
            //#endregion

            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
@@ -203,6 +265,7 @@
            // åˆå§‹åŒ–界面
            function set_ClearBill() {
                Year(); //初始化年
                Get_HProject(); //获取项目号
                GetGy_Division();//获取事业部
                set_InitGrid(); //初始化表格
                get_FastQuery();
@@ -261,6 +324,31 @@
                })
            }
            //#endregion

            //#region èŽ·å–项目号
            function Get_HProject() {
                //获取项目号
                var HProjectList = '<option value="" style="color:red;" selected></option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Gy_Material/Get_HProject",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HProjectList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                            }
                            $("#HProject").append(HProjectList);
                            form.render('select');

                        }
                        layer.closeAll("loading");
                    }
                })
            }
        //#endregion

            //查询
            function get_Display(sWhere) {
@@ -342,16 +430,23 @@
            function get_FastQuery() {
                var HYear = $("#HYear").val();
                var HMonth = $("#HMonth").val();
                var HProject = $("#HProject").val();//项目号
                var HBatchWork = $("#HBatchWork").val();//是否量产
                var HDivisionName = $("#HDivisionName").val();//事业部
                var HProcName = $("#HProcName").val();
                var HMaterName = $("#HMaterName").val();             
                             
                var HMaterName = $("#HMaterName").val();
                var HDeptID = $("#HDeptID").val();
              

                sWhere = {
                    HYear: HYear
                    , HMonth: HMonth
                    , HDivisionName: HDivisionName
                    , HProcName: HProcName
                    , HMaterName: HMaterName
                    , HProject: HProject
                    , HBatchWork: HBatchWork
                    , HDeptID: HDeptID
                }
                get_Display(JSON.stringify(sWhere));
                //加载柱状图
@@ -367,7 +462,8 @@
                $("#HProcName").val("");
                $("#HMaterName").val("");
                $("#HDivisionName").val("");
                $("#btnSearch").click();               
                $("#HProject").val("");
                $("#HBatchWork").val("");            
                form.render('select');

                sWhere = "";
@@ -427,6 +523,7 @@
                var HBadCount = [];//不良数量
                var HBackWorkQty = [];//返工数
                var FistPass = [];//一次合格
                var HProcTarGetVal = [];//各工序目标值
                var Pass = [];//合格
                var HTitle = "各工序趋势图";//图形标题
                if (option.data.length > 0) {                 
@@ -442,7 +539,7 @@
                        HBackWorkQty.push(option.data[i].返工数);
                        FistPass.push((option.data[i].一次合格率 == null ? '0.00%' : option.data[i].一次合格率 ).replace('%', ''));
                        Pass.push((option.data[i].合格率 == null ? '0.00%' : option.data[i].合格率).replace('%', ''))

                        HProcTarGetVal.push(option.data[i].各工序目标值);
                    }
                }
                option_ZZT = {
@@ -472,7 +569,7 @@

                    },
                    legend: {
                        data: ['生产总数', '良品数', '不良数','返工数','一次合格率','合格率'],
                        data: ['生产总数', '良品数', '不良数', '返工数', '一次合格率', '合格率','各工序目标值'],
                        top: 'bottom',  // å°†å›¾ä¾‹æ”¾ç½®åœ¨å›¾è¡¨çš„下方
                        left: 'center'  // æˆ–者 'right'，根据需要调整水平位置
                    },                   
@@ -641,6 +738,19 @@
                            lineStyle: {
                                color: '#1E90FF' // è®¾ç½®æŠ˜çº¿å›¾è“è‰²
                            }
                        },
                        {
                            name: '各工序目标值',
                            type: 'line',
                            yAxisIndex: 1, // ä½¿ç”¨ç¬¬äºŒä¸ª yAxis æ˜¾ç¤ºç™¾åˆ†æ¯”
                            data: HProcTarGetVal,
                            label: {
                                show: true,
                                formatter: '{c}%'
                            },
                            lineStyle: {
                                color: '#FF0000' // è®¾ç½®æŠ˜çº¿å›¾è“è‰²
                            }
                        }
                    ]
                };

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿Ô¶ÈÄ¿±êµ¥/QC_MonthTarGetBill.html

@@ -92,19 +92,19 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label" style="">制程陷阱目标值<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HProcTrapTarGetVal" id="HProcTrapTarGetVal" autocomplete="off" value="0" >
                                                <input class="layui-input" name="HProcTrapTarGetVal" id="HProcTrapTarGetVal" autocomplete="off" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label" style="">制程绩效目标值<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HProcKPITarGetVal" id="HProcKPITarGetVal" autocomplete="off" value="0" >
                                                <input class="layui-input" name="HProcKPITarGetVal" id="HProcKPITarGetVal" autocomplete="off" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label" style="">制程质量门逃逸上限值<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HProcOmitTarGetVal" id="HProcOmitTarGetVal" autocomplete="off" value="0" >
                                                <input class="layui-input" name="HProcOmitTarGetVal" id="HProcOmitTarGetVal" autocomplete="off" value="0">
                                            </div>
                                        </div>
                                    </div>
@@ -115,6 +115,14 @@
                                                <input class="layui-input" name="HProcPPMTarGetVal" id="HProcPPMTarGetVal" autocomplete="off" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label" style="">各工序目标值<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HProcTarGetVal" id="HProcTarGetVal" autocomplete="off" value="0">
                                            </div>
                                        </div>                                  
                                    </div>
                                    <div class="layui-row">                                       
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">å¹´</label>
                                            <div class="layui-input-inline">
@@ -560,6 +568,7 @@
                            , "HProcKPITarGetVal": tableMain["制程绩效目标值"]
                            , "HProcOmitTarGetVal": tableMain["制程质量门逃逸上限值"]
                            , "HProcPPMTarGetVal": tableMain["PPM目标值"]
                            , "HProcTarGetVal": tableMain["各工序目标值"]
                            , "HDeptName": tableMain["部门名称"]// è®¾ç½®â€œéƒ¨é—¨â€åç§°å­—段的值。
                        });
                        //组织的值HOrgID变化，重新渲染

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

@@ -526,7 +526,7 @@
                                        <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="" id="">
                                                <input type="text" class="layui-input" value="0" name="HBadCount" id="HBadCount">
                                            </div>
                                        </div>
                                      
@@ -903,6 +903,7 @@
                                "HProcNo": data.HProcNo,
                                "HQty": data.HQty,
                                "HWasterQty": data.HWasterQty,
                                "HBadCount": data.HBadCount,
                                "HWorkTimes": data.HWorkTimes,
                                "HGroupID": data.HGroupID,
                                "HGroupName": data.HGroupName,