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

yangle

2024-10-30 d3e287b7a9796bea00381fe7170f562083bd24c5

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

 WebTM/WebTM.csproj.user

@@ -12,5 +12,29 @@
    <IISExpressUseClassicPipelineMode />
    <UseGlobalApplicationHostFile />
  </PropertyGroup>
  <ProjectExtensions />
  <ProjectExtensions>
    <VisualStudio>
      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
        <WebProjectProperties>
          <StartPageUrl>
          </StartPageUrl>
          <StartAction>CurrentPage</StartAction>
          <AspNetDebugging>True</AspNetDebugging>
          <SilverlightDebugging>False</SilverlightDebugging>
          <NativeDebugging>False</NativeDebugging>
          <SQLDebugging>False</SQLDebugging>
          <ExternalProgram>
          </ExternalProgram>
          <StartExternalURL>
          </StartExternalURL>
          <StartCmdLineArguments>
          </StartCmdLineArguments>
          <StartWorkingDirectory>
          </StartWorkingDirectory>
          <EnableENC>True</EnableENC>
          <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
        </WebProjectProperties>
      </FlavorProperties>
    </VisualStudio>
  </ProjectExtensions>
</Project>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -7,8 +7,8 @@
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    /*var WEBURL = "http://localhost:8082/API/";*/    //杜贺本地配置
    /*var WEBURL = "http://localhost/API/";*/    //潘浙游本地配置  
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
   /* var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置*/
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
    /*var WEBURL = "http://localhost:8082/LuBaoAPI/"; */  //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)

 WebTM/views/IpadIndex.html

@@ -958,7 +958,7 @@
                , shade: 0.6
                , maxmin: false
                , anim: 0
                , content: ['质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=2&linterid=' + HProcExchInterID  + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID, 'yes']
                , content: ['质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=2&linterid=' + HProcExchInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID + '&HSourceEntryID=' + HSourceEntryID+'', 'yes']
                , resize: false
                , cancel: function () {
                }
@@ -981,7 +981,7 @@
                , shade: 0.6
                , maxmin: false
                , anim: 0
                , content: ['质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=2&linterid=' + HProcExchInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID, 'yes']
                , content: ['质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=2&linterid=' + HProcExchInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID+ '&HSourceEntryID=' + HSourceEntryID+'', 'yes']
                , resize: false
                , cancel: function () {


 WebTM/views/¹¤×ʹÜÀí/¸Úλ¼¼ÄÜÇåµ¥/HR_PostSkillBill.html

@@ -315,25 +315,32 @@

            //#region åˆ¤æ–­å¹¶è®¾ç½®æ“ä½œç±»åž‹ã€é¡µé¢åˆå§‹åŒ–
            if (OperationType == null || OperationType == 1) {                            //新增
                ////禁用组织选项
                //$("#HOrgID").attr("disabled", true);
                OperationType = 1;

                OperationType = 1;
                //初始化项目阶段表
                get_InitGrid();

                //生成并设置主表的内码和单据号
                createBillNo();


                //初始化制单人和制单时间
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));

                //初始化日期
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));


            }
            else if (OperationType == 2) {//如果修改则走下面 new                                        //编辑
              
                //初始化项目阶段表
                get_InitGrid();
                RoadBillMain(linterid);
                //生成并设置主表的内码和单据号
                createBillNo();
                //初始化制单人和制单时间
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化日期
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                OperationType = 1;
            }
            else if (OperationType == 3) {//如果修改则走下面 new                                        //编辑
                ////禁用组织选项
@@ -824,9 +831,9 @@

                        //主表 èµ‹å€¼
                        form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                            "HInterID": data[0]["hmainid"]
                            , "HBillNo": data[0]["单据号"]
                            , "HDate": formatDate(data[0]["日期"])
                            "HInterID": OperationType == 2 ? "" :data[0]["hmainid"]
                            , "HBillNo": OperationType == 2 ? "" :data[0]["单据号"]
                            , "HDate": OperationType == 2 ? "" :formatDate(data[0]["日期"])
                            , "HDeptID": data[0]["HDeptID"]
                            , "HDeptName": data[0]["部门名称"]
                            , "HPostID": data[0]["HPostID"]

 WebTM/views/¹¤×ʹÜÀí/¸Úλ¼¼ÄÜÇåµ¥/HR_PostSkillBillList.html

@@ -146,6 +146,7 @@
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>复制</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
@@ -225,6 +226,9 @@
                        break;
                    //编辑
                    case 'set_ShowBill': set_ShowBill();
                        break;
                    //复制
                    case 'set_Copy': set_Copy();
                        break;
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
@@ -574,6 +578,27 @@
            }
            //#endregion

            //复制
            function set_Copy() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '新增' + HPageTitle
                        , shift: 0//弹出动画
                        , content: '../../工资管理/岗位技能清单/HR_PostSkillBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
                        , end: function () {
                            //刷新页面,
                            location.reload();
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }

            //#region åˆ é™¤
            function set_DeleteBill() {

 WebTM/views/¹¤×ʹÜÀí/¹¤×ʽáËãµ¥(¸öÈË)/Pay_SingleBalBillList.html

@@ -1135,29 +1135,8 @@

                            columns = col;
                            option.cols = [col];
                            //option.data = data1.data;
                            //设置列表同一个单据只有第一条数据显示主表信息，其它记录只显示子表信息
                            //获取子表列数据
                            var colList = [];
                            for (var i = 0; i < option.cols[0].length; i++) {
                                colList.push(option.cols[0][i].field);
                            }
                            //设置数据
                            var result = data1.data;
                            var temp = "";
                            for (var i = 0; i < result.length; i++) {
                                if (temp != result[i]["单据号"]) {
                                    temp = result[i]["单据号"];
                                } else {
                                    var initIndex = $.inArray("单据号", colList);
                                    var lastIndex = $.inArray("hsubid", colList);
                                    for (var j = initIndex; j < lastIndex; j++) {
                                        var fieldName = colList[j];
                                        result[i][fieldName] = "";
                                    }
                                }
                            }
                            option.data = result;
                            option.data = data1.data;
                            
                            option.totalRow = true;
                            laypage.render(optionPage);
                            //刷新表格数据

 WebTM/views/¹¤×ʹÜÀí/¹¤×ʽáËãµ¥(¼¯Ìå)/Pay_GroupBalBillList.html

@@ -1150,29 +1150,8 @@

                            columns = col;
                            option.cols = [col];
                            //option.data = data1.data;
                            //设置列表同一个单据只有第一条数据显示主表信息，其它记录只显示子表信息
                            //获取子表列数据
                            var colList = [];
                            for (var i = 0; i < option.cols[0].length; i++) {
                                colList.push(option.cols[0][i].field);
                            }
                            //设置数据
                            var result = data1.data;
                            var temp = "";
                            for (var i = 0; i < result.length; i++) {
                                if (temp != result[i]["单据号"]) {
                                    temp = result[i]["单据号"];
                                } else {
                                    var initIndex = $.inArray("单据号", colList);
                                    var lastIndex = $.inArray("hsubid", colList);
                                    for (var j = initIndex; j < lastIndex; j++) {
                                        var fieldName = colList[j];
                                        result[i][fieldName] = "";
                                    }
                                }
                            }
                            option.data = result;
                            option.data = data1.data;
                            
                            option.totalRow = true;
                            laypage.render(optionPage);
                            //刷新表格数据

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

@@ -312,8 +312,11 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">指派处理人:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HHandleEmpName" id="HHandleEmpName" class="layui-input" value="" style="float:left;" disabled>
                                                            <input type="hidden" name="HHandleEmpID" id="HHandleEmpID" class="layui-input" value="0" style="float:left;">
                                                            <input type="text" name="HHandleEmpName" id="HHandleEmpName" class="layui-input" value="" style="float:left;width:150px;" disabled>
                                                            <input type="hidden" name="HHandleEmpID" id="HHandleEmpID" class="layui-input" value="0" style="float:left;width:150px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HHandleEmpList" id="HHandleEmpList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                            </button>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
@@ -728,8 +731,56 @@
                        $("#HHandleEmpName").val("孙文静");  //指派处理人
                        $("#HHandleEmpID").val(162622);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "环境原因") {
                        $("#HHandleEmpName").val("孙文静");  //指派处理人
                        $("#HHandleEmpID").val(162622);        //指派处理人
                        //$("#HHandleEmpName").val("孙文静");  //指派处理人
                        //$("#HHandleEmpID").val(162622);        //指派处理人
                    }
                }
                else if (sessionStorage["HDept"] == "生产部1-铁芯") {
                    if ($("#HErrMsgBackTypeName").val() == "人员原因") {
                        $("#HHandleEmpName").val("程帆");  //指派处理人
                        $("#HHandleEmpID").val(161720);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "设备原因") {
                        $("#HHandleEmpName").val("徐建洪");  //指派处理人
                        $("#HHandleEmpID").val(162576);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "材料原因") {
                        $("#HHandleEmpName").val("程帆");  //指派处理人
                        $("#HHandleEmpID").val(161720);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "工艺原因") {
                        $("#HHandleEmpName").val("王强");  //指派处理人
                        $("#HHandleEmpID").val(163378);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "模具原因") {
                        //$("#HHandleEmpName").val("吴斌");  //指派处理人
                        //$("#HHandleEmpID").val(162686);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "测试原因") {
                        $("#HHandleEmpName").val("张建鹏");  //指派处理人
                        $("#HHandleEmpID").val(162525);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "环境原因") {
                        $("#HHandleEmpName").val("吕双棋");  //指派处理人
                        $("#HHandleEmpID").val(162526);        //指派处理人
                    }
                }
                else if (sessionStorage["HDept"] == "生产部1-组装") {
                    if ($("#HErrMsgBackTypeName").val() == "人员原因") {
                        $("#HHandleEmpName").val("程帆");  //指派处理人
                        $("#HHandleEmpID").val(161720);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "设备原因") {
                        $("#HHandleEmpName").val("曾东鑫");  //指派处理人
                        $("#HHandleEmpID").val(162573);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "材料原因") {
                        $("#HHandleEmpName").val("程帆");  //指派处理人
                        $("#HHandleEmpID").val(161720);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "工艺原因") {
                        $("#HHandleEmpName").val("柯诗文");  //指派处理人
                        $("#HHandleEmpID").val(162661);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "模具原因") {
                        //$("#HHandleEmpName").val("吴斌");  //指派处理人
                        //$("#HHandleEmpID").val(162686);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "测试原因") {
                        $("#HHandleEmpName").val("刘龙飞");  //指派处理人
                        $("#HHandleEmpID").val(163180);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "环境原因") {
                        $("#HHandleEmpName").val("吕双棋");  //指派处理人
                        $("#HHandleEmpID").val(162526);        //指派处理人
                    }
                }
            }
@@ -751,6 +802,7 @@
                                EquipNumber = LoadData[0].设备编码; //产品名称
                            }
                            else {
                                EquipNumber = "";
                                layer.alert(data.Message, { icon: 5 });

                            }
@@ -1085,6 +1137,44 @@
                });
            });

            //指派处理人弹窗
            form.on('submit(HHandleEmpList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '发送人列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HEmp', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HHandleEmpID").val(checkStatus.data[0].HItemID);
                        $("#HHandleEmpName").val(checkStatus.data[0].职员名称);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                        $("#HDescription").val(generateString(Datetime, Person, HSourceName, HICMOBillNo, HType, EquipNumber));
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });

            //接收部门
            form.on('submit(HRecDeptList)', function () {
@@ -1245,6 +1335,9 @@
                        if (DeptName == "生产部3") {
                            $("#HQEMan").val(162622);
                            $("#HQEManName").val("孙文静");
                        } else{
                            $("#HQEMan").val(162525);
                            $("#HQEManName").val("张建鹏");
                        }
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillCheckQuery.html

@@ -883,13 +883,14 @@
            function set_CheckBill_Flow(num, tableName) {
                var checkStatus = table.checkStatus(tableName)
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                if (checkStatus.data.length != 0) {
                    var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//将对象数组id提取去重
                    var queryString = uniqueIds.join(",");//将ids变成数组
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Routing/AuditFlow", //方法所在页面和方法名
                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
                        url: GetWEBURL() + "/Gy_Routing/CheckAllFlow", //方法所在页面和方法名
                        data: { "HInterIDS": queryString, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -916,7 +917,7 @@
                    });
                }
                else {
                    layer.msg('请选择一行数据审核！');
                    layer.msg('请选择至少一行数据审核！');
                }
            }
            //#endregion

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillToInvalidatedList.html

@@ -46,21 +46,20 @@
                                        </button>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:10px;margin-left:5%;">
                                    <!--其他条件-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 76px;">物料名称</label>
                                        <div class="layui-input-block" style="margin-left: 107px;">
                                            <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" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HModel" id="HModel">
                                        </div>
                                <!--其他条件-->
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 76px;">物料名称</label>
                                    <div class="layui-input-block" style="margin-left: 107px;">
                                        <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" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HModel" id="HModel">
                                    </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>
@@ -168,13 +167,13 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>新增子路线</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>新增子路线</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>复制</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>复制</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>审核</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_defaultRoute" id="set_defaultRoute"><i class="layui-icon layui-icon-form"></i>启用默认</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_closeOtherRoute" id="set_closeOtherRoute"><i class="layui-icon layui-icon-form"></i>禁用其它</button>
@@ -185,14 +184,14 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>驳回</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></i>多行下推(定额申请单)</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></i>多行下推(定额申请单)</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>审核</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>反审核</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>-->
                            </div>
                        </script>
                    </form>
@@ -223,7 +222,7 @@
            var option = [];
            var HBillType = 3301;
            var ins;                        //用于导出excel
            var HModName = "Gy_RoutingBillList";
            var HModName = "Gy_RoutingBillToInvalidatedList";
            var titleData = [];//不需要显示的字段 å¯æ‰©å±•
            //获取参数
            function getUrlVars() {
@@ -395,66 +394,18 @@
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-150'
                    , page: false
                    , cols: [[]]
                    , data: [[]]
                    , height: 800
                    , page: true
                    , totalRow: true
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , done: function (res, curr, count) {
                        soulTable.render(this);
                    }
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        /*    { field: 'hmainid', title: 'hmainid', width: 110 }*/
                        , { field: '单据号', title: '单据号', sort: true, width: 165 }
                        , { field: '工艺名称', title: '工艺名称', width: 170, sort: true }
                        , { field: '物料代码', title: '物料代码', width: 160, sort: true }
                        , { field: '物料名称', title: '物料名称', width: 160, sort: true }
                        , { field: '规格型号', title: '规格型号', width: 160, sort: true }
                        , { field: '计量单位代码', title: '计量单位代码', width: 115, sort: true }
                        , { field: '计量单位', title: '计量单位', sort: true }
                        , { field: '表头备注', title: '表头备注', sort: true }
                        , { field: '工序号', title: '工序号', sort: true }
                        , { field: '工序代码', title: '工序代码', sort: true }
                        , { field: '工序', title: '工序', sort: true }
                        , { field: '工作中心代码', title: '工作中心代码', width: 115, sort: true }
                        , { field: '工作中心名称', title: '工作中心名称', width: 115, sort: true }
                        , { field: '制单人', title: '制单人', sort: true }
                        , { field: '制单日期', title: '制单日期', width: 195, sort: true }
                        , { field: '审核人', title: '审核人', sort: true }
                        , { field: '审核日期', title: '审核日期', width: 180, sort: true }
                        , { field: '修改人', title: '修改人', sort: true }
                        , { field: '修改日期', title: '修改日期', width: 180, sort: true }
                        , { field: '默认工艺', title: '默认工艺', sort: true }
                        //, { field: '单据类型', title: '单据类型' }
                        ////, { field: 'hmaterid', title: 'hmaterid', width: 165 }
                        //, { field: '组织', title: '组织' }
                        ////, { field: 'hsubid', title: 'hsubid', width: 80 }
                        //, { field: '委外标记', title: '委外标记' }
                        ////, { field: 'hprocid', title: 'hprocid', width: 105 }
                        ////, { field: 'HSupID', title: 'HSupID', width: 105 }
                        //, { field: '供应商代码', title: '供应商代码' }
                        //, { field: '供应商', title: '供应商' }
                        ////, { field: 'HCenterID', title: 'HCenterID', width: 105 }
                        //, { field: '时间单位', title: '时间单位' }
                        //, { field: '运行时间', title: '运行时间' }
                        //, { field: '加工数量', title: '加工数量' }
                        //, { field: '准备时间', title: '准备时间' }
                        //, { field: '排队时间', title: '排队时间' }
                        //, { field: '转移时间', title: '转移时间' }
                        //, { field: '良率', title: '良率' }
                        //, { field: '累计良率', title: '累计良率' }
                        //, { field: '表体备注', title: '表体备注' }
                        //, { field: '作废人', title: '作废人' }
                        //, { field: '作废日期', title: '作废日期' }
                        ////, { field: 'HDayWorkQty', title: 'HDayWorkQty', width: 105 }
                        ////, { field: 'HGroupID', title: 'HGroupID', width: 105 }
                        ////, { field: 'HWorkerID', title: 'HWorkerID', width: 105 }
                        ////, { field: 'HSourceID', title: 'HSourceID', width: 105 }
                        //, { field: '加工单价', title: '加工单价' }
                        ////, { field: 'HNextProcFlag', title: 'HNextProcFlag', width: 105 }
                        //, { field: '下道流转工序', title: '下道流转工序', width: 150 }
                        //, { field: '流转工序', title: '流转工序' }
                    ]]
                };
                }
                
            }
            //#region æŽ’序后选择
@@ -611,23 +562,8 @@
                                    }
                                }
                            }
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 800
                                , page: true
                                , totalRow: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                                , done: function (res, curr, count) {
                                    soulTable.render(this);
                                }
                            }

                            option.cols=[col];
                            option.data = data1.data;
                            //设置列表同一个单据只有第一条数据显示主表信息，其它记录只显示子表信息
                            //获取子表列数据
                            var colList = [];
@@ -970,7 +906,7 @@
            //#region åˆ·æ–°
            function get_Refresh() {
                set_ClearQuery();
                get_DisplayPage(sWhere);
                get_FastQuery();
            }

            //启用默认

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

@@ -717,6 +717,7 @@
                var linterid = params[params[1]];//源单id
                var HSouceBillType = params[params[2]];//源单类型
                var HICMOEntryID = params[params[3]];//源单子id
                var HEntryID = params[params[4]];//源单子id
            }
            /*固定代码，每张单据都要begin*/
            //////测试用数据
@@ -857,7 +858,7 @@
                $.ajax({
                    url: GetWEBURL() + '/QC_PatrolProcCheckOtherBill/get_ProcessExchangeBill',
                    type: "GET",
                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
                    data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
                        if (result.count == 1) {
@@ -2193,6 +2194,7 @@

            //表头信息检验方案弹窗
            form.on('submit(btnSearchQCScheme)', function () {
                var HName = $("#HMaterName").val();
                //页面层-自定义
                layer.open({
                    type: 2,
@@ -2202,7 +2204,7 @@
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../质量管理/检验方案单/QC_CheckProjectList.html', 'yes'],
                    content: ['../../质量管理/检验方案单/QC_CheckProjectList.html?OperationType=1&HName=' + HName + '', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {


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

@@ -761,6 +761,7 @@
                var linterid = params[params[1]];//源单id
                var HSouceBillType = params[params[2]];//源单类型
                var HICMOEntryID = params[params[3]];//源单子id
                var HEntryID = params[params[4]];//源单子id
            }
            /*固定代码，每张单据都要begin*/

@@ -829,7 +830,7 @@
                        //根据源单id获取源单信息
                        LoadingInformation_StationOutBill();
                    }
                    //工序流转卡列表首检
                    //工序流转卡列表工序检
                    else if (HSouceBillType == 3772) {
                        //根据源单id获取源单信息
                        LoadingInformation_ProcExchange();
@@ -940,7 +941,7 @@
                $.ajax({
                    url: GetWEBURL() + '/CheckBill/get_ProcessExchangeBill',
                    type: "GET",
                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
                    data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
                        if (result.count == 1) {
@@ -1557,6 +1558,7 @@

            //表头信息检验方案弹窗
            form.on('submit(btnSearchQCScheme)', function () {
                var HName = $("#HMaterName").val();
                //页面层-自定义
                layer.open({
                    type: 2,
@@ -1566,7 +1568,7 @@
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../质量管理/检验方案单/QC_CheckProjectList.html', 'yes'],
                    content: ['../../质量管理/检验方案单/QC_CheckProjectList.html?OperationType=1&HName=' + HName +'', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {


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

@@ -90,7 +90,10 @@
        //获取页面跳转参数  //单据编辑状态： 1.无源单新增  Â 2.有源单新增  Â 3.编辑  4.浏览  5.变更
        var params = get_UrlVars();
        if (typeof (params[params[0]]) == "undefined") {
            var OperationType = 1;//操作类型
            var OperationType = 1;//操作类型          
        } else {
            var OperationType = params[params[0]];//操作类型
            var HName = decodeURI(params[params[1]]);//物料名称
        }
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
@@ -214,7 +217,13 @@
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
                if (HName=="") {
                    get_Display(sWhere);
                } else {
                    sWhere += " and ç‰©æ–™åç§° = '" + HName + "'";
                    get_Display(sWhere);
                }
                
            }

            //初始化网格

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

@@ -131,6 +131,7 @@
                        </div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></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>
                        </script>
@@ -160,6 +161,7 @@
            , soulTable = layui.soulTable
        var sWhere = "";
        var option = [];
        var ins;                //用于导出excel
        var HModName = "QC_BadProductsReport";
        var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//子表不需要显示的字段 å¯æ‰©å±•

@@ -181,6 +183,9 @@
            switch (obj.event) {
                //列设置
                case 'set_HideColumn': get_HideColumn();
                    break;
                //导出按钮
                case 'btn_Export': btn_Export();
                    break;
            };
        });
@@ -321,7 +326,7 @@
                            }
                        }
                        table.render(option);

                        ins = table.render(option);
                        //刷新表格数据
                        DisPlay_HideColumn();

@@ -503,6 +508,13 @@
        });


        //#region å¯¼å‡ºExecel
        function btn_Export() {
            table.exportFile(ins.config.id, option.data, "xls");
        }
        //#endregion


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

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

@@ -102,6 +102,7 @@
                        </div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></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>
                        </script>
@@ -131,6 +132,7 @@
            , soulTable = layui.soulTable
        var sWhere = "";
        var option = [];
        var ins;                //用于导出excel
        var HModName = "QC_ErrManagerLedgerReport";
        var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//子表不需要显示的字段 å¯æ‰©å±•

@@ -152,6 +154,9 @@
            switch (obj.event) {
                //列设置
                case 'set_HideColumn': get_HideColumn();
                    break;
                //导出按钮
                case 'btn_Export': btn_Export();
                    break;
            };
        });
@@ -317,6 +322,7 @@
                            }
                        }
                        table.render(option);
                        ins = table.render(option);

                        //刷新表格数据
                        DisPlay_HideColumn();
@@ -426,6 +432,12 @@
        }
        //#endregion

        //#region å¯¼å‡ºExecel
        function btn_Export() {
            table.exportFile(ins.config.id, option.data, "xls");
        }
        //#endregion

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

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

@@ -102,6 +102,7 @@
                        </div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                            </div>
@@ -133,6 +134,7 @@
            //查询条件
            var sWhere = "";
            var option = [];
            var ins;                //用于导出excel
            var HModName = "QC_ErrManagerLedgerReport_EquipTop3Issue";
            var HEquipIssue = []; //设备问题
            //#endregion
@@ -386,6 +388,9 @@
                    case 'HideColumn':
                        get_HideColumn();
                        break;
                    //导出按钮
                    case 'btn_Export': btn_Export();
                        break;
                };
            });
            //重置按钮
@@ -504,6 +509,7 @@
                            option.data = data1.data;

                            table.render(option);
                            ins = table.render(option);
                            layer.close(wait);
                        } else {
                            layer.close(wait);
@@ -598,6 +604,12 @@
            }
            //#endregion

            //#region å¯¼å‡ºExecel
            function btn_Export() {
                table.exportFile(ins.config.id, option.data, "xls");
            }
            //#endregion

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

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

@@ -102,6 +102,7 @@
                        </div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                            </div>
@@ -133,6 +134,7 @@
            //查询条件
            var sWhere = "";
            var option = [];
            var ins;                //用于导出excel
            var HModName = "QC_ErrManagerLedgerReport_Issue";
            var HIssueType = []; //问题类型
            //#endregion
@@ -386,6 +388,9 @@
                    case 'HideColumn':
                        get_HideColumn();
                        break;
                    //导出按钮
                    case 'btn_Export': btn_Export();
                        break;
                };
            });
            //重置按钮
@@ -504,6 +509,7 @@
                            option.data = data1.data;

                            table.render(option);
                            ins = table.render(option);
                            layer.close(wait);
                        } else {
                            layer.close(wait);
@@ -601,6 +607,12 @@
            }
            //#endregion

            //#region å¯¼å‡ºExecel
            function btn_Export() {
                table.exportFile(ins.config.id, option.data, "xls");
            }
            //#endregion

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

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

@@ -102,6 +102,7 @@
                        </div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                            </div>
@@ -133,6 +134,7 @@
            //查询条件
            var sWhere = "";
            var option = [];
            var ins;                //用于导出excel
            var HModName = "QC_ErrManagerLedgerReport_Source";
            var HSourceName = []; //生产资源名称
            //#endregion
@@ -386,6 +388,9 @@
                    case 'HideColumn':
                        get_HideColumn();
                        break;
                    //导出按钮
                    case 'btn_Export': btn_Export();
                        break;
                };
            });
            //重置按钮
@@ -504,6 +509,7 @@
                            option.data = data1.data;

                            table.render(option);
                            ins = table.render(option);
                            layer.close(wait);
                        } else {
                            layer.close(wait);
@@ -599,7 +605,14 @@
                    }
                })
            }
        //#endregion
            //#endregion

            //#region å¯¼å‡ºExecel
            function btn_Export() {
                table.exportFile(ins.config.id, option.data, "xls");
            }
            //#endregion


            //隐藏列设置
            function get_HideColumn() {

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

@@ -102,6 +102,7 @@
                        </div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                            </div>
@@ -133,6 +134,7 @@
            //查询条件
            var sWhere = "";
            var option = [];
            var ins;                //用于导出excel
            var HModName = "QC_ErrManagerLedgerReport_SourceOfTheProblem";
            var HSourceOfTheProblem = []; //异常问题来源
            //#endregion
@@ -386,6 +388,9 @@
                    case 'HideColumn':
                        get_HideColumn();
                        break;
                    //导出按钮
                    case 'btn_Export': btn_Export();
                        break;
                };
            });
            //重置按钮
@@ -504,6 +509,7 @@
                            option.data = data1.data;

                            table.render(option);
                            ins = table.render(option);
                            layer.close(wait);
                        } else {
                            layer.close(wait);
@@ -601,6 +607,13 @@
            }
            //#endregion

            //#region å¯¼å‡ºExecel
            function btn_Export() {
                table.exportFile(ins.config.id, option.data, "xls");
            }
            //#endregion


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

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

@@ -215,6 +215,7 @@
                        </div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                            </div>
@@ -246,6 +247,7 @@
            //查询条件
            var sWhere = "";
            var option = [];
            var ins;                //用于导出excel
            var HModName = "QC_InspectionFormReport";
            var optionAVG = [];
            var optionS = [];
@@ -272,6 +274,9 @@
                    //隐藏列设置
                    case 'HideColumn':
                        get_HideColumn();
                        break;
                    //导出按钮
                    case 'btn_Export': btn_Export();
                        break;
                };
            });
@@ -441,6 +446,7 @@
                                optionAVG[0] = data1.data[limit + 1];
                                optionS[0] = data1.data[limit + 2];
                                table.render(option);
                                ins = table.render(option);
                                set_PPK();
                                set_CPK();
                                set_Line();
@@ -702,6 +708,12 @@
                return sum;
            }

            //#region å¯¼å‡ºExecel
            function btn_Export() {
                table.exportFile(ins.config.id, option.data, "xls");
            }
            //#endregion

            //折线图
            function set_Line() {
                //#region【折线图】

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

@@ -106,6 +106,7 @@
                        </div>
                        <script type="text/html" id="toolbarDemo1">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></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>
                        </script>
@@ -135,6 +136,7 @@
            , soulTable = layui.soulTable
        var sWhere = "";
        var option = [];
        var ins;                //用于导出excel
        var HModName = "QC_MoistureContentDataLedger";
        var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//子表不需要显示的字段 å¯æ‰©å±•

@@ -156,6 +158,9 @@
            switch (obj.event) {
                //列设置
                case 'set_HideColumn': get_HideColumn();
                    break;
                //导出按钮
                case 'btn_Export': btn_Export();
                    break;
            };
        });
@@ -302,7 +307,7 @@
                        }

                        table.render(option);

                        ins = table.render(option);
                        //刷新表格数据
                        DisPlay_HideColumn();
                        layer.close(ajaxLoad);
@@ -404,6 +409,11 @@
        }
        //#endregion

        //#region å¯¼å‡ºExecel
        function btn_Export() {
            table.exportFile(ins.config.id, option.data, "xls");
        }
        //#endregion

        //隐藏列设置
        function get_HideColumn() {

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

@@ -97,6 +97,7 @@
                        </div>
                        <script type="text/html" id="toolbarDemo1">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></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>
                        </script>
@@ -126,6 +127,7 @@
            , soulTable = layui.soulTable
        var sWhere = "";
        var option = [];
        var ins;                //用于导出excel
        var HModName = "QC_PerformanceScrapLedger";
        var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//子表不需要显示的字段 å¯æ‰©å±•

@@ -147,6 +149,9 @@
            switch (obj.event) {
                //列设置
                case 'set_HideColumn': get_HideColumn();
                    break;
                //导出按钮
                case 'btn_Export': btn_Export();
                    break;
            };
        });
@@ -301,13 +306,9 @@
                        }

                        table.render(option);

                        ins = table.render(option);
                        //刷新表格数据
                        DisPlay_HideColumn();

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

                        layer.close(ajaxLoad);
                    } else {
@@ -407,6 +408,11 @@
        }
        //#endregion

        //#region å¯¼å‡ºExecel
        function btn_Export() {
            table.exportFile(ins.config.id, option.data, "xls");
        }
        //#endregion

        //隐藏列设置
        function get_HideColumn() {

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

@@ -138,6 +138,7 @@
                        </div>
                        <script type="text/html" id="toolbarDemo1">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></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>
                        </script>
@@ -167,6 +168,7 @@
            , soulTable = layui.soulTable
        var sWhere = "";
        var option = [];
        var ins;                //用于导出excel
        var HModName = "QC_QualityStatisticsDailyReport";
        var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//子表不需要显示的字段 å¯æ‰©å±•

@@ -188,6 +190,9 @@
            switch (obj.event) {
                //列设置
                case 'set_HideColumn': get_HideColumn();
                    break;
                //导出按钮
                case 'btn_Export': btn_Export();
                    break;
            };
        });
@@ -229,6 +234,12 @@
            $("#HMonth").val(new Date().getMonth()+1);
            form.render('select');
        }

        //#region å¯¼å‡ºExecel
        function btn_Export() {
            table.exportFile(ins.config.id, option.data, "xls");
        }
         //#endregion

        //生产车间
        function DeptName() {
@@ -370,7 +381,7 @@
                      
                        option.data=data1.data
                        table.render(option);

                        ins = table.render(option);
                        //刷新表格数据
                        DisPlay_HideColumn();


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

@@ -102,6 +102,7 @@
                        </div>
                        <script type="text/html" id="toolbarDemo1">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></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>
                        </script>
@@ -131,6 +132,7 @@
            , soulTable = layui.soulTable
        var sWhere = "";
        var option = [];
        var ins;                //用于导出excel
        var HModName = "QC_RegistrationForTestingReport";
        var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//子表不需要显示的字段 å¯æ‰©å±•

@@ -152,6 +154,9 @@
            switch (obj.event) {
                //列设置
                case 'set_HideColumn': get_HideColumn();
                    break;
                //导出按钮
                case 'btn_Export': btn_Export();
                    break;
            };
        });
@@ -318,15 +323,10 @@
                            option.data = data1.data
                        }


                        table.render(option);

                        ins = table.render(option);
                        //刷新表格数据
                        DisPlay_HideColumn();

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

                        layer.close(ajaxLoad);
                    } else {
@@ -488,7 +488,11 @@
            }
        });
    

        //#region å¯¼å‡ºExecel
        function btn_Export() {
            table.exportFile(ins.config.id, option.data, "xls");
        }
        //#endregion

        //隐藏列设置
        function get_HideColumn() {

 WebTM/views/ÖÊÁ¿¹ÜÀí/³µ¼ä×Լ쵥/QC_Add_Edit_WorkSelfCheckBill.html

@@ -704,6 +704,7 @@
                var linterid = params[params[1]];//源单id
                var HSouceBillType = params[params[2]];//源单类型
                var HICMOEntryID = params[params[3]];//源单子id
                var HEntryID = params[params[4]];//源单子id
            }
            /*固定代码，每张单据都要begin*/
            //////测试用数据
@@ -843,7 +844,7 @@
                $.ajax({
                    url: GetWEBURL() + '/QC_WorkSelfCheckBill/get_ProcessExchangeBill',
                    type: "GET",
                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
                    data: { "HInterID": linterid, "HEntryID": HEntryID,  "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
                        if (result.count == 1) {
@@ -2172,6 +2173,7 @@

            //表头信息检验方案弹窗
            form.on('submit(btnSearchQCScheme)', function () {
                var HName = $("#HMaterName").val();
                //页面层-自定义
                layer.open({
                    type: 2,
@@ -2181,7 +2183,7 @@
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../质量管理/检验方案单/QC_CheckProjectList.html', 'yes'],
                    content: ['../../质量管理/检验方案单/QC_CheckProjectList.html?OperationType=1&HName=' + HName + '', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {


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

@@ -741,6 +741,7 @@
                var linterid = params[params[1]];//源单id
                var HSouceBillType = params[params[2]];//源单类型
                var HICMOEntryID = params[params[3]];//源单子id
                var HEntryID = params[params[4]];//源单子id
            }
            /*固定代码，每张单据都要begin*/
            //////测试用数据
@@ -884,7 +885,7 @@
                $.ajax({
                    url: GetWEBURL() + '/CheckBill/get_ProcessExchangeBill',
                    type: "GET",
                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
                    data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
                        if (result.count == 1) {
@@ -1651,6 +1652,7 @@

            //表头信息检验方案弹窗
            form.on('submit(btnSearchQCScheme)', function () {
                var HName = $("#HMaterName").val();
                //页面层-自定义
                layer.open({
                    type: 2,
@@ -1660,7 +1662,7 @@
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../质量管理/检验方案单/QC_CheckProjectList.html', 'yes'],
                    content: ['../../质量管理/检验方案单/QC_CheckProjectList.html?OperationType=1&HName=' + HName+'', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

@@ -3893,24 +3895,24 @@
            }
            //#endregion

            //#region ã€åºŸå¼ƒä»£ç ã€‘
            //#region ã€åºŸå¼ƒä»£ç (斯莫尔已启用)】
            table.on('edit(mainTable)', function (obj) {
                // å•å…ƒæ ¼ç¼–辑之前的值
                var oldText = $(this).prev().text();
                var value = obj.value //得到修改后的值
                    , data = obj.data //得到所在行所有键值
                    , field = obj.field; //得到字段
                //layer.msg('[ID: ' + data.id + '] ' + field + ' å­—段更改为：' + value);

                    , field = obj.field; //得到字段               
                var HInspectVal = $("#HInspectVal").val(); //检验值
                var HTargetVal = $("#HTargetVal").val(); //目标值
                var HComparator = $("#HComparator").val(); //比较符
                var HEntryID = $("#HEntryID").val() - 1;
                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //分析方法
                var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //上限值
                var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //下限值
                switch (field) {
                    case "HInspectVal":  //检验值
                        value = isNaN(value) ? 0 : value;
                        if (HInspectVal) {
                        if (HInspectVal < HUpLimit && HInspectVal > HDownLimit) {

                        }


 WebTM/views/³µ¼ä¹ÜÀí/Æô¶¯µã¼ìµ¥/Gy_WorkBeginDotCheckListBill.html

@@ -325,7 +325,20 @@
                $('#HOrgID').attr("disabled", true);

            }

            else if (OperationType == 2) {//如果修改则走下面 new                                        //编辑
               
                //初始化项目阶段表
                get_InitGrid();
                RoadBillMain(linterid);
                //生成并设置主表的内码和单据号
                createBillNo();
                //初始化制单人和制单时间
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化日期
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                OperationType = 1;
            }
            else if (OperationType == 3) {//如果修改则走下面 new

                //初始化子表

 WebTM/views/³µ¼ä¹ÜÀí/Æô¶¯µã¼ìµ¥/Gy_WorkBeginDotCheckListBillList.html

@@ -168,6 +168,7 @@
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>复制</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
@@ -179,7 +180,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>保存方案</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>读取方案</button>                              
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>读取方案</button>
                            </div>
                        </script>
                    </form>
@@ -245,6 +246,9 @@
                        break;
                    //编辑
                    case 'set_ShowBill': set_ShowBill();
                        break;
                    //复制
                    case 'set_Copy': set_Copy();
                        break;
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
@@ -687,6 +691,28 @@
            }
            //#endregion

            //复制
            function set_Copy() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].HInterID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '设备启动点检清单列表-新增'
                        , shift: 0//弹出动画
                        , content: '../../车间管理/启动点检单/Gy_WorkBeginDotCheckListBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
                        , end: function () {
                            //刷新页面,
                            location.reload();
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }


            //#region åˆ é™¤
            function set_DeleteBill() {

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

@@ -3105,25 +3105,32 @@
            function set_FirstPieceCheck() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var checkStatus2 = table.checkStatus('mainTable2')
                    , data2 = checkStatus2.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var OperationType = 2;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '首件检验单-编辑'
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0', 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();
                        }
                        , end: function () {
                            get_FastQuery();
                        }
                    })
                    if (data2.length > 0) {
                        var HEntryID = data2[0].HEntryID.toString();
                        var OperationType = 2;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '首件检验单-编辑'
                            , shade: 0.6
                            , maxmin: false
                            , anim: 0
                            , content: ['../../质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0&HEntryID=' + HEntryID + '', 'yes']
                            , resize: false
                            , cancel: function () {
                                btnIs();
                            }
                            , end: function () {
                                get_FastQuery();
                            }
                        })
                    } else {
                        layer.msg('请在下方表格选择对应的工序！');
                    }                   
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
@@ -3133,84 +3140,105 @@
            function set_ProcessCheck() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var checkStatus2 = table.checkStatus('mainTable2')
                    , data2 = checkStatus2.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var OperationType = 2;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '工序转移检验单-编辑'
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../质量管理/工序检验单/QC_ProcessCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0', 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();
                        }
                        , end: function () {
                            get_FastQuery();
                        }
                    })
                    if (data2.length > 0) {
                        var HEntryID = data2[0].HEntryID.toString();
                        var OperationType = 2;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '工序转移检验单-编辑'
                            , shade: 0.6
                            , maxmin: false
                            , anim: 0
                            , content: ['../../质量管理/工序检验单/QC_ProcessCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0&HEntryID=' + HEntryID +'', 'yes']
                            , resize: false
                            , cancel: function () {
                                btnIs();
                            }
                            , end: function () {
                                get_FastQuery();
                            }
                        })
                    } else {
                        layer.msg('请在下方表格选择对应的工序！');
                    }
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
                }                
            }

            //巡检
            function set_PatrolCheck() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var checkStatus2 = table.checkStatus('mainTable2')
                    , data2 = checkStatus2.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var OperationType = 2;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '巡检记录单-编辑'
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0', 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();
                        }
                        , end: function () {
                            get_FastQuery();
                        }
                    })
                    if (data2.length > 0) {
                        var HEntryID = data2[0].HEntryID.toString();
                        var OperationType = 2;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '巡检记录单-编辑'
                            , shade: 0.6
                            , maxmin: false
                            , anim: 0
                            , content: ['../../质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0&HEntryID=' + HEntryID +'', 'yes']
                            , resize: false
                            , cancel: function () {
                                btnIs();
                            }
                            , end: function () {
                                get_FastQuery();
                            }
                        })
                    } else {
                        layer.msg('请在下方表格选择对应的工序！');
                    }
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
                }                
            }

            //车间自检
            function set_WorkCheck() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var checkStatus2 = table.checkStatus('mainTable2')
                    , data2 = checkStatus2.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var OperationType = 2;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '车间自检单-编辑'
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../质量管理/车间自检单/QC_Add_Edit_WorkSelfCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0', 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();
                        }
                        , end: function () {
                            get_FastQuery();
                        }
                    })
                    if (data2.length > 0) {
                        var HEntryID = data2[0].HEntryID.toString();
                        var OperationType = 2;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '车间自检单-编辑'
                            , shade: 0.6
                            , maxmin: false
                            , anim: 0
                            , content: ['../../质量管理/车间自检单/QC_Add_Edit_WorkSelfCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0&HEntryID=' + HEntryID +'', 'yes']
                            , resize: false
                            , cancel: function () {
                                btnIs();
                            }
                            , end: function () {
                                get_FastQuery();
                            }
                        })
                    } else {
                        layer.msg('请在下方表格选择对应的工序！');
                    }
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
                }                
            }

            //生产质量汇报单