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

王 垚

2021-12-24 46b06e0e3cea557bd515c249378fd0ffb56fc512

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

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

Diff too large

 WebTM/WebTM.csproj

@@ -167,6 +167,8 @@
    <Content Include="views\基础资料\公用基础资料\grf\器具改制入库单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\器具改制出库单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\器具采购入库单.grf" />
    <Content Include="views\grf\cabinet-MZJ.grf" />
    <Content Include="views\grf\cabinet-SB.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -572,6 +574,7 @@
    <Content Include="views\基础资料\公用基础资料\Gy_EquipMent.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenter.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Currency.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipFileMainBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainPlanBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipTypeBill.aspx" />
@@ -579,6 +582,7 @@
    <Content Include="views\基础资料\公用基础资料\Gy_DepartmentList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldDotCheckBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldDotCheckPlanBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldFileMainBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldMaintainBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldMaintainPlanBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldProdInStockBill.aspx" />
@@ -960,6 +964,13 @@
    <Compile Include="App_Data\MssqlReportData.cs" />
    <Compile Include="App_Data\ReportData.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipFileMainBill.aspx.cs">
      <DependentUpon>xmlLBM_EquipFileMainBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipFileMainBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_EquipFileMainBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainBill.aspx.cs">
      <DependentUpon>xmlLBM_EquipMaintainBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -1009,6 +1020,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldDotCheckPlanBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldDotCheckPlanBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldFileMainBill.aspx.cs">
      <DependentUpon>xmlLBM_MouldFileMainBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldFileMainBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldFileMainBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldMaintainBill.aspx.cs">
      <DependentUpon>xmlLBM_MouldMaintainBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -6,9 +6,9 @@
    //var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/lubao";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨露本地配置
    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //章紫柔本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //章紫柔本地配置
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
    //var WEBURL = "http://47.96.97.237/API/";   //智云服务器
    var WEBURL = "http://47.96.97.237/API/";   //智云服务器
    //var WEBURL = "http://183.129.128.86:9090/API/";   //凯贝奈特客户服务器外网
    //var WEBURL = "http://192.168.1.253:8080/API/";   //凯贝奈特客户服务器内网
    //var WEBURL = "http://220.189.218.154:8092/API/";   //丸井四维尔服务器

 WebTM/views/grf/cabinet-MZJ.grf

New file
@@ -0,0 +1,154 @@
Object Report
    Version='6.0.0.6'
    Title='你的报表标题'
    PrintAsDesignPaper=F
    Object Font
        Name='宋体'
        Size=105000,0
        Weight=400
        Charset=134
    End
    Object Printer
        Size=256
        Width=9.7
        Height=6
        LeftMargin=0.1
        TopMargin=0
        RightMargin=0.1
        BottomMargin=0
    End
    Object DetailGrid
        CenterView=T
        Object Border
            Object Pen
                Width=1.5
            End
        End
        Object Recordset
            Items Field
                Item
                    Name='模治具编号'
                End
                Item
                    Name='模治具名称'
                End
                Item
                    Name='条码编号'
                End
            End
        End
        Items Column
            Item
                Name='标签宽度'
                Width=9.7
                FixedWidth=T
            End
        End
        Object ColumnContent
            Height=5.3975
            Items ColumnContentCell
                Item
                    Column='标签宽度'
                    FreeCell=T
                    Items Control
                        Item
                            Type=FreeGrid
                            Name='FreeGrid1'
                            Left=0.396875
                            Top=0.211667
                            Object Border
                                Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
                            End
                            ColumnCount=2
                            RowCount=2
                            Items FreeGridColumn
                                Item[1]
                                    Width=3.99521
                                    FixedWidth=T
                                End
                                Item[2]
                                    Width=4.6
                                    FixedWidth=T
                                End
                            End
                            Items FreeGridRow
                                Item[1]
                                    Height=2.5
                                End
                                Item[2]
                                    Height=2.5
                                End
                            End
                            Items FreeGridCell
                                Item[1,1]
                                    Object Font
                                        Name='宋体'
                                        Size=142500,0
                                        Bold=T
                                        Charset=134
                                    End
                                    TextAlign=MiddleCenter
                                    Text='[#模治具编号#]'
                                End
                                Item[1,2]
                                    FreeCell=T
                                    Items Control
                                        Item
                                            Type=Barcode
                                            Name='Barcode1'
                                            Left=0.211667
                                            Top=0.211667
                                            Width=4.18042
                                            Height=4.78896
                                            BarcodeType=QRCode
                                            CaptionPosition=None
                                            Text='[#条码编号#]'
                                        End
                                    End
                                    RowSpan=2
                                End
                                Item[2,1]
                                    Object Font
                                        Name='宋体'
                                        Size=142500,0
                                        Bold=T
                                        Charset=134
                                    End
                                    TextAlign=MiddleCenter
                                    Text='[#模治具名称#]'
                                End
                            End
                        End
                    End
                End
            End
        End
        Object ColumnTitle
            Height=0
            Items ColumnTitleCell
                Item
                    GroupTitle=F
                    Column='标签宽度'
                    TextAlign=MiddleCenter
                    PaddingLeft=0
                    PaddingRight=0
                    PaddingTop=0
                    PaddingBottom=0
                End
            End
        End
    End
    Items ReportHeader
        Item
            Name='ReportHeader1'
            Height=0.211667
            RepeatOnPage=T
        End
    End
    Items ReportFooter
        Item
            Name='ReportFooter1'
            Height=0
        End
    End
End

 WebTM/views/grf/cabinet-SB.grf

New file
@@ -0,0 +1,154 @@
Object Report
    Version='6.0.0.6'
    Title='你的报表标题'
    PrintAsDesignPaper=F
    Object Font
        Name='宋体'
        Size=105000,0
        Weight=400
        Charset=134
    End
    Object Printer
        Size=256
        Width=9.7
        Height=6
        LeftMargin=0.1
        TopMargin=0
        RightMargin=0.1
        BottomMargin=0
    End
    Object DetailGrid
        CenterView=T
        Object Border
            Object Pen
                Width=1.5
            End
        End
        Object Recordset
            Items Field
                Item
                    Name='设备编号'
                End
                Item
                    Name='设备名称'
                End
                Item
                    Name='条码编号'
                End
            End
        End
        Items Column
            Item
                Name='标签宽度'
                Width=9.7
                FixedWidth=T
            End
        End
        Object ColumnContent
            Height=5.3975
            Items ColumnContentCell
                Item
                    Column='标签宽度'
                    FreeCell=T
                    Items Control
                        Item
                            Type=FreeGrid
                            Name='FreeGrid1'
                            Left=0.396875
                            Top=0.211667
                            Object Border
                                Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
                            End
                            ColumnCount=2
                            RowCount=2
                            Items FreeGridColumn
                                Item[1]
                                    Width=3.99521
                                    FixedWidth=T
                                End
                                Item[2]
                                    Width=4.6
                                    FixedWidth=T
                                End
                            End
                            Items FreeGridRow
                                Item[1]
                                    Height=2.5
                                End
                                Item[2]
                                    Height=2.5
                                End
                            End
                            Items FreeGridCell
                                Item[1,1]
                                    Object Font
                                        Name='宋体'
                                        Size=142500,0
                                        Bold=T
                                        Charset=134
                                    End
                                    TextAlign=MiddleCenter
                                    Text='[#设备编号#]'
                                End
                                Item[1,2]
                                    FreeCell=T
                                    Items Control
                                        Item
                                            Type=Barcode
                                            Name='Barcode1'
                                            Left=0.211667
                                            Top=0.211667
                                            Width=4.18042
                                            Height=4.78896
                                            BarcodeType=QRCode
                                            CaptionPosition=None
                                            Text='[#条码编号#]'
                                        End
                                    End
                                    RowSpan=2
                                End
                                Item[2,1]
                                    Object Font
                                        Name='宋体'
                                        Size=142500,0
                                        Bold=T
                                        Charset=134
                                    End
                                    TextAlign=MiddleCenter
                                    Text='[#设备名称#]'
                                End
                            End
                        End
                    End
                End
            End
        End
        Object ColumnTitle
            Height=0
            Items ColumnTitleCell
                Item
                    GroupTitle=F
                    Column='标签宽度'
                    TextAlign=MiddleCenter
                    PaddingLeft=0
                    PaddingRight=0
                    PaddingTop=0
                    PaddingBottom=0
                End
            End
        End
    End
    Items ReportHeader
        Item
            Name='ReportHeader1'
            Height=0.211667
            RepeatOnPage=T
        End
    End
    Items ReportFooter
        Item
            Name='ReportFooter1'
            Height=0
        End
    End
End

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/HBarPlanPrint.html

@@ -138,6 +138,12 @@
            case "HEquipType"://设备分类单打印
                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_EquipTypeBill.aspx?linterid=" + value, true, "");
                break;
            case "HEquipFileMainBill"://设备档案单打印
                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_EquipFileMainBill.aspx?linterid=" + value, true, "");
                break;
            case "HMouldFileMainBill"://模具档案打印
                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_MouldFileMainBill.aspx?linterid=" + value, true, "");
                break;
           
        }
    </script>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_EquipFileMainBill.aspx

New file
@@ -0,0 +1,28 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_EquipFileMainBill.aspx.cs" Inherits="WebTM.views.基础资料.公用基础资料.xmlLBM_EquipFileMainBill" %>

<!DOCTYPE html>

<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <title></title>
     <script runat="server"> 
    protected void Page_Load(object sender, EventArgs e)
    {
        //★特别提示★：
        //不同的数据库应该选用不同的报表XML数据生成类，SQL Server数据库用SqlXMLReportData，Oracle数据库用OracleXMLReportData
        //OledbXMLReportData适合于Access等本地数据库，为了演示方便，这里从Grid++Report的Access例子数据库中获取报表数据

        //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
        SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Gy_EquipFileMainList where hmainid=" + Request.Params["linterid"]);
    }
</script>
</head>
<body>
    <form id="form1" runat="server">
        <div>
        </div>
    </form>
</body>
</html>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_EquipFileMainBill.aspx.cs

New file
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;

namespace WebTM.views.基础资料.公用基础资料
{
    public partial class xmlLBM_EquipFileMainBill : System.Web.UI.Page
    {
        protected void Page_Load(object sender, EventArgs e)
        {

        }
    }
}

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_EquipFileMainBill.aspx.designer.cs

New file
@@ -0,0 +1,26 @@
//------------------------------------------------------------------------------
// <自动生成>
//     æ­¤ä»£ç ç”±å·¥å…·ç”Ÿæˆã€‚
//
//     å¯¹æ­¤æ–‡ä»¶çš„更改可能导致不正确的行为，如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œåˆ™æ‰€åšæ›´æ”¹å°†ä¸¢å¤±ã€‚
// </自动生成>
//------------------------------------------------------------------------------

namespace WebTM.views.基础资料.公用基础资料
{


    public partial class xmlLBM_EquipFileMainBill
    {

        /// <summary>
        /// form1 æŽ§ä»¶ã€‚
        /// </summary>
        /// <remarks>
        /// è‡ªåŠ¨ç”Ÿæˆçš„字段。
        /// è‹¥è¦è¿›è¡Œä¿®æ”¹ï¼Œè¯·å°†å­—段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
    }
}

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_MouldFileMainBill.aspx

New file
@@ -0,0 +1,28 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldFileMainBill.aspx.cs" Inherits="WebTM.views.基础资料.公用基础资料.xmlLBM_MouldFileMainBill" %>

<!DOCTYPE html>

<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <title></title>
     <script runat="server"> 
    protected void Page_Load(object sender, EventArgs e)
    {
        //★特别提示★：
        //不同的数据库应该选用不同的报表XML数据生成类，SQL Server数据库用SqlXMLReportData，Oracle数据库用OracleXMLReportData
        //OledbXMLReportData适合于Access等本地数据库，为了演示方便，这里从Grid++Report的Access例子数据库中获取报表数据

        //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
        SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Gy_MouldFileList where hmainid=" + Request.Params["linterid"]);
    }
</script>
</head>
<body>
    <form id="form1" runat="server">
        <div>
        </div>
    </form>
</body>
</html>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_MouldFileMainBill.aspx.cs

New file
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;

namespace WebTM.views.基础资料.公用基础资料
{
    public partial class xmlLBM_MouldFileMainBill : System.Web.UI.Page
    {
        protected void Page_Load(object sender, EventArgs e)
        {

        }
    }
}

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_MouldFileMainBill.aspx.designer.cs

New file
@@ -0,0 +1,26 @@
//------------------------------------------------------------------------------
// <自动生成>
//     æ­¤ä»£ç ç”±å·¥å…·ç”Ÿæˆã€‚
//
//     å¯¹æ­¤æ–‡ä»¶çš„更改可能导致不正确的行为，如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œåˆ™æ‰€åšæ›´æ”¹å°†ä¸¢å¤±ã€‚
// </自动生成>
//------------------------------------------------------------------------------

namespace WebTM.views.基础资料.公用基础资料
{


    public partial class xmlLBM_MouldFileMainBill
    {

        /// <summary>
        /// form1 æŽ§ä»¶ã€‚
        /// </summary>
        /// <remarks>
        /// è‡ªåŠ¨ç”Ÿæˆçš„字段。
        /// è‹¥è¦è¿›è¡Œä¿®æ”¹ï¼Œè¯·å°†å­—段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
    }
}

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_MouldTypeBill.aspx

@@ -15,7 +15,7 @@

        //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
        SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Gy_MouldTypeList where HItemID=" + Request.Params["linterid"]+ " order by hsubid");
        SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Gy_EquipFileMainList where hmainid=" + Request.Params["linterid"]);
    }
</script>
</head>

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_StockCheckItemEdit.html

@@ -72,7 +72,6 @@
                                                <div class="layui-input-block">
                                                    <select name="HUseFlag" lay-filter="aihao" id="HUseFlag">
                                                        <option value="未检测" selected="selected">未检测</option>
                                                        <option value="未检测">未检测</option>
                                                        <option value="已使用">已使用</option>
                                                    </select>
                                                </div>
@@ -141,22 +140,14 @@
            //#endregion

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

            });
            
            //保存
            form.on('submit(Saver)', function (data) {//保存

                var isEndCheck = document.getElementById("HStopflag").checked;
                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//将数组合并成字符串
                var user = sessionStorage["HUserName"];
                if (sessionStorage["OrganizationID"] == undefined || sessionStorage["OrganizationID"] == "" || sessionStorage["OrganizationID"] == null) {
                    $("#HOrgID").val(0);
                }
                else {
                    $("#HOrgID").val(sessionStorage["OrganizationID"]);
                }
                
                var sMainStr = JSON.stringify(data.field) + ";" + user;
                if (AllowLoadData()) {
                    $.ajax(
@@ -215,7 +206,16 @@
            function set_AddFNew() {
                $("#HItemID").val("0");
                $("#HOrgID").val("0");
                if (sessionStorage["OrganizationID"] == undefined || sessionStorage["OrganizationID"] == "" || sessionStorage["OrganizationID"] == null) {
                    $("#HOrgID").val(0);
                }
                else {
                    $("#HOrgID").val(sessionStorage["OrganizationID"]);
                }
                $("#HNumber").val("");
                laydate.render({
                    elem: '#HEndDate'
                });
            }
            //编辑
            function set_EditFromGrid() {
@@ -235,6 +235,7 @@
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data[0];
                            $("#HNumber").val(data.HNumber);//代码
                            $("#HOrgID").val(data.HOrgID);//代码
                            $("#HItemID").val(data.HItemID);//代码ID
                            $("#HName").val(data.HName);//名称
                            $("#HHelpCode").val(data.HHelpCode);//助记代码

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/·µ¹¤/Sc_Add_MESReturnStepWorkBillList.html

@@ -123,9 +123,10 @@
                                                            <input type="text" name="HICMOBillNo" id="HICMOBillNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
                                                            <input type="hidden" name="HICMOInterID" id="HICMOInterID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HICMOBillList" id="HICMOBillList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                            </button>-->
                                                            <input type="hidden" name="HSourceBillNo" id="HSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HSourceInterID" id="HSourceInterID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HSourceEntryID" id="HSourceEntryID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HSourceBillType" id="HSourceBillType" class="layui-input" value="" style="float:left;width:150px;">
                                                        </div>
                                                    </div>
                                                </div>
@@ -204,6 +205,18 @@
                                                            <input type="text" name="HWorkerName" id="HWorkerName" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HWorkerID" id="HWorkerID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkerList" id="HEmpList" 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-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">生产资源</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HSourceName" id="HSourceName" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HSourceID" id="HSourceID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceList" id="HSourceList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                            </button>
                                                        </div>
@@ -422,7 +435,8 @@
                $('#HPlanBeginDate').attr("disabled", true);
                $('#HDeptName').attr("disabled", true);
                $('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);
               
                $('#HSourceName').attr("disabled", true);
                $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);

                $.ajax(
                    {
@@ -445,11 +459,17 @@
                                $("#HMaterCode").val(LoadData[0].HMaterNumber); //产品代码
                                $("#HMaterName").val(LoadData[0].HMaterName); //产品名称
                                $("#HMaterSpec").val(LoadData[0].HModel); //产品规格

                                $("#HSourceID").val(LoadData[0].HSourceID); //生产资源ID
                                $("#HSourceName").val(LoadData[0].HSourceName); //生产资源
                               
                                $("#HICMOInterID").val(LoadData[0].HICMOInterID); //任务单主内码ID
                                $("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //任务单子内码ID
                                $("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //任务单号
                                $("#HSourceBillType").val(HSourceBillType); //源单类型
                                $("#HSourceBillNo").val(HSourceBillNo); //源单内码
                                $("#HSourceInterID").val(HSourceInterID); //源单主码
                                $("#HSourceEntryID").val(HSourceEntryID); //源单子码

                                $("#HProcID").val(LoadData[0].HProcID); //返工工序ID
                                $("#HProcName").val(LoadData[0].HProcName); //返工工序
@@ -487,7 +507,8 @@
                $('#HPlanBeginDate').attr("disabled", true);
                $('#HDeptName').attr("disabled", true);
                $('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);

                $('#HSourceName').attr("disabled", true);
                $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
                $.ajax({
                    url: GetWEBURL() + "Sc_MESReturnStepWorkBill/Sc_MESReturnStepWorkBillListCheckDetai",
                    type: "GET",
@@ -504,6 +525,10 @@
                                , "HDate": formatDate(data.日期)
                                , "HICMOInterID": data.HICMOInterID                       //生产订单主ID
                                , "HICMOBillNo": data.任务单                        //生产订单
                                , "HSourceBillType": data.HSourceBillType
                                , "HSourceBillNo": data.HSourceBillNo
                                , "HSourceInterID": data.HSourceInterID
                                , "HSourceEntryID": data.HSourceEntryID

                                , "HProcID": data.HProcID
                                , "HProcName": data.返工工序名称
@@ -534,7 +559,8 @@
                                , "HCloseDate": data.关闭日期             //关闭日期
                                , "HDeleteMan": data.作废人               //作废人
                                , "HDeleteDate": data.作废日期       //作废日期

                                , "HSourceID": data.HSourceID              //资源ID
                                , "HSourceName": data.资源名称             //资源名称
                            });

                        } else {
@@ -730,6 +756,44 @@
                });
            });

            //生产资源
            form.on('submit(HSourceList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '资源列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../../PublicPage/SourceInformation.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('请选择数据');
                        }
                        $("#HSourceName").val(checkStatus.data[0].HName);
                        $("#HSourceID").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(HWorkerList)', function () {
                //页面层-自定义
@@ -868,6 +932,10 @@
                layer.msg("返工时间不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HQty").val() == '' || $("#HQty").val() == null) {
                layer.msg("返工数量不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HWorkerID").val() == '' || $("#HWorkerID").val() == null) {
                layer.msg("操作员不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
@@ -880,6 +948,10 @@
                layer.msg("部门不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HSourceID").val() == '' || $("#HSourceID").val() == null) {
                layer.msg("生产资源不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            return Result;
        }


 WebTM/views/É豸¹ÜÀí/É豸µµ°¸/Gy_EquipFileMainList.html

@@ -50,6 +50,8 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btnAdd"><i class="layui-icon layui-icon-add-1"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btnModify"><i class="layui-icon layui-icon-edit"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btndelete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
@@ -102,6 +104,12 @@
                        break;
                    //编辑按钮
                    case 'btnModify': set_ShowBill();
                        break;
                    //预览
                    case 'btn-view': get_ViewReport();
                        break;
                    //打印
                    case 'btn-print': get_PrintReport();
                        break;
                    //删除按钮
                    case 'btndelete': set_DeleteBill();
@@ -416,6 +424,48 @@

            }

            //预览
            function get_ViewReport() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    layer.open({
                        type: 2
                        , area: ['50%', '50%']
                        , title: '打印模版选择'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HEquipFileMainBill', 'yes']
                        , resize: false
                    })
                }
                else {
                    layer.msg('请选择一行数据打印！');
                }
            }

            //打印
            function get_PrintReport() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    layer.open({
                        type: 2
                        , area: ['50%', '50%']
                        , title: '打印模版选择'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HEquipFileMainBill', 'yes']
                        , resize: false
                    })
                }
                else {
                    layer.msg('请选择一行数据打印！');
                }
            }

            //刷新
            function get_Refresh() {
                $("#HNumber").val("");

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_Fast.html

@@ -256,7 +256,11 @@
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element;
                , element = layui.element;



            var option = [];

            //源单找货列表
            var ZHOption = {
@@ -302,6 +306,44 @@
            $("#HBillerID").hide();
            var HSourceFlag = sessionStorage["SourceFlag"];


            //初始化明细表格
            function set_InitGrid() {
                columns = [
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe", width: 100 }
                    , { 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 }
                    , { field: 'HInterID', title: '单据ID', width: 150, hide: true }
                    , { field: 'HBilltype', title: '单据类型', width: 150, hide: true }
                    , { field: 'Hbarcode', title: '条码编号', width: 150, hide: true }
                    , { field: 'HSCWHID', title: '调出仓库ID', width: 150, hide: true }
                    , { field: 'HSCSPID', title: '调出仓位ID', width: 150, hide: true }
                    , { field: 'HAuxPropID', title: '辅助属性ID', width: 150, hide: true }
                    , { field: 'HMTONo', title: 'MTO号', width: 150, hide: true }
                    , { field: 'HMaterID', title: '物料ID', width: 150, hide: true }
                ];
                option = {
                    id: 'wl-table'
                    , elem: '#wl-table'
                    , toolbar: '#toolbarDemo'
                    , page: false
                    , cellMinWidth: 120
                    , height: 500
                    , cols: [columns]
                    , limit: 500 //每页默认显示的数量
                    , done: function (res, curr, count) {
                    }
                };
            }

            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            if (sessionStorage.login != "login") {
                layer.confirm("登录失效，请重新登录！", {
@@ -339,12 +381,10 @@
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HBillType").val(d.data[0].HSourceBillType);
                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
                        //$("#HWHID").val(d.data[0].HWhID);
                        //$("#HKeeperID").val(d.data[0].HKeeperID);
                        //$("#HSecManagerID").val(d.data[0].HSecManagerID);
                        //$("#HDeptID").val(d.data[0].HDeptID);
                        //$("#HBarCode").val(d.data[0].HBarCode);
                        //$("#HQty").val(d.data[0].HQty);
                        $("#HWHID").val(d.data[0].HWhID);
                        $("#HStockPlaceID").val(d.data[0].HSPID);
                        $("#HKeeperID").val(d.data[0].HKeeperID);
                        $("#HSecManagerID").val(d.data[0].HSecManagerID);
                        RoadSup();
                    }
                })
@@ -372,7 +412,7 @@
                                $("#HSupID").val(result.data[0].HSupID);
                                $("#HSupName").val(result.data[0].HSupName);
                                $("#HDeptID").val(result.data[0].HDeptID);
                                //$("#HDeptName").val(result.data[0].HDeptName);
                                $("#HDeptName").val(result.data[0].HDeptName);
                                //sessionStorage["SourceFlag"] = true;
                                element.tabChange('tab-SellOutBill', '2');
                                layer.load(3);
@@ -388,28 +428,46 @@

            function RoadBillSub(linterid)//加载表体-----不会走
            {
                table.render({
                    elem: '#wl-table'
                    , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
                    , cellMinWidth: 80
                    , toolbar: '#toolbarDemo'
                    , where: { HBillID: linterid, HBillType: '1205', sWhere: '' }
                    , cols: [[
                        { type: 'radio' }
                    , { field: 'HQty', title: '数量', width: 80 }
                    , { field: 'HQtyMust', title: '应收数量', width: 80 }
                    , { field: 'HMaterNumber', title: '物料代码', width: 100 }
                    , { field: 'HMaterName', title: '物料名称', width: 100 }
                    , { 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 }
                    ]]
                    //, height: 500
                })
                $("#HInterID").val(linterid);//修改时主表ID
                //编辑加载数据
                $.ajax({
                    url: GetWEBURL() + 'SellOut/SellOutDetaiNew',
                    type: "GET",
                    data: { "HInterID": linterid },
                    success: function (result) {
                        if (result.count == 1) {
                            option.data = result.list[0];
                            table.render(option);
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index0);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                //table.render({
                //    elem: '#wl-table'
                //    , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
                //    , cellMinWidth: 80
                //    , toolbar: '#toolbarDemo'
                //    , where: { HBillID: linterid, HBillType: '1205', sWhere: '' }
                //    , cols: [[
                //        { type: 'radio' }
                //    , { field: 'HQty', title: '数量', width: 80 }
                //    , { field: 'HQtyMust', title: '应收数量', width: 80 }
                //    , { field: 'HMaterNumber', title: '物料代码', width: 100 }
                //    , { field: 'HMaterName', title: '物料名称', width: 100 }
                //    , { 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 }
                //    ]]
                //    //, height: 500
                //})
            }
             
            //动态加载源单类型列表 new
@@ -435,6 +493,7 @@
                        $("#HBillNo").val(d.data[0].HBillNo);
                        //$("#HInterID").val('132522535');
                        //$("#HBillNo").val('421458026');
                        set_InitGrid();
                    }
                }); 
            }

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_FastList.html

@@ -67,6 +67,9 @@
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">刷新</button>
                                </div>
                                <div class="layui-col-xs2">
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRescind">撤销</button>
                                </div>
                                <div class="layui-col-xs2">
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">退出</button>
                                </div>
                                <div class="layui-col-xs2">
@@ -156,6 +159,46 @@



        //撤销功能
        form.on('submit(cmdRescind)', function () {
            var checkStatus = table.checkStatus('yd-table')
                , data = checkStatus.data;
            var sInterID = data[0].HInterID
            var sBillNo = data[0].HBillNo
            var sBillType = '1205'
            $.ajax(
                {
                    type: "Get",
                    url: GetWEBURL() + "/Web/Rescind_Json",
                    async: true,
                    data: { "sHInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType },
                    dataType: "json",
                    success: function (data) {
                        if (data.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.msg(data.Message, { icon: 2 });
                        }
                    },
                    error: function (err) {
                        layer.msg('错误' + err, {
                            icon: 5,
                            time: 20000
                        }, function () {
                            //do something
                        });
                    }
                });
        });


        form.on('submit(cmdDelete)', function () {//删除
            var checkStatus = table.checkStatus('dj-table')
            , data = checkStatus.data;
@@ -178,26 +221,13 @@
                   dataType: "json",
                   success: function (data) {
                       if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                           //layer.msg(data.Message, { icon: 1 });
                           table.render({
                               elem: '#dj-table' 
                               , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
                               , cellMinWidth: 80
                               , toolbar: '#toolbarDemo'
                               , where: { HBillType: '1205', sWhere: '' }
                               , cols: [[
                                   { type: 'radio' }
                                , { field: 'HInterID', title: '单据内码', width: 80 }
                                , { field: 'HBillNo', title: '单据号', width: 80 }
                                , { field: 'HMaker', title: '制单人', width: 100 }
                                , { field: 'HMakeDate', title: '制单日期', width: 100 }
                                , { field: 'HQty', title: '数量', width: 100 }
                                , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                                , { field: 'HRedBlueFlag', title: '红蓝字', width: 100 }
                                , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                               ]]
                         , height: 500
                           })
                           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.msg(data.Message, { icon: 2 });
@@ -237,7 +267,33 @@
                      , done: function () {
                          layer.closeAll("loading");
                      }
    })
                })

        //已上传列表
        var
            table.render({
                elem: '#yd-table'
                , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
                , toolbar: '#toolbarDemo'
                , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HInterID', title: '单据内码', width: 80 }
                    , { field: 'HBillNo', title: '单据号', width: 80 }
                    , { field: 'HMaker', title: '制单人', width: 100 }
                    , { field: 'HMakeDate', title: '制单日期', width: 100 }
                    , { field: 'HMaterNumber', title: '物料代码', width: 100 }
                    , { field: 'HMaterName', title: '物料名称', width: 100 }
                    , { field: 'HMaterModel', title: '规格型号', width: 100 }
                    , { field: 'HQty', title: '数量', width: 100 }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                    , { field: 'HOrgID', title: '组织', width: 100 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            })
        //刷新明细页签
        table.render({
            elem: '#mx-table'

 WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBill_Fast.html

@@ -44,10 +44,10 @@
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">单据类型</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" value="生产订单" name="HBillTypeCHN" id="HBillTypeCHN" lay-verify="HBillTypeCHN" autocomplete="off" class="layui-input" readonly>
                                            <input type="hidden" value="3710" name="HBillType" id="HBillType" lay-verify="HBillType" autocomplete="off" class="layui-input">
                                            <!--<input type="text" value="生产汇报单" name="HBillTypeCHN" id="HBillTypeCHN" lay-verify="HBillTypeCHN" autocomplete="off" class="layui-input" readonly>
                                            <input type="hidden" value="3711" name="HBillType" id="HBillType" lay-verify="HBillType" autocomplete="off" class="layui-input">-->
                                            <!--<input type="text" value="生产订单" name="HBillTypeCHN" id="HBillTypeCHN" lay-verify="HBillTypeCHN" autocomplete="off" class="layui-input" readonly>
                                            <input type="hidden" value="3710" name="HBillType" id="HBillType" lay-verify="HBillType" autocomplete="off" class="layui-input">-->
                                            <input type="text" value="生产汇报单" name="HBillTypeCHN" id="HBillTypeCHN" lay-verify="HBillTypeCHN" autocomplete="off" class="layui-input" readonly>
                                            <input type="hidden" value="3711" name="HBillType" id="HBillType" lay-verify="HBillType" autocomplete="off" class="layui-input">
                                            <!--<select name="HBillType" id="HBillType">
                                                <option value="3711">生产汇报单</option>
                                            </select>-->
@@ -235,6 +235,11 @@
            , table = layui.table
            , form = layui.form
            , element = layui.element;


            var option = [];


            //清空界面  new

            //表头初始化赋值（根据登录用户获取 é»˜è®¤ä»“库、部门、验收、保管、金蝶用户） new
@@ -259,6 +264,45 @@
            //默认带入的仓库，如果启用仓位则仓位有效，如果没有启用则仓位灰度 new

            $("#HBarCode").focus();



            //初始化明细表格
            function set_InitGrid() {
                columns = [
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe", width: 100 }
                    , { 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 }
                    , { field: 'HInterID', title: '单据ID', width: 150, hide: true }
                    , { field: 'HBilltype', title: '单据类型', width: 150, hide: true }
                    , { field: 'Hbarcode', title: '条码编号', width: 150, hide: true }
                    , { field: 'HSCWHID', title: '调出仓库ID', width: 150, hide: true }
                    , { field: 'HSCSPID', title: '调出仓位ID', width: 150, hide: true }
                    , { field: 'HAuxPropID', title: '辅助属性ID', width: 150, hide: true }
                    , { field: 'HMTONo', title: 'MTO号', width: 150, hide: true }
                    , { field: 'HMaterID', title: '物料ID', width: 150, hide: true }
                ];
                option = {
                    id: 'wl-table'
                    , elem: '#wl-table'
                    , toolbar: '#toolbarDemo'
                    , page: false
                    , cellMinWidth: 120
                    , height: 500
                    , cols: [columns]
                    , limit: 500 //每页默认显示的数量
                    , done: function (res, curr, count) {
                    }
                };
            }

            //获取参数
            function getUrlVars() {
@@ -293,14 +337,12 @@
                        // console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        //$("#HBillType").val(d.data[0].HSourceBillType);
                        $("#HBillType").val(d.data[0].HSourceBillType);
                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
                        //$("#HWHID").val(d.data[0].HWhID);
                        //$("#HKeeperID").val(d.data[0].HKeeperID);
                        //$("#HSecManagerID").val(d.data[0].HSecManagerID);
                        //$("#HDeptID").val(d.data[0].HDeptID);
                        //$("#HBarCode").val(d.data[0].HBarCode);
                        //$("#HQty").val(d.data[0].HQty);
                        $("#HWHID").val(d.data[0].HWhID);
                        $("#HStockPlaceID").val(d.data[0].HSPID);
                        $("#HKeeperID").val(d.data[0].HKeeperID);
                        $("#HSecManagerID").val(d.data[0].HSecManagerID);
                    }
                })
            }
@@ -308,29 +350,24 @@

            function RoadBillSub(linterid)//加载表体
            {
                table.render({
                    elem: '#wl-table'
                    , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
                    , cellMinWidth: 80
                    , toolbar: '#toolbarDemo'
                    , where: { HBillID: linterid, HBillType: '1202', sWhere: '' }
                    , cols: [[
                            { type: 'radio' }
                            , { field: 'HQty', title: '数量', width: 80 }
                            , { field: 'HQtyMust', title: '应收数量', width: 80 }
                            , { field: 'HMaterNumber', title: '物料代码', width: 100 }
                            , { field: 'HMaterName', title: '物料名称', width: 100 }
                            , { 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
                })
                $("#HInterID").val(linterid);//修改时主表ID
                //编辑加载数据
                $.ajax({
                    url: GetWEBURL() + 'ProdIn/ProdInDetaiNew',
                    type: "GET",
                    data: { "HInterID": linterid },
                    success: function (result) {
                        if (result.count == 1) {
                            option.data = result.list[0];
                            table.render(option);
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index0);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
             
            //动态加载源单类型列表 new
@@ -354,6 +391,7 @@
                        //console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        set_InitGrid();
                    }
                });
            } 

 WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBill_FastList.html

@@ -67,6 +67,9 @@
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">刷新</button>
                                </div>
                                <div class="layui-col-xs2">
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRescind">撤销</button>
                                </div>
                                <div class="layui-col-xs2">
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">退出</button>
                                </div>
                                <div class="layui-col-xs2">
@@ -181,6 +184,47 @@
        });


        //撤销功能
        form.on('submit(cmdRescind)', function () {
            var checkStatus = table.checkStatus('yd-table')
                , data = checkStatus.data;
            var sInterID = data[0].HInterID
            var sBillNo = data[0].HBillNo
            var sBillType = '1205'
            $.ajax(
                {
                    type: "Get",
                    url: GetWEBURL() + "/Web/Rescind_Json",
                    async: true,
                    data: { "sHInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType },
                    dataType: "json",
                    success: function (data) {
                        if (data.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.msg(data.Message, { icon: 2 });
                        }
                    },
                    error: function (err) {
                        layer.msg('错误' + err, {
                            icon: 5,
                            time: 20000
                        }, function () {
                            //do something
                        });
                    }
                });
        });




        form.on('submit(cmdDelete)', function () {//删除
            var checkStatus = table.checkStatus('dj-table')
@@ -204,28 +248,13 @@
                   dataType: "json",
                   success: function (data) {
                       if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                           //layer.msg(data.Message, { icon: 1 });
                           table.render({
                               elem: '#dj-table'
                               //, url: 'http://61.130.49.162:9090/WMSAPI///POStockInBill/DisBillEntryList_Mate_Webs_Json'
                               //, url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Mate_Webs_Json'
                               , url: GetWEBURL() + '/ProductInBillList/DisBillEntryList_Mate_Webs_Json'
                               , cellMinWidth: 80
                               , toolbar: '#toolbarDemo'
                               , where: { HBillType: '1202', sWhere: '' }
                               , cols: [[
                                   { type: 'radio' }
                                , { field: 'HInterID', title: '单据内码', width: 80 }
                                , { field: 'HBillNo', title: '单据号', width: 80 }
                                , { field: 'HMaker', title: '制单人', width: 100 }
                                , { field: 'HMakeDate', title: '制单日期', width: 100 }
                                , { field: 'HQty', title: '数量', width: 100 }
                                , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                                , { field: 'HRedBlueFlag', title: '红蓝字', width: 100 }
                                , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                               ]]
                         , height: 500
                           })
                           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.msg(data.Message, { icon: 2 });
@@ -265,7 +294,34 @@
                      , done: function () {
                          layer.closeAll("loading");
                      }
    })
                })


        //已上传列表
        var
            table.render({
                elem: '#yd-table'
                , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
                , toolbar: '#toolbarDemo'
                , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HInterID', title: '单据内码', width: 80 }
                    , { field: 'HBillNo', title: '单据号', width: 80 }
                    , { field: 'HMaker', title: '制单人', width: 100 }
                    , { field: 'HMakeDate', title: '制单日期', width: 100 }
                    , { field: 'HMaterNumber', title: '物料代码', width: 100 }
                    , { field: 'HMaterName', title: '物料名称', width: 100 }
                    , { field: 'HMaterModel', title: '规格型号', width: 100 }
                    , { field: 'HQty', title: '数量', width: 100 }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                    , { field: 'HOrgID', title: '组织', width: 100 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            })
        //刷新明细页签
        table.render({
            elem: '#mx-table'

 WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBill_FastList.html

@@ -67,6 +67,9 @@
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">刷新</button>
                                </div>
                                <div class="layui-col-xs2">
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRescind">撤销</button>
                                </div>
                                <div class="layui-col-xs2">
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">退出</button>
                                </div>
                                <div class="layui-col-xs2">
@@ -155,6 +158,45 @@
        });


        //撤销功能
        form.on('submit(cmdRescind)', function () {
            var checkStatus = table.checkStatus('yd-table')
                , data = checkStatus.data;
            var sInterID = data[0].HInterID
            var sBillNo = data[0].HBillNo
            var sBillType = '1201'
            $.ajax(
                {
                    type: "Get",
                    url: GetWEBURL() + "/Web/Rescind_Json",
                    async: true,
                    data: { "sHInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType },
                    dataType: "json",
                    success: function (data) {
                        if (data.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.msg(data.Message, { icon: 2 });
                        }
                    },
                    error: function (err) {
                        layer.msg('错误' + err, {
                            icon: 5,
                            time: 20000
                        }, function () {
                            //do something
                        });
                    }
                });
        });


        form.on('submit(cmdDelete)', function () {//删除
            var checkStatus = table.checkStatus('dj-table')
@@ -178,26 +220,13 @@
                   dataType: "json",
                   success: function (data) {
                       if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                           //layer.msg(data.Message, { icon: 1 });
                           table.render({
                               elem: '#dj-table'
                               , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
                               , cellMinWidth: 80
                               , toolbar: '#toolbarDemo'
                               , where: { HBillType: '1201', sWhere: '' }
                               , cols: [[
                                   { type: 'radio' }
                                , { field: 'HInterID', title: '单据内码', width: 80 }
                                , { field: 'HBillNo', title: '单据号', width: 80 }
                                , { field: 'HMaker', title: '制单人', width: 100 }
                                , { field: 'HMakeDate', title: '制单日期', width: 100 }
                                , { field: 'HQty', title: '数量', width: 100 }
                                , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                                , { field: 'HRedBlueFlag', title: '红蓝字', width: 100 }
                                , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                               ]]
                         , height: 500
                           })
                           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.msg(data.Message, { icon: 2 });
@@ -237,7 +266,33 @@
                      , done: function () {
                          layer.closeAll("loading");
                      }
    })
                })

        //已上传列表
        var
            table.render({
                elem: '#yd-table'
                , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
                , toolbar: '#toolbarDemo'
                , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HInterID', title: '单据内码', width: 80 }
                    , { field: 'HBillNo', title: '单据号', width: 80 }
                    , { field: 'HMaker', title: '制单人', width: 100 }
                    , { field: 'HMakeDate', title: '制单日期', width: 100 }
                    , { field: 'HMaterNumber', title: '物料代码', width: 100 }
                    , { field: 'HMaterName', title: '物料名称', width: 100 }
                    , { field: 'HMaterModel', title: '规格型号', width: 100 }
                    , { field: 'HQty', title: '数量', width: 100 }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                    , { field: 'HOrgID', title: '组织', width: 100 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            })
        //刷新明细页签
        table.render({
            elem: '#mx-table'