1.取样单增加打印功能 2.模具/设备的pda点检:两条进行提示,一条自动带出点检内容 3.设备工艺参数趋势图:根据流转卡的子表进站出站时间查询工艺参数(增加一个选择框 采集来源:(设备采集,手动输入))
3个文件已添加
11个文件已修改
396 ■■■■■ 已修改文件
WebTM/WebTM.csproj 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user 4 ●●●● 补丁 | 查看 | 原始文档 | 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/模治具管理/器具点检规程单/Sc_MouldDotCheckRuleBillList_PDA.html 26 ●●●●● 补丁 | 查看 | 原始文档 | 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 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/检验取样还样单/QC_TakeSampleCheckBillMainList.html 60 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/质量报表/SB_TechnologyParameterList.html 185 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -366,6 +366,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" />
@@ -2332,6 +2333,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,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />
WebTM/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/Ä£Öξ߹ÜÀí/Æ÷¾ßµã¼ì¹æ³Ìµ¥/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,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 = "";