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

yusijie

2024-10-07 a4df75526a15e99844200a5838e8b1254a11dbaa

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

 WebTM/WebTM.csproj.user

@@ -3,7 +3,7 @@
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -3,7 +3,7 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    //var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    /*var WEBURL = "http://localhost/API/";*/    //潘浙游本地配置  

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

@@ -631,6 +631,7 @@
                if (HOrgID) {
                    sWhere += " and HUSEORGID = '" + HOrgID + "'";
                }
                sWhere +=addSWhereByOpenType();
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
@@ -1181,7 +1182,32 @@
            }

            //#endregion

            //#region åˆ¤æ–­æ˜¯ç›´æŽ¥æ‰“开页面还是其它页面通过选择按钮打开，并显示相应数据
            function addSWhereByOpenType(sWhere) {
                //获取参数
                var params = getUrlVars();
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开
                var HOrgID = params[params[1]];
                if (typeof (openType) != "undefined") {
                    return  " and æ˜Žç»†æ ‡è®° = 'Y' ";
                }
                return "";
            }
            //#endregion
        });
        //#region èŽ·å–参数
        function getUrlVars() {
            var vars = [], hash;
            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
            for (var i = 0; i < hashes.length; i++) {
                hash = hashes[i].split('=');
                vars.push(hash[0]);
                vars[hash[0]] = hash[1];
            }
            return vars;
        }
         //#endregion
        //#region ã€è¿‡æ»¤æ–¹æ¡ˆè¿”回数据】
        function HFilterScheme(obj)  //返回过滤方案
        {

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

@@ -15,7 +15,6 @@
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <style type="text/css">
        .layui-form-item .layui-inline {
@@ -308,8 +307,9 @@
            $("h1").html('<b>' + HPageTitle + '</b>');
            //#endregion

            //初始化子表
            //初始化子表并列设置
            set_InitGrid();
            DisPlay_HideColumn();

            //获取组织
            Organ();
@@ -1166,11 +1166,6 @@
                        } else {
                            table.render(option);
                        }

                        //刷新按钮显示
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        Display_HideButton(btns, HBillType, HModName, HMaker);

                    },
                    complete: function (XHR, TS) { XHR = null },//回收资源
                    error: function () {

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

@@ -15,7 +15,6 @@
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <style type="text/css">
        .layui-form-item .layui-inline {
@@ -364,9 +363,11 @@
            $("h1").html('<b>' + HPageTitle + '</b>');
            //#endregion

            //初始化子表
            //初始化子表并列设置
            set_InitGrid();
            DisPlay_HideColumn();
            set_InitGrid2();
            DisPlay_HideColumn2();

            //获取组织
            Organ();
@@ -1313,11 +1314,6 @@
                        } else {
                            table.render(option);
                        }

                        //刷新按钮显示
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        Display_HideButton(btns, HBillType, HModName, HMaker);

                    },
                    complete: function (XHR, TS) { XHR = null },//回收资源
                    error: function () {
@@ -1910,11 +1906,6 @@
                            //刷新设置复选框状态
                            CheckedSet_tableSub2();
                        }

                        //刷新按钮显示
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        Display_HideButton(btns, HBillType, HModName2, HMaker);

                    },
                    complete: function (XHR, TS) { XHR = null },//回收资源
                    error: function () {

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

@@ -15,7 +15,6 @@
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <style type="text/css">
        .layui-form-item .layui-inline {
@@ -257,8 +256,9 @@
            $("h1").html('<b>' + HPageTitle + '</b>');
            //#endregion

            //初始化子表
            //初始化子表并列设置
            set_InitGrid();
            DisPlay_HideColumn();

            //获取组织
            Organ();
@@ -592,18 +592,8 @@
                        }
                        $("#HGroupName").val(checkStatus.data[0].班组名称);
                        $("#HGroupID").val(checkStatus.data[0].HItemID);

                        var sSubStr = table.cache['mainTable'];
                        if (parseFloat(sSubStr[0].HEmpID) > 0) {
                            layer.confirm('列表中已经存在职员,是否要覆盖？', { icon: 3, title: '提示' }, function (index) {
                                set_InitGrid();     //初始化子表
                                GetEmployee();      //根据班组返回职员信息
                                layer.close(index); //关闭弹窗  å®ƒèŽ·å–的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                            });
                        }
                        else {
                            GetEmployee();
                        }
                        $("#HDeptID").val(checkStatus.data[0].HDeptID);//部门代码
                        $("#HDeptName").val(checkStatus.data[0].部门名称);//部门名称
                        layer.close(index); //关闭弹窗  å®ƒèŽ·å–的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
@@ -987,11 +977,6 @@
                            //刷新设置复选框状态
                            CheckedSet_tableSub();
                        }

                        //刷新按钮显示
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        Display_HideButton(btns, HBillType, HModName, HMaker);

                    },
                    complete: function (XHR, TS) { XHR = null },//回收资源
                    error: function () {

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

@@ -583,13 +583,14 @@
                     , { field: 'HCenterID', title: '工作中心ID', hide: true }//, hide: true
                    , { field: '工作中心', title: '工作中心' }//f7
                    , { field: 'HTechnologyParameter', title: '工艺参数', edit: 'text' }
                    , { field: 'HProcPrice', title: '工价', edit: 'text' }
                    , { field: 'HRemark', title: '备注', edit: 'text' }
                     , { field: 'HSupID', title: '供应商ID', hide: true }
                    , { field: '供应商代码', title: '供应商代码', edit: 'text', width: 110, event: "CheckHSupID" }
                    , { field: '供应商', title: '供应商' }//f7
                    , { field: 'HSupFlag', title: '外协标记', templet: "#HSupFlag" }//checkbox
                    , { field: 'HSortProcFlag', title: '排产工序标记', templet: "#HSortProcFlag", width: 120 }//checkbox

                    
                    //, { field: 'HProcType', title: '工序类型', templet: '#HProcType' }//选择
                    ////, { field: 'HBadWHID', title: 'HBadWHID', hide: true }//, hide: true
                    //, { field: 'HBadWHName', title: '不良品仓', edit: 'text', event: "HBadWHID" }//f7
@@ -1598,7 +1599,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ["../../基础资料/生产基础资料/Gy_Process.html", "yes"]
                                , content: ["../../基础资料/生产基础资料/Gy_Process.html?Type=HProcess", "yes"]
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调

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

@@ -193,25 +193,30 @@
                        <div id="page" style="position:relative;bottom:0;"></div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" 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" style="display:none;" 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" style="display:none;" 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" style="display:none;" 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" style="display:none;" 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" style="display:none;" 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" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" 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" style="display:none;" 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="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_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="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_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>发起审批</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>查看审批进度</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>多级审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>多级反审核</button>
                                <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-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" style="display:none;" 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" style="display:none;" 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" style="display:none;" 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="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>
                            </div>
                        </script>
                    </form>
@@ -242,6 +247,7 @@
            var option = [];
            var page = 1;//分页数据
            var size = 50;
            var HBillType = 3301;
            var ins;                        //用于导出excel
            var HModName = "Gy_RoutingBillList";
            var titleData = [];//不需要显示的字段 å¯æ‰©å±•
@@ -294,6 +300,21 @@
                        break;
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
                        break;
                    //发起审批
                    case 'set_startCheckBill': set_startCheckBill();
                        break;
                    //查看审批进度
                    case 'get_CheckFlowInfo': get_CheckFlowInfo();
                        break;
                    //多级审核
                    case 'set_CheckBill_Flow': set_CheckBill_Flow(0);
                        break;
                    //多级反审核
                    case 'set_AbandonCheck_Flow': set_CheckBill_Flow(1);
                        break;
                    //驳回
                    case 'set_RejectCheck_Flow': set_RejectCheck_Flow();
                        break;
                    //复制
                    case 'set_Copy': set_Copy();
@@ -515,7 +536,19 @@
                }
                laypage.render(optionPage);
            }

            //#region æŽ’序后选择
            table.on('sort(mainTable)', function (obj) { //注：sort æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„属性 lay-filter="对应的值"
                table.reload('mainTable', {
                    initSort: obj //记录初始排序，如果不设的话，将无法标记表头的排序状态。 layui 2.1.1 æ–°å¢žå‚æ•°
                    , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
                        field: obj.field //排序字段   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                        , order: obj.type //排序方式   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                    }
                });
                option.data = layui.table.cache["mainTable"];
                table.render(option);
            });
            //#endregion

            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTable)', function (obj) {
@@ -706,12 +739,8 @@


                            option.data = result;
                            ins = table.render(option);
                            layer.close(ajaxLoad);
                            DisPlay_HideColumn();
                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            Display_HideButton(btns, "3301", HModName, sessionStorage["HUserName"]);
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }
@@ -730,6 +759,7 @@

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery(number) {
                
                var HDate = $("#HBeginDate").val();//开始日期
                var HDate1 = $("#HEndDate").val();//结束日期
                var HOrgID = "";
@@ -814,18 +844,23 @@
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }

                if (HMaterID != "" && HMaterID != "undefined" && HMaterID != null) {

                } else {
                    if (HDate) {
                        sWhere += " and CONVERT(varchar(100),日期, 23) >= ''" + HDate + "''";
                    }
                    if (HDate1) {
                        sWhere += " and CONVERT(varchar(100),日期, 23) <= ''" + HDate1 + "''";
                    }
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= ''" + HDate + "''";
                }
                
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= ''" + HDate1 + "''";
                }
                if (HMaterID != "" && HMaterID != "undefined" && HMaterID != null) {
                    //从别的页面打开传入Hmaterid值，设置物料过滤
                    sWhere += " and HMaterID = " + HMaterID;
                } else {
                    //不是从别的页面打开
                    var HMaterID2 = $("#HMaterID").val();
                    sWhere += (HMaterID2 == 0 ? "" : (" and HMaterID = " + HMaterID2));
                }
                if (HProID != 0 && HProID != "undefined" && HProID != null) {
                    sWhere += " and HMainProcID = " + HProID;
                }
                if (number == 1) {
                    HOrgID = sessionStorage["OrganizationID"];
                }
@@ -903,7 +938,7 @@

                            option.cols = [col];
                            option.data = data1.data;
                            ins = table.render(option);
                            
                            laypage.render(optionPage);
                            //刷新表格数据
                            DisPlay_HideColumn();
@@ -914,10 +949,10 @@
                            }
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            option.data = [[]]
                            table.render(option);
                            //option.data = [[]]
                            //table.render(option);
                            layer.close(ajaxLoad);
                            /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
@@ -1220,13 +1255,156 @@
            }
            //#endregion

            //#region å‘起审批
            function set_startCheckBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Routing/StartCheckFlow", //方法所在页面和方法名
                        data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    layer.close(index);
                                    $("#btnSearch").trigger('click');
                                });

                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                    //修改为功后刷新界面
                    $("#btnSearch").trigger('click');
                }
                else {
                    layer.msg('请选择一行数据审核！');
                }
            }
            //#endregion

            //#region æŸ¥çœ‹å®¡æ‰¹è¿›åº¦
            function get_CheckFlowInfo() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var hID = data[0].hmainid.toString();
                    layer.open({
                        type: 2
                        , area: ['70%', '70%']
                        , title: '单据审批进度'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../系统管理/多级审批/审批进度/Xt_CheckFlowProgressList.html?linterid=' + hID + '&HSouceBillType=' + HBillType
                        , resize: false,
                        end: function () {
                            ////修改为功后刷新界面
                            //if (get_needClose_Bar == 0) {
                            //    $("#btnSearch").trigger('click');
                            //} else if (get_needClose_Bar == 1) {
                            //    $("#get_needClose").trigger('click');
                            //}
                        }
                        , cancel: function () {

                        }
                    })
                } else {
                    layer.msg('请选择一行数据查看！');
                }
            }
            //#endregion

            //#region å¤šçº§ åå®¡æ ¸/审核数据
            function set_CheckBill_Flow(num) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Routing/AuditFlow", //方法所在页面和方法名
                        data: { "HInterID": InterID, "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 () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    layer.close(index);
                                    //修改为功后刷新界面
                                    $("#btnSearch").trigger('click');
                                });

                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                }
                else {
                    layer.msg('请选择一行数据审核！');
                }
            }
            //#endregion

            //#region é©³å›ž
            function set_RejectCheck_Flow(num) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Routing/RejectCheckFlow", //方法所在页面和方法名
                        data: { "HInterID": InterID, "CurUserID": sessionStorage["Czybm"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    layer.close(index);
                                });
                                //修改为功后刷新界面
                                $("#btnSearch").trigger('click');
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                }
                else {
                    layer.msg('请选择一行数据审核！');
                }
            }
            //#endregion

            //#endregion
            //隐藏列设置
            function get_HideColumn() {
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                    colName += option.cols[0][i]["field"] + ",";
                }
                var urlStr = window.document.location.pathname;//获取文件路径
                var urlLen = urlStr.split('/');
@@ -1261,6 +1439,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    async: "false",
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {
@@ -1297,6 +1476,10 @@
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //统计列
                                if (dataCols[6] == 1) {
                                    option.cols[0][i + 1]["totalRow"] = true;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
@@ -1308,6 +1491,10 @@
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                                //设置表格title属性显示别名
                                if (dataCols[4] != null && dataCols[4] != "") {
                                    option.cols[0][i + 1]["title"] = dataCols[4];
                                }
                            }

@@ -1362,7 +1549,7 @@
                var Organization = '<option  value="0" selected="selected" ></option>';
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
                    }
                }
                $("#ColName").empty();

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

@@ -1117,6 +1117,7 @@
            }
            else if (OperationType == 3) {//编辑
                $("#HItemID").val(linterid);//修改时主表ID
                $("#btnRoutingBill").addClass("layui-btn-disabled").attr("disabled", true);
                set_EditFromGrid();

            }
@@ -1906,7 +1907,7 @@

                        for (var i = 0; i < data.length; i++) {
                            Tablerow.push({
                                "HProcNo": data[i].工序号, "HProcID": data[i].hprocid, "HProcNumber": data[i].工序代码, "HProcName": data[i].工序, "HWorkRemark": data[i].表体备注,
                                "HProcNo": data[i].工序号, "HProcID": data[i].HProcID, "HProcNumber": data[i].工序代码, "HProcName": data[i].工序, "HWorkRemark": data[i].表体备注,
                                "HCenterID": data[i].HCenterID, "HCenterNumber": data[i].工作中心代码, "HCenterName": data[i].工作中心名称,
                                "HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
                                "HSupID": data[i].HSupID, "HSupNumber": data[i].供应商代码, "HSupName": data[i].供应商, "HSupFlag": data[i].委外标记 == 0 ? "false" : "true",