yangle
2022-08-16 e261e4ab0848bcdd36aafe63e6835eac723270f1
Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
8个文件已添加
11个文件已修改
1513 ■■■■■ 已修改文件
WebTM/App_Data/MssqlReportData.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Vlog/webapi20220811.txt 239 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Vlog/webapi20220815.txt 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/SRM_OpenTmpList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/grf/cabinet-SB.grf 154 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/xmlLBM_Gy_HEquipResumeBillList.aspx 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/xmlLBM_Gy_HEquipResumeBillList.aspx.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/xmlLBM_Gy_HEquipResumeBillList.aspx.designer.cs 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_HPPickingBillList.aspx 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Gy_MouldFileResume.html 537 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/组装单/Sc_PCruxBindingPDA.html 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/设备档案/Gy_EquipFileBillResume.html 420 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/App_Data/MssqlReportData.cs
@@ -18,12 +18,12 @@
    //public const string SqlConnStr = "Data Source=10.0.2.9;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch测试
    //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL测试
   public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL测试
    //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸井
    //public const string SqlConnStr = "Data Source=192.168.0.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸井地址
    //public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//雅琪诺测试
    //public const string SqlConnStr = "Data Source=183.129.128.86:26589;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//凯贝奈特
    public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//瑞琪
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//凯贝奈特
    //public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//瑞琪
    //public string sServer;
    //public string sDataBase;
WebTM/Vlog/webapi20220811.txt
New file
@@ -0,0 +1,239 @@
2022/8/11 9:58:39 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,p.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')
2022/8/11 9:58:39 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,p.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')
2022/8/11 17:36:17 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,p.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2728')
2022/8/11 17:36:17 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,p.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2728')
2022/8/11 17:36:18 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2022/8/11 17:36:18 ReportDataSet:0
2022/8/11 17:36:39 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,p.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2728','12500117-5830')
2022/8/11 17:36:39 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,p.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2728','12500117-5830')
2022/8/11 17:36:39 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2022/8/11 17:36:39 ReportDataSet:0
2022/8/11 17:37:18 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,p.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('12500063-5817','12500117-5830')
2022/8/11 17:37:18 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,p.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('12500063-5817','12500117-5830')
2022/8/11 17:37:18 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2022/8/11 17:37:18 ReportDataSet:0
2022/8/11 17:44:51 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,p.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2729')
2022/8/11 17:44:51 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,p.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2729')
2022/8/11 17:44:51 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2022/8/11 17:44:51 ReportDataSet:0
2022/8/11 17:45:07 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,p.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2729')
2022/8/11 17:45:07 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,p.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2729')
2022/8/11 17:45:07 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2022/8/11 17:45:07 ReportDataSet:0
2022/8/11 17:48:28 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,p.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2728')
2022/8/11 17:48:28 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,p.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2728')
2022/8/11 17:48:28 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2022/8/11 17:48:28 ReportDataSet:0
2022/8/11 17:56:08 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,p.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('12360550-2981','12481123-5304')
2022/8/11 17:56:09 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,p.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('12360550-2981','12481123-5304')
2022/8/11 17:56:09 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2022/8/11 17:56:09 ReportDataSet:0
2022/8/11 18:05:56 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,pm.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            left JOIN Sc_PPBomBillSub p ON b.HSourceEntryID = p.HInterID
                            left JOIN Sc_PPBomBillMain pm ON p.HInterID=pm.HInterID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2729','123865-3394')
2022/8/11 18:05:56 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,pm.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            left JOIN Sc_PPBomBillSub p ON b.HSourceEntryID = p.HInterID
                            left JOIN Sc_PPBomBillMain pm ON p.HInterID=pm.HInterID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2729','123865-3394')
2022/8/11 18:05:56 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2022/8/11 18:05:56 ReportDataSet:2
2022/8/11 18:49:18 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,pm.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            left JOIN Sc_PPBomBillSub p ON b.HSourceEntryID = p.HInterID
                            left JOIN Sc_PPBomBillMain pm ON p.HInterID=pm.HInterID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2728','123371-2729')
2022/8/11 18:49:18 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,pm.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            left JOIN Sc_PPBomBillSub p ON b.HSourceEntryID = p.HInterID
                            left JOIN Sc_PPBomBillMain pm ON p.HInterID=pm.HInterID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2728','123371-2729')
2022/8/11 18:50:49 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,pm.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            left JOIN Sc_PPBomBillSub p ON b.HSourceEntryID = p.HInterID
                            left JOIN Sc_PPBomBillMain pm ON p.HInterID=pm.HInterID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2728','123371-2729')
2022/8/11 18:50:49 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,pm.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            left JOIN Sc_PPBomBillSub p ON b.HSourceEntryID = p.HInterID
                            left JOIN Sc_PPBomBillMain pm ON p.HInterID=pm.HInterID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2728','123371-2729')
2022/8/11 18:50:50 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2022/8/11 18:50:50 ReportDataSet:2
WebTM/Vlog/webapi20220815.txt
New file
@@ -0,0 +1,5 @@
2022/8/15 11:06:42 æ‰“印sql:select * from h_v_Gy_EquipFileMainList where hmainid=49
2022/8/15 11:06:42 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2022/8/15 11:06:42 ReportDataSet:1
WebTM/WebTM.csproj
@@ -216,6 +216,7 @@
    <Content Include="views\grf\工序流转.grf" />
    <Content Include="views\grf\cabinet-CG.grf" />
    <Content Include="views\grf\瑞与祺江苏打印模板.grf" />
    <Content Include="views\grf\cabinet-SB.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -625,6 +626,7 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainPlanBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipTypeBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_HEquipResumeBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_Material.aspx" />
    <Content Include="views\基础资料\公用基础资料\Gy_DepartmentList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill.aspx" />
@@ -785,6 +787,7 @@
    <Content Include="views\模治具管理\模治具管理\Gy_CheckToolsFileMainList.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFileList.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFile.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFileResume.html" />
    <Content Include="views\模治具管理\模治具管理\Sb_Add_MouldRepairWorkBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_Add_MouldConkBookBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_Add_MouldDotCheckBillList.html" />
@@ -936,6 +939,7 @@
    <Content Include="views\设备管理\Sb_EquipMaintainPlanBillEdit.html" />
    <Content Include="views\设备管理\Sb_EquipMaintainPlanBillList.html" />
    <Content Include="views\设备管理\Sc_Add_MouldDotCheckBillList.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileBillResume.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileMainEdit.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileMainList.html" />
    <Content Include="views\设备管理\设备维修派工单\Sb_EquipRepairSendWorkBillEdit.html" />
@@ -1141,6 +1145,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipTypeBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_HEquipResumeBillList.aspx.cs">
      <DependentUpon>xmlLBM_Gy_HEquipResumeBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_HEquipResumeBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Gy_HEquipResumeBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_Material.aspx.cs">
      <DependentUpon>xmlLBM_Gy_Material.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
WebTM/views/Baseset/SRM_OpenTmpList.html
@@ -18,8 +18,8 @@
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <div class="layui-btn-group">
                                <!--<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Add">新增</button>
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Del">删除</button>-->
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Add">新增</button>
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Del">删除</button>
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Reload">刷新</button>
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Select">选择</button>
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Exit">退出</button>
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/index.html
@@ -573,6 +573,7 @@
                                        <dd><a lay-href="模治具管理/模治具管理/Gy_MouldFileList.html">器具主档维护</a></dd>
                                        <dd><a lay-href="模治具管理/模治具管理/Sc_MouldMaintainRuleBillEdit.html">器具保养规程单</a></dd>
                                        <dd><a lay-href="模治具管理/模治具管理/Sc_MouldMaintainRuleBillList.html">器具保养规程单维护</a></dd>
                                        <dd><a lay-href="模治具管理/模治具管理/Gy_MouldFileResume.html">器具履历</a></dd>
                                    </dl>
                                </dd>
                                <dd>
@@ -667,6 +668,7 @@
                                        <dd><a lay-href="设备管理/设备规程单/Sb_EquipDotCheckRuleList.html">设备点检规程单维护</a></dd>
                                        <dd><a lay-href="设备管理/设备规程单/Sb_EquipMaintainRuleEdit.html">设备保养规程单</a></dd>
                                        <dd><a lay-href="设备管理/设备规程单/Sb_EquipMaintainRuleList.html">设备保养规程单维护</a></dd>
                                        <dd><a lay-href="设备管理/设备档案/Gy_EquipFileBillResume.html">设备履历</a></dd>
                                    </dl>
                                </dd>
                                <dd>
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/HBarPlanPrint.html
@@ -181,6 +181,9 @@
            case "HPPickingBill"://生产领料拆码列表
                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_HPPickingBillList.aspx?linterid=" + value, true, "");
                break;
            case "HEquipResume"://设备履历
                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Gy_HEquipResumeBillList.aspx?linterid=" + value, true, "");
                break;
        }
    </script>
</body>
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_Gy_HEquipResumeBillList.aspx
New file
@@ -0,0 +1,28 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Gy_HEquipResumeBillList.aspx.cs" Inherits="WebTM.views.基础资料.公用基础资料.xmlLBM_Gy_HEquipResumeBillList" %>
<!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_Gy_HEquipResumeBillList.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_Gy_HEquipResumeBillList : System.Web.UI.Page
    {
        protected void Page_Load(object sender, EventArgs e)
        {
        }
    }
}
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_Gy_HEquipResumeBillList.aspx.designer.cs
New file
@@ -0,0 +1,26 @@
//------------------------------------------------------------------------------
// <自动生成>
//     æ­¤ä»£ç ç”±å·¥å…·ç”Ÿæˆã€‚
//
//     å¯¹æ­¤æ–‡ä»¶çš„æ›´æ”¹å¯èƒ½å¯¼è‡´ä¸æ­£ç¡®çš„行为,如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œåˆ™æ‰€åšæ›´æ”¹å°†ä¸¢å¤±ã€‚
// </自动生成>
//------------------------------------------------------------------------------
namespace WebTM.views.基础资料.公用基础资料
{
    public partial class xmlLBM_Gy_HEquipResumeBillList
    {
        /// <summary>
        /// form1 æŽ§ä»¶ã€‚
        /// </summary>
        /// <remarks>
        /// è‡ªåŠ¨ç”Ÿæˆçš„å­—æ®µã€‚
        /// è‹¥è¦è¿›è¡Œä¿®æ”¹ï¼Œè¯·å°†å­—段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
    }
}
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_Sc_HPPickingBillList.aspx
@@ -23,13 +23,14 @@
                PrintIds += "'" + idsArray[i] + "',";
            }
            PrintIds = PrintIds.Substring(0, PrintIds.Length - 1);
            string sql = string.Format(@"select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,p.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
            string sql = string.Format(@"select b.HInterID,b.HEntryID,b.HBarCode as æ¡å½¢ç ,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•号,pm.HBillNo as æºå•单号,b.HMaker åˆ¶å•人,u.HName è®¡é‡å•位
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            left JOIN Sc_PPBomBillSub p ON b.HSourceEntryID = p.HInterID
                            left JOIN Sc_PPBomBillMain pm ON p.HInterID=pm.HInterID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ("+ PrintIds+")");
            LogService.Write(sql);
            SqlXMLReportData.GenOneRecordset(this, sql);
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdInBillList.html
@@ -655,7 +655,7 @@
            }
            å¿«é€Ÿè¿‡æ»¤
            //快速过滤
            function get_FastQuery(table, option) {
                var HStatus = $("select[name='HStatus']").val();//状态
                var HBeginDate = $("#HBeginDate").val();//开始日期
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_MouldFileResume.html
New file
@@ -0,0 +1,537 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>器具履历</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">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <style type="text/css">
        input.layui-input.layui-unselect {
            padding-right: 0;
        }
    </style>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">器具分类</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HMouldType" id="HMouldType">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始时间</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束时间</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <div class="layui-tab layui-tab-card">
                            <ul class="layui-tab-title">
                                <li class="layui-this">出入库记录</li>
                                <li>器具耗用记录</li>
                                <li>日常记录</li>
                                <li>维修记录</li>
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <table class="layui-hide" id="mainTable3" lay-filter="mainTable3"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <table class="layui-hide" id="mainTable4" lay-filter="mainTable4"></table>
                                </div>
                            </div>
                        </div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <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="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>
                        </script>
                        <script type="text/html" id="xuhao1">
                            {{d.LAY_TABLE_INDEX+1}}
                        </script>
                        <script type="text/html" id="xuhao2">
                            {{d.LAY_TABLE_INDEX+1}}
                        </script>
                        <script type="text/html" id="xuhao3">
                            {{d.LAY_TABLE_INDEX+1}}
                        </script>
                        <script type="text/html" id="xuhao4">
                            {{d.LAY_TABLE_INDEX+1}}
                        </script>
                    </form>
                </div>
            </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 src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , table1 = layui.table
                , table2 = layui.table
                , table3 = layui.table
                , table4 = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , util = layui.util
            //查询条件
            var sWhere = "";
            var option = [];
            var option1 = [];
            var option2 = [];
            var option3 = [];
            var option4 = [];
            //#endregion
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            //初始化界面
            set_ClearBill();
            //#endregion
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);
                switch (obj.event) {
                    //浏览
                    case 'btn-view':
                        get_ViewReport();
                        break;
                    //刷新
                    case 'get_Refresh':
                        set_Refresh();
                        break;
                    //退出
                    case 'get_Exit':
                        Pub_Close(2);
                        break;
                };
            });
            //点击主表带出从表数据
            table.on('row(mainTable)', function (obj) { //注:tool æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„å±žæ€§ lay-filter="对应的值"
                var datas = obj.data; //获得当前行数据
                var linterid = datas.hmainid;
                $.ajax({
                    url: GetWEBURL() + 'Gy_EquipFileMain/Gy_MouldFileBillResumeDate',
                    type: "GET",
                    data: { "HInterID": linterid },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option1.data = data1.list[0];
                            table1.render(option1);
                            option2.data = data1.list[1];
                            table2.render(option2);
                            option3.data = data1.list[2];
                            table3.render(option3);
                            option4.data = data1.list[3];
                            table4.render(option4);
                        } else {
                            layer.alert("获取失败", { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口失效!", { icon: 5 });
                    }
                });
            });
            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery(table, option);
            });
            //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
            function set_ClearBill() {
                //初始化表格(主表)
                set_InitGrid();
                //初始化表格(子表1)
                set_InitGrid1();
                //初始化表格(子表2)
                set_InitGrid2();
                //初始化表格(子表3)
                set_InitGrid3();
                //初始化表格(子表4)
                set_InitGrid4();
                //查询
                get_Display(sWhere);
            }
            //初始化主表格
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: '400'
                    , page: true
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                        , { field: '日期', title: '日期', templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '单据号', title: '单据号' }
                        , { field: '模具品类', title: '器具分类' }
                        , { field: '条码编号', title: '条码编号' }
                        , { field: '对应ERP物料编码', title: '物料编号' }
                        , { field: '模具编号', title: '器具编号' }
                        , { field: '模具名称', title: '器具名称' }
                        , { field: '模具型号', title: '器具型号' }
                        , { field: '模具状态', title: '器具状态' }
                        , { field: '对应ERP物料编码', title: '器具ERP物料' }
                        , { field: '直径', title: '直径' }
                        , { field: '辅助属性', title: '辅助属性' }
                        , { field: '辅助属性2', title: '辅助属性2' }
                        , { field: '图号', title: '图号' }
                        , { field: '生产产品型号', title: '生产产品型号' }
                        , { field: 'HUnitID', title: 'HUnitID', hide: true }
                        , { field: '计量单位', title: '计量单位' }
                        , { field: '出厂日期', title: '出厂日期', templet: "<div>{{d.出厂日期 ==null ?'':layui.util.toDateString(d.出厂日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '出厂编号', title: '出厂编号' }
                        , { field: '使用部门代码', title: '使用部门代码' }
                        , { field: '使用部门', title: '使用部门' }
                        , { field: 'HSupID', title: 'HSupID', hide: true }
                        , { field: '供应商代码', title: '供应商代码' }
                        , { field: '供应商', title: '供应商' }
                        , { field: 'HWhID', title: 'HWhID', hide: true }
                        , { field: '默认仓库', title: '默认仓库' }
                        , { field: 'HSPID', title: 'HSPID', hide: true }
                        , { field: '默认仓位', title: '默认仓位' }
                        , { field: '版本', title: '版本' }
                        , { field: '当前仓库', title: '当前仓库' }
                        , { field: '当前仓位', title: '当前仓位' }
                        , { field: '虚拟仓类型', title: '虚拟仓类型' }
                        , { field: '虚拟仓', title: '虚拟仓' }
                        , { field: '当前模具规格', title: '当前器具规格' }
                        , { field: '初始模具规格', title: '初始器具规格' }
                        , { field: '当前设计寿命', title: '当前设计寿命' }
                        , { field: '初始设计寿命', title: '初始设计寿命' }
                        , { field: '使用寿命', title: '使用寿命' }
                        , { field: '剩余寿命', title: '剩余寿命' }
                        , { field: '已生产数量', title: '已生产数量' }
                        , { field: '已生产重量', title: '已生产重量' }
                        , { field: '备注', title: '备注' }
                        , { field: '关联数量', title: '关联数量' }
                        , { field: '制单人', title: '制单人' }
                        , { field: '制单日期', title: '制单日期', templet: "<div>{{d.制单日期 ==null ?'':layui.util.toDateString(d.制单日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '审核人', title: '审核人' }
                        , { field: '审核日期', title: '审核日期', templet: "<div>{{d.审核日期 ==null ?'':layui.util.toDateString(d.审核日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '修改人', title: '修改人' }
                        , { field: '修改日期', title: '修改日期', templet: "<div>{{d.修改日期 ==null ?'':layui.util.toDateString(d.修改日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '关闭人', title: '关闭人' }
                        , { field: '关闭日期', title: '关闭日期', templet: "<div>{{d.关闭日期 ==null ?'':layui.util.toDateString(d.关闭日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'hbilltype', title: 'hbilltype', hide: true }
                        , { field: '单据类型', title: '单据类型', hide: true }
                        , { field: 'HMoudType', title: 'HMoudType', hide: true }
                        , { field: 'hsubid', title: 'hsubid', hide: true }
                    ]]
                }
            }
            //初始化表格(子表1)
            function set_InitGrid1() {
                var ajaxLoad = layer.load();
                option1 = {
                    elem: '#mainTable1'
                    //, toolbar: '#toolbarDemo'
                    , height: '350'
                    , page: true
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        //{ type: 'checkbox', fixed: 'left' }
                        , { templet: '#xuhao1', title: '序号', sort: true, fixed: 'left', event: "qwe" }
                        , { field: '日期', title: '日期', width: 200}
                        , { field: '单据类型', title: '单据类型', width: 200 }
                        , { field: '单据号', title: '单据号', width: 200 }
                        , { field: '器具分类', title: '器具分类', width: 200 }
                        , { field: '器具条码', title: '器具条码', width: 200 }
                        , { field: '器具编码', title: '器具编码', width: 200 }
                        , { field: '器具名称', title: '器具名称', width: 200 }
                        , { field: '器具规格', title: '器具规格', width: 200 }
                        , { field: '器具型号', title: '器具型号', width: 200 }
                        , { field: '数量', title: '数量', width: 200 }
                        , { field: '仓库', title: '仓库', width: 200 }
                        , { field: '仓位', title: '仓位', width: 200 }
                        , { field: '调出仓库', title: '调出仓库', width: 200 }
                        , { field: '调出仓位', title: '调出仓位', width: 200 }
                        , { field: '制单人', title: '制单人' }
                        , { field: '制单日期', title: '制单日期', templet: "<div>{{d.制单日期 ==null ?'':layui.util.toDateString(d.制单日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '审核人', title: '审核人' }
                        , { field: '审核日期', title: '审核日期', templet: "<div>{{d.审核日期 ==null ?'':layui.util.toDateString(d.审核日期, 'yyyy-MM-dd')}}</div>" }
                    ]]
                };
                option1.data = [];
                table1.render(option1);
                layer.close(ajaxLoad);
            }
            //初始化表格(子表2)
            function set_InitGrid2() {
                var ajaxLoad = layer.load();
                option2 = {
                    elem: '#mainTable2'
                    //, toolbar: '#toolbarDemo'
                    , height: '350'
                    , page: true
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        //{ type: 'checkbox', fixed: 'left' }
                        , { templet: '#xuhao2', title: '序号', sort: true, fixed: 'left', event: "qwe" }
                        , { field: '日期', title: '日期', width: 200 }
                        , { field: '单据类型', title: '单据类型', width: 200 }
                        , { field: '单据号', title: '单据号', width: 200 }
                        , { field: '产品代码', title: '产品代码', width: 200 }
                        , { field: '产品名称', title: '产品名称', width: 200 }
                        , { field: '规格型号', title: '规格型号', width: 200 }
                        , { field: '器具分类', title: '器具分类', width: 200 }
                        , { field: '器具条码', title: '器具条码', width: 200 }
                        , { field: '器具编码', title: '器具编码', width: 200, hide: true }
                        , { field: '器具名称', title: '器具名称', width: 200 }
                        , { field: '器具规格', title: '器具规格', width: 200 }
                        , { field: '器具型号', title: '器具型号', width: 200 }
                        , { field: '生产数量', title: '生产数量', width: 200 }
                        , { field: '设计寿命', title: '设计寿命', width: 200 }
                        , { field: '耗用寿命', title: '耗用寿命', width: 200 }
                        , { field: '剩余寿命', title: '剩余寿命', width: 200 }
                        , { field: '制单人', title: '制单人' }
                        , { field: '制单日期', title: '制单日期', templet: "<div>{{d.制单日期 ==null ?'':layui.util.toDateString(d.制单日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '审核人', title: '审核人' }
                        , { field: '审核日期', title: '审核日期', templet: "<div>{{d.审核日期 ==null ?'':layui.util.toDateString(d.审核日期, 'yyyy-MM-dd')}}</div>" }
                    ]]
                };
                option2.data = [];
                table2.render(option2);
                layer.close(ajaxLoad);
            }
            //初始化表格(子表3)
            function set_InitGrid3() {
                var ajaxLoad = layer.load();
                option3 = {
                    elem: '#mainTable3'
                    //, toolbar: '#toolbarDemo'
                    , height: '350'
                    , page: true
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        //{ type: 'checkbox', fixed: 'left' }
                        , { templet: '#xuhao3', title: '序号', sort: true, fixed: 'left', event: "qwe" }
                        , { field: '日期', title: '日期', width: 200 }
                        , { field: '单据类型', title: '单据类型', width: 200 }
                        , { field: '单据号', title: '单据号', width: 200 }
                        , { field: '器具分类', title: '器具分类', width: 200 }
                        , { field: '器具条码', title: '器具条码', width: 200 }
                        , { field: '器具编码', title: '器具编码', width: 200, hide: true }
                        , { field: '器具名称', title: '器具名称', width: 200 }
                        , { field: '器具规格', title: '器具规格', width: 200 }
                        , { field: '器具型号', title: '器具型号', width: 200 }
                        , { field: '制单人', title: '制单人' }
                        , { field: '制单日期', title: '制单日期', templet: "<div>{{d.制单日期 ==null ?'':layui.util.toDateString(d.制单日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '审核人', title: '审核人' }
                        , { field: '审核日期', title: '审核日期', templet: "<div>{{d.审核日期 ==null ?'':layui.util.toDateString(d.审核日期, 'yyyy-MM-dd')}}</div>" }
                    ]]
                };
                option3.data = [];
                table3.render(option3);
                layer.close(ajaxLoad);
            }
            //初始化表格(子表4)
            function set_InitGrid4() {
                var ajaxLoad = layer.load();
                option4 = {
                    elem: '#mainTable4'
                    //, toolbar: '#toolbarDemo'
                    , height: '350'
                    , page: true
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        //{ type: 'checkbox', fixed: 'left' }
                        , { templet: '#xuhao4', title: '序号', sort: true, fixed: 'left', event: "qwe" }
                        , { field: '日期', title: '日期', width: 200 }
                        , { field: '单据类型', title: '单据类型', width: 200 }
                        , { field: '单据号', title: '单据号', width: 200 }
                        , { field: '器具分类', title: '器具分类', width: 200 }
                        , { field: '器具条码', title: '器具条码', width: 200 }
                        , { field: '器具编码', title: '器具编码', width: 200, hide: true }
                        , { field: '器具名称', title: '器具名称', width: 200 }
                        , { field: '器具规格', title: '器具规格', width: 200 }
                        , { field: '器具型号', title: '器具型号', width: 200 }
                        , { field: '制单人', title: '制单人' }
                        , { field: '制单日期', title: '制单日期', templet: "<div>{{d.制单日期 ==null ?'':layui.util.toDateString(d.制单日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '审核人', title: '审核人' }
                        , { field: '审核日期', title: '审核日期', templet: "<div>{{d.审核日期 ==null ?'':layui.util.toDateString(d.审核日期, 'yyyy-MM-dd')}}</div>" }
                    ]]
                };
                option4.data = [];
                table4.render(option4);
                layer.close(ajaxLoad);
            }
            //加载网格
            function get_Display(sWhere) {
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/Gy_Mould/list1',
                    type: "GET",
                    data: { "sWhere": sWhere, "ModRightNameSelect": "Gy_MouldFileList", "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.close(index);
                        } else {
                            layer.close(index);
                            layer.alert("没有数据记录!", { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
            var index = layer.load(0);
            //预览
            function get_ViewReport() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    window.open("../../基础资料/公用基础资料/HBarPlanPrint.html?linterid=" + InterID + "&Type=HEquipResume&OpenTmp=设备履历");
                }
                else {
                    layer.msg('请选择一行数据打印!');
                }
            }
            //刷新
            function set_Refresh() {
                $("#btnSearch").click();
            }
            //快速过滤
            function get_FastQuery() {
                //var HBillType = $("#HBillType").val();//单据类型
                var HBillNo = $("#HBillNo").val();//单据号
                var HMouldType = $("#HMouldType").val();//制单人
                var BenginHCreateDate = $("#BenginHCreateDate").val();//开始制单时间
                var EndHCreateDate = $("#EndHCreateDate").val();//结束制单时间
                if (HBillNo) {
                    sWhere += " and å•据号 like '%" + HBillNo + "%'";
                }
                if (HMouldType) {
                    sWhere += " and æ¨¡å…·å“ç±» like '%" + HMouldType + "%'";
                }
                if (BenginHCreateDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + BenginHCreateDate + "'";
                }
                if (EndHCreateDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + EndHCreateDate + "'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //重置过滤条件
            function set_ClearQuery() {
                //$("#HBillType").val("");//单据类型
                $("#HBillNo").val("");//单据号
                $("#HMouldType").val("");//设备类型
                $("#BenginHCreateDate").val("");//开始制单时间
                $("#EndHCreateDate").val("");//结束制单时间
                sWhere = "";
                $("#btnSearch").click();
            }
            //#endregion
        });
    </script>
</body>
</html>
WebTM/views/×é×°µ¥/Sc_PCruxBindingPDA.html
@@ -6,8 +6,8 @@
    <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">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
    <style>
        .layui-table-cell {
            height: auto;
@@ -155,14 +155,14 @@
        </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/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>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
            base: '../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
WebTM/views/É豸¹ÜÀí/Sb_EquipDotCheckBillEdit.html
@@ -272,16 +272,16 @@
                                var rowdate1 = layui.table.cache["mainTable"];
                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
                                table.render(option);
                                $("#HEquipDotCheckRuleInterID").val(BYData.data[i].HInterID);
                                $("#HEquipDotCheckRuleInterNo").val(BYData.data[i].HBillNo)
                                $("#HEquipDotCheckRuleInterID").val(BYData.data[0].HInterID);
                                $("#HEquipDotCheckRuleInterNo").val(BYData.data[0].HBillNo)
                                if (BYData.data.length != 0)  //表体数据为空时
                                {
                                    buttonArr = [];//清空数组
                                    for (var i = 0; i < BYData.data.length; i++) {
                                        var checkrow = {
                                            "HDotCheckItemID": BYData.data[i].HDotCheckItemID, "HDotCheckCode": BYData.data[i].HDotCheckCode, "HDotCheckItem": BYData.data[i].HDotCheckItem,
                                            "HDotCheckPart": BYData.data[i].HDotCheckPart, "HClaim": rowdate1[i].HClaim, "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
                                            "HManagerName": BYData.data[i].HManagerName,  "HRemark": rowdate1[i].HRemark
                                            "HDotCheckPart": BYData.data[i].HDotCheckPart,  "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
                                            "HManagerName": BYData.data[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }
@@ -354,8 +354,8 @@
                                    for (var i = 0; i < BYData.data.length; i++) {
                                        var checkrow = {
                                            "HDotCheckItemID": BYData.data[i].HDotCheckItemID, "HDotCheckCode": BYData.data[i].HDotCheckCode, "HDotCheckItem": BYData.data[i].HDotCheckItem,
                                            "HDotCheckPart": BYData.data[i].HDotCheckPart, "HClaim": rowdate1[i].HClaim, "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
                                            "HManagerName": BYData.data[i].HManagerName, "HRemark": rowdate1[i].HRemark
                                            "HDotCheckPart": BYData.data[i].HDotCheckPart, "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
                                            "HManagerName": BYData.data[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }
WebTM/views/É豸¹ÜÀí/Sb_EquipMaintainBillEdit.html
@@ -612,7 +612,7 @@
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe" }
                    , { field: 'HMaintainItemID', title: '保养项目ID', edit: 'text', hide: true }
                    , { field: 'HMaintainItemNumber', title: '保养项目代码', edit: 'text', event: 'HMaintainItemNumber' }
                    , { field: 'HMaintainItemNumber', title: '保养项目代码', hide: true ,edit: 'text', event: 'HMaintainItemNumber' }
                    , { field: 'HMaintainItem', title: '保养项目', edit: 'text' }
                    , { field: 'HMaintainPart', title: '保养部位', edit: 'text' }
                    , { field: 'HClaim', title: '具体要求', edit: 'text' }
WebTM/views/É豸¹ÜÀí/É豸µµ°¸/Gy_EquipFileBillResume.html
New file
@@ -0,0 +1,420 @@
<!DOCTYPE html>
<html>
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>设备履历</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">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <style type="text/css">
        input.layui-input.layui-unselect {
            padding-right: 0;
        }
    </style>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">设备分类</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HEquipType" id="HEquipType">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始时间</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束时间</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <div class="layui-tab layui-tab-card">
                            <ul class="layui-tab-title">
                                <li class="layui-this">日常记录</li>
                                <li>维修记录</li>
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
                                </div>
                            </div>
                        </div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <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="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>
                        </script>
                        <script type="text/html" id="xuhao">
                            {{d.LAY_TABLE_INDEX+1}}
                        </script>
                        <script type="text/html" id="xuhao1">
                            {{d.LAY_TABLE_INDEX+1}}
                        </script>
                    </form>
                </div>
            </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 src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , table1 = layui.table
                , table2 = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , util = layui.util
            //查询条件
            var sWhere = "";
            var option = [];
            var option1 = [];
            var option2 = [];
            //#endregion
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            //初始化界面
            set_ClearBill();
            //#endregion
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);
                switch (obj.event) {
                    //浏览
                    case 'btn-view':
                        get_ViewReport();
                        break;
                    //刷新
                    case 'get_Refresh':
                        set_Refresh();
                        break;
                    //退出
                    case 'get_Exit':
                        Pub_Close(2);
                        break;
                };
            });
            //点击主表带出从表数据
            table.on('row(mainTable)', function (obj) { //注:tool æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„å±žæ€§ lay-filter="对应的值"
                var datas = obj.data; //获得当前行数据
                var linterid = datas.hmainid;
                $.ajax({
                    url: GetWEBURL() + 'Gy_EquipFileMain/Sb_EquipFileBillResumeDate',
                    type: "GET",
                    data: { "HInterID": linterid },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option1.data = data1.list[0];
                            table1.render(option1);
                            option2.data = data1.list[1];
                            table2.render(option2);
                        } else {
                            layer.alert("获取失败", { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口失效!", { icon: 5 });
                    }
                });
            });
            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery(table, option);
            });
            //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
            function set_ClearBill() {
                //初始化表格(主表)
                set_InitGrid();
                //初始化表格(子表1)
                set_InitGrid1();
                //初始化表格(子表2)
                set_InitGrid2();
                //查询
                get_Display(sWhere);
            }
            //初始化主表格
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: '400'
                    , page: true
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                        , { field: '单据号', title: '单据号' }
                        , { field: '日期', title: '日期', templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '条形码', title: '条码编号' }
                        , { field: 'HMaterID', title: 'HMaterID', hide: true }
                        , { field: '物料名称', title: '物料名称' }
                        , { field: '设备类型', title: '设备分类' }
                        , { field: '设备代码', title: '设备代码' }
                        , { field: '设备编码', title: '设备编码' }
                        , { field: '设备名称', title: '设备名称' }
                        , { field: '设备规格', title: '设备规格' }
                        , { field: '设备型号', title: '设备型号' }
                        , { field: 'HUnitID', title: 'HUnitID', hide: true }
                        , { field: '单位', title: '单位' }
                        , { field: '设备出厂日期', title: '设备出厂日期', templet: "<div>{{d.设备出厂日期 ==null ?'':layui.util.toDateString(d.设备出厂日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '设备出厂编号', title: '设备出厂编号' }
                        , { field: 'HDeptID', title: 'HDeptID', hide: true }
                        , { field: '使用部门', title: '使用部门' }
                        , { field: 'HUseEmpID', title: 'HUseEmpID', hide: true }
                        , { field: '使用负责人', title: '使用负责人' }
                        , { field: 'HRepairEmpID', title: 'HRepairEmpID', hide: true }
                        , { field: '维护负责人', title: '维护负责人' }
                        , { field: '安装地点', title: '安装地点' }
                        , { field: '安装日期', title: '安装日期', templet: "<div>{{d.安装日期 ==null ?'':layui.util.toDateString(d.安装日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '运行开始日期', title: '运行开始日期', templet: "<div>{{d.运行开始日期 ==null ?'':layui.util.toDateString(d.运行开始日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '当前状态', title: '当前状态' }
                        , { field: 'HEquipFileTypeID', title: 'HEquipFileTypeID', hide: true }
                        , { field: '工程编码', title: '工程编码' }
                        , { field: '产品', title: '产品' }
                        , { field: '品牌', title: '品牌' }
                        , { field: 'HSellSupID', title: 'HSellSupID', hide: true }
                        , { field: '供应商', title: '供应商' }
                        , { field: 'HMakeSupID', title: 'HMakeSupID', hide: true }
                        , { field: '制造商', title: '制造商' }
                        , { field: '制单人', title: '制单人' }
                        , { field: '制单日期', title: '制单日期', templet: "<div>{{d.制单日期 ==null ?'':layui.util.toDateString(d.制单日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '审核人', title: '审核人' }
                        , { field: '审核日期', title: '审核日期', templet: "<div>{{d.审核日期 ==null ?'':layui.util.toDateString(d.审核日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '修改人', title: '修改人' }
                        , { field: '修改日期', title: '修改日期', templet: "<div>{{d.修改日期 ==null ?'':layui.util.toDateString(d.修改日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '关闭人', title: '关闭人' }
                        , { field: '关闭日期', title: '关闭日期', templet: "<div>{{d.关闭日期 ==null ?'':layui.util.toDateString(d.关闭日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'hbilltype', title: 'hbilltype', hide: true }
                        , { field: '单据类型', title: '单据类型' }
                        , { field: 'HMoudType', title: 'HMoudType', hide: true }
                        , { field: 'hsubid', title: 'hsubid', hide: true }
                    ]]
                }
            }
            //初始化表格(子表1)
            function set_InitGrid1() {
                var ajaxLoad = layer.load();
                option1 = {
                    elem: '#mainTable1'
                    //, toolbar: '#toolbarDemo'
                    , height: '350'
                    , page: true
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        //{ type: 'checkbox', fixed: 'left' }
                        , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe" }
                        , { field: '日期', title: '日期', width: 200}
                        , { field: '单据类型', title: '单据类型', width: 200 }
                        , { field: '单据号', title: '单据号', width: 200 }
                        , { field: '设备分类', title: '设备分类', width: 200 }
                        , { field: '设备条码', title: '设备条码', width: 200 }
                        , { field: '设备编码', title: '设备编码', width: 200, hide: true }
                        , { field: '设备名称', title: '设备名称', width: 200 }
                        , { field: '设备规格', title: '设备规格', width: 200 }
                        , { field: '设备型号', title: '设备型号', width: 200 }
                        , { field: '制单人', title: '制单人' }
                        , { field: '制单日期', title: '制单日期', templet: "<div>{{d.制单日期 ==null ?'':layui.util.toDateString(d.制单日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '审核人', title: '审核人' }
                        , { field: '审核日期', title: '审核日期', templet: "<div>{{d.审核日期 ==null ?'':layui.util.toDateString(d.审核日期, 'yyyy-MM-dd')}}</div>" }
                    ]]
                };
                option1.data = [];
                table1.render(option1);
                layer.close(ajaxLoad);
            }
            //初始化表格(子表2)
            function set_InitGrid2() {
                var ajaxLoad = layer.load();
                option2 = {
                    elem: '#mainTable2'
                    //, toolbar: '#toolbarDemo'
                    , height: '350'
                    , page: true
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        //{ type: 'checkbox', fixed: 'left' }
                        , { templet: '#xuhao1', title: '序号', sort: true, fixed: 'left', event: "qwe" }
                        , { field: '日期', title: '日期', width: 200 }
                        , { field: '单据类型', title: '单据类型', width: 200 }
                        , { field: '单据号', title: '单据号', width: 200 }
                        , { field: '设备分类', title: '设备分类', width: 200 }
                        , { field: '设备条码', title: '设备条码', width: 200 }
                        , { field: '设备编码', title: '设备编码', width: 200, hide: true }
                        , { field: '设备名称', title: '设备名称', width: 200 }
                        , { field: '设备规格', title: '设备规格', width: 200 }
                        , { field: '设备型号', title: '设备型号', width: 200 }
                        , { field: '制单人', title: '制单人' }
                        , { field: '制单日期', title: '制单日期', templet: "<div>{{d.制单日期 ==null ?'':layui.util.toDateString(d.制单日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '审核人', title: '审核人' }
                        , { field: '审核日期', title: '审核日期', templet: "<div>{{d.审核日期 ==null ?'':layui.util.toDateString(d.审核日期, 'yyyy-MM-dd')}}</div>" }
                    ]]
                };
                option2.data = [];
                table2.render(option2);
                layer.close(ajaxLoad);
            }
            //加载网格
            function get_Display(sWhere) {
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/Gy_EquipFileMain/GetList',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.close(index);
                        } else {
                            layer.close(index);
                            layer.alert("没有数据记录!", { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
            var index = layer.load(0);
            //预览
            function get_ViewReport() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    window.open("../../基础资料/公用基础资料/HBarPlanPrint.html?linterid=" + InterID + "&Type=HEquipResume&OpenTmp=设备履历");
                }
                else {
                    layer.msg('请选择一行数据打印!');
                }
            }
            //刷新
            function set_Refresh() {
                $("#btnSearch").click();
            }
            //快速过滤
            function get_FastQuery() {
                //var HBillType = $("#HBillType").val();//单据类型
                var HBillNo = $("#HBillNo").val();//单据号
                var HEquipType = $("#HEquipType").val();//制单人
                var BenginHCreateDate = $("#BenginHCreateDate").val();//开始制单时间
                var EndHCreateDate = $("#EndHCreateDate").val();//结束制单时间
                if (HBillNo) {
                    sWhere += " and å•据号 like '%" + HBillNo + "%'";
                }
                if (HEquipType) {
                    sWhere += " and è®¾å¤‡ç±»åž‹ like '%" + HEquipType + "%'";
                }
                if (BenginHCreateDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + BenginHCreateDate + "'";
                }
                if (EndHCreateDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + EndHCreateDate + "'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //重置过滤条件
            function set_ClearQuery() {
                //$("#HBillType").val("");//单据类型
                $("#HBillNo").val("");//单据号
                $("#HEquipType").val("");//设备类型
                $("#BenginHCreateDate").val("");//开始制单时间
                $("#EndHCreateDate").val("");//结束制单时间
                sWhere = "";
                $("#btnSearch").click();
            }
            //#endregion
        });
    </script>
</body>
</html>
WebTM/views/É豸¹ÜÀí/É豸µµ°¸/Gy_EquipFileMainEdit.html
@@ -71,19 +71,19 @@
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">设备编号</label>
                                                <label class="layui-form-label">设备编号<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HEquipFileNo" id="HEquipFileNo">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">设备名称</label>
                                                <label class="layui-form-label">设备名称<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HName" id="HName">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">设备规格</label>
                                                <label class="layui-form-label">设备规格<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HModel" id="HModel">
                                                </div>
@@ -97,7 +97,7 @@
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">设备代码</label>
                                                <label class="layui-form-label">设备代码<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HEquipFileNumber" id="HEquipFileNumber">
                                                </div>
@@ -125,7 +125,7 @@
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">对应ERP物料</label>
                                                <label class="layui-form-label">对应ERP物料<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="float:left;width:150px;">
                                                    <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" style="float:left;width:150px;">
@@ -135,7 +135,7 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">设备分类</label>
                                                <label class="layui-form-label">设备分类<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HEquipFileTypeName" id="HEquipFileTypeName" style="float:left;width:150px;">
                                                    <input type="hidden" class="layui-input" name="HEquipFileTypeID" id="HEquipFileTypeID" style="float:left;width:150px;">
@@ -145,7 +145,7 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">单位</label>
                                                <label class="layui-form-label">单位<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="float:left;width:150px;">
                                                    <input type="hidden" class="layui-input" name="HUnitID" id="HUnitID" style="float:left;width:150px;">
@@ -156,7 +156,7 @@
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">供应商</label>
                                                <label class="layui-form-label">供应商<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HSellSupName" id="HSellSupName" style="float:left;width:150px;">
                                                    <input type="hidden" class="layui-input" name="HSellSupID" id="HSellSupID" style="float:left;width:150px;">
@@ -168,7 +168,7 @@
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">使用部门</label>
                                                <label class="layui-form-label">使用部门<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="float:left;width:150px;">
                                                    <input type="hidden" class="layui-input" name="HDeptID" id="HDeptID" style="float:left;width:150px;">
@@ -178,7 +178,7 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">使用负责人</label>
                                                <label class="layui-form-label">使用负责人<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HUseEmpName" id="HUseEmpName" style="float:left;width:150px;">
                                                    <input type="hidden" class="layui-input" name="HUseEmpID" id="HUseEmpID" style="float:left;width:150px;">
@@ -188,7 +188,7 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">维护负责人</label>
                                                <label class="layui-form-label">维护负责人<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HRepairEmpName" id="HRepairEmpName" style="float:left;width:150px;" y>
                                                    <input type="hidden" class="layui-input" name="HRepairEmpID" id="HRepairEmpID" style="float:left;width:150px;">
@@ -255,7 +255,7 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">设备状态</label>
                                                <label class="layui-form-label">设备状态<label style="color:red"> * </label></label>
                                                <div class="layui-input-block"  style="margin-left: 125px;width:55%;">
                                                    <select name="HStatus" lay-filter="aihao" id="HStatus">
                                                        <option value="空闲" selected="selected">空闲</option>