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

杨乐

2022-01-19 a0b127f733b3c9d2e26949c5c0e8cc4ba02ddd24

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

 WebTM/WebTM.csproj

@@ -792,6 +792,7 @@
    <Content Include="views\生产管理\生产开工单\Sc_Add_MESBeginWorkBillList - å¤åˆ¶.html" />
    <Content Include="views\生产管理\生产开工单\Sc_Add_MESBeginWorkBillList.html" />
    <Content Include="views\生产管理\生产开工单\Sc_MESBeginWorkBillList.html" />
    <Content Include="views\生产管理\生产拆箱单\Sc_PackSplitBill_Fast.html" />
    <Content Include="views\生产管理\生产汇报单\Sc_ICMOReportBill_FastNew.html" />
    <Content Include="views\生产管理\生产汇报单\Sc_Add_ICMOReportBillList.html" />
    <Content Include="views\生产管理\生产组装追溯单\Sc_AssemblyBillList.html" />
@@ -822,6 +823,7 @@
    <Content Include="views\设备管理\Sb_EqpConkBookBillList.html" />
    <Content Include="views\设备管理\Sb_EqpMaintenanceBillList.html" />
    <Content Include="views\设备管理\Sb_EqpMaintenanceBillList_PDA.html" />
    <Content Include="views\设备管理\Sb_EqpMaintenanceBillList_PDAEdit.html" />
    <Content Include="views\设备管理\Sb_EqpRepairCheckBillList.html" />
    <Content Include="views\设备管理\Sb_EquipDocCheckItemBillList_PDAEdit.html" />
    <Content Include="views\设备管理\Sb_EquipDotCheckBillEdit.html" />
@@ -1178,7 +1180,6 @@
  <ItemGroup>
    <Folder Include="views\仓存管理\调拨单核对\" />
    <Folder Include="views\仓存管理\调拨单稽核\" />
    <Folder Include="views\生产管理\生产拆箱单\" />
  </ItemGroup>
  <PropertyGroup>
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

 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>JFTM</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云MES\Lay-Ui\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/views/IpadStepIndex.html

@@ -725,6 +725,7 @@
                        "HMaker": sessionStorage["HUserName"],    //sessionStorage["HUserName"]
                        "Czybm": sessionStorage["Czybm"],
                        //"HEmpID": "0",    //sessionStorage["HEmpID"]
                        "HSourceInterID": HSourceInterID,
                        "HSourceBillType": HSourceBillType,
                        "HProcID": HProcID
                    });

 WebTM/views/home/console.html

@@ -99,12 +99,18 @@
                                                    <cite>委外工序发出单</cite>
                                                </a>
                                            </li>
                                            <!--<li class="layui-col-xs3">
                                                <a lay-href="set/user/info.html">
                                                    <i class="layui-icon layui-icon-set"></i>
                                                    <cite>我的资料</cite>
                                            <li class="layui-col-xs3">
                                                <a href="../生产管理/生产拆箱单/Sc_PackSplitBill_Fast.html" target="main_self_frame">
                                                    <i class="layui-icon layui-icon-find-fill"></i>
                                                    <cite>生产拆箱单</cite>
                                                </a>
                                            </li>-->
                                            </li>
                                            <!--<li class="layui-col-xs3">
        <a lay-href="set/user/info.html">
            <i class="layui-icon layui-icon-set"></i>
            <cite>我的资料</cite>
        </a>
    </li>-->
                                        </ul>
                                    </div>
                                    <div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub"></button><button class="layui-icon layui-carousel-arrow" lay-type="add"></button>

 WebTM/views/index_Mobile.html

@@ -417,9 +417,9 @@
                          </a>
                      </dd>
                      <dd>
                          <a lay-href="" style="color: aqua;">
                          <a lay-href="设备管理/Sb_EqpMaintenanceBillList_PDA.html" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              è®¾å¤‡ç»´ä¿®è®°å½•å•null
                              è®¾å¤‡ç»´ä¿®è®°å½•å•
                          </a>
                      </dd>
                  </dl>

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdBackBillList.html

@@ -154,6 +154,10 @@
                        , { field: '单据号', title: '单据号', width: 195 }
                        , { field: '单据类型', title: '单据类型', width: 110 }
                        , { field: '物料代码', title: '物料代码', width: 110 }
                        , { field: 'HSupTypeID', title: 'HSupTypeID', width: 200, hide: true }
                        , { field: '往来类型名称', title: '往来类型', width: 200 }
                        , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
                        , { field: '往来单位', title: '往来单位', width: 200 }
                        , { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
                        , { field: '仓库代码', title: '仓库代码', width: 125 }
                        , { field: '仓库', title: '仓库', width: 125 }
@@ -166,10 +170,6 @@
                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
                        , { field: '部门代码', title: '部门代码', width: 115 }
                        , { field: '部门', title: '部门', width: 125 }
                        , { field: 'HSupTypeID', title: 'HSupTypeID', width: 200, hide: true }
                        , { field: '往来类型名称', title: '往来类型', width: 200 }
                        , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
                        , { field: '往来单位', title: '往来单位', width: 200 }
                        , { field: '摘要', title: '摘要', width: 125 }
                        , { field: '表头备注', title: '表头备注', width: 125 }
                        //, { field: '内部单据号', title: '内部单据号', width: 115 }

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdOutBillEdit.html

@@ -238,6 +238,25 @@
            
            //#endregion

            //判断用户是否有查询权限
            //$.ajax({
            //    url: GetWEBURL() + "/Sc_MouldProdOutBill/QueryUserRight",
            //    type: "GET",
            //    data: { "UserName": sessionStorage["HUserName"] },
            //    success: function (result) {
            //        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        
            //            });

            //        } else {
            //            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
            //        }
            //    }, error: function () {
            //        layer.alert("发生错误!", { icon: 5 });
            //    } 
            //});
            //

            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½
            //初始化表单插件
            set_InitFrom();

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdOutBillList.html

@@ -155,6 +155,10 @@
                        , { field: '单据号', title: '单据号', width: 195 }
                        , { field: '单据类型', title: '单据类型', width: 110 }
                        , { field: '物料代码', title: '物料代码', width: 110 }
                        , { field: 'HSupTypeID', title: 'HSupTypeID', width: 200, hide: true }
                        , { field: '往来类型名称', title: '往来类型', width: 200 }
                        , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
                        , { field: '往来单位', title: '往来单位', width: 200 }
                        , { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
                        , { field: '仓库代码', title: '仓库代码', width: 125 }
                        , { field: '仓库', title: '仓库', width: 125 }
@@ -167,10 +171,6 @@
                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
                        , { field: '部门代码', title: '部门代码', width: 115 }
                        , { field: '部门', title: '部门', width: 125 }
                        , { field: 'HSupTypeID', title: 'HSupTypeID', width: 200, hide: true }
                        , { field: '往来类型名称', title: '往来类型', width: 200 }
                        , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
                        , { field: '往来单位', title: '往来单位', width: 200 }
                        , { field: '摘要', title: '摘要', width: 125 }
                        , { field: '表头备注', title: '表头备注', width: 125 }
                        , { field: '内部单据号', title: '内部单据号', width: 115 }

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldScrapOutBillList.html

@@ -217,7 +217,10 @@
                        , { field: '单据号', title: '单据号', width: 160 }
                        , { field: '单据类型', title: '单据类型', width: 160 }
                        , { field: '物料代码', title: '物料代码', width: 110 }
                        , { field: 'HSupTypeID', title: 'HSupTypeID', width: 200, hide: true }
                        , { field: '往来类型名称', title: '往来类型', width: 200 }
                        , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
                        , { field: '往来单位', title: '往来单位', width: 200 }
                        , { field: 'HManagerID', title: 'HManagerID', width: 200, hide: true }
                        , { field: '负责人代码', title: '负责人代码', width: 200 }
                        , { field: '负责人名称', title: '负责人名称', width: 200 }
@@ -230,10 +233,6 @@
                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
                        , { field: '部门代码', title: '部门代码', width: 115 }
                        , { field: '部门名称', title: '部门名称', width: 200 }
                        , { field: 'HSupTypeID', title: 'HSupTypeID', width: 200, hide: true }
                        , { field: '往来类型名称', title: '往来类型', width: 200 }
                        , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
                        , { field: '往来单位', title: '往来单位', width: 200 }
                        , { field: '摘要', title: '摘要', width: 200 }
                        , { field: '内部单据号', title: '内部单据号', width: 115 }
                        , { field: '备注', title: '备注', width: 200 }

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldOtherInBillList.html

@@ -153,6 +153,10 @@
                        , { field: '日期', title: '日期', width: 125, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '单据号', title: '单据号', width: 195 }
                        , { field: '单据类型', title: '单据类型', width: 110 }
                        , { field: 'HSupTypeID', title: 'HSupTypeID', width: 200, hide: true }
                        , { field: '往来类型名称', title: '往来类型', width: 200 }
                        , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
                        , { field: '往来单位', title: '往来单位', width: 200 }
                        , { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
                        , { field: '仓库代码', title: '仓库代码', width: 125 }
                        , { field: '仓库', title: '仓库', width: 125 }

 WebTM/views/Éú²ú¹ÜÀí/²úÁ¿»ã±¨µ¥/Sc_Add_ProductReportBillList.html

@@ -836,7 +836,7 @@
                    dataType: "json",//数据类型可以为 text xml json  script  jsonp
                    async: false,
                    success: function (datas) {
                        var LoadData = datas.data.Sc_ICMOBillWorkQtyStatus_Tmp;
                        var LoadData = datas.data.Sc_ProcessReportSub;
                        var HQty = LoadData[0].HQty;
                        var HBadQty = LoadData[0].HBadQty;
                        var HWasterQty = LoadData[0].HWasterQty;

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_Add_ProductReportStepBillList.html

@@ -86,8 +86,7 @@
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">

                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">审核</button>
                                <button type="button" id="ReVerIfySaver" class="layui-btn layui-btn-normal layui-btn-circle" lay-submit="" lay-filter="ReVerIfySaver">反审核</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
@@ -347,7 +346,7 @@
    <script>
        //获取参数
        var HBillType = "";  //单据类型
        var HSourceInterID = ""; //源单主内码
        var HSourceInterID = ""; //源单主内码（生产状态临时表主内码）
        var HSourceEntryID = "";  //源单子内码
        var HSourceBillNo = "";   //源单单号
        var HSourceBillType = "";  //源单类型
@@ -505,6 +504,7 @@
                                $("#HSourceName").val(LoadData[0].HSourceName); //生产资源
                                $("#HSourceBillNo").val(LoadData[0].HICMOBillNo); //源单单号（暂时取值订单编号）
                                $("#HSourceInterID").val(LoadData[0].HSourceInterID); //源单主内码(取值HInterID)
                                //$("#HSourceInterID").val(LoadData[0].HICMOInterID); //源单主内码
                                $("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //源单子内码(源单行号)
                                $("#HSourceBillType").val(HSourceBillType); //源单类型
                                $("#HGroupID").val(LoadData[0].HDeptID); //班组ID
@@ -659,12 +659,12 @@


            //保存提交
            form.on('submit(Saver)', function (data) {
            form.on('submit(Saver)', function (objdata) {
                if (!AllowLoadData())//数据验证
                {
                    return false;
                }
                OverStepQty(data);
                OverStepQty(objdata);

            });

@@ -846,7 +846,7 @@


            //验证汇报数量是否超过计划数量
            function OverStepQty(data) {
            function OverStepQty(objdata) {
                var sWhere = "";
                if (OperationType == 3) //编辑
                {
@@ -855,7 +855,7 @@
                    HSourceBillNo = $("#HSourceBillNo").val();
                    HSourceBillType = $("#HSourceBillType").val();
                }
                sWhere = " where  HSourceID='" + $("#HSourceID").val() + "' and  HSourceInterID='" + HSourceInterID + "' and HSourceEntryID='" + HSourceEntryID + "' and HSourceBillNo='" + HSourceBillNo + "' and HSourceBillType='" + HSourceBillType + "' ";
                sWhere = " where  HSourceID='" + $("#HSourceID").val() + "' and HProcID='" + $("#HProcID").val() + "' and  HSourceInterID='" + $("#HSourceInterID").val() + "' and HSourceEntryID='" + HSourceEntryID + "' and HSourceBillNo='" + HSourceBillNo + "' and HSourceBillType='" + HSourceBillType + "' ";
                $.ajax({
                    url: GetWEBURL() + "/Sc_MESBeginStepWorkBill/GetMESOverStepQty",
                    type: "GET",
@@ -863,9 +863,9 @@
                    dataType: "json",//数据类型可以为 text xml json  script  jsonp
                    async: false,
                    success: function (datas) {
                        var LoadData = datas.data.Sc_ICMOBillWorkQtyStatus_Tmp;
                        var LoadData = datas.data.Sc_ProcessReportSub;
                        var HQty = LoadData[0].HQty;
                        var HBadCount = LoadData[0].HBadCount;
                        var HBadCount = LoadData[0].HBadQty;
                        var HWasterQty = LoadData[0].HWasterQty;
                        var HWasterQty2 = LoadData[0].HWasterQty2;
                        var yessqty = HQty + HBadCount + HWasterQty + HWasterQty2;
@@ -882,7 +882,7 @@
                            });
                        }
                        else {
                            Submit(data);
                            Submit(objdata);
                        }
                    },
                    error: function (err) {
@@ -892,18 +892,19 @@
            }

            //提交请求ajax
            function Submit(data) {
                if (data.field.HBadCount == "" || data.field.HBadCount == null) {
                    data.field.HBadCount = 0;
            function Submit(objdata) {
                if (objdata.field.HBadCount == "" || objdata.field.HBadCount == null) {
                    objdata.field.HBadCount = 0;
                }
                if (data.field.HWasterQty == "" || data.field.HWasterQty == null) {
                    data.field.HWasterQty = 0;
                if (objdata.field.HWasterQty == "" || objdata.field.HWasterQty == null) {
                    objdata.field.HWasterQty = 0;
                }
                if (data.field.HWasterQty2 == "" || data.field.HWasterQty2 == null) {
                    data.field.HWasterQty2 = 0;
                if (objdata.field.HWasterQty2 == "" || objdata.field.HWasterQty2 == null) {
                    objdata.field.HWasterQty2 = 0;
                }
                var sMainStr = JSON.stringify(data.field);
                var sMainSub = sMainStr + ';' + refSav;
                var sMainStr = JSON.stringify(objdata.field);
                var sMainSub = sMainStr + ';'+ refSav;


                $.ajax({
                    type: "POST",
@@ -1093,7 +1094,7 @@
                layer.msg("产品编码不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HRelBeginDate").val() == '' || $("#HWorkBeginDate").val() == null) {
            if ($("#HRelBeginDate").val() == '' || $("#HRelBeginDate").val() == null) {
                layer.msg("开工时间不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_ProductReportStepBillList.html

@@ -125,6 +125,7 @@
        var HSourceID = ""; //资源ID
        var HICMOInterID = ""; //生产订单主ID
        var HICMOEntryID = ""; //生产订单子ID
        var HSourceInterID = ""; //生产状态临时表主ID
        var HSourceBillType = ""; //源单类型
        var HProcID = ""; //工序ID
        var SchWhere = ""; //按钮查询参数
@@ -136,6 +137,7 @@
            HICMOEntryID = data[0].HICMOEntryID;
            HMaker = data[0].HMaker;
            Czybm = data[0].Czybm;
            HSourceInterID = data[0].HSourceInterID;
            HSourceBillType = data[0].HSourceBillType;
            HProcID = data[0].HProcID;
        }
@@ -237,7 +239,7 @@
            //报工平台进入(有源单)
            function set_AddNew()
            {
                sWhere = " where b.HSourceID='" + HSourceID + "' and b.HSourceBillNo='" + workcode + "' and b.HSourceInterID='" + (HICMOInterID == "null" ? 0 : HICMOInterID) + "' and b.HSourceEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and a.HMaker='" + HMaker + "' ";
                sWhere = " where b.HSourceID='" + HSourceID + "' and b.HSourceBillNo='" + workcode + "' and b.HSourceInterID='" + (HSourceInterID == "null" ? 0 : HSourceInterID) + "' and b.HSourceEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and a.HMaker='" + HMaker + "' ";
                SchWhere = sWhere;
                console.log(sWhere);
                //进入页面显示的缓存列表

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/¿ª¹¤/Sc_Add_MESBeginStepWorkBillList.html

@@ -89,8 +89,9 @@
                                <button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">审核</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="a_href" id="a_href">导出</button>
                            </div>

                    
                        </div>
                        <div class="layui-card-body">
                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
@@ -584,6 +585,10 @@
                    success: function (d) {
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HInterID").val(0);
                        //$("#HGroupID").val(sessionStorage["HGroupID"]); //默认班组ID
                        //$("#HGroupName").val(sessionStorage["HGroup"]); //默认班组
                        //$("#HEmpID").val(sessionStorage["HKeeperID"]);     //默认操作员ID
                        //$("#HEmpName").val(sessionStorage["HKeeper"]);   //默认操作员
                    }
                });
            }
@@ -611,9 +616,6 @@
                    OperationType = 2;
                }
            });


          


            //保存提交

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/¿ª¹¤/Sc_MESBeginStepWorkBillList.html

@@ -194,7 +194,7 @@
                    sWhere += " and èµ„源代码 like '%" + HSource + "%' or èµ„源名称 like '%" + HSource + "%'";
                }
                $.ajax({
                    url: GetWEBURL() + '/Sc_MESBeginStepWorkBill/GetMESBeginStepWorkBillStaus',
                    url: GetWEBURL() + '/Sc_MESBeginStepWorkBill/GetMESBeginStepWorkBill',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {
@@ -293,6 +293,14 @@
            function get_Display()
            {
                var ajaxLoad = layer.load();
                var HDate = $("#HDate").val();//开始日期
                var HDate1 = $("#HDate1").val();//结束日期
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
                }
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/Sc_MESBeginStepWorkBill/GetMESBeginStepWorkBill',

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú²ðÏäµ¥/Sc_PackSplitBill_Fast.html

@@ -503,76 +503,24 @@
            var checkStatus = table.checkStatus('wl-table')
            , data = checkStatus.data;
            var sInterID = $('#HInterID').val()
            var sMaterID = data[0].HMaterID
            var sBillType = '1202'
            var sAuxPropID = data[0].HAuxPropID
            //var sMTONo = data[0].HMTONo
            var sMTONo = ''
            var sSourceInterID = data[0].HSourceInterID
            var sSourceEntryID = data[0].HSourceEntryID
            var HBillNo = $("#HBillNo").val()
            var sMouldManagerCtl = 'N'
            var sFIFOCtl = 'N'
            var HBarCode = data[0].HBarCode
            $.ajax(
               {
                   type: "Get",
                   //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/Delete_Json", //方法所在页面和方法名
                    url: GetWEBURL() + "/ProductIn/Delete_Json_AN",
                    url: GetWEBURL() + "/PackSplit/Delete",
                   async: true,
                   data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
                    data: { "HInterID": sInterID, "HBarCode": HBarCode, "HBillType": '3784'},
                   dataType: "json",
                   success: function (data) {
                       if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
                         //  table.render({
                         //      elem: '#wl-table'
                         //      //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Mate_Webs_Json'
                         //      , url: GetWEBURL() + '/ProductIn/DisPlayBarCodeList_Json'
                         //, cellMinWidth: 80
                         //, toolbar: '#toolbarDemo'
                         //      , where: { HBillID: sInterID, HBillNo: HBillNo, HBillType: '1202', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl}
                         //, cols: [[
                         //       { type: 'radio' }
                         //       , { field: 'HQty', title: '数量', width: 80 }
                         //       , { field: 'HQtyMust', title: '应收数量', width: 80 }
                         //       , { field: 'HMaterNumber', title: '物料代码', width: 100 }
                         //       , { field: 'HMaterName', title: '物料名称', width: 150 }
                         //       , { field: 'HMaterModel', title: '规格型号', width: 100 }
                         //       , { field: 'HSourceInterID', title: '源单主内码', width: 100 }
                         //       , { field: 'HSourceEntryID', title: '源单子内码', width: 100 }
                         //       , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                         //       , { field: 'HBatchNo', title: '批次', width: 100 }
                         //       , { field: 'HAuxPropID', title: '辅助属性', width: 100 }
                         //       , { field: 'HMTONo', title: '计划跟踪号', width: 100 }
                         //       , { field: 'HMaterID', title: '物料ID', width: 100 }
                         //]]
                         //, height: 500
                         //  })
                           table.render({
                               elem: '#wl-table'
                               //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
                               , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
                               , toolbar: '#toolbarDemo'
                               , defaultToolbar: []
                               , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
                               , cols: [[
                                   { type: 'radio' }
                                   , { field: 'HQty', title: '数量', width: 150 }
                                   , { field: 'HQtyMust', title: '应收数量', width: 150 }
                                   , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                                   , { field: 'HMaterName', title: '物料名称', width: 150 }
                                   , { field: 'HMaterModel', title: '规格型号', width: 150 }
                                   , { field: 'HSourceInterID', title: '源单主内码', width: 150 }
                                   , { field: 'HSourceEntryID', title: '源单子内码', width: 150 }
                                   , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                                   , { field: 'HBatchNo', title: '批次', width: 150 }
                               ]]
                               // , data: [linterid]
                               // , page: true
                               , height: 500
                               , done: function () {
                                   layer.closeAll("loading");
                               }
                           })
                           layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                               // å¾—到frame索引
                               var index = layer.getFrameIndex(window.name);
                               //关闭当前frame
                               layer.close(index);
                               //修改为功后刷新界面
                               window.location.reload();
                           });
                       }
                       else {
                           layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
@@ -586,37 +534,24 @@

        //提交
        form.on('submit(Saver)', function (data) {//提交
            //debugger;
            if ($("#HExplanation").val() == "") {
                if ($("#HWHNAME").val() == "宽幅成品仓NEW" || $("#HWHNAME").val() == "样本仓NEW") {
                    $("#HWHNAME").val("");
                    $("#HWHID").val("");
                    layer.msg("请扫MES库位码！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                else
                {
                    $("#HExplanation").val($("#HWHNAME").val());
                }
            }
            var sMainStr = JSON.stringify(data.field);
            var sSubStr = table.cache['wl-table'];
            //var sSourceType = $("#HBillType").val();
            var sSourceType = "3711";
            var sInterID = $('#HInterID').val()
            var sBillNo = $("#HBillNo").val()
            var HTBarCode = $('#HTBarCode').val()
            var HOrgID = sessionStorage["OrganizationID"]
            var sMaker = sessionStorage["HUserName"]
            if (AllowLoadData(sSubStr) != false)//非空验证
            {
                layer.load(3);
                $.ajax(
                {
                    type: "POST",
                    //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/set_SaveProductInBill_Json", //方法所在页面和方法名
                    url: GetWEBURL() + "/ProductIn/set_SaveProductInBill_Json",
                        url: GetWEBURL() + "/PackSplit/set_SavePackSplitBill_Json",
                    async: true,
                    data: { "oMain": sMainStr  },
                    dataType: "json",
                        data: { "sInterID": sInterID, "HBillType": '3784', "sBillNo": sBillNo, "HTBarCode": HTBarCode, "sMaker": sMaker, "HOWNERID": HOrgID },
                    //dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
                            layer.confirm("生成产品入库单" + data.Message + $("#HBillNo").val(), {
                            layer.confirm("生成拆箱单" + data.Message + $("#HBillNo").val(), {
                                icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['新增'],
                                btn2: function () {
                                    //parent.layui.admin.events.closeThisTabs();关闭页签
@@ -649,73 +584,13 @@
            }
        });

        //扫条码
            $('#HBarCode').on('keydown', function (event) {  //扫条码
                var sOldBarCode = $('#HBarCode').val()
                var HDeleteFlag = sOldBarCode.substring(0, 1);
                var sBarCode = sOldBarCode.slice(1);
                var sSubStr = table.cache['wl-table'];
        //扫描拆箱条码
            $('#HBarCode').on('keydown', function (event) {  //扫描拆箱条码
                var sInterID = $("#HInterID").val()
                var sBillNo = $("#HBillNo").val()
                var sQty = $("#HQty").val()
                var sHBillType = $("#HBillType").val()  //源单类型
                var sBillType = '1202'
                var sHWHID = $("#HWHID").val()
                var sHSPID = $("#HStockPlaceID").val()
                var sSourceBillNo = $("#HSourceBillNo").val()
                var HBarCode = $('#HBarCode').val()
                var HTBarCode = $('#HTBarCode').val()
                if (event.keyCode == 13) {
                if (HDeleteFlag == "*")
                {
                    if (sBarCode != "") {
                        $('#HBarCode').val("");
                    }
                    var sBarCode = sOldBarCode.slice(1);
                    $.ajax(
                        {
                            type: "Get",
                            url: GetWEBURL() + "/ProductIn/Delete_Json",
                            async: true,
                            data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": sBillType, "HBarCode": sBarCode},
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
                                    table.render({
                                        elem: '#wl-table'
                                        //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
                                        , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
                                        , toolbar: '#toolbarDemo'
                                        , defaultToolbar: []
                                        , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
                                        , cols: [[
                                            { type: 'radio' }
                                            , { field: 'HQty', title: '数量', width: 150 }
                                            , { field: 'HQtyMust', title: '应收数量', width: 150 }
                                            , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                                            , { field: 'HMaterName', title: '物料名称', width: 150 }
                                            , { field: 'HMaterModel', title: '规格型号', width: 150 }
                                            , { field: 'HSourceInterID', title: '源单主内码', width: 150 }
                                            , { field: 'HSourceEntryID', title: '源单子内码', width: 150 }
                                            , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                                            , { field: 'HBatchNo', title: '批次', width: 150 }
                                        ]]
                                        // , data: [linterid]
                                        // , page: true
                                        , height: 500
                                        , done: function () {
                                            layer.closeAll("loading");
                                        }
                                    })
                                }
                                else {
                                    layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                }
                            },
                            error: function (err) {
                                layer.msg('错误' + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        });
                }
                else {
                    var sBarCode = $('#HBarCode').val()
                    //var Flag = sessionStorage["SourceFlag"];
                    if (sQty == "") {
@@ -730,110 +605,41 @@
                        if (sBarCode != "") {
                            $('#HBarCode').val("");
                        }
                        if (sQty != "") {
                            $('#HQty').val("");
                        }
                        if (sHWHID == "184154") {
                            if (sHSPID == "0") {
                                layer.msg("仓位为空，请选择仓位！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                return false;
                            }
                        }
                        //if (AllowLoadData(sSubStr, 'HBarCode') != false) {//非空验证
                        $.ajax({
                            //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/get_CheckTypeByBarCode_Json",
                            url: GetWEBURL() + "/ProductIn/get_CheckTypeByBarCode_Json",
                            url: GetWEBURL() + "/PackSplit/get_CheckTypeByBarCode_Json",
                            type: "GET",
                            data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
                            data: { "HBarCode": HBarCode, "sInterID": sInterID, "HBillType": '3784', "sBillNo": sBillNo, "HTBarCode": HTBarCode, "sMaker": sessionStorage["HUserName"], "HOWNERID": sessionStorage["OrganizationID"] },
                            success: function (result) {
                                //debugger;
                                playSound1();
                                if (result.count == 1) {
                                    if (result.data.HBarType == '仓库条码') {
                                        $("#HWHNAME").val(result.data.HWhName);
                                        $("#HWHID").val(result.data.HWhID);
                                        $("#HStockPlaceName").val("");
                                        $("#HNote").val(";一键扫码仓库条码");
                                        element.tabChange('tab-ProductlnBill', '2');  //跳转页签
                                    }
                                    else if (result.data.HBarType == '仓位条码') {
                                        $("#HStockPlaceName").val(result.data.HSPName);
                                        $("#HStockPlaceID").val(result.data.HSPID);
                                        $("#HWHNAME").val(result.data.HWhName);
                                        $("#HWHID").val(result.data.HWhID);
                                        $("#HNote").val(";一键扫码仓位条码");
                                        element.tabChange('tab-ProductlnBill', '2');//跳转页签
                                    }
                                    else if (result.data.HBarType == '部门条码') {
                                        $("#HDeptName").val(result.data.HDeptName);
                                        $("#HDeptID").val(result.data.HDeptID);
                                        $("#HNote").val(";一键扫码部门条码");
                                        element.tabChange('tab-ProductlnBill', '2');//跳转页签
                                    }
                                    else if (result.data.HBarType == '源单条码') {
                                        $("#HSupName").val(result.data.HSupName);
                                        $("#HSupID").val(result.data.HSupID);
                                        $("#HDeptName").val(result.data.HDeptName);
                                        $("#HDeptID").val(result.data.HDeptID);
                                        $("#HSourceBillNo").val(result.data.HSourceBillNo);
                                        HSourceFlag = true;
                                        //获取源单类型、源单单号
                                        //if (result.data.HSourceBillType == "3711") {
                                        //    $("#HBillType").val("3711");
                                        //}
                                        //else {
                                        //    $("#HBillType").val("-1");
                                        //}
                                        $("#HNote").val(";一键扫码源单条码");
                                        element.tabChange('tab-ProductlnBill', '3');
                                    }
                                    else {
                                        if (HSourceFlag == "true") {
                                            element.tabChange('tab-ProductlnBill', '3');
                                        }
                                        else {
                                            $("#HSupName").val(result.data.HSupName);
                                            $("#HSupID").val(result.data.HSupID);
                                            //$("#HDeptName").val(result.data.HDept);
                                            //$("#HDeptID").val(result.data.HDeptID);
                                            $("#HSourceBillNo").val(result.data.HSourceBillNo);
                                            HSourceFlag = true;
                                            //获取源单类型、源单单号
                                            //if (result.data.HSourceBillType == "3711") {
                                            //    $("#HBillType").val("3711");

                                            //}

                                            //else {
                                            //    $("#HBillType").val("-1");
                                            //}
                                            $("#HNote").val(";物料条码");
                                            element.tabChange('tab-ProductlnBill', '3');
                                        }
                                        //}
                                    }
                                    //$("#HSupID").val(result.data.HSupID);
                                    //$("#HSupName").val(result.data.HSupName);
                                    //$("#HDeptID").val(result.data.HDeptID);
                                    //$("#HDeptName").val(result.data.HDeptName);
                                    layer.load(3)
                                    table.render({
                                        elem: '#wl-table'
                                        //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
                                        , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
                                        , url: GetWEBURL() + '/PackSplitBill/GetBillEntry_TmpList_Pack'
                                        , toolbar: '#toolbarDemo'
                                        , defaultToolbar: []
                                        , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
                                        , where: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '3784', sWhere: '' }
                                        , cols: [[
                                            { type: 'radio' }
                                            , { field: 'HQty', title: '数量', width: 150 }
                                            , { field: 'HQtyMust', title: '应收数量', width: 150 }
                                            , { field: 'HPieceQty', title: '件数', width: 150 }
                                            , { field: 'HBarCode', title: '子条码编号', width: 150 }
                                            , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                                            , { field: 'HMaterName', title: '物料名称', width: 150 }
                                            , { field: 'HMaterModel', title: '规格型号', width: 150 }
                                            , { field: 'HMaterID', title: '物料ID', width: 150 }
                                            , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                                            , { field: 'HSourceInterID', title: '源单主内码', width: 150 }
                                            , { field: 'HSourceEntryID', title: '源单子内码', width: 150 }
                                            , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                                            , { field: 'HBatchNo', title: '批次', width: 150 }
                                            , { field: 'HQtyMust', title: '应收数量', width: 150 }
                                        ]]
                                        // , data: [linterid]
                                        // , page: true
@@ -842,11 +648,6 @@
                                            layer.closeAll("loading");
                                        }
                                    });
                                }
                                else {
                                    playSound();
                                    layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                }
                                layer.closeAll("loading");
                            },
                            error: function (err) {
@@ -855,7 +656,6 @@
                                console.log(err);
                            }
                        });
                    }
                }
            });

@@ -882,8 +682,8 @@
                audio.play();
            }

        //扫源单
            $('#HTBarCode').on('keydown', function (event) {   //扫源单
        //扫拖条码
            $('#HTBarCode').on('keydown', function (event) {   
            var HTBarCode = $('#HTBarCode').val()
            var sInterID = $("#HInterID").val()
            var sBillNo = $("#HBillNo").val()
@@ -917,10 +717,10 @@
                                , url: GetWEBURL() + '/PackSplitBill/GetBillEntry_TmpList_Pack'
                                , toolbar: '#toolbarDemo'
                                , defaultToolbar: []
                              , where: { HBillID: sInterID, HBillType: '3784', sWhere: '' }
                                , where: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '3784', sWhere: '' }
                              , cols: [[
                                  { type: 'radio' }
                                , { field: 'HQty', title: '数量', width: 150 }
                                , { field: 'HPieceQty', title: '件数', width: 150 }
                                , { field: 'HBarCode', title: '子条码编号', width: 150 }
                                , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                                , { field: 'HMaterName', title: '物料名称', width: 150 }
@@ -929,7 +729,7 @@
                                , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                                , { field: 'HSourceInterID', title: '源单主内码', width: 150 }
                                , { field: 'HSourceEntryID', title: '源单子内码', width: 150 }
                                , { field: 'HBarCodeQty', title: '条码数量', width: 150 }
                                , { field: 'HQtyMust', title: '应收数量', width: 150 }
                              ]]
                                // , data: [linterid]
                                // , page: true
@@ -1059,19 +859,19 @@
        //    layer.msg("请先扫源单!", { icon: 5 });
        //    return false;
        //}
        if($("#HDeptName").val()=='')
        {
            layer.msg("部门没有选择", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            return false;
        }
        if ($("#HSecManager").val() == '') {
            layer.msg("验收人没有选择", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            return false;
        }
        if ($("#HKeeper").val() == '') {
            layer.msg("保管人没有选择", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            return false;
        }
        //if($("#HDeptName").val()=='')
        //{
        //    layer.msg("部门没有选择", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
        //    return false;
        //}
        //if ($("#HSecManager").val() == '') {
        //    layer.msg("验收人没有选择", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
        //    return false;
        //}
        //if ($("#HKeeper").val() == '') {
        //    layer.msg("保管人没有选择", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
        //    return false;
        //}
        //if ($("#HWHNAME").val() == '') {
        //    layer.msg("仓库没有选择!", { icon: 5 });
        //    return false;
@@ -1084,31 +884,31 @@
            layer.msg("错误的内码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            return false;
        }
        if (typeof (sSubStr) == "undefined")
        {
            layer.msg("没有物料明细记录", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            return false;
        }
        if (!typeof (sSubStr) == "undefined") {
            //for (var i = 0; i <= sSubStr.length - 1; i++) {  //判断扫码数量不能大于应收数量
            //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
            //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
            //        {
            //            layer.msg("数量不能大于应收数量", { icon: 5, btn: ['确定'], time: 100000, offset: 't' }); 
            //            return false;
            //        }
            //    }
            //}
            for (var i = 0; i <= sSubStr.length - 1; i++) {   //判断扫码数量不能为0
                if (parseFloat(sSubStr[i].HQty) > 0) {
                    s = 1;
                }
            }
            if (s == 0) {
                layer.msg("产品入库记录未扫码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
        }
        //if (typeof (sSubStr) == "undefined")
        //{
        //    layer.msg("没有物料明细记录", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
        //    return false;
        //}
        //if (!typeof (sSubStr) == "undefined") {
        //    //for (var i = 0; i <= sSubStr.length - 1; i++) {  //判断扫码数量不能大于应收数量
        //    //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
        //    //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
        //    //        {
        //    //            layer.msg("数量不能大于应收数量", { icon: 5, btn: ['确定'], time: 100000, offset: 't' }); 
        //    //            return false;
        //    //        }
        //    //    }
        //    //}
        //    for (var i = 0; i <= sSubStr.length - 1; i++) {   //判断扫码数量不能为0
        //        if (parseFloat(sSubStr[i].HQty) > 0) {
        //            s = 1;
        //        }
        //    }
        //    if (s == 0) {
        //        layer.msg("产品入库记录未扫码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
        //        return false;
        //    }
        //}
        else
        {
            return true;

 WebTM/views/É豸¹ÜÀí/Sb_EqpMaintenanceBillList_PDA.html

@@ -79,22 +79,23 @@
        <div class="layui-card" style="padding: 15px;background-color: #efefef;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
                    <div class="maintitle">设备点检记录单</div>
                    <div class="layui-form-item" style="padding-top: 10px;">
                        <div class="layui-row">
                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>设备条码</label>
                            <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="请键入后回车" autocomplete="off" class="layui-input">
                            </div>
                        </div>
                    </div>
                    <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                    <div class="maintitle">设备保养记录单</div>
                    <div class="layui-tab layui-tab-card" lay-filter="TabTest">
                        <ul class="layui-tab-title">
                            <li class="layui-this">基本信息</li>
                            <li>其他信息</li>
                            <li>明细信息</li>
                        </ul>
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
                                <div class="layui-form-item" style="padding-top: 10px;">
                                    <div class="layui-row">
                                        <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>设备条码</label>
                                        <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                            <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="请键入后回车" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding-top: 10px;">
                                    <div class="layui-row">
                                        <div class="layui-inline">
@@ -157,7 +158,7 @@
                                            <div class="layui-input-block">
                                                <input type="text" name="HRepair" id="HRepair" class="layui-input" style="width:80%;">
                                                <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input">
                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HDotCheckItemList" style="width:40px;">
                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HRepairList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
@@ -168,6 +169,18 @@
                                                <textarea name="HRepairExplanation" id="HRepairExplanation" placeholder="请输入内容" class="layui-textarea"></textarea>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">故障登记单</label>
                                            <div class="layui-input-block">
                                                <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" style="width:80%;">
                                                <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="XDHList" id="XDHList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>

                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
@@ -197,14 +210,6 @@
                                            <label class="layui-form-label" style="width: 75px;">设备型号:</label>
                                            <div class="layui-input-block" style="margin-left: 85px;">
                                                <input type="text" name="HBarModel" id="HBarModel" class="layui-input" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 75px;">数量:</label>
                                            <div class="layui-input-block" style="margin-left: 85px;">
                                                <input type="text" name="HQty" id="HQty" class="layui-input" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
@@ -268,9 +273,23 @@
                                    </div>
                                </div>
                            </div>
                            <div class="layui-tab-item">
                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                                <script type="text/html" id="toolbarDemo">
                                    <div class="layui-btn-container">
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>增行</button>
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                    </div>
                                </script>
                                <script type="text/html" id="xuhao">
                                    {{d.LAY_TABLE_INDEX+1}}
                                </script>
                                <script type="text/html" id="barDemo">
                                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
                                </script>
                            </div>
                        </div>
                    </div>


                    <div class="layer-footer" style="text-align: center;">
                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">提交</button>
@@ -301,7 +320,7 @@
                ,laydate = layui.laydate
                , element = layui.element;

            //日期时间选择器
            //#region æ—¥æœŸæ—¶é—´é€‰æ‹©å™¨
            laydate.render({
                elem: '#HRepairBeginDate'
                , type: 'datetime'
@@ -330,10 +349,43 @@
                elem: '#HDeleteDate'
                , type: 'datetime'
            });
            //初始化表格
            set_InitGrid();
            //获取最大单据号
            $.ajax({
                url: GetWEBURL() + "/Web/GetMAXNum",
                type: "GET",
                data: { "HBillType": '3910' },
                success: function (d) {
                    //console.log(d.data);
                    $("#HInterID").val("0");
                    $("#HBillNo").val(d.data[0].HBillNo);
                }
            });
            //#endregion

            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": ""};
                switch (obj.event) {
                    //新增一行
                    case 'btn-AddLine': btnAddLine(NewRow);
                        break;
                    case 'btn-Edit': btnEditLine(obj);
                        break;
                }
            });
            //行内事件
            table.on('tool(mainTable)', function (obj) {
                set_GridDelete(obj);   //行内删除
                set_GridCellCheck(obj); //行内快捷键筛选
            });


            //进入页面默认光标在条形码上
            $("#HBarCode").focus();

            //初始基本信息赋值
            $("#HRepairBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //点检开始时间
            $("#HRepairEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));    //点检结束时间
@@ -350,17 +402,7 @@
            //模治具条码是否扫描标记
            var HProcExchBillNoFlag = false;

            //获取最大单据号
            $.ajax({
                url: GetWEBURL() + "/Web/GetMAXNum",
                type: "GET",
                data: { "HBillType": '3910' },
                success: function (d) {
                    //console.log(d.data);
                    $("#HInterID").val("0");
                    $("#HBillNo").val(d.data[0].HBillNo);
                }
            });
            


            //条形码回车方法
@@ -418,41 +460,35 @@
                //var tableData = data.field;
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var oMain = JSON.stringify(data.field);
                //var oMain = data.field;
                var index = layer.load();
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Sb_PDA_EqpRepairWorkBill/SaveGetEqpRepairWorkBillList",
                    //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
                    async: true,
                    data: { "msg": oMain },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {
                            //layer.confirm(data.Message, {
                            //    icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['新增'],
                            //    btn2: function () {
                            //        //parent.layui.admin.events.closeThisTabs();关闭页签
                            //        //window.close();//关闭页面，浏览器有效，PDA无效
                            //        parent.location.href = "../../../views/index.html"
                            //    }//关闭
                            //}, function () { window.location.reload(); });//新增
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = oMain + ';' + sSubStr;
                if (AllowLoadData(sSubStr)) {
                    $.ajax({
                        type: "POST",
                        url: GetWEBURL() + "/Sb_PDA_EqpRepairWorkBill/SaveGetEqpRepairWorkBillList",
                        async: true,
                        data: { "msg": sMainSub },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) {
                                layer.msg("提交成功");
                                $('#Saver').removeClass("buttom_box_little");
                                $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
                            }
                            else {
                                layer.close(index);
                                layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        },
                        error: function (err) {
                            layer.close(index);
                            layer.msg("提交成功");
                            $('#Saver').removeClass("buttom_box_little");
                            $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
                            layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                        else {
                            layer.close(index);
                            layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    },
                    error: function (err) {
                        layer.close(index);
                        layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
                    });
                }
            });


            //新增
            form.on('submit(Add)', function (data) {
                $('#Saver').addClass("buttom_box_little");
@@ -463,7 +499,8 @@
                // æ¸…空表单 ï¼ˆâ€œformData”是表单的id）
                $("#formData")[0].reset();
                layui.form.render();

                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" }];
                table.render(option);

                $("#HBarCode").focus();
                //获取最大单据号
@@ -483,6 +520,7 @@
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //创建日期
                $("#HMaker").val(sessionStorage["HUserName"]);     //创建人
            })

            //部门弹窗
            form.on('submit(Department)', function () {
                //页面层-自定义
@@ -494,89 +532,328 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../Baseset/基础资料/Gy_DepartmentList.html', 'yes'],
                    cancel: function (index, layero) {
                    content: ['../../views/PublicPage/DeptInformation.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HDeptName").val(checkStatus.data[0].HName);
                        $("#HDeptID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });

            //维修人弹窗
            form.on('submit(HEmp)', function () {
                IsSet = 0;  //维修人0，负责人1
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '维修人列表',
                    title: '人员列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../Baseset/基础资料/Gy_EmployeeList.html?Type=HWorker', 'yes'],
                    cancel: function (index, layero) {
                    content: ['../PublicPage/UserInformation.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

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

                    },
                    success: function (layero, index) {

                    }
                });
            });

            //点检项目弹窗
            form.on('submit(HDotCheckItemList)', function () {
                //页面层-自定义
            //维修项目弹窗
            form.on('submit(HRepairList)', function () {
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '点检项目列表',
                    title: '维修项目列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../Baseset/基础资料/Gy_CheckItemList.html', 'yes'],
                    cancel: function (index, layero) {
                    content: ['../PublicPage/RepairItemInformation.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

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

                    },
                    success: function (layero, index) {

                    }
                });
            });

            //负责人弹窗
            form.on('submit(HManager)', function () {
                IsSet = 1;  //维修人0，负责人1
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '负责人列表',
                    title: '人员列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../Baseset/基础资料/Gy_EmployeeList.html?Type=HWorker', 'yes'],
                    cancel: function (index, layero) {
                    content: ['../PublicPage/UserInformation.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

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

                    },
                    success: function (layero, index) {

                    }
                });
            });

            //表头信息选择单据弹窗
            form.on('submit(XDHList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '设备维修登记单',
                    shift: 2,
                    area: ['90%', '90%'],
                    content: ['../设备管理/Sb_EqpConkBookBillList.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择单据数据');
                        }
                        $("#HMainSourceBillNo").val(checkStatus.data[0].单据号);
                        $("#HMainSourceInterID").val(checkStatus.data[0].hmainid);
                        $("#HMainSourceEntryID").val(checkStatus.data[0].hsubid);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {
                        //layer.full(index);
                    }
                });
            });


            //以下为此页面所有方法
            //初始化表格
            function set_InitGrid() {
                //表头
                columns = [
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe" }
                    , { field: 'HRepairID', title: 'HRepairID', edit: 'text', event: "", hide: true }
                    , { field: 'HRepairCode', title: '维修项目代码', edit: 'text', event: "", event: "HRepairCode" }
                    , { field: 'HRepairName', title: '维修项目', edit: 'text', event: "" }
                    , { field: 'HManagerID', title: 'HManagerID', edit: 'text', hide: true }
                    , { field: 'HManagerCode', title: '负责人代码', edit: 'text', event: "HManagerCode" }
                    , { field: 'HManagerName', title: '负责人', edit: 'text' }
                    , { field: 'HRepairExplanation', title: '维修要求', edit: 'text' }
                    , { field: 'HRemark', title: '备注', event: "", edit: 'text' }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 150 }
                ];
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , cellMinWidth: 120
                    , totalRow: true
                    , limit: 10
                    , height: 'full-50'
                    , cols: [columns]
                    , limits: [50, 500, 1000, 5000]
                    , done: function (res, curr, count) {

                    }
                };
                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" }];
                table.render(option);
            }
            //增加一行
            function btnAddLine(NewRow) {
                var tableBak = table.cache["mainTable"]; //获取之前编辑过的表格数据
                buttonArr = [];//清空数组
                for (var i = 0; i < tableBak.length; i++) {
                    buttonArr.push(tableBak[i]);  //将之前的数据存储
                }
                buttonArr.push(NewRow);  //在尾部加一行
                table.reload("mainTable", {
                    data: buttonArr    //将数据重新载入表格
                })
            }
            //编辑一行
            function btnEditLine() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    layer.open({
                        type: 2
                        , area: ['80%', '80%']
                        , title: '编辑PDA设备维修'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../设备管理/Sb_EqpMaintenanceBillList_PDAEdit.html?OperationType=3&linterid=&HSouceBillType='
                        , resize: false
                        , btn: ['确定', '取消']
                        , yes: function (index, layero) {

                            //按钮【按钮一】的回调
                            var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                            var HRepairID = parent.layer.getChildFrame('#HRepairID').val();
                            var HRepairCode = parent.layer.getChildFrame('#HRepairCode').val();
                            var HRepairName = parent.layer.getChildFrame('#HRepairName').val();
                            var HManagerID = parent.layer.getChildFrame('#HManagerID').val();
                            var HManagerCode = parent.layer.getChildFrame('#HManagerCode').val();
                            var HManagerName = parent.layer.getChildFrame('#HManagerName').val();
                            var HRepairExplanation = parent.layer.getChildFrame('#HRepairExplanation').val();
                            if (HRepairID == "") {
                                return layer.msg('请选择维修项目');
                            }
                            if (HManagerID == "") {
                                return layer.msg('请选择负责人');
                            }
                            buttonArr = [];//清空数组
                            var checkrow = {
                                "HRepairID": HRepairID, "HRepairCode": HRepairCode, "HRepairName": HRepairName,
                                "HManagerID": HManagerID, "HManagerCode": HManagerCode, "HManagerName": HManagerName,
                                "HRepairExplanation": HRepairExplanation
                            };
                            buttonArr.push(checkrow);  //将之前的数据存储
                            table.reload("mainTable", {
                                data: buttonArr    //将数据重新载入表格
                            })
                            layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                        }
                        , end: function () {

                        }
                        , cancel: function () {

                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }
            // è¡¨æ ¼è¡Œå†…事件删除
            function set_GridDelete(obj) {
                var data = obj.data;
                var rowIndex = $(obj.tr).attr("data-index");
                if (obj.event === 'del') {
                    layer.confirm('真的删除行么', function (index) {
                        console.log("索引为:" + rowIndex);
                        if (rowIndex === '0') {
                            layer.msg('首行无法删除！！！');
                        } else {
                            //obj.del();
                            //layer.close(index);
                            var oldData = table.cache["mainTable"];
                            oldData.splice(obj.tr.data('index'), 1);
                            table.reload('mainTable', { data: oldData });
                            layer.close(index);
                        }
                    });
                }
            }
            //非空验证
            function AllowLoadData(sSubStr) {
                if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
                    layer.msg("没有物料明细记录", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
                    sSubStr = JSON.parse(sSubStr);
                    for (var i = 0; i < sSubStr.length; i++) {
                        if (sSubStr[i].HManagerCode == "") {
                            layer.msg("明细记录第" + (i + 1) + "行,负责人代码信息为空!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return false;
                        }
                        if (sSubStr[i].HRepairCode == "") {
                            layer.msg("明细记录第" + (i + 1) + "行,维修项目代码信息为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return false;
                        }
                        else {
                            return true;
                        }
                    }
                }
            }
            
            //以上为layui模块
        });

        //返回部门
        function GetHDeptNameValue(obj) {
            $("#HDeptName").val(obj[0].HName);
            $("#HDeptID").val(obj[0].HItemID);
        }
        //返回维修人、负责人
        function GetHWorkerValue(obj) {
            if (IsSet == 0) {
                $("#HEmpName").val(obj[0].HName);
                $("#HEmpID").val(obj[0].HItemID);
            }
            if (IsSet == 1) {
                $("#HManagerName").val(obj[0].HName);
                $("#HManagerID").val(obj[0].HItemID);
            }
        }
        //返回维修项目
        function GetHCheckNameValue(obj) {
            $("#HRepair").val(obj[0].HName);
            $("#HRepairID").val(obj[0].HItemID);
        }
    </script>
</body>
</html>

 WebTM/views/É豸¹ÜÀí/Sb_EqpMaintenanceBillList_PDAEdit.html

New file
@@ -0,0 +1,245 @@
<!DOCTYPE html>
<html>
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>编辑PDA设备维修记录</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <!--引用layui样式文件-->
    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
    <!--引用layui js文件-->
    <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/zgqCustom/zgqCustom.js"></script>
    <!--自定义样式-->
    <style>
        .maintitle {
            background-color: #1492ff;
            color: #fff;
            padding: 5px 10px;
            border: none;
            border-radius: 4px;
        }

        .title {
            border-left: 4px solid #1492ff;
            padding-left: 6px;
            margin: 20px 10px 4px;
            font-size: 16px;
            color: #333;
        }

        .buttom_box_little {
            width: 60px;
            height: 36px;
            color: #fff;
            background-color: #1492ff;
            border-radius: 4px;
            border: none;
            margin: 10px;
        }

        .layui-input {
            width: 93%;
        }

        .layui-inline, img {
            display: block;
            vertical-align: middle
        }

        .layui-input, .layui-textarea {
            display: inline-block;
            width: 100%;
            padding-left: 10px;
        }

        .laydate-time-list ol {
            overflow-x: hidden !important;
            overflow-y: auto !important;
        }

        .layui-form-label {
            padding: 9px 5px;
            width: 85px;
        }

        .layui-input-block {
            margin-left: 85px;
            min-height: 36px;
        }
    </style>
</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 15px;background-color: #efefef;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
                    <div class="maintitle">编辑PDA设备维修记录</div>
                    <div class="layui-tab layui-tab-card" lay-filter="TabTest">
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
                                <div class="layui-form-item" style="padding-top: 10px;">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">维修项目:</label>
                                            <div class="layui-input-block">
                                                <input type="text" name="HRepairName" id="HRepairName" class="layui-input" style="width:80%;">
                                                <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input">
                                                <input type="hidden" name="HRepairCode" id="HRepairCode" class="layui-input">
                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HRepairList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">负责人:</label>
                                            <div class="layui-input-block">
                                                <input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input">
                                                <input type="hidden" name="HManagerCode" id="HManagerCode" class="layui-input">
                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HManagerList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">维修要求:</label>
                                            <div class="layui-input-inline">
                                                <textarea placeholder="请输入维修要求" class="layui-textarea" name="HRepairExplanation" id="HRepairExplanation"></textarea>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>

                </form>
            </div>
        </div>
    </div>

    <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>
    <script>
        //获取参数
        var params = get_UrlVars();
        if (typeof (params[params[0]]) == "undefined") {
            var OperationType = 1;//操作类型
        } else {
            var OperationType = params[params[0]];//操作类型
            var linterid = params[params[1]];//源单id
            var HSouceBillType = params[params[2]];//源单类型
        }


        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
                , laydate = layui.laydate
                , element = layui.element;
            //查询条件
            //#endregion

            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等

            //表头信息维修项目
            form.on('submit(HRepairList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '维修项目列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../PublicPage/RepairItemInformation.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

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

                    },
                    success: function (layero, index) {

                    }
                });
            });
            //表头信息责任人
            form.on('submit(HManagerList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '责任人列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../PublicPage/UserInformation.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HManagerName").val(checkStatus.data[0].HName);
                        $("#HManagerID").val(checkStatus.data[0].HItemID);
                        $("#HManagerCode").val(checkStatus.data[0].HNumber);

                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    }
                });
            });
            //#endregion

        });
    </script>
</body>
</html>

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_StationInBillList.html

@@ -35,6 +35,12 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">工序名</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HName" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">流转卡号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" id="HProcExchBillNo" style="width:190px;">
@@ -164,6 +170,7 @@
                    , { field: '流转卡号', title: '流转卡号', width: 160 }
                    , { field: '进出站所用时间', title: '进出站所用时间', width: 160 }
                    , { field: '工时', title: '工时', width: 160 }
                    , { field: '工序名', title: '工序名', width: 160 }
                    , { field: '不良数量', title: '不良数量', width: 160 }
                    , { field: '报废数量', title: '报废数量', width: 160 }
                    , { field: '进站数量', title: '进站数量', width: 160 }
@@ -307,20 +314,21 @@
                        type: "GET",
                        url: GetWEBURL() + "/Sc_PackUnionBill/Sc_StationInBillSetExcel",
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    layer.close(index);
                                    //修改为功后刷新界面
                                    window.location.reload();
                                });
                            window.location.reload();
                            //if (result.count == 1) {
                            //    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                            //        // å¾—到frame索引
                            //        var index = layer.getFrameIndex(window.name);
                            //        //关闭当前frame
                            //        layer.close(index);
                            //        //修改为功后刷新界面
                            //        window.location.reload();
                            //    });

                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                            layer.close(wait);
                            //} else {
                            //    layer.alert(result.code + result.Message, { icon: 5 });
                            //}
                            //layer.close(wait);
                        }, error: function () {
                            layer.close(wait);
                            layer.alert("接口请求失败!", { icon: 5 });
@@ -449,6 +457,7 @@
                var HEndDate = $("#HEndDate").val();//结束日期
                var HICMOBillNo = $("#HICMOBillNo").val(); //单据号
                var HProcExchBillNo = $("#HProcExchBillNo").val();
                var HName = $("#HName").val();

                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),进站时间, 23) >= '" + HBeginDate + "'";
@@ -462,6 +471,9 @@
                if (HProcExchBillNo) {
                    sWhere += " and æµè½¬å¡å· like '%" + HProcExchBillNo + "%'";
                }
                if (HName) {
                    sWhere += " and å·¥åºå like '%" + HName + "%'";
                }
                get_Display(sWhere);
                //调用接口后清空sWhere缓存
                sWhere = " where 1 = 1 ";