1
pzy
2024-09-14 77bbec6f10ad2c24d82e92db4f507f589f4e0e6f
1
4个文件已添加
39个文件已修改
5635 ■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 4625 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/HideButton_New.js 161 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_Material.html 203 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/xmlLBM_QC_TakeSampleCheckBillMainList.aspx 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/xmlLBM_QC_TakeSampleCheckBillMainList.aspx.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/xmlLBM_QC_TakeSampleCheckBillMainList.aspx.designer.cs 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList.aspx.designer.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/通用基础资料/Gy_CommonBaseData.html 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/器具点检规程单/Sc_MouldDotCheckRuleBillList_PDA.html 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具点检保养/Sc_MouldDotCheckBill_PDA.html 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/看板/采购收料/KB_CGSL.html 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/按钮设置/Xt_ModuleButtonSet.html 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/Sb_EquipDotCheckBill_PDA.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/Sb_EquipMaintainBill_PDA.html 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/检验取样还样单/QC_TakeSampleCheckBillMainList.html 60 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/质量报表/SB_TechnologyParameterList.html 185 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/付款单/YF_PayMentBill.html 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/付款单/YF_PayMentBillQuery.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/应付单/Cg_PayableBill.html 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/应付单/Cg_PayableBillQuery.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/收料通知单/Cg_POInStockBillList.html 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/收料通知单/Cg_POInStockBillQuery.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html 49 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/采购订单/Cg_POOrderBillQuery.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/其他应收单/YS_ReceiveOtherBillMain.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillQuery.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/应收单/Xs_ReceivableBillQuery.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/收款单/YS_ReceiveBill.html 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/收款单/YS_ReceiveBillQuery.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/销售订单/Xs_SeOrderBillQuery.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBillQuery.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/外购入库/Kf_POStockInBillListQuery.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml.user
Diff too large
WebTM/WebTM.csproj
@@ -141,6 +141,7 @@
    <Content Include="layuiadmin\treeTable.js" />
    <Content Include="layuiadmin\PubCustom.js" />
    <Content Include="layuiadmin\PubJs\PubCheck.js" />
    <Content Include="layuiadmin\HideButton_New.js" />
    <Content Include="views\Baseset\HBarPlanPrint.html" />
    <Content Include="views\Baseset\SRM_OpenTmpList_GXPG.html" />
    <Content Include="views\Baseset\基础资料\Gy_BadCountDevelopWHList.html" />
@@ -366,6 +367,7 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillListByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOReportBillList2.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOReportBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_QC_TakeSampleCheckBillMainList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Xs_SeOrderBill_StockInCodeNote.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlSRM_Web_BarCodeBillList.aspx" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemMethodEdit.html" />
@@ -2341,6 +2343,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOReportBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_ICMOReportBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_QC_TakeSampleCheckBillMainList.aspx.cs">
      <DependentUpon>xmlLBM_QC_TakeSampleCheckBillMainList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_QC_TakeSampleCheckBillMainList.aspx.designer.cs">
      <DependentUpon>xmlLBM_QC_TakeSampleCheckBillMainList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Xs_SellOutChangeBillList.aspx.cs">
      <DependentUpon>xmlLBM_Xs_SellOutChangeBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\vs\项目代码\MES-WEB-TM\MESWMS-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/HideButton_New.js
New file
@@ -0,0 +1,161 @@
//#region æŒ‰é’®è®¾ç½®
function get_HideButton(set_HideButton_ID, HBillType, HModName, HUserName) {
    //获取父节点下所有的按钮节点
    var parentNodes = document.getElementById(set_HideButton_ID);
    var btns = parentNodes.querySelectorAll('button');
    var btnIdList = "";          //按钮ID列表
    var btnNameList = "";        //按钮名称列表
    var btnOrderList = "";       //按钮次序列表
    var contentUrl = "";         //按钮设置窗口页面位置
    //获取页面按钮元素的信息
    for (var i = 0; i < btns.length; i++) {
        btnIdList += btns[i].id + ",";
        btnNameList += btns[i].innerText + ",";
        btnOrderList += i + ",";
    }
    //对数组进行编码
    btnIdList = encodeURI(btnIdList.substring(0, btnIdList.length - 1));//对 URI è¿›è¡Œç¼–码
    btnNameList = encodeURI(btnNameList.substring(0, btnNameList.length - 1));//对 URI è¿›è¡Œç¼–码
    btnOrderList = encodeURI(btnOrderList.substring(0, btnOrderList.length - 1));//对 URI è¿›è¡Œç¼–码
    //获取按钮隐藏设置窗口文件路径
    var urlStr = window.document.location.pathname;//获取文件路径
    var urlLen = urlStr.split('/');
    for (var i = 0; i < urlLen.length - 4; i++) {
        contentUrl += "../";
    }
    contentUrl += '系统管理/按钮设置/Xt_ModuleButtonSet.html?HModName=' + HModName + '&HBillType=' + HBillType + "&btnIdList=" + btnIdList + "&btnNameList=" + btnNameList + "&btnOrderList=" + btnOrderList + "&HUserName=" + HUserName;
    //打开按钮隐藏设置子窗口
    layer.open({
        type: 2
        , skin: "layui-layer-rim" //加上边框
        , title: "按钮设置"  //标题
        , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
        , shift: 2 //弹出动画
        , area: ["30%", "90%"] //窗体大小
        , maxmin: true //设置最大最小按钮是否显示
        , content: [contentUrl, "yes"]
        , btn: ["确定", "取消"]
        , btn1: function (index, laero) {
            //刷新按钮显示
            Display_HideButton(set_HideButton_ID, HBillType, HModName, HUserName);
            //更新表格缓存的数据
            layer.close(index);//关闭弹窗
        }
    })
}
//#endregion
//#region æ˜¾ç¤ºæŒ‰é’®
function Display_HideButton(set_HideButton_ID, HBillType, HModName, HUserName) {
    $.ajax({
        url: GetWEBURL() + '/Xt_ModuleButtonSet_WMES/moduleButtonSetWMESList',
        type: "GET",
        async: false,
        data: { "HModName": HModName, "HBillType": HBillType, "HUserName": HUserName },
        success: function (data1) {
            //获取父节点下所有的按钮节点
            var parentNodes = document.getElementById(set_HideButton_ID);
            var btns = parentNodes.querySelectorAll('button');
            //获取数据库中已经记录的按钮节点的id列表
            var btnsData_InDataBase = [];
            for (var i = 0; i < data1.data.length; i++) {
                btnsData_InDataBase.push(data1.data[i]["HButtonID"]);
            }
            //记录数据库中没有设置数据的按钮节点的信息  ||  è®°å½•页面上设置的按钮的信息
            var btns_IDInfo = [];                                           //记录页面上设置的按钮的ID
            var btns_info = [];                                             //记录页面上设置的按钮的信息
            var btnsData_NoInDataBase = [];                                 //记录数据库中没有设置数据的按钮节点的信息
            for (var i = 0; i < btns.length; i++) {
                //记录页面上设置的按钮的ID
                btns_IDInfo.push(btns[i].id);
                //记录页面上设置的按钮的信息
                btns_info.push({
                    "HButtonID": btns[i].id
                    , "HClassValue": btns[i].getAttribute('class')
                    , "HLay_Event": btns[i].getAttribute('lay-event')
                    , "HValue": btns[i].innerText
                })
                //记录数据库中没有设置数据的按钮节点的信息
                if ($.inArray(btns[i].id, btnsData_InDataBase) == -1) {
                    //var label_i = btns[i].firstChild;
                    //var label_i_icon = label_i.getAttribute('class');
                    btnsData_NoInDataBase.push(btns[i].id);
                }
            }
            //清除父节点下的所有子节点
            while (parentNodes.firstChild) {
                parentNodes.removeChild(parentNodes.firstChild);
            }
            //重新加载父节点下的子节点
            //加载数据库中存在记录的按钮节点数据
            for (var i = 0; i < data1.data.length; i++) {
                var index_temp = $.inArray(data1.data[i]["HButtonID"], btns_IDInfo);
                if (index_temp > -1) {
                    // åˆ›å»ºå­èŠ‚ç‚¹
                    var child = document.createElement('button');
                    child.type = "button";
                    child.className = btns_info[index_temp].HClassValue;
                    child.setAttribute('lay-event', btns_info[index_temp].HLay_Event);
                    child.id = btns_info[index_temp].HButtonID;
                    child.innerHTML = data1.data[i]["HOtherName"] == "" ? btns_info[index_temp].HValue : data1.data[i]["HOtherName"];
                    if (data1.data[i]["HHideFlag"] == true) {
                        child.style = "display:none;";
                    } else {
                        child.style = "display:inline;";
                    }
                    // å°†å­èŠ‚ç‚¹æ·»åŠ åˆ°çˆ¶èŠ‚ç‚¹ä¸‹
                    parentNodes.appendChild(child);
                }
            }
            //加载数据库中不存在记录的按钮节点数据
            for (var i = 0; i < btnsData_NoInDataBase.length; i++) {
                var index_temp = $.inArray(btnsData_NoInDataBase[i], btns_IDInfo);
                if (index_temp > -1) {
                    // åˆ›å»ºå­èŠ‚ç‚¹
                    var child = document.createElement('button');
                    child.type = "button";
                    child.className = btns_info[index_temp].HClassValue;
                    child.setAttribute('lay-event', btns_info[index_temp].HLay_Event);
                    child.id = btns_info[index_temp].HButtonID;
                    child.innerHTML = btns_info[index_temp].HValue;
                    child.style = "display:inline;";
                    // å°†å­èŠ‚ç‚¹æ·»åŠ åˆ°çˆ¶èŠ‚ç‚¹ä¸‹
                    parentNodes.appendChild(child);
                }
            }
            ////遍历父节点下所有的按钮节点,获取 è®°å½•数据库中没有设置数据的按钮节点的信息
            //for (var i = 0; i < btns.length; i++) {
            //    var bar = 0;
            //    for (var j = 0; j < data1.count; j++) {
            //        if (btns[i].id == data1.data[j]["HButtonID"]) {
            //            if (data1.data[j]["HHideFlag"] == true) {
            //                btns[i].style = "display:none;";
            //            } else {
            //                btns[i].style = "display:inline;";
            //            }
            //            bar = 1;
            //            break;
            //        }
            //    }
            //    if (bar == 0) {
            //        btns[i].style = "display:inline;";
            //    }
            //}
        }, error: function () {
            layer.alert("接口请求失败!", { icon: 5 });
        }
    })
}
//#endregion
WebTM/layuiadmin/Scripts/webConfig.js
@@ -11,7 +11,7 @@
    /*var WEBURL = "http://localhost/API/";*/    //潘浙游本地配置  
    /*var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置*/
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://localhost:8082/API/";        //杜贺本地配置
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Material.html
@@ -175,6 +175,7 @@
                            <div>
                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                            </div>
                            <div id="page"></div>
                        </div>
                    </div>
                </div>
@@ -206,10 +207,15 @@
            var Organization = sessionStorage["Organization"];
            var HModName = "Gy_Material";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HItemID", "HUnitID", "HParentID", "HUSEORGID", "HMinPickQty", "HEndFlag", "HStopFlag"];
            var titleData = ["HItemID", "HUnitID", "HParentID", "HUSEORGID", "HMinPickQty", "HEndFlag", "HStopFlag","选择","sorderid"];
            var ins;                        //用于导出excel
            var HMaterTypeID = 0;              //物料分类节点id
            var page = 1;//分页数据
            var size = 50;
            //获取参数
            var params = getUrlVars();
            var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开
            //#endregion
            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘
@@ -318,18 +324,14 @@
            //#region é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
                //$("#btnSearch").click();
            });
            //#endregion
            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                if ($("#HProject").val() == "0") {
                    get_FastQuery();
                }
                else {
                    get_FastQuery(2);
                }
            });
            //#endregion
@@ -423,13 +425,7 @@
                //初始化表格
                set_InitGrid();
                //查询
                //根据页面的打开方式,判断过滤条件sWhere是否需要进行额外的添加
                //获取参数
                var params = getUrlVars();
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开
                addSWhereByOpenType();
                //树状图查询
                get_Display_Tree();
                //物料图片位置默认为空
                var html2 = '<h1 style="text-align:center;line-height:290px;color:red;font-weight:bolder;"></h1>';
@@ -437,22 +433,8 @@
                Carousel.reload({ autoplay: false })
                //获取项目号
                Get_HProject();
                //if ($("#HProject").val() == "0") {
                //    get_FastQuery();
                //}
                //else {
                //    get_FastQuery(2);
                //}
                //if (openType == 2) {
                //    addSWhereByOpenType();
                //    //get_Display(sWhere);
                //    get_Display_Tree();
                //} else {
                //    addSWhereByOpenType();
                //    get_Display(sWhere);
                //    get_Display_Tree();
                //}
                //过滤方案
                get_DefaultModule()
            }
            //#endregion
@@ -461,28 +443,9 @@
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 500
                    , page: true
                    , limits: [50, 500, 5000, 50000]
                    , limit: 50
                    //, cols: [[
                    //    { type: 'checkbox', fixed: 'left' }
                    //    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                    //    , { field: '物料代码', title: '物料代码' }
                    //    , { field: '物料名称', title: '物料名称' }
                    //    , { field: '规格型号', title: '规格型号' }
                    //    , { field: 'HUnitID', title: 'HUnitID', hide: true }
                    //    , { field: '计量单位代码', title: '计量单位代码' }
                    //    , { field: '计量单位名称', title: '计量单位名称' }
                    //    , { field: 'HMinPickQty', title: 'HMinPickQty', hide: true }
                    //    , { field: '明细标记', title: '明细标记' }
                    //    , { field: '禁用标记', title: '禁用标记' }
                    //    , { field: '组织名称', title: '组织名称' }
                    //    , { field: 'HEndFlag', title: 'HEndFlag', hide: true }
                    //    , { field: 'HStopFlag', title: 'HStopFlag', hide: true }
                    //    , { field: 'HParentID', title: 'HParentID', hide: true }
                    //    , { field: 'HUSEORGID', title: 'HUSEORGID', hide: true }
                    //]]
                    , height: 'full-80'
                    , page: false
                    , limit: 50
                    , done: function (res, curr, count) {
                        var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td');
                        var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th');
@@ -500,6 +463,28 @@
                        }
                    }
                };
                optionPage = {
                    elem: 'page', //注意,这里的 page æ˜¯ ID,不用加 # å·
                    count: 10000, //数据总数,从服务端得到
                    limit: 50,
                    limits: [50, 500, 5000, 50000],
                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
                    jump: function (obj, first) {
                        //console.log(obj)
                        //obj包含了当前分页的所有参数,比如:
                        //console.log(obj.curr); //得到当前页,以便向服务端请求对应页的数据。
                        //console.log(obj.limit); //得到每页显示的条数
                        //首次不执行
                        if (!first) {
                            //do something
                            page = obj.curr;
                            size = obj.limit;
                            get_FastQuery();
                        }
                    }
                }
                laypage.render(optionPage);
            }
            //#endregion
@@ -528,7 +513,7 @@
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization},
                    success: function (data1) {
                        if (data1.count == 1) {
                        if (data1.count != 0) {
                            var data = [];
                            var col = [];
                            //给空的数组赋值
@@ -554,18 +539,9 @@
                                }
                            }
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 'full-80'
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                            }
                            option.cols = [col];
                            option.data = data1.data;
                            ins = table.render(option);
                            //刷新表格数据
@@ -574,7 +550,6 @@
                            layer.close(ajaxLoad);
                            if ($("#ColName option").length < 1) {
                                ColFilter();
                                get_DefaultModule();//加载方案
                            }
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
@@ -589,7 +564,69 @@
            }
            //#endregion
            //#region åˆ†é¡µæŸ¥è¯¢
            function get_DisplayPage(sWhere) {
                var wait = layer.load();//遮罩
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Gy_Material/page',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size },
                    success: function (data1) {
                        option.limit = size;//改变表格页大小
                        if (data1.count != 0) {
                            optionPage.count = data1.count;//改变列表数据总数
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                    }
                                }
                            }
                            option.cols = [col];
                            option.data = data1.data;
                            ins = table.render(option);
                            laypage.render(optionPage);
                            //刷新表格数据
                            DisPlay_HideColumn();
                            layer.close(ajaxLoad);
                            if ($("#ColName option").length < 1) {
                                ColFilter();
                            }
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            option.data = [[]]
                            table.render(option);
                            layer.close(ajaxLoad);
                            /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //#region å¿«é€Ÿè¿‡æ»¤
@@ -607,47 +644,47 @@
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            com = "like''%" + ColContent + "%''";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            com = "like''%" + ColContent + "''";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            com = "like''" + ColContent + "%''";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            com = "not like''%" + ColContent + "%''";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            com = "" + Comparator + "''" + ColContent + "''";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                if (HNumber) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + HNumber + "%'";
                    sWhere += " and ç‰©æ–™ä»£ç  like ''%" + HNumber + "%''";
                }
                if (HName) {
                    sWhere += " and ç‰©æ–™åç§° like '%" + HName + "%'";
                    sWhere += " and ç‰©æ–™åç§° like ''%" + HName + "%''";
                }
                if (HModel) {
                    sWhere += " and è§„格型号 like '%" + HModel + "%'";
                    sWhere += " and è§„格型号 like ''%" + HModel + "%''";
                }
                if (HOrgName) {
                    sWhere += " and ç»„织名称 like '%" + HOrgName + "%'";
                    sWhere += " and ç»„织名称 like ''%" + HOrgName + "%''";
                }
                if (number==2) {
                    if (HProject) {
                        sWhere += " and é¡¹ç›®å· like '%" + HProject + "%'";
                    }
                if (HProject) {
                    sWhere += " and é¡¹ç›®å· like ''%" + HProject + "%''";
                }
                if (GetDataCols != "") {
                    sWhere += GetDataCols;
                }
                if (sql != "") {
                    sWhere += sql;
                }
                get_Display(sWhere);
                addSWhereByOpenType();
                get_DisplayPage(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
                GetDataCols = "";
            }
@@ -1031,10 +1068,10 @@
                            sql = "";
                            HMaterTypeID = 0;
                        } else {
                            sql = " and HMaterTypeID='" + data.id + "' ";
                            sql = " and HMaterTypeID=''" + data.id + "'' ";
                            HMaterTypeID = data.id;
                        }
                        get_Display(sql);
                        get_FastQuery()
                    }
                });
            }
@@ -1350,7 +1387,7 @@
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开
                var HOrgID = params[params[1]];
                if (openType == 2) {
                    sWhere += " and ç¦ç”¨æ ‡è®° = '' ";
                    sWhere += " and ç¦ç”¨æ ‡è®° = '''' ";
                    Organ(HOrgID);
                }
            }
@@ -1393,7 +1430,7 @@
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            //执行查询方法
                            //查询
                            /*get_FastQuery();*/
                            get_FastQuery();
                            form.render("select");
                        }
                    }, error: function () {
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/HBarPlanPrint.html
@@ -312,6 +312,9 @@
            case "HICMOReport2"://生产汇报单2
                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ICMOReportBillList2.aspx?linterid=" + value, true, "");
                break;
            case "QC_TakeSampleCheckBillMainList"://检验取样单
                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_QC_TakeSampleCheckBillMainList.aspx?linterid=" + value, true, "");
                break;
        }
    </script>
</body>
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_QC_TakeSampleCheckBillMainList.aspx
New file
@@ -0,0 +1,27 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_QC_TakeSampleCheckBillMainList.aspx.cs" Inherits="WebTM.views.基础资料.公用基础资料.xmlLBM_Sc_ProcessExchangeBillList" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <title></title>
    <script runat="server">
        protected void Page_Load(object sender, EventArgs e)
        {
            //★特别提示★:
            //不同的数据库应该选用不同的报表XML数据生成类,SQL Server数据库用SqlXMLReportData,Oracle数据库用OracleXMLReportData
            //OledbXMLReportData适合于Access等本地数据库,为了演示方便,这里从Grid++Report的Access例子数据库中获取报表数据
            //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
            SqlXMLReportData.GenEntireData(this, "select  å•据号 as æµè½¬å¡ç¼–号,产品名称,生产资源,CONVERT(varchar(10),日期,23) as æ£€æµ‹æ—¶é—´,工序流转卡批次号 as æ‰¹å· from h_v_QC_TakeSampleCheckBillList where hmainid="+Request.Params["linterid"],"select 1");
        }
    </script>
</head>
<body>
    <form id="form1" runat="server">
        <div>
        </div>
    </form>
</body>
</html>
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_QC_TakeSampleCheckBillMainList.aspx.cs
New file
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace WebTM.views.基础资料.公用基础资料
{
    public partial class xmlLBM_QC_TakeSampleCheckBillMainList : System.Web.UI.Page
    {
        protected void Page_Load(object sender, EventArgs e)
        {
        }
    }
}
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_QC_TakeSampleCheckBillMainList.aspx.designer.cs
New file
@@ -0,0 +1,26 @@
//------------------------------------------------------------------------------
// <自动生成>
//     æ­¤ä»£ç ç”±å·¥å…·ç”Ÿæˆã€‚
//
//     å¯¹æ­¤æ–‡ä»¶çš„æ›´æ”¹å¯èƒ½å¯¼è‡´ä¸æ­£ç¡®çš„行为,如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œåˆ™æ‰€åšæ›´æ”¹å°†ä¸¢å¤±ã€‚
// </自动生成>
//------------------------------------------------------------------------------
namespace WebTM.views.基础资料.公用基础资料
{
    public partial class xmlLBM_Sc_ProcessExchangeBillList
    {
        /// <summary>
        /// form1 æŽ§ä»¶ã€‚
        /// </summary>
        /// <remarks>
        /// è‡ªåŠ¨ç”Ÿæˆçš„å­—æ®µã€‚
        /// è‹¥è¦è¿›è¡Œä¿®æ”¹ï¼Œè¯·å°†å­—段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
    }
}
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_Sc_ProcessExchangeBillList.aspx.designer.cs
@@ -11,7 +11,7 @@
{
    public partial class xmlLBM_Sc_ProcessExchangeBillList
    public partial class xmlLBM_QC_TakeSampleCheckBillMainList
    {
        /// <summary>
WebTM/views/»ù´¡×ÊÁÏ/ͨÓûù´¡×ÊÁÏ/Gy_CommonBaseData.html
@@ -19,12 +19,12 @@
    <style>
        /* å½“鼠标悬浮在表格的奇数行上时改变背景色 */
        .layui-table tbody tr:nth-child(odd):hover {
            background-color: #ffff00; /* æ›´æ”¹ä¸ºä½ æƒ³è¦çš„颜色 */
            background-color: #ceedfa; /* æ›´æ”¹ä¸ºä½ æƒ³è¦çš„颜色 */
        }
        /* å½“鼠标悬浮在表格的偶数行上时改变背景色 */
        .layui-table tbody tr:nth-child(even):hover {
            background-color: #ffff00; /* æ›´æ”¹ä¸ºä½ æƒ³è¦çš„颜色 */
            background-color: #ceedfa; /* æ›´æ”¹ä¸ºä½ æƒ³è¦çš„颜色 */
        }
    </style>
@@ -96,10 +96,10 @@
                    //, toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , cellMinWidth: 90
                    , page: true
                    , limit: 5
                    //, page: true
                    , limit: 10
                    , limits: [5, 10, 15, 20]
                    , totalRow: true
                    //, totalRow: true
                    , cols: [[
                        { field: '代码', title: '代码', width: 150, sort: true }
                        , { field: '名称', title: '名称', width: 150, sort: true }
@@ -107,10 +107,23 @@
                    , data: []
                    , done: function (res, curr, count) {
                        // è®¾ç½®è¡Œæ ·å¼
                        var style = 'background-color: #ffff00;'; // æŒ‡å®šçš„背景色
                        var style = 'background-color: #ceedfa;'; // æŒ‡å®šçš„背景色
                        // å‡è®¾æˆ‘们要设置第三行的背景色
                        var targetIndex = rowIndex; // è¡Œå·ç´¢å¼•,从0开始计数
                        $('tr[data-index=' + targetIndex + ']').attr('style', style);
                        //设置滚动条位置
                        if (option.data.length > 0) {
                            // è¡¨æ ¼æ¸²æŸ“完毕后的回调
                            var parentObject = document.getElementById('mainTable').nextElementSibling.childNodes[0].childNodes[1].childNodes[0].childNodes[0];
                            if (parentObject.childNodes.length > 0) {
                                var rowObject = parentObject.childNodes[0];
                                var rowHeight = rowObject.offsetHeight; // èŽ·å–è¡Œé«˜
                                var rowPosition = rowHeight * rowIndex;
                                $('.layui-table-body').scrollTop(rowPosition);
                            }
                        }
                    }
                };
            }
WebTM/views/Ä£Öξ߹ÜÀí/Æ÷¾ßµã¼ì¹æ³Ìµ¥/Sc_MouldDotCheckRuleBillList_PDA.html
@@ -319,31 +319,7 @@
                var HCreateBy = $("#HCreateBy").val();//制单人
                var BenginHCreateDate = $("#BenginHCreateDate").val();//开始制单时间
                var EndHCreateDate = $("#EndHCreateDate").val();//结束制单时间
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
                //if (ColName != 0 && Comparator != 0) {
                //    var com = "";
                //    switch (Comparator) {
                //        case "7":
                //            com = "like'%" + ColContent + "%'";
                //            break;
                //        case "8":
                //            com = "like'%" + ColContent + "'";
                //            break;
                //        case "9":
                //            com = "like'" + ColContent + "%'";
                //            break;
                //        case "10":
                //            com = "not like'%" + ColContent + "%'";
                //            break;
                //        default:
                //            com = "" + Comparator + "'" + ColContent + "'";
                //            break;
                //    }
                //    sWhere += " and " + ColName + " " + com;
                //}
                if (HBillNo) {
                    sWhere += " and å•据号 like '%" + HBillNo + "%'";
                }
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξߵã¼ì±£Ñø/Sc_MouldDotCheckBill_PDA.html
@@ -909,10 +909,10 @@
                if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
                    sSubStr = JSON.parse(sSubStr);
                    for (var i = 0; i < sSubStr.length; i++) {
                        if (sSubStr[i].HDotCheckCode == "" || sSubStr[i].HDotCheckItemID == "") {
                            layer.msg("明细记录第" + (i + 1) + "行,点检项目代码信息为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return false;
                        }
                        //if (sSubStr[i].HDotCheckCode == "" || sSubStr[i].HDotCheckItemID == "") {
                        //    layer.msg("明细记录第" + (i + 1) + "行,点检项目代码信息为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        //    return false;
                        //}
                        if (sSubStr[i].HManagerCode == "") {
                            layer.msg("明细记录第" + (i + 1) + "行,负责人代码信息为空!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return false;
@@ -949,7 +949,7 @@
                            $("#HBarCode").attr("readonly", "readonly");//条形码只读
                            $("#HBarCode").css("background-color", "#efefef4d");
                            HProcExchBillNoFlag = true;
                            //get_DocCheckItem();
                            get_DocCheckItem();
                            layer.close(index);
                        }
                        else {
@@ -965,29 +965,32 @@
            }
            function get_DocCheckItem() {
                $.ajax({
                    url: GetWEBURL() + "/Web/GetItemByEquipFile",
                    url: GetWEBURL() + "/Web/GetItemByMouldFile",
                    type: "GET",
                    data: { "MouldProjectID": $("#HMouldID").val(), "Type": "DJ", "HDate": $("#HBeginDate").val() },
                    success: function (result) {
                        if (result.code == 1) {
                            var data = result.data;
                            $("#HMouldDotCheckRuleID").val(data[0].点检规程ID);
                            $("#HMouldDotCheckRuleNo").val(data[0].点检规程单号);
                            $("#HPlanNo").val(data[0].点检计划单);
                            $("#HPlanInterID").val(data[0].点检计划ID);
                            $("#HPlanEntryID").val(data[0].点检计划子ID);
                            $("#HMouldDotCheckRuleID").val(data[0].HMouldDotCheckRuleID);
                            $("#HMouldDotCheckRuleNo").val(data[0].HMouldDotCheckRuleNo);
                            $("#HPlanNo").val(data[0].单据号);
                            $("#HPlanInterID").val(data[0].hmainid);
                            $("#HPlanEntryID").val(data[0].HEntryID);
                            var rowdata = [];
                            for (let i = 0; i < data.length; i++) {
                                rowdata.push(
                                    {
                                        "HDotCheckResult": data[i].默认结论 == 1 ? true : false, "HDotCheckItemID": data[i].点检项目ID, "HDotCheckCode": data[i].点检项目代码, "HDotCheckItem": data[i].点检项目名称,
                                        "HDotCheckItemClassID": data[i].点检项目分类id, "HDotCheckItemClassName": data[i].点检项目分类, "HDotCheckItemMethodID": data[i].点检方法id, "HDotCheckItemMethodName": data[i].点检方法,
                                        "HDotCheckPart": data[i].点检部位, "HClaim": data[i].具体要求, "HManagerID": data[i].负责人ID, "HManagerCode": data[i].负责人代码,
                                        "HManagerName": data[i].负责人名称, "HSourceInterID": data[i].点检计划ID, "HSourceEntryID": data[i].点检计划子ID, "HSourceBillNo": data[i].点检计划单, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""
                                        "HManagerID": data[i].负责人ID, "HManagerName": data[i].负责人名称, "HSourceInterID": data[i].hmainid, "HSourceEntryID": data[i].HEntryID, "HSourceBillNo": data[i].单据号
                                    }
                                );
                            }
                            option.data = rowdata;
                            table.render(option);
                        } else {
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    }
                })
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_MouldFile.html
@@ -385,7 +385,7 @@
                                        <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="HInitLife" id="HInitLife">
                                                <input type="text" class="layui-input" name="HInitLife" id="HInitLife" value="0">
                                            </div>
                                        </div>
                                    </div>
@@ -1725,7 +1725,7 @@
                        $("#HDesignLife").val(d.data[0].初始设计寿命);
                        $("#HUseLife").val(d.data[0].使用寿命);
                        $("#HLeaveLife").val(d.data[0].剩余寿命);
                        $("#HInitLife").val(d.data[0].上线初始化寿命);
                        $("#HInitLife").val(d.data[0].上线初始化寿命 == null ? 0 : d.data[0].上线初始化寿命);
                        $("#HCaveQty").val(d.data[0].穴数);
                        $("#HProdQty").val(d.data[0].已生产数量);
                        $("#HProdWeight").val(d.data[0].已生产重量);
WebTM/views/¿´°å/²É¹ºÊÕÁÏ/KB_CGSL.html
@@ -371,12 +371,17 @@
                //初始化表格
                set_InitGrid();
                //加载数据
                get_FastQuery();
                //表格数据开始滚动
                autoScroll();
                var loadPageData = setInterval(function () {
                    //加载数据
                    get_FastQuery();
                    //表格数据开始滚动
                    autoScroll();
                }, 1000 * 10);
                }, 1000 * 60*5);
            }
            //#endregion
WebTM/views/ϵͳ¹ÜÀí/°´Å¥ÉèÖÃ/Xt_ModuleButtonSet.html
@@ -182,15 +182,15 @@
                        for (var j = 0; j < data1.count; j++) {
                            if (btnIdLists[i] == data1.data[j]["HButtonID"]) {
                                if (data1.data[j]["HEditFlag"] == false) {
                                    no_edit.push({ "HBillType": data1.data[j]["HBillType"], "HModuleName": data1.data[j]["HModuleName"], "HButtonID": data1.data[j]["HButtonID"], "HButtonName": data1.data[j]["HButtonName"], "HOrder": data1.data[j]["HOrder"], "HHideFlag": data1.data[j]["HHideFlag"], "HEditFlag": data1.data[j]["HEditFlag"] });
                                    no_edit.push({ "HBillType": data1.data[j]["HBillType"], "HModuleName": data1.data[j]["HModuleName"], "HButtonID": data1.data[j]["HButtonID"], "HButtonName": data1.data[j]["HButtonName"], "HOrder": data1.data[j]["HOrder"], "HHideFlag": data1.data[j]["HHideFlag"], "HEditFlag": data1.data[j]["HEditFlag"], "HOtherName": data1.data[j]["HOtherName"] });
                                } else {
                                    data.push({ "BtnID": btnIdLists[i], "BtnName": btnNameLists[i], "IsHide": data1.data[j]["HHideFlag"] });
                                    data.push({ "BtnID": btnIdLists[i], "BtnName": btnNameLists[i], "IsHide": data1.data[j]["HHideFlag"], "HOrder": btnOrderLists[i], "HOtherName": data1.data[j]["HOtherName"] });
                                }
                                break;
                            }
                        }
                        if (data.length + no_edit.length == i) {
                            data.push({ "BtnID": btnIdLists[i],"BtnName": btnNameLists[i], "IsHide": false });
                            data.push({ "BtnID": btnIdLists[i], "BtnName": btnNameLists[i], "IsHide": false, "HOtherName": "" });
                        }
                    }
                    option.data = data;
@@ -225,7 +225,9 @@
                , cols: [[
                    { field: 'BtnID', title: '按钮ID', width: 100, hide: false }
                    ,{ field: 'BtnName', title: '按钮名', width: 100 }
                    , { file: 'IsHide', title: '是否隐藏', width: 100, templet: '#IsHide' }
                    , { field: 'IsHide', title: '是否隐藏', width: 100, templet: '#IsHide' }
                    , { field: 'HOtherName', title: '别名', width: 100, edit: true }
                    , { field: 'HOrder', title: '次序', width: 100, edit:true }
                ]]
            };
        }
@@ -242,6 +244,13 @@
                if (table.cache["mainTable"][i] != "") {
                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                    tableData.push(table.cache["mainTable"][i])
                    //更新次序列表
                    var index_temp = $.inArray(table.cache["mainTable"][i].BtnID, btnIdLists);
                    if (index_temp != -1) {
                        btnOrderLists[index_temp] = (table.cache["mainTable"][i].HOrder == "" ? 0 : table.cache["mainTable"][i].HOrder);
                    }
                }
            }
WebTM/views/É豸¹ÜÀí/Sb_EquipDotCheckBill_PDA.html
@@ -930,6 +930,9 @@
                            option.data = rowdata;
                            table.render(option);
                        }
                        else {
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    }
                })
            }
WebTM/views/É豸¹ÜÀí/Sb_EquipMaintainBill_PDA.html
@@ -836,7 +836,9 @@
                            option.data = rowdata;
                            table.render(option);
                        }
                        } else {
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    }
                })
            }
WebTM/views/ÖÊÁ¿¹ÜÀí/¼ìÑéÈ¡Ñù»¹Ñùµ¥/QC_TakeSampleCheckBillMainList.html
@@ -163,6 +163,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>反作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-BackSample"><i class="layui-icon layui-icon-radio"></i>还样</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_view"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <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>
@@ -215,6 +216,7 @@
            window.HInterID_Choose = 0;
            //#endregion
            //#endregion
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -271,6 +273,10 @@
                    case 'btn-BackSample':
                        set_BackSample();
                        break;
                    //打印按钮
                    case 'btn_view':
                        get_print();
                        break;
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
                        break;
@@ -321,6 +327,7 @@
            //#endregion
            //#endregion
            //日期间隔下拉列表监听
            form.on('select(HInitTimeCycle)', function (data) {
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
@@ -339,7 +346,7 @@
                    $('#HEndDate').prop('disabled', false);
                }
            });
            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„æ–¹æ³•
            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„æ–¹æ³•
            //#region åˆå§‹åŒ–界面
@@ -382,22 +389,24 @@
                };
            }
            //#endregion
            //#endregion
            //#endregion  ç›‘听网格表体事件
            //监听网格表体事件
            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                //单据号超链接
                if (obj.event == '单据号') {                  //检查 obj.event æ˜¯å¦ç­‰äºŽå­—符串 '单据号'。如果等于,则执行if循环
                    var linterid = data.hmainid.toString();    //声明变量linterid ä¸º data.hmainid
                    var linterid = data.hmainid.toString();    //声明变量linterid ä¸º data.hmainid
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({                //使用 layer的open打开弹出 å±‚
                    layer.open({                //使用 layer的open打开弹出 å±‚
                        type: 2                         //表示弹出层的内容是一个 iframe
                        , area: ['100%', '100%']
                        , title: '编辑' + HPageTitle   //设置弹出层的名字和变量
                        , closeBtn: 1//显示关闭按钮
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../../质量管理/检验取样还样单/QC_Add_TakeSampleCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //设置 iframe çš„ URL,URL ä¸­åŒ…含了查询参数,来调用所需要的值
                        , resize: false,  //是否允许用户调整弹出大小
@@ -410,6 +419,7 @@
                    })
                }
            });
            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
@@ -592,7 +602,7 @@
                    sWhere += " and å•据号 like '%" + HBillNo + "%'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
@@ -618,6 +628,7 @@
                sWhere = "";
            }
            //#endregion
            //#region åˆå§‹æ—¥æœŸé—´éš” ä¸‹æ‹‰åˆ—表
            function setSelect_HInitTimeCycle() {
                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
@@ -657,7 +668,7 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var linterid = data[0].hmainid.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
@@ -857,6 +868,35 @@
            }
            //#endregion
            //#region é¢„览
            function get_print() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length ==1) {
                    var linterid = [];
                    for (var i = 0; i < data.length; i++) {
                        linterid.push(data[i].hmainid.toString())
                    }
                    layer.open({
                        type: 2
                        , area: ['80%', '80%']
                        , title: '打印模版选择'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + '&MyMsg=' + linterid.toString() + '&Type=QC_TakeSampleCheckBillMainList', 'yes']
                        , resize: false
                    })
                }
                else {
                    layer.msg('请选择数据打印!');
                }
            }
            //#region éšè—åˆ—设置
            function get_HideColumn() {
                var colName = "";
@@ -892,6 +932,7 @@
                })
            }
            //#endregion
            //#region æ˜¾ç¤ºåˆ—数据
            function DisPlay_HideColumn() {
                $.ajax({
@@ -994,6 +1035,7 @@
                form.render('select');
            }
            //#endregion
            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘
            //获取当前用户的默认过滤方案
@@ -1202,12 +1244,12 @@
            //#endregion
        });
            //#endregion
        //#region ã€è¿‡æ»¤æ–¹æ¡ˆè¿”回数据】
            //#region ã€è¿‡æ»¤æ–¹æ¡ˆè¿”回数据】
        function HFilterScheme(obj)  //返回过滤方案
        {
            var HInterID = obj[0].hmainid;
WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/SB_TechnologyParameterList.html
@@ -62,7 +62,7 @@
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">物料名称</label>
@@ -73,90 +73,17 @@
                                        <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="HEquipName" id="HEquipName" value="" readonly>
                                                <input type="text" class="layui-input" name="HEquipName" id="HEquipName" value="" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
                                            <label class="layui-form-label" style="width: 85px;">采集来源</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                                <select name="HEquipType" id="HEquipType"  class=" ForFilteringSchemes" lay-verify="HEquipType">
                                                    <option value="手动输入">手动输入</option>
                                                    <option value="设备采集">设备采集</option>
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
@@ -307,12 +234,18 @@
            function get_Display(sWhere) {
                var index = layer.load(0, { shade: false });
                var ajaxLoad = layer.load();
                var Type = "";
                if ($("#HEquipType").val() == "手动输入") {
                    Type = 1;
                } else {
                    Type = 2;
                }
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/QC_CustomerAppealReport/SB_EquipICMOTechParamList',
                    type: "GET",
                    async:false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    async: false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Type": Type },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
@@ -380,82 +313,7 @@
                var HProcName = $("#HProcName").val();
                var HTechParamName = $("#HTechParamName").val();
                var HEquipName = $("#HEquipName").val();
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
                var ColName1 = $("#ColName1").val();//复选框
                var Comparator1 = $("#Comparator1").val()
                var ColContent1 = $("#ColContent1").val();
                var ColName2 = $("#ColName2").val();//复选框
                var Comparator2 = $("#Comparator2").val()
                var ColContent2 = $("#ColContent2").val();
                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                if (ColName1 != 0 && Comparator1 != 0) {
                    var com1 = "";
                    switch (Comparator1) {
                        case "7":
                            com1 = "like'%" + ColContent1 + "%'";
                            break;
                        case "8":
                            com1 = "like'%" + ColContent1 + "'";
                            break;
                        case "9":
                            com1 = "like'" + ColContent1 + "%'";
                            break;
                        case "10":
                            com1 = "not like'%" + ColContent1 + "%'";
                            break;
                        default:
                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                            break;
                    }
                    sWhere += " and " + ColName1 + " " + com1;
                }
                if (ColName2 != 0 && Comparator2 != 0) {
                    var com2 = "";
                    switch (Comparator2) {
                        case "7":
                            com2 = "like'%" + ColContent2 + "%'";
                            break;
                        case "8":
                            com2 = "like'%" + ColContent2 + "'";
                            break;
                        case "9":
                            com2 = "like'" + ColContent2 + "%'";
                            break;
                        case "10":
                            com2 = "not like'%" + ColContent2 + "%'";
                            break;
                        default:
                            com2 = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }
                if (HProcExchBillNo != "" && HProcName != "" && HTechParamName != "") {
                    sWhere = {
                        HProcExchBillNo: HProcExchBillNo
@@ -475,16 +333,7 @@
                $("#HMaterName").val();
                $("#HEquipName").val();
                $("#btnSearch").click();
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
                $("#ColContent1").val("");
                $("#ColName1").val("0");
                $("#Comparator1").val("0");
                $("#btnSearch").click();
                form.render('select');
                sWhere = "";
WebTM/views/²É¹º¹ÜÀí/¸¶¿îµ¥/YF_PayMentBill.html
@@ -980,6 +980,18 @@
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        var HSupID = checkStatus.data[0]["HSupID"];;//判断供应商
                        //if (HSupID == 0 || HSupID == '') {
                        //    HSupID = checkStatus.data[0]["HSupID"];
                        //}
                        for (var i = 0; i < checkStatus.data.length; i++) {
                            if (checkStatus.data[i]["HSupID"] != HSupID) {
                                layer.msg("下推失败!已经选中的记录中存在不同供应商!");
                                layer.close(index);//关闭弹窗
                                return;
                            }
                        }
                        setPayableBill(checkStatus);
WebTM/views/²É¹º¹ÜÀí/¸¶¿îµ¥/YF_PayMentBillQuery.html
@@ -434,7 +434,7 @@
                //初始化表格
                set_InitGrid();
                //直接执行列表筛选 åŠ è½½æ•°æ®åˆ°ç½‘æ ¼
                get_FastQuery(table, option,1)
                /*get_FastQuery(table, option,1)*/
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
@@ -1546,7 +1546,7 @@
                            //隐藏显示过滤方案的标签信息
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            ////执行查询方法
                            //get_FastQuery()
                            get_FastQuery()
                            //form.render("select");
                        }
                    }, error: function () {
WebTM/views/²É¹º¹ÜÀí/Ó¦¸¶µ¥/Cg_PayableBill.html
@@ -1239,7 +1239,17 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        var HSupID = $("#HSupID").val();//判断供应商
                        if (HSupID == 0 || HSupID == '') {
                            HSupID = checkStatus.data[0]["HSupID"];
                        }
                        for (var i = 0; i < checkStatus.data.length; i++) {
                            if (checkStatus.data[i]["HSupID"] != HSupID) {
                                layer.msg("下推失败!已经选中的记录中存在不同供应商!");
                                layer.close(index);//关闭弹窗
                                return;
                            }
                        }
                        if ($("#BillType").val() == "1102") {
                            setInitByPOOrderBill(checkStatus);
                        }
WebTM/views/²É¹º¹ÜÀí/Ó¦¸¶µ¥/Cg_PayableBillQuery.html
@@ -439,7 +439,7 @@
                //初始化表格
                set_InitGrid();
                //直接执行列表筛选 åŠ è½½æ•°æ®åˆ°ç½‘æ ¼
                get_FastQuery(table, option,1)
                /*get_FastQuery(table, option,1)*/
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
@@ -1529,7 +1529,7 @@
                            //隐藏显示过滤方案的标签信息
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            ////执行查询方法
                            //get_FastQuery()
                            get_FastQuery()
                            //form.render("select");
                        }
                    }, error: function () {
WebTM/views/²É¹º¹ÜÀí/ÊÕÁÏ֪ͨµ¥/Add_Edit_Cg_POInStockBillList.html
@@ -2164,10 +2164,19 @@
                        if (checkStatus.data.length == 0) {
                            return layer.msg("请至少选择一条数据!");
                        }
                        var HSupID = $("#HSupID").val();//判断供应商
                        if (HSupID == 0 || HSupID == '') {
                            HSupID = checkStatus.data[0]["HSupID"];
                        }
                        //layer.alert("你已选择" + checkStatus.data.length + "条数据");
                        //获取收料通知单代码
                        var ProcessNumber = [];
                        for (var i = 0; i < checkStatus.data.length; i++) {
                            if (checkStatus.data[i]["HSupID"] != HSupID) {
                                layer.msg("下推失败!已经选中的记录中存在不同供应商!");
                                layer.close(index);//关闭弹窗
                                return;
                            }
                            ProcessNumber.push(checkStatus.data[i]);
                        }
WebTM/views/²É¹º¹ÜÀí/ÊÕÁÏ֪ͨµ¥/Cg_POInStockBillList.html
@@ -780,6 +780,7 @@
                    var dataArray = [];
                    var HCusName = data[0].客户;
                    var HEmpName = data[0].业务员;
                    var HSupName = data[0].供应商;
                    for (var i = 0; i < data.length; i++) {
                        var temp = {
                            "hmainid": data[i].hmainid
@@ -810,6 +811,10 @@
                            layer.msg("下推失败!已经选中的记录中存在不同业务员!");
                            return;
                        }
                        if (data[i].供应商 != HSupName) {
                            layer.msg("下推失败!已经选中的记录中存在不同供应商!");
                            return;
                        }
                    }
                    var datajson = {
WebTM/views/²É¹º¹ÜÀí/ÊÕÁÏ֪ͨµ¥/Cg_POInStockBillQuery.html
@@ -460,7 +460,7 @@
                //初始化表格
                set_InitGrid();
                //直接执行列表筛选 åŠ è½½æ•°æ®åˆ°ç½‘æ ¼
                get_FastQuery(table, option,1)
                /*get_FastQuery(table, option,1)*/
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
@@ -1603,7 +1603,7 @@
                            //隐藏显示过滤方案的标签信息
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            ////执行查询方法
                            //get_FastQuery()
                            get_FastQuery()
                            //form.render("select");
                        }
                    }, error: function () {
WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillList.html
@@ -15,7 +15,7 @@
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/HideButton_New.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
</head>
@@ -277,7 +277,7 @@
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
@@ -474,9 +474,9 @@
                        break;
                    //按钮设置
                    case 'set_HideButton':
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //需要设置的按钮的父级节点的id
                        var HBillType = "1102";
                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                        break;
                    //保存方案
                    case 'set_SaveScheme': set_SaveScheme();
@@ -792,6 +792,7 @@
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Cg_POOrderBill/list',
                    async:false,
                    type: "GET",
                    data: { "sWhere": sWhere  , "user": sessionStorage["HUserName"]},
                    success: function (data1) {
@@ -858,9 +859,9 @@
                            DisPlay_HideColumn();
                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //需要设置的按钮的父级节点的id
                            var HBillType = "1102";
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }
@@ -1054,6 +1055,7 @@
                    var dataArray = [];
                    var HCusName = data[0].客户;
                    var HEmpName = data[0].业务员;
                    var HSupName = data[0].供应商;
                    for (var i = 0; i < data.length; i++) {
                        var temp = {
                            "hmainid": data[i].hmainid
@@ -1080,6 +1082,10 @@
                        }
                        if (data[i].业务员 != HEmpName) {
                            layer.msg("下推失败!已经选中的记录中存在不同业务员!");
                            return;
                        }
                        if (data[i].供应商 != HSupName) {
                            layer.msg("下推失败!已经选中的记录中存在不同供应商!");
                            return;
                        }
                    }
@@ -1117,6 +1123,7 @@
                    var dataArray = [];
                    var HCusName = data[0].客户;
                    var HEmpName = data[0].业务员;
                    var HSupName = data[0].供应商;
                    for (var i = 0; i < data.length; i++) {
                        var temp = {
                            "hmainid": data[i].hmainid
@@ -1143,6 +1150,10 @@
                        }
                        if (data[i].业务员 != HEmpName) {
                            layer.msg("下推失败!已经选中的记录中存在不同业务员!");
                            return;
                        }
                        if (data[i].供应商 != HSupName) {
                            layer.msg("下推失败!已经选中的记录中存在不同供应商!");
                            return;
                        }
                    }
@@ -1179,6 +1190,7 @@
                    var dataArray = [];
                    var HCusName = data[0].客户;
                    var HEmpName = data[0].业务员;
                    var HSupName = data[0].供应商;
                    for (var i = 0; i < data.length; i++) {
                        var temp = {
                            "hmainid": data[i].hmainid
@@ -1203,10 +1215,14 @@
                            layer.msg("下推失败!已经选中的记录中存在不同客户!");
                            return;
                        }
                        //if (data[i].业务员 != HEmpName) {
                        //    layer.msg("下推失败!已经选中的记录中存在不同业务员!");
                        //    return;
                        //}
                        if (data[i].业务员 != HEmpName) {
                            layer.msg("下推失败!已经选中的记录中存在不同业务员!");
                            return;
                        }
                        if (data[i].供应商 != HSupName) {
                            layer.msg("下推失败!已经选中的记录中存在不同供应商!");
                            return;
                        }
                    }
                    var datajson = {
@@ -1242,6 +1258,7 @@
                    var dataArray = [];
                    var HCusName = data[0].客户;
                    var HEmpName = data[0].业务员;
                    var HSupName = data[0].供应商;
                    for (var i = 0; i < data.length; i++) {
                        var temp = {
                            "hmainid": data[i].hmainid
@@ -1268,6 +1285,10 @@
                        }
                        if (data[i].业务员 != HEmpName) {
                            layer.msg("下推失败!已经选中的记录中存在不同业务员!");
                            return;
                        }
                        if (data[i].供应商 != HSupName) {
                            layer.msg("下推失败!已经选中的记录中存在不同供应商!");
                            return;
                        }
                    }
@@ -2308,14 +2329,14 @@
                            table.render(option);
                            var HBillType = "1102";
                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                            var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //需要设置的按钮的父级节点的id
                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                        } else {
                            table.render(option);
                            var HBillType = "1102";
                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                            var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //需要设置的按钮的父级节点的id
                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillQuery.html
@@ -452,8 +452,8 @@
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化表格
                set_InitGrid();
                //直接执行列表筛选 åŠ è½½æ•°æ®åˆ°ç½‘æ ¼
                get_FastQuery(table, option,1)
                ////直接执行列表筛选 åŠ è½½æ•°æ®åˆ°ç½‘æ ¼
                //get_FastQuery(table, option,1)
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
@@ -1595,7 +1595,7 @@
                            //隐藏显示过滤方案的标签信息
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            ////执行查询方法
                            //get_FastQuery()
                            get_FastQuery()
                            //form.render("select");
                        }
                    }, error: function () {
WebTM/views/ÏúÊÛ¹ÜÀí/ÆäËûÓ¦ÊÕµ¥/YS_ReceiveOtherBillMain.html
@@ -975,7 +975,7 @@
                                                var value = $(e.currentTarget).val().replace("'", "");                                  //获取文本框最新值
                                                currRowIndex = 0;
                                                var tableView = "h_v_Gy_ProjectMoney";
                                                var childSWhere = "select HItemID,项目费用代码 ä»£ç ,项目费用名称 åç§° from " + tableView + " where 1=1 and (项目费用名称 like '%" + value + "%' or é¡¹ç›®è´¹ç”¨ä»£ç  like '%" + value + "%') ";
                                                var childSWhere = "select top(10) HItemID,项目费用代码 ä»£ç ,项目费用名称 åç§° from " + tableView + " where 1=1 and (项目费用名称 like '%" + value + "%' or é¡¹ç›®è´¹ç”¨ä»£ç  like '%" + value + "%') ";
                                                childPage.getData(childSWhere, tableView);
                                            }, 200);
                                        }
@@ -997,7 +997,7 @@
                                        var value = $(e.currentTarget).val().replace("'", "");                                  //获取文本框最新值
                                        currRowIndex = 0;
                                        var tableView = "h_v_Gy_ProjectMoney";
                                        var childSWhere = "select HItemID,项目费用代码 ä»£ç ,项目费用名称 åç§° from " + tableView + " where 1=1 and (项目费用名称 like '%" + value + "%' or é¡¹ç›®è´¹ç”¨ä»£ç  like '%" + value + "%') ";
                                        var childSWhere = "select top(10) HItemID,项目费用代码 ä»£ç ,项目费用名称 åç§° from " + tableView + " where 1=1 and (项目费用名称 like '%" + value + "%' or é¡¹ç›®è´¹ç”¨ä»£ç  like '%" + value + "%') ";
                                        childPage.getData(childSWhere, tableView);
                                    }, 200);
                                }
WebTM/views/ÏúÊÛ¹ÜÀí/·¢»õ֪ͨµ¥/Add_Edit_Xs_SeOutStockBillList.html
@@ -805,9 +805,18 @@
                        if (checkStatus.data.length == 0) {
                            return layer.msg("请至少选择一条数据!");
                        }
                        var HCusID = $("#HCusID").val();//判断客户
                        if (HCusID == 0 || HCusID == '') {
                            HCusID = checkStatus.data[0]["HCusID"];
                        }
                        //获取销售订单代码
                        var ProcessNumber = [];
                        for (var i = 0; i < checkStatus.data.length; i++) {
                            if (checkStatus.data[i]["HCusID"] != HCusID) {
                                layer.msg("下推失败!已经选中的记录中存在不同客户!");
                                layer.close(index);
                                return;
                            }
                            ProcessNumber.push(checkStatus.data[i]);
                        }
                        for (var i = 0; i < ProcessNumber.length; i++) {
WebTM/views/ÏúÊÛ¹ÜÀí/·¢»õ֪ͨµ¥/Xs_SeOutStockBillQuery.html
@@ -456,7 +456,7 @@
                //初始化表格
                set_InitGrid();
                //直接执行列表筛选 åŠ è½½æ•°æ®åˆ°ç½‘æ ¼
                get_FastQuery(table, option,1)
               /* get_FastQuery(table, option,1)*/
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
@@ -1602,7 +1602,7 @@
                            //隐藏显示过滤方案的标签信息
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            ////执行查询方法
                            //get_FastQuery()
                            get_FastQuery()
                            //form.render("select");
                        }
                    }, error: function () {
WebTM/views/ÏúÊÛ¹ÜÀí/Ó¦ÊÕµ¥/Xs_ReceivableBill.html
@@ -1590,7 +1590,17 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        var HCusID = $("#HCusID").val();//判断客户
                        if (HCusID == 0 || HCusID == '') {
                            HCusID = checkStatus.data[0]["HCusID"];
                        }
                        for (var i = 0; i < checkStatus.data.length; i++) {
                            if (checkStatus.data[i]["HCusID"] != HCusID) {
                                layer.msg("下推失败!已经选中的记录中存在不同客户!");
                                layer.close(index);
                                return;
                            }
                        }
                        if ($("#BillType").val() == "1401") {
                            setInitBySeOrderBill(checkStatus);
                        }
WebTM/views/ÏúÊÛ¹ÜÀí/Ó¦ÊÕµ¥/Xs_ReceivableBillQuery.html
@@ -426,7 +426,7 @@
                //初始化表格
                set_InitGrid();
                //直接执行列表筛选 åŠ è½½æ•°æ®åˆ°ç½‘æ ¼
                get_FastQuery(table, option,1)
                /*get_FastQuery(table, option,1)*/
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
@@ -1530,7 +1530,7 @@
                            //隐藏显示过滤方案的标签信息
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            ////执行查询方法
                            //get_FastQuery()
                            get_FastQuery()
                            //form.render("select");
                        }
                    }, error: function () {
WebTM/views/ÏúÊÛ¹ÜÀí/ÊÕ¿îµ¥/YS_ReceiveBill.html
@@ -1161,6 +1161,17 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        var HCusID = $("#HCusID").val();//判断客户
                        if (HCusID == 0 || HCusID == '') {
                            HCusID = checkStatus.data[0]["HCusID"];
                        }
                        for (var i = 0; i < checkStatus.data.length; i++) {
                            if (checkStatus.data[i]["HCusID"] != HCusID) {
                                layer.msg("下推失败!已经选中的记录中存在不同客户!");
                                layer.close(index);
                                return;
                            }
                        }
                        setReceivableBill(checkStatus);
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
WebTM/views/ÏúÊÛ¹ÜÀí/ÊÕ¿îµ¥/YS_ReceiveBillQuery.html
@@ -427,7 +427,7 @@
                //初始化表格
                set_InitGrid();
                //直接执行列表筛选 åŠ è½½æ•°æ®åˆ°ç½‘æ ¼
                get_FastQuery(table, option,1)
                /*get_FastQuery(table, option,1)*/
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
@@ -1531,7 +1531,7 @@
                            //隐藏显示过滤方案的标签信息
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            ////执行查询方法
                            //get_FastQuery()
                            get_FastQuery()
                            //form.render("select");
                        }
                    }, error: function () {
WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛ¶©µ¥/Xs_SeOrderBillQuery.html
@@ -453,7 +453,7 @@
                //初始化表格
                set_InitGrid();
                //直接执行列表筛选 åŠ è½½æ•°æ®åˆ°ç½‘æ ¼
                get_FastQuery(table, option,1)
                /*get_FastQuery(table, option,1)*/
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
@@ -1598,7 +1598,7 @@
                            //隐藏显示过滤方案的标签信息
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            ////执行查询方法
                            //get_FastQuery()
                            get_FastQuery()
                            //form.render("select");
                        }
                    }, error: function () {
WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill.html
@@ -1874,7 +1874,17 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        var HCusID = $("#HCusID").val();//判断客户
                        if (HCusID == 0 || HCusID == '') {
                            HCusID = checkStatus.data[0]["HCusID"];
                        }
                        for (var i = 0; i < checkStatus.data.length; i++) {
                            if (checkStatus.data[i]["HCusID"] != HCusID) {
                                layer.msg("下推失败!已经选中的记录中存在不同客户!");
                                layer.close(index);
                                return;
                            }
                        }
                        if ($("#BillType").val() == "1401") {
                            setInitBySeOrderBill(checkStatus);
                        } else if ($("#BillType").val() == "1402") {
WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBillQuery.html
@@ -438,7 +438,7 @@
                //初始化表格
                set_InitGrid();
                //直接执行列表筛选 åŠ è½½æ•°æ®åˆ°ç½‘æ ¼
                get_FastQuery(table, option,1)
                /*get_FastQuery(table, option,1)*/
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
@@ -1553,7 +1553,7 @@
                            //隐藏显示过滤方案的标签信息
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            ////执行查询方法
                            //get_FastQuery()
                            get_FastQuery()
                            //form.render("select");
                        }
                    }, error: function () {
WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Add_Edit_Kf_POStockInBillList.html
@@ -2256,10 +2256,18 @@
                        if (checkStatus.data.length == 0) {
                            return layer.msg("请至少选择一条数据!");
                        }
                        var HSupID = $("#HSupID").val();//判断供应商
                        if (HSupID == 0 || HSupID == '') {
                            HSupID = checkStatus.data[0]["HSupID"];
                        }
                        //获取收料通知单代码
                        var ProcessNumber = [];
                        for (var i = 0; i < checkStatus.data.length; i++) {
                            if (checkStatus.data[i]["HSupID"] != HSupID) {
                                layer.msg("下推失败!已经选中的记录中存在不同供应商!");
                                layer.close(index);//关闭弹窗
                                return;
                            }
                            ProcessNumber.push(checkStatus.data[i]);
                        }
WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBillList.html
@@ -937,6 +937,7 @@
                    var dataArray = [];
                    var HCusName = data[0].客户;
                    var HEmpName = data[0].业务员;
                    var HSupName = data[0].供应商;
                    for (var i = 0; i < data.length; i++) {
                        var temp = {
                            "hmainid": data[i].hmainid
@@ -961,10 +962,14 @@
                            layer.msg("下推失败!已经选中的记录中存在不同客户!");
                            return;
                        }
                        //if (data[i].业务员 != HEmpName) {
                        //    layer.msg("下推失败!已经选中的记录中存在不同业务员!");
                        //    return;
                        //}
                        if (data[i].业务员 != HEmpName) {
                            layer.msg("下推失败!已经选中的记录中存在不同业务员!");
                            return;
                        }
                        if (data[i].供应商 != HSupName) {
                            layer.msg("下推失败!已经选中的记录中存在不同供应商!");
                            return;
                        }
                    }
                    var datajson = {
WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBillListQuery.html
@@ -446,7 +446,7 @@
                //初始化表格
                set_InitGrid();
                //直接执行列表筛选 åŠ è½½æ•°æ®åˆ°ç½‘æ ¼
                get_FastQuery(table, option,1)
                /*get_FastQuery(table, option,1)*/
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
@@ -1661,7 +1661,7 @@
                            //隐藏显示过滤方案的标签信息
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            ////执行查询方法
                            //get_FastQuery()
                            get_FastQuery()
                            //form.render("select");
                        }
                    }, error: function () {