1
duhe
2024-09-13 693fdf5337b8d1475713cf1e9ab28aec1712213d
1
4个文件已添加
16个文件已修改
1255 ■■■■ 已修改文件
WebTM/WebTM.csproj 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/生产入库单/Kf_ProductInBillList.html 6 ●●●● 补丁 | 查看 | 原始文档 | 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_Group.html 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/条码明细/Kf_MateOutBillList_CodeDetail.html 784 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/器具点检规程单/Sc_MouldDotCheckRuleBillList_PDA.html 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具点检保养/Sc_MouldDotCheckBill_PDA.html 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/Sb_EquipDotCheckBill_PDA.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/Sb_EquipMaintainBill_PDA.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/检验取样还样单/QC_TakeSampleCheckBillMainList.html 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/质量报表/SB_TechnologyParameterList.html 177 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/分步式调出单/Fb_StepFoldOutBillList.html 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/领料出库/Kf_MateOutBackBillList.html 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/领料出库/Kf_MateOutBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -367,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" />
@@ -383,6 +384,7 @@
    <Content Include="views\工资管理\技能考核\HR_EmployeeSkillExamBill.html" />
    <Content Include="views\工资管理\技能考核\HR_EmployeeSkillExamBillList.html" />
    <Content Include="views\应收管理\报表分析\Xs_SeOrderBarCodeInAndOutStockDetailReport.html" />
    <Content Include="views\条码明细\Kf_MateOutBillList_CodeDetail.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldLifeUsePicReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldDotCheckTaskReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldMaintainTaskReport.html" />
@@ -2340,6 +2342,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
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\网站发布\后端代码\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
WebTM/views/²Ö´æ¹ÜÀí/Éú²úÈë¿âµ¥/Kf_ProductInBillList.html
@@ -469,12 +469,12 @@
                    //编辑按钮
                    case 'btn_Edit': btn_Edit();
                        break;
                    //条码明细按钮
                    case 'btn_WMSSub': getWmsSub();
                        break;
                    //删除按钮
                    case 'btn_Delete': btn_Delete();
                        break;
                    //条码明细
                    case 'get_BarCodeNote': get_BarCodeNote();
                        break;
                    //刷新按钮
                    case 'btn_Refresh': btn_Refresh();
                        break;
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_Group.html
@@ -239,6 +239,8 @@
                    //刷新
                    case 'get_Refresh': get_Refresh();
                        break;
                    //导入
                    case 'set_SouceExcel': set_SouceExcel();
                    //审核按钮
                    case 'btn-Audit':
                        set_CheckBill(0);
@@ -358,6 +360,26 @@
            }
            //#endregion
            //文件上传
            upload.render({
                elem: '#UpLoad',
                url: GetWEBURL() + '/Gy_ProcPrice/Gy_ProcPrice_Excel',
                contentType: 'application/json',
                exts: 'xls|xlsx', //允许上传的类型
                done: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);
                    } else {
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                },
                error: function (err) {
                    debugger
                    layer.alert('导入出现异常', { icon: 2 });
                }
            });
            //#region åˆå§‹åŒ–表格方法
            function set_InitGrid() {
                option = {
WebTM/views/ÌõÂëÃ÷ϸ/Kf_MateOutBillList_CodeDetail.html
New file
@@ -0,0 +1,784 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>采购入库单码单查询</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 2px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">退出</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn-Print" id="btn-Print">打印码单</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn-PrintByCusDefine" id="btn-PrintByCusDefine">打印码单(客户物料)</button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="0" style="padding:1px;width:120px;" class="layui-this">基本信息</li>
                            <li lay-id="1" style="padding:1px;">码单信息</li>
                            <li lay-id="2" style="padding:1px;">条码明细</li>
                        </ul>
                        <div class="layui-tab-content">
                            <!--基本信息-->
                            <div class="layui-tab-item layui-show">
                                <table class="layui-hide" id="mainTable0" lay-filter="mainTable0"></table>
                                <script type="text/html" id="toolbarDemo0">
                                    <div class="layui-btn-container">
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn0"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                    </div>
                                </script>
                            </div>
                            <!--码单信息-->
                            <div class="layui-tab-item">
                                <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
                                <script type="text/html" id="toolbarDemo1">
                                    <div class="layui-btn-container">
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn1"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                    </div>
                                </script>
                            </div>
                            <!--条码明细-->
                            <div class="layui-tab-item">
                                <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
                                <script type="text/html" id="toolbarDemo2">
                                    <div class="layui-btn-container">
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                    </div>
                                </script>
                            </div>
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
</body>
</html>
<script>
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index' //主入口模块
    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
        //#region å…¬å…±å˜é‡
        var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element;
        //获取参数
        var params = getUrlVars();
        var linterid = params[params[0]];           //从参数中获取 å•据内码
        //子表渲染参数
        var option0 = {};
        var option1 = {};
        var option2 = {};
        //子表不需要显示的字段
        var titleData0 = ["hmainid","HMainSourceInterID","HMainSourceEntryID","HDeptID","HEmpID","HCurID","HCusID","HSSID","HSellSID","HOrgID","HMaterID","HUnitID","HSourceInterID","HSourceEntryID","HSourceBillNo","HSourceBillType"];
        var titleData1 = ["hmainid", "HEntryID", "HEmpID", "HBomID", "HRoutingInterID", "HPRDORGID", "hsubid", "HMaterID", "HUnitID", "HAuxPropID", "HDeptID", "HEntryCusID", "HCenterID", "HSourceID", "HSourceID_b", "HSourceName", "HBillStatus", "HAuxQty", "HAuxUnit", "HAuxUnitName", "HWidth", "HWeight", "HIsStockQty", "HCusID", "HSourceInterID", "HSourceEntryID", "HSourceBillNo", "HSourceBillType"];
        var titleData2 = ["hmainid", "HMainSourceInterID", "HMainSourceEntryID", "HDeptID", "HEmpID", "HCurID", "HCusID", "HManagerID", "HOrgID"];
        //#endregion
        //#region è¿›å…¥é¡µé¢å³åŠ è½½
        //初始化界面
        set_ClearBill();
        //#endregion
        //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
        //#region é€€å‡º
        form.on('submit(Cancel)', function () {
            if (params[1] != null) {
                Pub_Close(1);
            } else if (params[1] == null) {
                Pub_Close(2);
            }
        })
        //#endregion
        //#region æ‰“印码单
        form.on('submit(btn-Print)', function () {
            layer.open({
                type: 2
                , area: ['50%', '50%']
                , title: '打印模版选择'
                , shade: 0.6 //遮罩透明度
                , maxmin: false //允许全屏最小化
                , anim: 0 //0-6的动画形式,-1不开启
                , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid + '&MyMsg=' + linterid + '&Type=Kf_SellOutBillList_BarCodeNote', 'yes']
                , resize: false
            })
        })
        //#endregion
        //#region æ‰“印码单(客户自定义)
        form.on('submit(btn-PrintByCusDefine)', function () {
            layer.open({
                type: 2
                , area: ['50%', '50%']
                , title: '打印模版选择'
                , shade: 0.6 //遮罩透明度
                , maxmin: false //允许全屏最小化
                , anim: 0 //0-6的动画形式,-1不开启
                , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid + '&MyMsg=' + linterid + '&Type=Kf_SellOutBillList_BarCodeNote_ByCusDefine', 'yes']
                , resize: false
            })
        })
        //#endregion
        //#region å­è¡¨0:头工具栏事件
        table.on('toolbar(mainTable0)', function (obj) {
            switch (obj.event) {
                //列设置
                case 'set_HideColumn0':
                    get_HideColumn0();
                    break;
            }
        });
        //#endregion
        //#region å­è¡¨1:头工具栏事件
        table.on('toolbar(mainTable1)', function (obj) {
            switch (obj.event) {
                //列设置
                case 'set_HideColumn1':
                    get_HideColumn1();
                    break;
            }
        });
        //#endregion
        //#region å­è¡¨2:头工具栏事件
        table.on('toolbar(mainTable2)', function (obj) {
            switch (obj.event) {
                //列设置
                case 'set_HideColumn2':
                    get_HideColumn2();
                    break;
            }
        });
        //#endregion
        //#endregion
        //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
        //#region åˆå§‹åŒ–界面
        function set_ClearBill()
        {
            set_InitGrid();
            get_Display();
        }
        //#endregion
        //#region èŽ·å–å‚æ•°
        function getUrlVars() {
            var vars = [], hash;
            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
            for (var i = 0; i < hashes.length; i++) {
                hash = hashes[i].split('=');
                vars.push(hash[0]);
                vars[hash[0]] = hash[1];
            }
            return vars;
        }
        //#endregion
        //#region å­è¡¨åˆå§‹åŒ–
        function set_InitGrid() {
            //动态显示列名
            option0 ={
                elem: '#mainTable0'
                , toolbar: '#toolbarDemo0'
                , height: 550
                //, page: true
                , cellMinWidth: 90
                , limit: 5000
                //, limits: [50, 500, 5000, 20000]
            };
            //动态显示列名
            option1 = {
                elem: '#mainTable1'
                , toolbar: '#toolbarDemo1'
                , height: 550
                //, page: true
                , cellMinWidth: 90
                , limit: 5000
                //, limits: [50, 500, 5000, 20000]
            };
            //动态显示列名
            option2 = {
                elem: '#mainTable2'
                , toolbar: '#toolbarDemo2'
                , height: 550
                //, page: true
                , cellMinWidth: 90
                , limit: 5000
                //, limits: [50, 500, 5000, 20000]
            };
        }
        //#endregion
        //#region æŸ¥è¯¢
        function get_Display() {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Kf_MateOutBillController/BarCodeNote',
                type: "GET",
                data: { "HInterID": linterid},
                success: function (data1) {
                    if (data1.count == 1) {
                        //渲染表0
                        var table0 = {
                            "data": data1.data[0]
                            , "list": data1.list[0]
                        };
                        setInit_mainTable0(table0);
                        //渲染表1
                        var table1 = {
                            "data": data1.data[1]
                            , "list": data1.list[1]
                        };
                        setInit_mainTable1(table1);
                        //渲染表2
                        var table2 = {
                            "data": data1.data[2]
                            , "list": data1.list[2]
                        };
                        setInit_mainTable2(table2);
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }
        //#endregion
        //#region æ¸²æŸ“表0
        function setInit_mainTable0(data1) {
            //需要设置合计行的列
            var totalArray = [];
            //整理子表的列
            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, titleData0) > -1) {
                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                }
                else if ($.inArray(data[i].name, totalArray) > -1) {
                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                } 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 });
                    }
                }
            }
            //设置子表渲染参数的列集合和数据并渲染
            option0.cols = [col];
            option0.data = data1.data;
            table.render(option0);
            //刷新表格数据
            DisPlay_HideColumn0();
        }
        //#endregion
        //#region æ¸²æŸ“表1
        function setInit_mainTable1(data1) {
            //需要设置合计行的列
            var totalArray = [];
            //整理子表的列
            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, titleData1) > -1) {
                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                }
                else if ($.inArray(data[i].name, totalArray) > -1) {
                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                } 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 });
                    }
                }
            }
            //设置子表渲染参数的列集合和数据并渲染
            option1.cols = [col];
            option1.data = data1.data;
            table.render(option1);
            //刷新表格数据
            DisPlay_HideColumn1();
        }
        //#endregion
        //#region æ¸²æŸ“表2
        function setInit_mainTable2(data1) {
            //需要设置合计行的列
            var totalArray = [];
            //整理子表的列
            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, titleData2) > -1) {
                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                }
                else if ($.inArray(data[i].name, totalArray) > -1) {
                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                } 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 });
                    }
                }
            }
            //设置子表渲染参数的列集合和数据并渲染
            option2.cols = [col];
            option2.data = data1.data;
            table.render(option2);
            //刷新表格数据
            DisPlay_HideColumn2();
        }
        //#endregion
        //#region å­è¡¨0:隐藏列设置
        function get_HideColumn0() {
            HModName = "Xs_SeOrderBill_LookDown_SeOrderChangeBill";
            var colName = "";
            var contentUrl = "";
            for (var i = 1; i < option0.cols[0].length; i++) {
                colName += option0.cols[0][i]["title"] + ",";
            }
            var urlStr = window.document.location.pathname;//获取文件路径
            var urlLen = urlStr.split('/');
            for (var i = 0; i < urlLen.length - 4; i++) {
                contentUrl += "../";
            }
            colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
            contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
            layer.open({
                type: 2
                , skin: "layui-layer-rim" //加上边框
                , title: "隐藏列设置"  //标题
                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                , shift: 2 //弹出动画
                , area: ["50%", "90%"] //窗体大小
                , maxmin: true //设置最大最小按钮是否显示
                , content: [contentUrl, "yes"]
                , btn: ["确定", "取消"]
                , btn1: function (index, laero) {
                    //刷新表格数据
                    DisPlay_HideColumn0();
                    //更新表格缓存的数据
                    layer.close(index);//关闭弹窗
                }
            })
        }
        //#endregion
        //#region å­è¡¨0:显示列数据
        function DisPlay_HideColumn0() {
            HModName = "Xs_SeOrderBill_LookDown_SeOrderChangeBill";
            $.ajax({
                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                type: "GET",
                data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                async: false,
                success: function (data1) {
                    if (data1.data.length != 0) {
                        var dataCol = [];//数据库查询出的列数据
                        dataCol = data1.data[0].HGridString.split(',');
                        for (var i = 0; i < option0.cols[0].length-1; i++) {
                            var dataCols = dataCol[i].split('|');
                            //隐藏列
                            if (dataCols[1] == 1) {
                                option0.cols[0][i + 1]["hide"] = true;
                            }
                            //设置列宽
                            if (dataCols[3] > 0) {
                                option0.cols[0][i + 1]["width"] = dataCols[3];
                            }
                            //设置内容字体大小
                            if (data1.data[0].HFontSize != 0) {
                                option0.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
                            } else {
                                option0.cols[0][i + 1]["style"] += "font-size:100%";
                            }
                            //设置列宽
                            //if (data1.data[0].HColumnWidth != 0) {
                            //    option0.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                            //} else {
                            //    option0.cols[0][i + 1]["width"] = "";
                            //}
                            //显示列
                            if (dataCols[1] == 0 && $.inArray(option0.cols[0][i + 1]["title"], titleData0) == -1) {
                                option0.cols[0][i + 1]["hide"] = false;
                            }
                            //字体所在位置(å·¦ å±…中 å³)
                            switch (dataCols[2]) {
                                case "L":
                                    option0.cols[0][i + 1]["align"] = "left";
                                    break;
                                case "M":
                                    option0.cols[0][i + 1]["align"] = "center";
                                    break;
                                case "R":
                                    option0.cols[0][i + 1]["align"] = "right";
                                    break;
                            }
                        }
                        //取消冻结列
                        for (var i = 1; i < option0.cols[0].length - 1; i++) {
                            if (option0.cols[0][i]["fixed"] != null) {
                                option0.cols[0][i]["fixed"] = null;
                            }
                            else {
                                break;
                            }
                        }
                        //冻结列
                        if (data1.data[0].HFixCols != 0) {
                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                if ($.inArray(option0.cols[0][i + 1]["title"], titleData) != -1) {
                                    data1.data[0].HFixCols += 1;
                                }
                                option0.cols[0][i + 1]["fixed"] = "left";
                            }
                        }
                        table.render(option0);
                    } else {
                        table.render(option0);
                    }
                }, error: function () {
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            })
        }
        //#endregion
        //#region å­è¡¨1:隐藏列设置
        function get_HideColumn1() {
            HModName = "Xs_SeOrderBill_LookDown_ICMOBill";
            var colName = "";
            var contentUrl = "";
            for (var i = 1; i < option1.cols[0].length; i++) {
                colName += option1.cols[0][i]["title"] + ",";
            }
            var urlStr = window.document.location.pathname;//获取文件路径
            var urlLen = urlStr.split('/');
            for (var i = 0; i < urlLen.length - 4; i++) {
                contentUrl += "../";
            }
            colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
            contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
            layer.open({
                type: 2
                , skin: "layui-layer-rim" //加上边框
                , title: "隐藏列设置"  //标题
                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                , shift: 2 //弹出动画
                , area: ["50%", "90%"] //窗体大小
                , maxmin: true //设置最大最小按钮是否显示
                , content: [contentUrl, "yes"]
                , btn: ["确定", "取消"]
                , btn1: function (index, laero) {
                    //刷新表格数据
                    DisPlay_HideColumn1();
                    //更新表格缓存的数据
                    layer.close(index);//关闭弹窗
                }
            })
        }
        //#endregion
        //#region å­è¡¨1:显示列数据
        function DisPlay_HideColumn1() {
            HModName = "Xs_SeOrderBill_LookDown_ICMOBill";
            $.ajax({
                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                type: "GET",
                data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                async: false,
                success: function (data1) {
                    if (data1.data.length != 0) {
                        var dataCol = [];//数据库查询出的列数据
                        dataCol = data1.data[0].HGridString.split(',');
                        for (var i = 0; i < option1.cols[0].length - 1; i++) {
                            var dataCols = dataCol[i].split('|');
                            //隐藏列
                            if (dataCols[1] == 1) {
                                option1.cols[0][i + 1]["hide"] = true;
                            }
                            //设置列宽
                            if (dataCols[3] > 0) {
                                option1.cols[0][i + 1]["width"] = dataCols[3];
                            }
                            //设置内容字体大小
                            if (data1.data[0].HFontSize != 0) {
                                option1.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
                            } else {
                                option1.cols[0][i + 1]["style"] += "font-size:100%";
                            }
                            //设置列宽
                            //if (data1.data[0].HColumnWidth != 0) {
                            //    option1.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                            //} else {
                            //    option1.cols[0][i + 1]["width"] = "";
                            //}
                            //显示列
                            if (dataCols[1] == 0 && $.inArray(option1.cols[0][i + 1]["title"], titleData1) == -1) {
                                option1.cols[0][i + 1]["hide"] = false;
                            }
                            //字体所在位置(å·¦ å±…中 å³)
                            switch (dataCols[2]) {
                                case "L":
                                    option1.cols[0][i + 1]["align"] = "left";
                                    break;
                                case "M":
                                    option1.cols[0][i + 1]["align"] = "center";
                                    break;
                                case "R":
                                    option1.cols[0][i + 1]["align"] = "right";
                                    break;
                            }
                        }
                        //取消冻结列
                        for (var i = 1; i < option1.cols[0].length - 1; i++) {
                            if (option1.cols[0][i]["fixed"] != null) {
                                option1.cols[0][i]["fixed"] = null;
                            }
                            else {
                                break;
                            }
                        }
                        //冻结列
                        if (data1.data[0].HFixCols != 0) {
                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                if ($.inArray(option1.cols[0][i + 1]["title"], titleData) != -1) {
                                    data1.data[0].HFixCols += 1;
                                }
                                option1.cols[0][i + 1]["fixed"] = "left";
                            }
                        }
                        table.render(option1);
                    } else {
                        table.render(option1);
                    }
                }, error: function () {
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            })
        }
        //#endregion
        //#region å­è¡¨2:隐藏列设置
        function get_HideColumn2() {
            HModName = "Xs_SeOrderBill_LookDown_ExceptiveCheckRequestBill";
            var colName = "";
            var contentUrl = "";
            for (var i = 1; i < option2.cols[0].length; i++) {
                colName += option2.cols[0][i]["title"] + ",";
            }
            var urlStr = window.document.location.pathname;//获取文件路径
            var urlLen = urlStr.split('/');
            for (var i = 0; i < urlLen.length - 4; i++) {
                contentUrl += "../";
            }
            colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
            contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
            layer.open({
                type: 2
                , skin: "layui-layer-rim" //加上边框
                , title: "隐藏列设置"  //标题
                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                , shift: 2 //弹出动画
                , area: ["50%", "90%"] //窗体大小
                , maxmin: true //设置最大最小按钮是否显示
                , content: [contentUrl, "yes"]
                , btn: ["确定", "取消"]
                , btn1: function (index, laero) {
                    //刷新表格数据
                    DisPlay_HideColumn2();
                    //更新表格缓存的数据
                    layer.close(index);//关闭弹窗
                }
            })
        }
        //#endregion
        //#region å­è¡¨2:显示列数据
        function DisPlay_HideColumn2() {
            HModName = "Xs_SeOrderBill_LookDown_ExceptiveCheckRequestBill";
            $.ajax({
                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                type: "GET",
                data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                async: false,
                success: function (data1) {
                    if (data1.data.length != 0) {
                        var dataCol = [];//数据库查询出的列数据
                        dataCol = data1.data[0].HGridString.split(',');
                        for (var i = 0; i < option2.cols[0].length - 1; i++) {
                            var dataCols = dataCol[i].split('|');
                            //隐藏列
                            if (dataCols[1] == 1) {
                                option2.cols[0][i + 1]["hide"] = true;
                            }
                            //设置列宽
                            if (dataCols[3] > 0) {
                                option2.cols[0][i + 1]["width"] = dataCols[3];
                            }
                            //设置内容字体大小
                            if (data1.data[0].HFontSize != 0) {
                                option2.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
                            } else {
                                option2.cols[0][i + 1]["style"] += "font-size:100%";
                            }
                            //设置列宽
                            //if (data1.data[0].HColumnWidth != 0) {
                            //    option2.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                            //} else {
                            //    option2.cols[0][i + 1]["width"] = "";
                            //}
                            //显示列
                            if (dataCols[1] == 0 && $.inArray(option2.cols[0][i + 1]["title"], titleData2) == -1) {
                                option2.cols[0][i + 1]["hide"] = false;
                            }
                            //字体所在位置(å·¦ å±…中 å³)
                            switch (dataCols[2]) {
                                case "L":
                                    option2.cols[0][i + 1]["align"] = "left";
                                    break;
                                case "M":
                                    option2.cols[0][i + 1]["align"] = "center";
                                    break;
                                case "R":
                                    option2.cols[0][i + 1]["align"] = "right";
                                    break;
                            }
                        }
                        //取消冻结列
                        for (var i = 1; i < option2.cols[0].length - 1; i++) {
                            if (option2.cols[0][i]["fixed"] != null) {
                                option2.cols[0][i]["fixed"] = null;
                            }
                            else {
                                break;
                            }
                        }
                        //冻结列
                        if (data1.data[0].HFixCols != 0) {
                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                if ($.inArray(option2.cols[0][i + 1]["title"], titleData) != -1) {
                                    data1.data[0].HFixCols += 1;
                                }
                                option2.cols[0][i + 1]["fixed"] = "left";
                            }
                        }
                        table.render(option2);
                    } else {
                        table.render(option2);
                    }
                }, error: function () {
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            })
        }
        //#endregion
        //#region èŽ·å–å‚æ•°
        function getUrlVars() {
            var vars = [], hash;
            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
            for (var i = 0; i < hashes.length; i++) {
                hash = hashes[i].split('=');
                vars.push(hash[0]);
                vars[hash[0]] = hash[1];
            }
            return vars;
        }
        //#endregion
        //#endregion
    });
</script>
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/É豸¹ÜÀí/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,6 +836,8 @@
                            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,8 +389,10 @@
                };
            }
            //#endregion
            //#endregion
            //#endregion  ç›‘听网格表体事件
            //监听网格表体事件
            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
@@ -410,6 +419,7 @@
                    })
                }
            });
            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
@@ -618,6 +628,7 @@
                sWhere = "";
            }
            //#endregion
            //#region åˆå§‹æ—¥æœŸé—´éš” ä¸‹æ‹‰åˆ—表
            function setSelect_HInitTimeCycle() {
                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
@@ -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 ã€è¿‡æ»¤æ–¹æ¡ˆã€‘
            //获取当前用户的默认过滤方案
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>
@@ -76,87 +76,14 @@
                                                <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"] },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Type": Type },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
@@ -381,81 +314,6 @@
                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
@@ -476,15 +334,6 @@
                $("#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");
                form.render('select');
                sWhere = "";
WebTM/views/ÁìÁÏ·¢»õ/·Ö²½Ê½µ÷³öµ¥/Fb_StepFoldOutBillList.html
@@ -205,6 +205,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view" id="view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-BarCodeDetail" lay-event="btn-BarCodeDetail"><i class="layui-icon layui-icon-form"></i>条码明细</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>关闭</button>
@@ -288,6 +289,8 @@
                    //打印
                    case 'btn-print':
                        get_PrintReport();
                        break;
                    case 'btn-BarCodeDetail': get_BarCodeDetail();
                        break;
                    //审核按钮
                    case 'btn-Audit':
@@ -977,7 +980,39 @@
            //#endregion
            //条码明细
            function get_BarCodeDetail() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid;
                    var HBillType = '1203';
                    var HBillNo = data[0]["单据号"];
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['90%', '90%']
                        , title: '其它入库单条码明细'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../../条码明细/Kf_BarCodeDetailQuery.html?HInterID=' + HInterID + '&HBillType=' + HBillType + '&HBillNo=' + HBillNo
                        , resize: false
                        , btn: ["确定", "取消"]
                        , end: function () {
                            //刷新页面,
                            //location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
            }
            // å¿«é€Ÿè¿‡æ»¤
WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBackBillList.html
@@ -214,6 +214,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Audit" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-DeAudit" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-BarCodeDetail" lay-event="btn-BarCodeDetail"><i class="layui-icon layui-icon-form"></i>条码明细</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
@@ -311,6 +312,8 @@
                        break;
                    //反审核
                    case 'btn-DeAudit': set_AbandonCheck();
                        break;
                    case 'btn-BarCodeDetail': get_BarCodeDetail();
                        break;
                    //列设置
                    case 'set_HideColumn': get_HideColumn();
@@ -1199,6 +1202,40 @@
            }
            //#endregion
            //条码明细
            function get_BarCodeDetail() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid;
                    var HBillType = '1203';
                    var HBillNo = data[0]["单据号"];
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['90%', '90%']
                        , title: '其它入库单条码明细'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../../条码明细/Kf_BarCodeDetailQuery.html?HInterID=' + HInterID + '&HBillType=' + HBillType + '&HBillNo=' + HBillNo
                        , resize: false
                        , btn: ["确定", "取消"]
                        , end: function () {
                            //刷新页面,
                            //location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
            }
            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘
            //获取当前用户的默认过滤方案
WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBillList.html
@@ -221,7 +221,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-BarCodeDetail" lay-event="btn-BarCodeDetail"><i class="layui-icon layui-icon-form"></i>条码明细</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-BarCodeDetail" lay-event="btn-BarCodeDetail"><i class="layui-icon layui-icon-form"></i>条码明细</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-exit" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>保存方案</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>读取方案</button>