From 5e6d4558639f6570fc56b1081784700647108465 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 17 七月 2024 17:31:54 +0800
Subject: [PATCH] 1
---
WebTM/views/仓存管理/条码报表/Kf_BarCodeOutInReport.html | 105
WebTM/views/采购管理/付款单/YF_PayMentBillList.html | 16
WebTM/views/基础资料/公用基础资料/xmlLBM_HPayMentBill.aspx.designer.cs | 26
WebTM/views/工资管理/技能考核/HR_EmployeeSkillExamBill.html | 2
WebTM/views/基础资料/公用基础资料/xmlLBM_HPOStockInBillByID.aspx.cs | 17
WebTM/views/设备管理/设备报表/Sb_EquipRepairCheckTaskReport.html | 506 ++++++
WebTM/views/领料发货/领料出库/Kf_MateOutRequestBillList.html | 47
WebTM/views/基础资料/公用基础资料/xmlLBM_HPayMentBill.aspx.cs | 17
WebTM/views/设备管理/设备报表/Sb_EquipMaintainTaskReport.html | 506 ++++++
WebTM/views/基础资料/公用基础资料/xmlLBM_HPOStockInBill.aspx | 27
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldRepairCheckBillList.html | 11
WebTM/views/基础资料/公用基础资料/xmlLBM_HPOStockInBill.aspx.cs | 17
WebTM/views/模治具管理/器具报表/Sc_MouldDotCheckTaskReport.html | 506 ++++++
WebTM/views/设备管理/Sb_Add_EqpRepairCheckBillList.html | 11
WebTM/views/模治具管理/器具报表/Sc_MouldRepairTaskReport.html | 506 ++++++
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 9
WebTM/WebTM.csproj.user | 5
WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html | 1
WebTM/views/采购管理/收料通知单/Cg_POInStockBillList.html | 13
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 24
WebTM/views/设备管理/设备报表/Sb_EquipRepairTaskReport.html | 506 ++++++
WebTM/views/模治具管理/器具报表/Sc_MouldRepairCheckTaskReport.html | 506 ++++++
WebTM/Vlog/webapi20240717.txt | 265 +++
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html | 2
WebTM/views/设备管理/设备报表/Sb_EquipDotCheckTaskReport.html | 506 ++++++
WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html | 2
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html | 56
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckBillList.html | 71
WebTM/views/模治具管理/器具报表/Sc_MouldMaintainTaskReport.html | 506 ++++++
WebTM/views/基础资料/公用基础资料/xmlLBM_HPOStockInBill.aspx.designer.cs | 26
WebTM/views/基础资料/公用基础资料/xmlLBM_HPOStockInBillByID.aspx | 27
WebTM/views/基础资料/公用基础资料/xmlLBM_HPOStockInBillByID.aspx.designer.cs | 26
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 2
WebTM/WebTM.csproj | 32
WebTM/views/基础资料/公用基础资料/xmlLBM_HPayMentBill.aspx | 27
36 files changed, 4,830 insertions(+), 104 deletions(-)
diff --git a/WebTM/Vlog/webapi20240717.txt b/WebTM/Vlog/webapi20240717.txt
new file mode 100644
index 0000000..6e42254
--- /dev/null
+++ b/WebTM/Vlog/webapi20240717.txt
@@ -0,0 +1,265 @@
+2024/7/17 8:14:12 鎵撳嵃sql:select * from h_v_IF_POOrderBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(135800102413) order by hmainid desc
+
+2024/7/17 8:14:12 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 8:14:12 ReportDataSet:1
+
+2024/7/17 8:18:41 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(10070000101161) order by hmainid desc
+
+2024/7/17 8:18:41 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 8:18:41 ReportDataSet:1
+
+2024/7/17 8:19:24 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(1373459300100818) order by hmainid desc
+
+2024/7/17 8:19:24 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 8:19:24 ReportDataSet:0
+
+2024/7/17 8:47:51 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where hmainid = order by hmainid desc
+
+2024/7/17 8:49:12 鎵撳嵃sql:select * from h_v_Kf_POStockInBillList where where cast( hmainid as bigint)*POWER(10,8)+hsubid in(1373459300100818) order by hmainid desc
+
+2024/7/17 8:51:56 鎵撳嵃sql:select * from h_v_Kf_POStockInBillList where where cast( hmainid as bigint)*POWER(10,8)+hsubid in(1373459300100818) order by hmainid desc
+
+2024/7/17 8:54:32 鎵撳嵃sql:select * from h_v_Kf_POStockInBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(1373459300100818) order by hmainid desc
+
+2024/7/17 8:54:32 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 8:54:32 ReportDataSet:1
+
+2024/7/17 8:54:47 鎵撳嵃sql:select * from h_v_Kf_POStockInBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(1373459300100818) order by hmainid desc
+
+2024/7/17 8:54:48 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 8:54:48 ReportDataSet:1
+
+2024/7/17 9:05:35 鎵撳嵃sql:select * from h_v_Kf_POStockInBillList where hmainid = 13734593 order by hmainid desc
+
+2024/7/17 9:05:35 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:05:35 ReportDataSet:4
+
+2024/7/17 9:16:03 鎵撳嵃sql:select * from h_v_IF_SellOutBillList_EditInit where hmainid = 13734823
+
+2024/7/17 9:16:03 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:16:03 ReportDataSet:3
+
+2024/7/17 9:16:55 鎵撳嵃sql:select * from h_v_IF_SellOutBillList_EditInit where hmainid = 13734823
+
+2024/7/17 9:16:55 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:16:55 ReportDataSet:3
+
+2024/7/17 9:23:39 鎵撳嵃sql:select * from h_v_YF_PayMentBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in() order by hmainid desc
+
+2024/7/17 9:24:51 鎵撳嵃sql:select * from h_v_YF_PayMentBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(42200000000) order by hmainid desc
+
+2024/7/17 9:24:52 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:24:52 ReportDataSet:0
+
+2024/7/17 9:29:24 鎵撳嵃sql:select * from h_v_IF_SeOutStockBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(56500100123,56500100125) order by hmainid desc
+
+2024/7/17 9:29:24 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:29:24 ReportDataSet:2
+
+2024/7/17 9:30:41 鎵撳嵃sql:select * from h_v_YF_PayMentBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(42200000000) order by hmainid desc
+
+2024/7/17 9:30:41 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:30:41 ReportDataSet:0
+
+2024/7/17 9:32:38 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where hmainid =1000308593 order by hmainid desc
+
+2024/7/17 9:32:38 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:32:38 ReportDataSet:4
+
+2024/7/17 9:33:27 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(100030859300101150) order by hmainid desc
+
+2024/7/17 9:33:27 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:33:27 ReportDataSet:0
+
+2024/7/17 9:38:00 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(100030859300101150) order by hmainid desc
+
+2024/7/17 9:38:00 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:38:00 ReportDataSet:0
+
+2024/7/17 9:38:21 鎵撳嵃sql:select * from h_v_YF_PayMentBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(42200000000) order by hmainid desc
+
+2024/7/17 9:38:21 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:38:21 ReportDataSet:0
+
+2024/7/17 9:38:33 鎵撳嵃sql:select * from h_v_YF_PayMentBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(42200000000) order by hmainid desc
+
+2024/7/17 9:38:33 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:38:33 ReportDataSet:0
+
+2024/7/17 9:39:37 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where hmainid =1000308593 order by hmainid desc
+
+2024/7/17 9:39:37 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:39:37 ReportDataSet:4
+
+2024/7/17 9:39:42 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where hmainid =1000308593 order by hmainid desc
+
+2024/7/17 9:39:42 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:39:42 ReportDataSet:4
+
+2024/7/17 9:42:44 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(100030859300101150) order by hmainid desc
+
+2024/7/17 9:42:44 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:42:44 ReportDataSet:0
+
+2024/7/17 9:43:17 鎵撳嵃sql:select * from h_v_YF_PayMentBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(42200000000) order by hmainid desc
+
+2024/7/17 9:43:17 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:43:17 ReportDataSet:0
+
+2024/7/17 9:44:02 鎵撳嵃sql:select * from h_v_YF_PayMentBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(42200000000) order by hmainid desc
+
+2024/7/17 9:44:03 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:44:03 ReportDataSet:0
+
+2024/7/17 9:44:16 鎵撳嵃sql:select * from h_v_YF_PayMentBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(42200000000) order by hmainid desc
+
+2024/7/17 9:44:16 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:44:16 ReportDataSet:0
+
+2024/7/17 9:44:48 鎵撳嵃sql:select * from h_v_YF_PayMentBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(42200000000) order by hmainid desc
+
+2024/7/17 9:44:48 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:44:48 ReportDataSet:0
+
+2024/7/17 9:45:12 鎵撳嵃sql:select * from h_v_YF_PayMentBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(42200000000) order by hmainid desc
+
+2024/7/17 9:45:12 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:45:12 ReportDataSet:0
+
+2024/7/17 9:45:16 鎵撳嵃sql:select * from h_v_YF_PayMentBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(42200000000) order by hmainid desc
+
+2024/7/17 9:45:16 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:45:16 ReportDataSet:0
+
+2024/7/17 9:46:26 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where hmainid =1000308593 order by hmainid desc
+
+2024/7/17 9:46:27 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:46:27 ReportDataSet:4
+
+2024/7/17 9:47:15 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where hmainid =1000308593 order by hmainid desc
+
+2024/7/17 9:47:15 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:47:15 ReportDataSet:4
+
+2024/7/17 9:47:31 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where hmainid =1000308593 order by hmainid desc
+
+2024/7/17 9:47:31 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:47:31 ReportDataSet:4
+
+2024/7/17 9:47:38 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where hmainid =1000308593 order by hmainid desc
+
+2024/7/17 9:47:38 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:47:38 ReportDataSet:4
+
+2024/7/17 9:47:40 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where hmainid =1000308593 order by hmainid desc
+
+2024/7/17 9:47:40 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:47:40 ReportDataSet:4
+
+2024/7/17 9:47:41 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where hmainid =1000308593 order by hmainid desc
+
+2024/7/17 9:47:41 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:47:41 ReportDataSet:4
+
+2024/7/17 9:48:38 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where hmainid =1000308593 order by hmainid desc
+
+2024/7/17 9:48:38 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:48:38 ReportDataSet:4
+
+2024/7/17 9:48:39 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where hmainid =1000308593 order by hmainid desc
+
+2024/7/17 9:48:39 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:48:39 ReportDataSet:4
+
+2024/7/17 9:49:55 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(100030859300101150) order by hmainid desc
+
+2024/7/17 9:49:55 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:49:55 ReportDataSet:0
+
+2024/7/17 9:51:21 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where hmainid =1000308593 order by hmainid desc
+
+2024/7/17 9:51:21 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 9:51:21 ReportDataSet:4
+
+2024/7/17 10:04:06 鎵撳嵃sql:select * from h_v_YF_PayMentBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(42200000000) order by hmainid desc
+
+2024/7/17 10:04:06 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 10:04:06 ReportDataSet:0
+
+2024/7/17 10:08:40 鎵撳嵃sql:select * from h_v_YF_PayMentBillList where hmainid = 422 order by hmainid desc
+
+2024/7/17 10:08:40 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 10:08:40 ReportDataSet:1
+
+2024/7/17 10:10:03 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(100030859300101150) order by hmainid desc
+
+2024/7/17 10:10:03 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 10:10:03 ReportDataSet:0
+
+2024/7/17 10:13:11 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(100030859300101150) order by hmainid desc
+
+2024/7/17 10:13:11 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 10:13:11 ReportDataSet:0
+
+2024/7/17 10:16:39 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(100030859300101150) order by hmainid desc
+
+2024/7/17 10:16:39 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 10:16:39 ReportDataSet:0
+
+2024/7/17 10:18:57 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(100030859300101150) order by hmainid desc
+
+2024/7/17 10:18:57 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 10:18:57 ReportDataSet:0
+
+2024/7/17 10:19:11 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(100030859300101150) order by hmainid desc
+
+2024/7/17 10:19:11 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 10:19:11 ReportDataSet:0
+
+2024/7/17 10:29:18 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(100030859300101157) order by hmainid desc
+
+2024/7/17 10:29:18 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/17 10:29:18 ReportDataSet:1
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 879eb76..4fb37f1 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -349,6 +349,9 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PreventErrMould.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenter_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_UnitConvertRateList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPayMentBill.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOStockInBillByID.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOStockInBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOInStockBillByID.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HSeOutStockBillListByID.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillListByID.aspx" />
@@ -367,6 +370,10 @@
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Process_Excel.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBillList.html" />
+ <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldDotCheckTaskReport.html" />
+ <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldMaintainTaskReport.html" />
+ <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldRepairCheckTaskReport.html" />
+ <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldRepairTaskReport.html" />
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\Xs_SellOutMoneyRangeReport.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldResumeCheckQuery.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鐐规瑙勭▼鍗昞Sc_MouldDotCheckRuleBillList_PDA.html" />
@@ -417,6 +424,10 @@
<Content Include="views\璁惧绠＄悊\璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛╘SB_EquipICMOTechParamBillEdit.html" />
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList_PDA.html" />
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBill_PDA.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipDotCheckTaskReport.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipMaintainTaskReport.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipRepairCheckTaskReport.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipRepairTaskReport.html" />
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipResumeCheckQuery.html" />
<Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipDotCheckRule_Excel.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸ヤ綔鑱旂郴鍗昞OA_WorkLinkSelfQuery.html" />
@@ -2157,6 +2168,27 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_FixCard.aspx.designer.cs">
<DependentUpon>xmlLBM_HGy_FixCard.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPayMentBill.aspx.cs">
+ <DependentUpon>xmlLBM_HPayMentBill.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPayMentBill.aspx.designer.cs">
+ <DependentUpon>xmlLBM_HPayMentBill.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOStockInBillByID.aspx.cs">
+ <DependentUpon>xmlLBM_HPOStockInBillByID.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOStockInBillByID.aspx.designer.cs">
+ <DependentUpon>xmlLBM_HPOStockInBillByID.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOStockInBill.aspx.cs">
+ <DependentUpon>xmlLBM_HPOStockInBill.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOStockInBill.aspx.designer.cs">
+ <DependentUpon>xmlLBM_HPOStockInBill.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOInStockBillByID.aspx.cs">
<DependentUpon>xmlLBM_HPOInStockBillByID.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index e39639b..65037ad 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -16,9 +16,8 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
- <StartPageUrl>
- </StartPageUrl>
- <StartAction>CurrentPage</StartAction>
+ <StartPageUrl>views/user/login.html</StartPageUrl>
+ <StartAction>SpecificPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 9f4b7cd..dffa025 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,7 +3,7 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- //var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:81/API/"; //鐜嬪浆鏈湴閰嶇疆
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_BarCodeOutInReport.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_BarCodeOutInReport.html"
index c5d468f..583d5d6 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_BarCodeOutInReport.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_BarCodeOutInReport.html"
@@ -418,68 +418,67 @@
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "sWhere": sWhere },
success: function (data1) {
- if (data1.count == 1) {
- var data = [];
- var col = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
- //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
- var patrn = new RegExp(/^h/i);
- if (patrn.test(data1.list[key].ColmCols)) {
- titleData[key] = data1.list[key].ColmCols;
- }
+ //鏃犺鏈夋棤鏁版嵁鍏堝姞杞絚ol
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
}
+ }
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
- for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, titleData) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
- break;
- case 'long':
- case 'Int32':
- case 'Int64':
- case 'double':
- case 'Decimal':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
- break;
- default:
- if (data[i].name == '鏁伴噺') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
- } else {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
- }
- }
- }
- }
-
- columns = col;
-
- //璁剧疆璧嬪�煎垪瀹�
- var colWidth = getColumnsWidth();
- if (colWidth == "" || colWidth == []) {
-
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
- $.each(columns, function (x, m) {
- m["width"] = colWidth[x];
- });
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ break;
+ default:
+ if (data[i].name == '鏁伴噺') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ }
+ }
}
- option.cols = [columns];
+ }
+
+ columns = col;
+
+ //璁剧疆璧嬪�煎垪瀹�
+ var colWidth = getColumnsWidth();
+ if (colWidth == "" || colWidth == []) {
+
+ }
+ else {
+ $.each(columns, function (x, m) {
+ m["width"] = colWidth[x];
+ });
+ }
+ option.cols = [columns];
+ if (data1.count == 1) {
option.data = data1.data;
option.totalRow = true;
table.render(option);
ins = table.render(option);
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index 35d2bb1..83c8048 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -213,7 +213,7 @@
var sWhere = "";
var sBillType = "3801";
var HModName = "Gy_BarCodeBill";
- var titleData = ["鐗╂枡ID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "杈呭姪灞炴�D", "璁￠噺鍗曚綅ID", "瀹㈡埛ID", "HItemID", "hmainid", "hsubid", "HinterID", "杞﹂棿ID", "渚涘簲鍟咺D", "HSTOCKORGID", "鎿嶄綔鍛業D", "鐝粍ID", "澶栫鏁�", "閽㈠嵎鎹嗗寘鍙�", "鐐夊彿", "鍘傚晢", "瀹㈡埛浠ｇ爜", "瀹㈡埛鍚嶇О", "閿�鍞鍗曞彿", "鐢熶骇鏃ユ湡", "淇濊川鏈熻嚦", "鐑鐞�", "杈呭姪灞炴�т唬鐮�", "杈呭姪灞炴�у悕绉�", "杈呭崟浣嶆暟閲�", "鏄惁鍚敤淇濊川鏈�", "鏄惁璧犲搧","杩涙枡鏃ユ湡"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["鐗╂枡ID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "杈呭姪灞炴�D", "璁￠噺鍗曚綅ID", "瀹㈡埛ID", "HItemID", "hmainid", "hsubid", "HinterID", "杞﹂棿ID", "渚涘簲鍟咺D", "HSTOCKORGID", "鎿嶄綔鍛業D", "鐝粍ID", "澶栫鏁�", "閽㈠嵎鎹嗗寘鍙�", "鐐夊彿", "鍘傚晢", "瀹㈡埛浠ｇ爜", "瀹㈡埛鍚嶇О", "閿�鍞鍗曞彿", "鐢熶骇鏃ユ湡", "淇濊川鏈熻嚦", "鐑鐞�", "杈呭姪灞炴�т唬鐮�", "杈呭姪灞炴�у悕绉�", "杈呭崟浣嶆暟閲�", "鏄惁鍚敤淇濊川鏈�", "鏄惁璧犲搧", "杩涙枡鏃ユ湡"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var HMaterID = "";
var HBatchNo = "";
@@ -267,7 +267,7 @@
var rowdata = [{
"HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
- "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": ""
+ "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
}];
//鍒濆鍖栬〃鏍�
set_InitGrid();
@@ -299,7 +299,7 @@
var NewRow = {
"HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
- "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": ""
+ "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
};
//console.log(NewRow);
switch (obj.event) {
@@ -588,6 +588,9 @@
//鏉＄爜鐢熸垚
form.on('submit(ToolCreate)', function (data) {
$('#ToolCreate').addClass("layui-btn-disabled").attr("disabled", true);//鐢熸垚鎸夐挳绂佺敤
+ for (var i = 0; i < table.cache['mainTable'].length; i++) {
+ table.cache['mainTable'][i]["HDate"] = $("#HDate").val();
+ }
var sSubStr = JSON.stringify(table.cache['mainTable']);
HMaterInfo = table.cache['mainTable'];
//鐗╂枡鏄庣粏淇℃伅涓嶄负绌哄垽鏂�
@@ -626,7 +629,7 @@
$("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //鍗曟嵁鏃ユ湡
$("#HSourceBillType").val('1'); //閫夋嫨涓嬫媺妗嗛粯璁ょ涓�涓�夐」
$("#HBarCodeType").val('0');
- var arr = [{ HBillNo: '', HMaterNumber: '', HMaterName: '', HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: '', HUnitName: '', HBatchNo: '', HGiveAwayFlag: '0', HQty: '0', HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '', HCusModel: "", HCusMaterName: "" }]
+ var arr = [{ HBillNo: '', HMaterNumber: '', HMaterName: '', HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: '', HUnitName: '', HBatchNo: '', HGiveAwayFlag: '0', HQty: '0', HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '', HCusModel: "", HCusMaterName: "", "HCheckEmpName": "" }]
table.reload('mainTable', {
data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
});
@@ -634,7 +637,7 @@
"HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
, "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
, "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
- , "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": ""
+ , "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
}]
table.reload('mainTable1', {
data: arr1 // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
@@ -670,7 +673,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].鐗╂枡浠ｇ爜, HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].璁￠噺鍗曚綅浠ｇ爜, HUnitName: checkStatus.data[0].璁￠噺鍗曚綅, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].鏁伴噺.toString("#0.00"), HMinQty: checkStatus.data[0].鏈�灏忓寘瑁呮暟, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '', "HCusModel": "", "HCusMaterName": "" }]
+ var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].鐗╂枡浠ｇ爜, HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].璁￠噺鍗曚綅浠ｇ爜, HUnitName: checkStatus.data[0].璁￠噺鍗曚綅, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].鏁伴噺.toString("#0.00"), HMinQty: checkStatus.data[0].鏈�灏忓寘瑁呮暟, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '', "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": "" }]
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
table.reload('mainTable', {
data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
@@ -837,10 +840,11 @@
, { field: 'HCusMaterName', title: '瀹㈡埛鐗╂枡鍚嶇О', edit: 'text', width: 200 }
, { field: 'HEmpID', title: '鎿嶄綔鍛業D', width: 100, hide: true }
, { field: 'HEmpNumber', title: '鎿嶄綔鍛樹唬鐮�', edit: 'text', width: 200, event: 'HEmpNumber' }
- , { field: 'HEmpName', title: '鎿嶄綔鍛�', width: 200 }
+ , { field: 'HEmpName', title: '鎿嶄綔鍛�', width: 200 }
, { field: 'HGroupID', title: '鐝粍ID', width: 100, hide: true }
, { field: 'HGroupNumber', title: '鐝粍浠ｇ爜', edit: 'text', width: 200, event: 'HGroupNumber' }
, { field: 'HGroupName', title: '鐝粍鍚嶇О', width: 200 }
+ , { field: 'HCheckEmpName', title: '妫�楠屽憳', width: 200, edit: 'text' }
, { field: 'HBatchNo', title: '鎵瑰彿', edit: 'text', width: 100 }
, { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100, totalRow: true }
, { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', totalRow: true, width: 100 }
@@ -866,7 +870,7 @@
, { field: 'HAuxQty', title: '杈呭崟浣嶆暟閲�', edit: 'text', width: 100, totalRow: true }
, { field: 'HExpirationDateFlag', title: '鏄惁鍚敤淇濊川鏈�', width: 100, templet: '#switchTp3', unresize: false }
, { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', width: 100, templet: '#switchTpl', unresize: false }
- , { field: 'HDate', title: '杩涙枡鏃ユ湡', width: 100 }
+ , { field: 'HDate', title: '鏉＄爜鏃ユ湡', width: 100, hide: true }
, { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100, hide: true }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
@@ -1001,7 +1005,7 @@
, "HAuxPropID": 0, "HAuxPropNumber": "", "HAuxPropName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HBatchNo": "", "HGiveAwayFlag": 0
, "HQty": 0, "HMinQty": '', "HBQty": 0, "HPackQty": 0, "HDate": "", "HCusID": 0, "HCusNumber": "", "HCusName": "", "HSeOrderBillNo": "", "HRemark": ""
, "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
- "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": ""
+ "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
}];
table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
@@ -1015,7 +1019,7 @@
"HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
, "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
, "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
- , "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HCusModel": "", "HCusMaterName": ""
+ , "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
}];
table.render(option1);
//鍒锋柊琛ㄦ牸鏁版嵁
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
index 08abc55..696cee9 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
@@ -149,6 +149,9 @@
case "ICStockBill"://閿�鍞��璐у崟鎵撳嵃
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_ICStockBill.aspx?linterid=" + value, true, "");
break;
+ case "HPayMentBill"://浠樻鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HPayMentBill.aspx?linterid=" + value, true, "");
+ break;
case "HGy_BarCodeBill"://鏉＄爜鎵撳嵃
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HGy_BarCodeBill.aspx?linterid=" + value, true, "");
break;
@@ -164,6 +167,12 @@
case "HPOInStockBillByID"://鏀舵枡閫氱煡鍗�2鎵撳嵃
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HPOInStockBillByID.aspx?linterid=" + value, true, "");
break;
+ case "HPOStockInBill"://閲囪喘鍏ュ簱鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HPOStockInBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HPOStockInBillByID"://閲囪喘鍏ュ簱鍗�2缂栬緫鎵撳嵃
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HPOStockInBillByID.aspx?linterid=" + value, true, "");
+ break;
case "HICMOBillList"://鐢熶骇璁㈠崟鎵撳嵃
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HICMOBillList.aspx?linterid=" + value, true, "");
break;
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPOStockInBill.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPOStockInBill.aspx"
new file mode 100644
index 0000000..db805ce
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPOStockInBill.aspx"
@@ -0,0 +1,27 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_HPOStockInBill.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_HPOStockInBill" %>
+
+<!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)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(" + Request.Params["linterid"] + ") order by hmainid desc");
+ }
+ </script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPOStockInBill.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPOStockInBill.aspx.cs"
new file mode 100644
index 0000000..292380f
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPOStockInBill.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing 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_HPOStockInBill : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPOStockInBill.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPOStockInBill.aspx.designer.cs"
new file mode 100644
index 0000000..e228c8f
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPOStockInBill.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_HPOStockInBill
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPOStockInBillByID.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPOStockInBillByID.aspx"
new file mode 100644
index 0000000..e3bf481
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPOStockInBillByID.aspx"
@@ -0,0 +1,27 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_HPOStockInBillByID.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_HPOStockInBillByID" %>
+
+<!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)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList where hmainid = " + Request.Params["linterid"] + " order by hmainid desc");
+ }
+ </script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPOStockInBillByID.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPOStockInBillByID.aspx.cs"
new file mode 100644
index 0000000..d351d28
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPOStockInBillByID.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing 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_HPOStockInBillByID : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPOStockInBillByID.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPOStockInBillByID.aspx.designer.cs"
new file mode 100644
index 0000000..f74dd5c
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPOStockInBillByID.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_HPOStockInBillByID
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPayMentBill.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPayMentBill.aspx"
new file mode 100644
index 0000000..e05f12c
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPayMentBill.aspx"
@@ -0,0 +1,27 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_HPayMentBill.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_HPayMentBill" %>
+
+<!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)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ SqlXMLReportData.GenOneRecordset(this, "select * from h_v_YF_PayMentBillList where hmainid = " + Request.Params["linterid"] + " order by hmainid desc");
+ }
+ </script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPayMentBill.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPayMentBill.aspx.cs"
new file mode 100644
index 0000000..0a401ee
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPayMentBill.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing 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_HPayMentBill : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPayMentBill.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPayMentBill.aspx.designer.cs"
new file mode 100644
index 0000000..4570d0f
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HPayMentBill.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_HPayMentBill
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\212\200\350\203\275\350\200\203\346\240\270/HR_EmployeeSkillExamBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\212\200\350\203\275\350\200\203\346\240\270/HR_EmployeeSkillExamBill.html"
index 37c0560..03bb56c 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\212\200\350\203\275\350\200\203\346\240\270/HR_EmployeeSkillExamBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\212\200\350\203\275\350\200\203\346\240\270/HR_EmployeeSkillExamBill.html"
@@ -1236,7 +1236,7 @@
$("#HProcName").val(obj[0].宸ュ簭鍚嶇О);//宸ュ簭鍚嶇О
}
//鐢熶骇璧勬簮
- function GetProcessValue(obj) {
+ function GetGySource(obj) {
$("#HSourceID").val(obj[0].HItemID);//鐢熶骇璧勬簮id
$("#HSourceName").val(obj[0].鐢熶骇璧勬簮鍚嶇О);//鐢熶骇璧勬簮鍚嶇О
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldDotCheckTaskReport.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldDotCheckTaskReport.html"
new file mode 100644
index 0000000..0226cd6
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldDotCheckTaskReport.html"
@@ -0,0 +1,506 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<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>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+
+</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 style="padding: 10px; ">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="get_Exit" lay-filter="get_Exit">閫�鍑�</button>
+ </div>
+ <div class="layui-tab layui-tab-card" style="margin-top:20px;" lay-filter="tab-TabTest">
+ <ul class="layui-tab-title">
+ <li lay-id="1" class="layui-this">浠婃棩寰呯偣妫�</li>
+ <li lay-id="2">浠婃棩宸茬偣妫�</li>
+ <li lay-id="3">浠婂ぉ鍏ㄩ儴浠诲姟</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--浠婃棩寰呯偣妫�-->
+ <table class="layui-hide" id="mainTable_waitCheck" lay-filter="mainTable_waitCheck"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--浠婃棩宸茬偣妫�-->
+ <table class="layui-hide" id="mainTable_finishCheck" lay-filter="mainTable_finishCheck"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--浠婂ぉ鍏ㄩ儴浠诲姟-->
+ <table class="layui-hide" id="mainTable_task" lay-filter="mainTable_task"></table>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , soulTable = layui.soulTable
+ var sWhere = "";
+ var option_waitCheck = ""; //浠婃棩寰呯偣妫�
+ var option_finishCheck = ""; //浠婃棩宸茬偣妫�
+ var option_task = ""; //浠婂ぉ鍏ㄩ儴浠诲姟
+ var ins;
+ var TableTab = "mainTable_waitCheck"; //鍒濆鍖栭〉闈㈡椂榛樿涓� 鈥滀粖鏃ュ緟鐐规鈥� 椤电
+ var cur_title = "浠婃棩寰呯偣妫�"; //褰撳墠閫変腑椤电
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //
+ var HModName = "Sc_MouldDotCheckTaskReport";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟垜涓诲鐨勶級
+ var titleData = ["HInterID","HEntryID","HSourceID","HMaterID","HDeptID","婧愬崟瀛愬唴鐮�","婧愬崟绫诲瀷","鍗曟嵁绫诲瀷"];
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+
+ //閫�鍑�
+ form.on('submit(get_Exit)', function (data) {
+ Pub_Close(2);
+ });
+
+ //鍒锋柊
+ form.on('submit(btn_refresh)', function (data) {
+ get_Refresh();
+ });
+
+
+ //鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
+ element.on('tab(tab-TabTest)', function (data) {
+ HMaterInfo = table.cache['mainTable'];
+ cur_title = data.elem.context.innerText;
+ if (cur_title == "浠婃棩寰呯偣妫�") {
+ TableTab = "mainTable_waitCheck";
+ } else if (cur_title == "浠婃棩宸茬偣妫�") {
+ TableTab = "mainTable_finishCheck";
+ } else if (cur_title == "浠婂ぉ鍏ㄩ儴浠诲姟") {
+ TableTab = "mainTable_task";
+ }
+ })
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+ function set_ClearBill() {
+ //鍒濆鍖栦粖鏃ュ緟鐐规鍒楄〃
+ set_InitGrid_waitCheck();
+ //鍒濆鍖栦粖鏃ュ凡鐐规鍒楄〃
+ set_InitGrid_finishCheck();
+ //鍒濆鍖栦粖澶╁叏閮ㄤ换鍔″垪琛�
+ set_InitGrid_task();
+ //鏌ヨ
+ get_FastQuery();
+ }
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //鍒濆鍖栦粖鏃ュ緟鐐规鍒楄〃
+ function set_InitGrid_waitCheck() {
+ option_waitCheck = {
+ elem: '#mainTable_waitCheck'
+ //, toolbar: '#toolbarDemo'
+ , page: true
+ , height: 300
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: []
+ };
+ //table.render(option);
+ }
+
+ //鍒濆鍖栦粖鏃ュ凡鐐规鍒楄〃
+ function set_InitGrid_finishCheck() {
+ option_finishCheck = {
+ elem: '#mainTable_finishCheck'
+ , page: false
+ , height: 500
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+ //鍒濆鍖栦粖澶╁叏閮ㄤ换鍔″垪琛�
+ function set_InitGrid_task() {
+ option_task = {
+ elem: '#mainTable_task'
+ , page: false
+ , height: 500
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldDotCheckTaskReport/CheckList',
+ type: "GET",
+ async: false,
+ data: { "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ var HBillNo_wait = "";
+ var HRowBackgroundColor_wait = "#E0F5F7";
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option_waitCheck = {
+ elem: '#mainTable_waitCheck'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sc_MouldDotCheckTaskReport
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_wait == "") {
+ HBillNo_wait = item.鍣ㄥ叿鐐规璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ } else if (HBillNo_wait == item.鍣ㄥ叿鐐规璁″垝鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ } else if (HBillNo_wait != item.鍣ㄥ叿鐐规璁″垝鍗曞彿 && HBillNo_wait != "") {
+ if (HRowBackgroundColor_wait == "#E0F5F7") {
+ HRowBackgroundColor_wait = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_wait = "#E0F5F7"
+ }
+ HBillNo_wait = item.鍣ㄥ叿鐐规璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ }
+
+ })
+ }
+ }
+ table.render(option_waitCheck);
+
+ var HBillNo_finish = "";
+ var HRowBackgroundColor_finish = "#E0F5F7";
+ option_finishCheck = {
+ elem: '#mainTable_finishCheck'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sc_MouldDotCheckTaskReport1
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_finish == "") {
+ HBillNo_finish = item.鍣ㄥ叿鐐规璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ } else if (HBillNo_finish == item.鍣ㄥ叿鐐规璁″垝鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ } else if (HBillNo_finish != item.鍣ㄥ叿鐐规璁″垝鍗曞彿 && HBillNo_finish != "") {
+ if (HRowBackgroundColor_finish == "#E0F5F7") {
+ HRowBackgroundColor_finish = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_finish = "#E0F5F7"
+ }
+ HBillNo_finish = item.鍣ㄥ叿鐐规璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ }
+
+ })
+ }
+ }
+ table.render(option_finishCheck);
+
+ var HBillNo_task = "";
+ var HRowBackgroundColor_task = "#E0F5F7";
+ option_task = {
+ elem: '#mainTable_task'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sc_MouldDotCheckTaskReport2
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_task == "") {
+ HBillNo_task = item.鍣ㄥ叿鐐规璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ } else if (HBillNo_task == item.鍣ㄥ叿鐐规璁″垝鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ } else if (HBillNo_task != item.鍣ㄥ叿鐐规璁″垝鍗曞彿 && HBillNo_task != "") {
+ if (HRowBackgroundColor_task == "#E0F5F7") {
+ HRowBackgroundColor_task = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_task = "#E0F5F7"
+ }
+ HBillNo_task = item.鍣ㄥ叿鐐规璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ }
+
+ })
+ }
+ }
+ table.render(option_task);
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "鍣ㄥ叿鐐规浠诲姟";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ //DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ get_FastQuery();
+ }
+ //#endregion
+
+ function getActiveTab() {
+ var tabs = document.getElementsByClassName("layui-tab-title")[0].getElementsByTagName("li");
+ var activeTab;
+ for (var i = 0; i < tabs.length; i++) {
+ if (tabs[i].classList.contains("layui-this")) {
+ activeTab = tabs[i].innerText;
+ break;
+ }
+ }
+ return activeTab;
+
+ }
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldMaintainTaskReport.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldMaintainTaskReport.html"
new file mode 100644
index 0000000..617ad57
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldMaintainTaskReport.html"
@@ -0,0 +1,506 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<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>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+
+</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 style="padding: 10px; ">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="get_Exit" lay-filter="get_Exit">閫�鍑�</button>
+ </div>
+ <div class="layui-tab layui-tab-card" style="margin-top:20px;" lay-filter="tab-TabTest">
+ <ul class="layui-tab-title">
+ <li lay-id="1" class="layui-this">浠婃棩寰呬繚鍏�</li>
+ <li lay-id="2">浠婃棩宸蹭繚鍏�</li>
+ <li lay-id="3">浠婂ぉ鍏ㄩ儴浠诲姟</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--浠婃棩寰呬繚鍏�-->
+ <table class="layui-hide" id="mainTable_waitMaintain" lay-filter="mainTable_waitMaintain"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--浠婃棩宸蹭繚鍏�-->
+ <table class="layui-hide" id="mainTable_finishMaintain" lay-filter="mainTable_finishMaintain"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--浠婂ぉ鍏ㄩ儴浠诲姟-->
+ <table class="layui-hide" id="mainTable_task" lay-filter="mainTable_task"></table>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , soulTable = layui.soulTable
+ var sWhere = "";
+ var option_waitMaintain = ""; //浠婃棩寰呬繚鍏�
+ var option_finishMaintain = ""; //浠婃棩宸蹭繚鍏�
+ var option_task = ""; //浠婂ぉ鍏ㄩ儴浠诲姟
+ var ins;
+ var TableTab = "mainTable_waitMaintain"; //鍒濆鍖栭〉闈㈡椂榛樿涓� 鈥滀粖鏃ュ緟淇濆吇鈥� 椤电
+ var cur_title = "浠婃棩寰呬繚鍏�"; //褰撳墠閫変腑椤电
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //
+ var HModName = "Sc_MouldMaintainTaskReport";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟垜涓诲鐨勶級
+ var titleData = ["HInterID","HEntryID","HSourceID","HMaterID","HDeptID","婧愬崟瀛愬唴鐮�","婧愬崟绫诲瀷","鍗曟嵁绫诲瀷"];
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+
+ //閫�鍑�
+ form.on('submit(get_Exit)', function (data) {
+ Pub_Close(2);
+ });
+
+ //鍒锋柊
+ form.on('submit(btn_refresh)', function (data) {
+ get_Refresh();
+ });
+
+
+ //鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
+ element.on('tab(tab-TabTest)', function (data) {
+ HMaterInfo = table.cache['mainTable'];
+ cur_title = data.elem.context.innerText;
+ if (cur_title == "浠婃棩寰呬繚鍏�") {
+ TableTab = "mainTable_waitMaintain";
+ } else if (cur_title == "浠婃棩宸蹭繚鍏�") {
+ TableTab = "mainTable_finishMaintain";
+ } else if (cur_title == "浠婂ぉ鍏ㄩ儴浠诲姟") {
+ TableTab = "mainTable_task";
+ }
+ })
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+ function set_ClearBill() {
+ //鍒濆鍖栦粖鏃ュ緟淇濆吇鍒楄〃
+ set_InitGrid_waitMaintain();
+ //鍒濆鍖栦粖鏃ュ凡淇濆吇鍒楄〃
+ set_InitGrid_finishMaintain();
+ //鍒濆鍖栦粖澶╁叏閮ㄤ换鍔″垪琛�
+ set_InitGrid_task();
+ //鏌ヨ
+ get_FastQuery();
+ }
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //鍒濆鍖栦粖鏃ュ緟淇濆吇鍒楄〃
+ function set_InitGrid_waitMaintain() {
+ option_waitMaintain = {
+ elem: '#mainTable_waitMaintain'
+ //, toolbar: '#toolbarDemo'
+ , page: true
+ , height: 300
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: []
+ };
+ //table.render(option);
+ }
+
+ //鍒濆鍖栦粖鏃ュ凡淇濆吇鍒楄〃
+ function set_InitGrid_finishMaintain() {
+ option_finishMaintain = {
+ elem: '#mainTable_finishMaintain'
+ , page: false
+ , height: 500
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+ //鍒濆鍖栦粖澶╁叏閮ㄤ换鍔″垪琛�
+ function set_InitGrid_task() {
+ option_task = {
+ elem: '#mainTable_task'
+ , page: false
+ , height: 500
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldMaintainTaskReport/Maintainlist',
+ type: "GET",
+ async: false,
+ data: { "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ var HBillNo_wait = "";
+ var HRowBackgroundColor_wait = "#E0F5F7";
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option_waitMaintain = {
+ elem: '#mainTable_waitMaintain'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sc_MouldMaintainTaskReport
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_wait == "") {
+ HBillNo_wait = item.鍣ㄥ叿淇濆吇璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ } else if (HBillNo_wait == item.鍣ㄥ叿淇濆吇璁″垝鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ } else if (HBillNo_wait != item.鍣ㄥ叿淇濆吇璁″垝鍗曞彿 && HBillNo_wait != "") {
+ if (HRowBackgroundColor_wait == "#E0F5F7") {
+ HRowBackgroundColor_wait = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_wait = "#E0F5F7"
+ }
+ HBillNo_wait = item.鍣ㄥ叿淇濆吇璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ }
+
+ })
+ }
+ }
+ table.render(option_waitMaintain);
+
+ var HBillNo_finish = "";
+ var HRowBackgroundColor_finish = "#E0F5F7";
+ option_finishMaintain = {
+ elem: '#mainTable_finishMaintain'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sc_MouldMaintainTaskReport1
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_finish == "") {
+ HBillNo_finish = item.鍣ㄥ叿淇濆吇璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ } else if (HBillNo_finish == item.鍣ㄥ叿淇濆吇璁″垝鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ } else if (HBillNo_finish != item.鍣ㄥ叿淇濆吇璁″垝鍗曞彿 && HBillNo_finish != "") {
+ if (HRowBackgroundColor_finish == "#E0F5F7") {
+ HRowBackgroundColor_finish = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_finish = "#E0F5F7"
+ }
+ HBillNo_finish = item.鍣ㄥ叿淇濆吇璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ }
+
+ })
+ }
+ }
+ table.render(option_finishMaintain);
+
+ var HBillNo_task = "";
+ var HRowBackgroundColor_task = "#E0F5F7";
+ option_task = {
+ elem: '#mainTable_task'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sc_MouldMaintainTaskReport2
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_task == "") {
+ HBillNo_task = item.鍣ㄥ叿淇濆吇璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ } else if (HBillNo_task == item.鍣ㄥ叿淇濆吇璁″垝鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ } else if (HBillNo_task != item.鍣ㄥ叿淇濆吇璁″垝鍗曞彿 && HBillNo_task != "") {
+ if (HRowBackgroundColor_task == "#E0F5F7") {
+ HRowBackgroundColor_task = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_task = "#E0F5F7"
+ }
+ HBillNo_task = item.鍣ㄥ叿淇濆吇璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ }
+
+ })
+ }
+ }
+ table.render(option_task);
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "鍣ㄥ叿淇濆吇浠诲姟";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ //DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ get_FastQuery();
+ }
+ //#endregion
+
+ function getActiveTab() {
+ var tabs = document.getElementsByClassName("layui-tab-title")[0].getElementsByTagName("li");
+ var activeTab;
+ for (var i = 0; i < tabs.length; i++) {
+ if (tabs[i].classList.contains("layui-this")) {
+ activeTab = tabs[i].innerText;
+ break;
+ }
+ }
+ return activeTab;
+
+ }
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldRepairCheckTaskReport.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldRepairCheckTaskReport.html"
new file mode 100644
index 0000000..ebf3507
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldRepairCheckTaskReport.html"
@@ -0,0 +1,506 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<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>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+
+</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 style="padding: 10px; ">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="get_Exit" lay-filter="get_Exit">閫�鍑�</button>
+ </div>
+ <div class="layui-tab layui-tab-card" style="margin-top:20px;" lay-filter="tab-TabTest">
+ <ul class="layui-tab-title">
+ <li lay-id="1" class="layui-this">寰呯淮淇�</li>
+ <li lay-id="2">宸茬淮淇�</li>
+ <li lay-id="3">宸查獙鏀�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--寰呯淮淇�-->
+ <table class="layui-hide" id="mainTable_waitRepair" lay-filter="mainTable_waitRepair"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--宸茬淮淇�-->
+ <table class="layui-hide" id="mainTable_finishRepair" lay-filter="mainTable_finishRepair"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--宸查獙鏀�-->
+ <table class="layui-hide" id="mainTable_finishTask" lay-filter="mainTable_finishTask"></table>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , soulTable = layui.soulTable
+ var sWhere = "";
+ var option_waitRepair = ""; //寰呯淮淇�
+ var option_finishRepair = ""; //宸茬淮淇�
+ var option_task = ""; //宸查獙鏀�
+ var ins;
+ var TableTab = "mainTable_waitRepair"; //鍒濆鍖栭〉闈㈡椂榛樿涓� 鈥滃緟缁翠慨鈥� 椤电
+ var cur_title = "寰呯淮淇�"; //褰撳墠閫変腑椤电
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //
+ var HModName = "Sc_MouldRepairCheckTaskReport";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟垜涓诲鐨勶級
+ var titleData = ["HInterID","HEntryID","HSourceID","HMaterID","HDeptID","婧愬崟瀛愬唴鐮�","婧愬崟绫诲瀷","鍗曟嵁绫诲瀷"];
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+
+ //閫�鍑�
+ form.on('submit(get_Exit)', function (data) {
+ Pub_Close(2);
+ });
+
+ //鍒锋柊
+ form.on('submit(btn_refresh)', function (data) {
+ get_Refresh();
+ });
+
+
+ //鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
+ element.on('tab(tab-TabTest)', function (data) {
+ HMaterInfo = table.cache['mainTable'];
+ cur_title = data.elem.context.innerText;
+ if (cur_title == "寰呯淮淇�") {
+ TableTab = "mainTable_waitRepair";
+ } else if (cur_title == "宸茬淮淇�") {
+ TableTab = "mainTable_finishRepair";
+ } else if (cur_title == "宸查獙鏀�") {
+ TableTab = "mainTable_finishTask";
+ }
+ })
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+ function set_ClearBill() {
+ //鍒濆鍖栧緟缁翠慨鍒楄〃
+ set_InitGrid_waitRepair();
+ //鍒濆鍖栧凡缁翠慨鍒楄〃
+ set_InitGrid_finishRepair();
+ //鍒濆鍖栧凡楠屾敹鍒楄〃
+ set_InitGrid_finishTask();
+ //鏌ヨ
+ get_FastQuery();
+ }
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //鍒濆鍖栧緟缁翠慨鍒楄〃
+ function set_InitGrid_waitRepair() {
+ option_waitRepair = {
+ elem: '#mainTable_waitRepair'
+ //, toolbar: '#toolbarDemo'
+ , page: true
+ , height: 300
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: []
+ };
+ //table.render(option);
+ }
+
+ //鍒濆鍖栧凡缁翠慨鍒楄〃
+ function set_InitGrid_finishRepair() {
+ option_finishRepair = {
+ elem: '#mainTable_finishRepair'
+ , page: false
+ , height: 500
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+ //鍒濆鍖栧凡楠屾敹鍒楄〃
+ function set_InitGrid_finishTask() {
+ option_task = {
+ elem: '#mainTable_finishTask'
+ , page: false
+ , height: 500
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldRepairCheckTaskReport/RepairCheckList',
+ type: "GET",
+ async: false,
+ data: { "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ var HBillNo_wait = "";
+ var HRowBackgroundColor_wait = "#E0F5F7";
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option_waitRepair = {
+ elem: '#mainTable_waitRepair'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sc_MouldRepairCheckTaskReport
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_wait == "") {
+ HBillNo_wait = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ } else if (HBillNo_wait == item.鏁呴殰鐧昏鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ } else if (HBillNo_wait != item.鏁呴殰鐧昏鍗曞彿 && HBillNo_wait != "") {
+ if (HRowBackgroundColor_wait == "#E0F5F7") {
+ HRowBackgroundColor_wait = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_wait = "#E0F5F7"
+ }
+ HBillNo_wait = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ }
+
+ })
+ }
+ }
+ table.render(option_waitRepair);
+
+ var HBillNo_finish = "";
+ var HRowBackgroundColor_finish = "#E0F5F7";
+ option_finishRepair = {
+ elem: '#mainTable_finishRepair'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sc_MouldRepairCheckTaskReport1
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_finish == "") {
+ HBillNo_finish = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ } else if (HBillNo_finish == item.鏁呴殰鐧昏鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ } else if (HBillNo_finish != item.鏁呴殰鐧昏鍗曞彿 && HBillNo_finish != "") {
+ if (HRowBackgroundColor_finish == "#E0F5F7") {
+ HRowBackgroundColor_finish = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_finish = "#E0F5F7"
+ }
+ HBillNo_finish = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ }
+
+ })
+ }
+ }
+ table.render(option_finishRepair);
+
+ var HBillNo_task = "";
+ var HRowBackgroundColor_task = "#E0F5F7";
+ option_task = {
+ elem: '#mainTable_finishTask'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sc_MouldRepairCheckTaskReport2
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_task == "") {
+ HBillNo_task = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ } else if (HBillNo_task == item.鏁呴殰鐧昏鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ } else if (HBillNo_task != item.鏁呴殰鐧昏鍗曞彿 && HBillNo_task != "") {
+ if (HRowBackgroundColor_task == "#E0F5F7") {
+ HRowBackgroundColor_task = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_task = "#E0F5F7"
+ }
+ HBillNo_task = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ }
+
+ })
+ }
+ }
+ table.render(option_task);
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "鍣ㄥ叿缁翠慨浠诲姟";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ //DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ get_FastQuery();
+ }
+ //#endregion
+
+ function getActiveTab() {
+ var tabs = document.getElementsByClassName("layui-tab-title")[0].getElementsByTagName("li");
+ var activeTab;
+ for (var i = 0; i < tabs.length; i++) {
+ if (tabs[i].classList.contains("layui-this")) {
+ activeTab = tabs[i].innerText;
+ break;
+ }
+ }
+ return activeTab;
+
+ }
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldRepairTaskReport.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldRepairTaskReport.html"
new file mode 100644
index 0000000..d3e0add
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldRepairTaskReport.html"
@@ -0,0 +1,506 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<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>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+
+</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 style="padding: 10px; ">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="get_Exit" lay-filter="get_Exit">閫�鍑�</button>
+ </div>
+ <div class="layui-tab layui-tab-card" style="margin-top:20px;" lay-filter="tab-TabTest">
+ <ul class="layui-tab-title">
+ <li lay-id="1" class="layui-this">寰呯淮淇�</li>
+ <li lay-id="2">宸茬淮淇�</li>
+ <li lay-id="3">鍏ㄩ儴浠诲姟</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--寰呯淮淇�-->
+ <table class="layui-hide" id="mainTable_waitRepair" lay-filter="mainTable_waitRepair"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--宸茬淮淇�-->
+ <table class="layui-hide" id="mainTable_finishRepair" lay-filter="mainTable_finishRepair"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--鍏ㄩ儴浠诲姟-->
+ <table class="layui-hide" id="mainTable_task" lay-filter="mainTable_task"></table>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , soulTable = layui.soulTable
+ var sWhere = "";
+ var option_waitRepair = ""; //寰呯淮淇�
+ var option_finishRepair = ""; //宸茬淮淇�
+ var option_task = ""; //鍏ㄩ儴浠诲姟
+ var ins;
+ var TableTab = "mainTable_waitRepair"; //鍒濆鍖栭〉闈㈡椂榛樿涓� 鈥滃緟缁翠慨鈥� 椤电
+ var cur_title = "寰呯淮淇�"; //褰撳墠閫変腑椤电
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //
+ var HModName = "Sc_MouldRepairTaskReport";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟垜涓诲鐨勶級
+ var titleData = ["HInterID","HEntryID","HSourceID","HMaterID","HDeptID","婧愬崟瀛愬唴鐮�","婧愬崟绫诲瀷","鍗曟嵁绫诲瀷"];
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+
+ //閫�鍑�
+ form.on('submit(get_Exit)', function (data) {
+ Pub_Close(2);
+ });
+
+ //鍒锋柊
+ form.on('submit(btn_refresh)', function (data) {
+ get_Refresh();
+ });
+
+
+ //鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
+ element.on('tab(tab-TabTest)', function (data) {
+ HMaterInfo = table.cache['mainTable'];
+ cur_title = data.elem.context.innerText;
+ if (cur_title == "寰呯淮淇�") {
+ TableTab = "mainTable_waitRepair";
+ } else if (cur_title == "宸茬淮淇�") {
+ TableTab = "mainTable_finishRepair";
+ } else if (cur_title == "鍏ㄩ儴浠诲姟") {
+ TableTab = "mainTable_task";
+ }
+ })
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+ function set_ClearBill() {
+ //鍒濆鍖栧緟缁翠慨鍒楄〃
+ set_InitGrid_waitRepair();
+ //鍒濆鍖栧凡缁翠慨鍒楄〃
+ set_InitGrid_finishRepair();
+ //鍒濆鍖栧叏閮ㄤ换鍔″垪琛�
+ set_InitGrid_task();
+ //鏌ヨ
+ get_FastQuery();
+ }
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //鍒濆鍖栧緟缁翠慨鍒楄〃
+ function set_InitGrid_waitRepair() {
+ option_waitRepair = {
+ elem: '#mainTable_waitRepair'
+ //, toolbar: '#toolbarDemo'
+ , page: true
+ , height: 300
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: []
+ };
+ //table.render(option);
+ }
+
+ //鍒濆鍖栧凡缁翠慨鍒楄〃
+ function set_InitGrid_finishRepair() {
+ option_finishRepair = {
+ elem: '#mainTable_finishRepair'
+ , page: false
+ , height: 500
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+ //鍒濆鍖栧叏閮ㄤ换鍔″垪琛�
+ function set_InitGrid_task() {
+ option_task = {
+ elem: '#mainTable_task'
+ , page: false
+ , height: 500
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldRepairTaskReport/RepairList',
+ type: "GET",
+ async: false,
+ data: { "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ var HBillNo_wait = "";
+ var HRowBackgroundColor_wait = "#E0F5F7";
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option_waitRepair = {
+ elem: '#mainTable_waitRepair'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sc_MouldRepairTaskReport
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_wait == "") {
+ HBillNo_wait = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ } else if (HBillNo_wait == item.鏁呴殰鐧昏鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ } else if (HBillNo_wait != item.鏁呴殰鐧昏鍗曞彿 && HBillNo_wait != "") {
+ if (HRowBackgroundColor_wait == "#E0F5F7") {
+ HRowBackgroundColor_wait = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_wait = "#E0F5F7"
+ }
+ HBillNo_wait = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ }
+
+ })
+ }
+ }
+ table.render(option_waitRepair);
+
+ var HBillNo_finish = "";
+ var HRowBackgroundColor_finish = "#E0F5F7";
+ option_finishRepair = {
+ elem: '#mainTable_finishRepair'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sc_MouldRepairTaskReport1
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_finish == "") {
+ HBillNo_finish = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ } else if (HBillNo_finish == item.鏁呴殰鐧昏鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ } else if (HBillNo_finish != item.鏁呴殰鐧昏鍗曞彿 && HBillNo_finish != "") {
+ if (HRowBackgroundColor_finish == "#E0F5F7") {
+ HRowBackgroundColor_finish = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_finish = "#E0F5F7"
+ }
+ HBillNo_finish = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ }
+
+ })
+ }
+ }
+ table.render(option_finishRepair);
+
+ var HBillNo_task = "";
+ var HRowBackgroundColor_task = "#E0F5F7";
+ option_task = {
+ elem: '#mainTable_task'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sc_MouldRepairTaskReport2
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_task == "") {
+ HBillNo_task = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ } else if (HBillNo_task == item.鏁呴殰鐧昏鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ } else if (HBillNo_task != item.鏁呴殰鐧昏鍗曞彿 && HBillNo_task != "") {
+ if (HRowBackgroundColor_task == "#E0F5F7") {
+ HRowBackgroundColor_task = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_task = "#E0F5F7"
+ }
+ HBillNo_task = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ }
+
+ })
+ }
+ }
+ table.render(option_task);
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "鍣ㄥ叿缁翠慨浠诲姟";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ //DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ get_FastQuery();
+ }
+ //#endregion
+
+ function getActiveTab() {
+ var tabs = document.getElementsByClassName("layui-tab-title")[0].getElementsByTagName("li");
+ var activeTab;
+ for (var i = 0; i < tabs.length; i++) {
+ if (tabs[i].classList.contains("layui-this")) {
+ activeTab = tabs[i].innerText;
+ break;
+ }
+ }
+ return activeTab;
+
+ }
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
index 657bb5e..3df80ab 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
@@ -884,7 +884,6 @@
});
}
else {
-
f_alert(data.Message);
console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
index bdd4360..e615d8a 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
@@ -87,6 +87,8 @@
<div class="layui-input-inline">
<input type="text" name="HPlanNo" id="HPlanNo" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HPlanInterID" id="HPlanInterID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HMouldDotCheckPlanEntryID" id="HMouldDotCheckPlanEntryID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HMouldDotCheckPlanInterID" id="HMouldDotCheckPlanInterID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HPlanInterList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -337,24 +339,11 @@
$("#HMouldName").val(checkStatus.data[0].浜у搧妯″叿);
$("#HMouldDotCheckRuleID").val(checkStatus.data[0].HMouldDotCheckRuleID);
$("#HMouldDotCheckRuleName").val(checkStatus.data[0].HMouldDotCheckRuleNo);
+ $("#HMouldDotCheckPlanInterID").val(checkStatus.data[0].hmainid);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- //$.ajax({
- // url: GetWEBURL() + 'Sc_MouldDotCheckBill/Sc_MouldDotCheckSubBillListByPlan',
- // type: "GET",
- // data: { "HPlanInterID": $("#HPlanInterID").val() },
- // success: function (result) {
- // if (result.count == 1) {
- // option.data = result.data;
- // table.render(option);
- // } else {
- // layer.alert(result.code + result.Message, { icon: 5 });
- // }
- // }, error: function () {
- // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- // }
- //});
- get_DocCheckItem(checkStatus.data[0].hmainid);
+ //get_DocCheckItem(checkStatus.data[0].hmainid);
+ get_DocCheckItem3();
}
});
@@ -879,6 +868,54 @@
})
}
+ function get_DocCheckItem3() {
+ var HPlanID = $("#HMouldDotCheckPlanInterID").val() //鐐规璁″垝ID
+ var HDate = $("#HDate").val(); //褰撳ぉ鏃ユ湡
+ $.ajax({
+ url: GetWEBURL() + "/Sc_MouldDotCheckPlanBill/Sc_MouldDotCheckPlanBill_PlanList",
+ type: "GET",
+ data: { "HInterID": HPlanID, "HDate": HDate },
+ success: function (result) {
+ if (result != null) {
+ if (result.count == 1) {
+ var DJData = result.data;//
+ var rowdate1 = layui.table.cache["mainTable"];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
+ table.render(option);
+
+ if (DJData.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
+ {
+ $("#HMouldDotCheckPlanEntryID").val(DJData[0].HPlanEntryID);
+ buttonArr = [];//娓呯┖鏁扮粍
+ for (var i = 0; i < DJData.length; i++) {
+ var checkrow = {
+ "HDotCheckItemID": DJData[i].HDotCheckID, "HDotCheckItem": DJData[i].鐐规椤圭洰,
+ "HDotCheckPart": DJData[i].鐐规閮ㄤ綅, "HClaim": DJData[i].鍏蜂綋瑕佹眰, "HManagerID": DJData[i].HEmployeeID,
+ "HManagerNumber": DJData[i].璐熻矗浜轰唬鐮�, "HManagerName": DJData[i].璐熻矗浜哄悕绉�, "HRemark": DJData[i].HRemark,
+ "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
+ };
+
+ buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ }
+ option.data = buttonArr;
+ table.render(option);
+ //table.reload("mainTable", {
+ // data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ //})
+ } else {
+ layer.alert("鐐瑰墠鏃堕棿娈垫殏鏃犻渶瑕佺偣妫�鐨勮鍒�", { icon: 5 });
+ }
+ }
+ else {
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
+ table.render(option);
+ //layer.alert("璇ヨ澶囨殏鏃犻粯璁ょ偣妫�璁板綍", { icon: 5 });
+ }
+ }
+ }
+ })
+ }
+
//缂栬緫鑾峰彇琛ㄥご
function set_EditForm(linterid) {
@@ -958,7 +995,7 @@
var data = result.data;
var subarr = [];
for (var i = 0; i < data.length; i++) {
- subarr.push({ "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckItem": data[i].鐐规椤圭洰, "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerNumber": data[i].璐熻矗浜轰唬鐮�, "HManagerName": data[i].璐熻矗浜哄悕绉�, "HRemark": data[i].瀛愬娉�2, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О, "HDotCheckResult": data[i].鐐规缁撴灉 == "鍚堟牸" ? 'Y' : 'X' });
+ subarr.push({ "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckItem": data[i].鐐规椤圭洰, "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerNumber": data[i].璐熻矗浜轰唬鐮�, "HManagerName": data[i].璐熻矗浜哄悕绉�, "HRemark": data[i].瀛愬娉�2, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О, "HDotCheckResult": data[i].鐐规缁撴灉 == "鍚堟牸" ? 'Y' : 'X' });
}
option.data = subarr;
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
index 5c76fb9..d2ba6ae 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
@@ -108,6 +108,16 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">浜у搧鍣ㄥ叿<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鎽樿</label>
<div class="layui-input-inline">
<textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
@@ -118,7 +128,7 @@
<div class="layui-input-inline">
<textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
</div>
- </div>
+ </div>
</div>
</div>
</div>
@@ -378,6 +388,44 @@
});
});
+ //琛ㄥご浜у搧妯″叿淇℃伅
+ form.on('submit(HMouldList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浜у搧鍣ㄥ叿鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ console.log(checkStatus);
+ $("#HMouldName").val(checkStatus.data[0].妯″叿鍚嶇О);
+ $("#HMouldID").val(checkStatus.data[0].hmainid);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
//鏂板
form.on('submit(set_AddNew)', function (data) {
$("#component-form-group")[0].reset();
@@ -525,7 +573,7 @@
};
}
-
+
//鍒濆鍖栬〃鏍�
function set_InitGrid_Plan() {
//鐐规璁″垝
@@ -576,7 +624,7 @@
table.render(option1);
set_EditGrid_Plan(linterid); //缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
- option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "","HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
+ option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "", "HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
table.render(option_plan);
}
@@ -627,6 +675,8 @@
, "HMouldMaintainRuleNo": data.鍣ㄥ叿淇濆吇瑙勭▼
, "HMaintainLevID": data.HMaintainLevID
, "HMaintainLevName": data.淇濆吇绾у埆鍚嶇О
+ , "HMouldID": data.HMouldID
+ , "HMouldName": data.鍣ㄥ叿鍚嶇О
});
} else {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldRepairCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldRepairCheckBillList.html"
index 78aa1d5..75b0048 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldRepairCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldRepairCheckBillList.html"
@@ -125,6 +125,9 @@
<div class="layui-input-inline">
<input type="text" name="HMouldRepairWorkName" id="HMouldRepairWorkName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HMouldRepairWorkID" id="HMouldRepairWorkID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="btnHMouldRepairWork" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -435,6 +438,10 @@
}
$("#HMouldRepairWorkName").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HMouldRepairWorkID").val(checkStatus.data[0].hmainid);
+
+ $("#HMainSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HMainSourceInterID").val(checkStatus.data[0].hmainid);
+ $("#HMainSourceEntryID").val(checkStatus.data[0].hsubid == undefined ? 1 : checkStatus.data[0].hsubid);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -600,6 +607,10 @@
, "HRemark": data.澶囨敞
, "HMouldRepairWorkID": data.HMouldRepairWorkID
, "HMouldRepairWorkName": data.HMouldRepairWorkNo
+
+ , "HMainSourceBillNo": data.HMouldRepairWorkNo //缁翠慨璁板綍鍗�
+ , "HMainSourceInterID": data.HMouldRepairWorkID //缁翠慨璁板綍鍐呯爜
+ , "HMainSourceEntryID": data.HMouldRepairWorkEntryID == undefined ? 1 : data.HMouldRepairWorkEntryID //缁翠慨璁板綍瀛愬唴鐮�
});
} else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
index 7b70284..5ddd04f 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
@@ -120,6 +120,9 @@
<div class="layui-input-inline">
<input type="text" name="HMouldRepairWorkName" id="HMouldRepairWorkName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HMouldRepairWorkID" id="HMouldRepairWorkID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="btnHMouldRepairWork" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -488,11 +491,14 @@
}
$("#HMouldRepairWorkName").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HMouldRepairWorkID").val(checkStatus.data[0].hmainid);
-
$("#HEquipID").val(checkStatus.data[0].HEquipID);
$("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);
$("#HManagerID").val(checkStatus.data[0].HManagerID);
$("#HManagerName").val(checkStatus.data[0].璐熻矗浜�);
+
+ $("#HMainSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HMainSourceInterID").val(checkStatus.data[0].hmainid);
+ $("#HMainSourceEntryID").val(checkStatus.data[0].hsubid);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -631,6 +637,9 @@
, "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
, "HMouldRepairWorkID": data.HMouldRepairWorkID //缁翠慨璁板綍鍐呯爜
, "HMouldRepairWorkName": data.HMouldRepairWorkNo //缁翠慨璁板綍
+ , "HMainSourceBillNo": data.HMouldRepairWorkNo //缁翠慨璁板綍鍗�
+ , "HMainSourceInterID": data.HMouldRepairWorkID //缁翠慨璁板綍鍐呯爜
+ , "HMainSourceEntryID": data.HMouldRepairWorkEntryID //缁翠慨璁板綍瀛愬唴鐮�
});
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
index 8f90645..58ff781 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
@@ -546,7 +546,7 @@
});
function get_DocCheckItem3() {
- var HPlanID = $("#HPlanNo").val() //鐐规璁″垝ID
+ var HPlanID = $("#HEquipDotCheckPlanInterID").val() //鐐规璁″垝ID
var HDate = $("#HDate").val(); //褰撳ぉ鏃ユ湡
$.ajax({
url: GetWEBURL() + "/Sb_EquipDotCheckPlanBill/Sb_EquipDotCheckPlanBill_PlanList",
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipDotCheckTaskReport.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipDotCheckTaskReport.html"
new file mode 100644
index 0000000..f0dfef2
--- /dev/null
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipDotCheckTaskReport.html"
@@ -0,0 +1,506 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<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>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+
+</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 style="padding: 10px; ">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="get_Exit" lay-filter="get_Exit">閫�鍑�</button>
+ </div>
+ <div class="layui-tab layui-tab-card" style="margin-top:20px;" lay-filter="tab-TabTest">
+ <ul class="layui-tab-title">
+ <li lay-id="1" class="layui-this">浠婃棩寰呯偣妫�</li>
+ <li lay-id="2">浠婃棩宸茬偣妫�</li>
+ <li lay-id="3">浠婂ぉ鍏ㄩ儴浠诲姟</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--浠婃棩寰呯偣妫�-->
+ <table class="layui-hide" id="mainTable_waitCheck" lay-filter="mainTable_waitCheck"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--浠婃棩宸茬偣妫�-->
+ <table class="layui-hide" id="mainTable_finishCheck" lay-filter="mainTable_finishCheck"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--浠婂ぉ鍏ㄩ儴浠诲姟-->
+ <table class="layui-hide" id="mainTable_task" lay-filter="mainTable_task"></table>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , soulTable = layui.soulTable
+ var sWhere = "";
+ var option_waitCheck = ""; //浠婃棩寰呯偣妫�
+ var option_finishCheck = ""; //浠婃棩宸茬偣妫�
+ var option_task = ""; //浠婂ぉ鍏ㄩ儴浠诲姟
+ var ins;
+ var TableTab = "mainTable_waitCheck"; //鍒濆鍖栭〉闈㈡椂榛樿涓� 鈥滀粖鏃ュ緟鐐规鈥� 椤电
+ var cur_title = "浠婃棩寰呯偣妫�"; //褰撳墠閫変腑椤电
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //
+ var HModName = "Sb_EquipDotCheckTaskReport";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟垜涓诲鐨勶級
+ var titleData = ["HInterID","HEntryID","HSourceID","HMaterID","HDeptID","婧愬崟瀛愬唴鐮�","婧愬崟绫诲瀷","鍗曟嵁绫诲瀷"];
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+
+ //閫�鍑�
+ form.on('submit(get_Exit)', function (data) {
+ Pub_Close(2);
+ });
+
+ //鍒锋柊
+ form.on('submit(btn_refresh)', function (data) {
+ get_Refresh();
+ });
+
+
+ //鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
+ element.on('tab(tab-TabTest)', function (data) {
+ HMaterInfo = table.cache['mainTable'];
+ cur_title = data.elem.context.innerText;
+ if (cur_title == "浠婃棩寰呯偣妫�") {
+ TableTab = "mainTable_waitCheck";
+ } else if (cur_title == "浠婃棩宸茬偣妫�") {
+ TableTab = "mainTable_finishCheck";
+ } else if (cur_title == "浠婂ぉ鍏ㄩ儴浠诲姟") {
+ TableTab = "mainTable_task";
+ }
+ })
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+ function set_ClearBill() {
+ //鍒濆鍖栦粖鏃ュ緟鐐规鍒楄〃
+ set_InitGrid_waitCheck();
+ //鍒濆鍖栦粖鏃ュ凡鐐规鍒楄〃
+ set_InitGrid_finishCheck();
+ //鍒濆鍖栦粖澶╁叏閮ㄤ换鍔″垪琛�
+ set_InitGrid_task();
+ //鏌ヨ
+ get_FastQuery();
+ }
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //鍒濆鍖栦粖鏃ュ緟鐐规鍒楄〃
+ function set_InitGrid_waitCheck() {
+ option_waitCheck = {
+ elem: '#mainTable_waitCheck'
+ //, toolbar: '#toolbarDemo'
+ , page: true
+ , height: 300
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: []
+ };
+ //table.render(option);
+ }
+
+ //鍒濆鍖栦粖鏃ュ凡鐐规鍒楄〃
+ function set_InitGrid_finishCheck() {
+ option_finishCheck = {
+ elem: '#mainTable_finishCheck'
+ , page: false
+ , height: 500
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+ //鍒濆鍖栦粖澶╁叏閮ㄤ换鍔″垪琛�
+ function set_InitGrid_task() {
+ option_task = {
+ elem: '#mainTable_task'
+ , page: false
+ , height: 500
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + '/Sb_EquipDotCheckTaskReport/CheckList',
+ type: "GET",
+ async: false,
+ data: { "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ var HBillNo_wait = "";
+ var HRowBackgroundColor_wait = "#E0F5F7";
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option_waitCheck = {
+ elem: '#mainTable_waitCheck'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sb_EquipDotCheckTaskReport
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_wait == "") {
+ HBillNo_wait = item.璁惧鐐规璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ } else if (HBillNo_wait == item.璁惧鐐规璁″垝鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ } else if (HBillNo_wait != item.璁惧鐐规璁″垝鍗曞彿 && HBillNo_wait != "") {
+ if (HRowBackgroundColor_wait == "#E0F5F7") {
+ HRowBackgroundColor_wait = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_wait = "#E0F5F7"
+ }
+ HBillNo_wait = item.璁惧鐐规璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ }
+
+ })
+ }
+ }
+ table.render(option_waitCheck);
+
+ var HBillNo_finish = "";
+ var HRowBackgroundColor_finish = "#E0F5F7";
+ option_finishCheck = {
+ elem: '#mainTable_finishCheck'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sb_EquipDotCheckTaskReport1
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_finish == "") {
+ HBillNo_finish = item.璁惧鐐规璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ } else if (HBillNo_finish == item.璁惧鐐规璁″垝鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ } else if (HBillNo_finish != item.璁惧鐐规璁″垝鍗曞彿 && HBillNo_finish != "") {
+ if (HRowBackgroundColor_finish == "#E0F5F7") {
+ HRowBackgroundColor_finish = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_finish = "#E0F5F7"
+ }
+ HBillNo_finish = item.璁惧鐐规璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ }
+
+ })
+ }
+ }
+ table.render(option_finishCheck);
+
+ var HBillNo_task = "";
+ var HRowBackgroundColor_task = "#E0F5F7";
+ option_task = {
+ elem: '#mainTable_task'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sb_EquipDotCheckTaskReport2
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_task == "") {
+ HBillNo_task = item.璁惧鐐规璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ } else if (HBillNo_task == item.璁惧鐐规璁″垝鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ } else if (HBillNo_task != item.璁惧鐐规璁″垝鍗曞彿 && HBillNo_task != "") {
+ if (HRowBackgroundColor_task == "#E0F5F7") {
+ HRowBackgroundColor_task = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_task = "#E0F5F7"
+ }
+ HBillNo_task = item.璁惧鐐规璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ }
+
+ })
+ }
+ }
+ table.render(option_task);
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "璁惧鐐规浠诲姟";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ //DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ get_FastQuery();
+ }
+ //#endregion
+
+ function getActiveTab() {
+ var tabs = document.getElementsByClassName("layui-tab-title")[0].getElementsByTagName("li");
+ var activeTab;
+ for (var i = 0; i < tabs.length; i++) {
+ if (tabs[i].classList.contains("layui-this")) {
+ activeTab = tabs[i].innerText;
+ break;
+ }
+ }
+ return activeTab;
+
+ }
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMaintainTaskReport.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMaintainTaskReport.html"
new file mode 100644
index 0000000..e6d43aa
--- /dev/null
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMaintainTaskReport.html"
@@ -0,0 +1,506 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<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>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+
+</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 style="padding: 10px; ">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="get_Exit" lay-filter="get_Exit">閫�鍑�</button>
+ </div>
+ <div class="layui-tab layui-tab-card" style="margin-top:20px;" lay-filter="tab-TabTest">
+ <ul class="layui-tab-title">
+ <li lay-id="1" class="layui-this">浠婃棩寰呬繚鍏�</li>
+ <li lay-id="2">浠婃棩宸蹭繚鍏�</li>
+ <li lay-id="3">浠婂ぉ鍏ㄩ儴浠诲姟</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--浠婃棩寰呬繚鍏�-->
+ <table class="layui-hide" id="mainTable_waitMaintain" lay-filter="mainTable_waitMaintain"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--浠婃棩宸蹭繚鍏�-->
+ <table class="layui-hide" id="mainTable_finishMaintain" lay-filter="mainTable_finishMaintain"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--浠婂ぉ鍏ㄩ儴浠诲姟-->
+ <table class="layui-hide" id="mainTable_task" lay-filter="mainTable_task"></table>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , soulTable = layui.soulTable
+ var sWhere = "";
+ var option_waitMaintain = ""; //浠婃棩寰呬繚鍏�
+ var option_finishMaintain = ""; //浠婃棩宸蹭繚鍏�
+ var option_task = ""; //浠婂ぉ鍏ㄩ儴浠诲姟
+ var ins;
+ var TableTab = "mainTable_waitMaintain"; //鍒濆鍖栭〉闈㈡椂榛樿涓� 鈥滀粖鏃ュ緟淇濆吇鈥� 椤电
+ var cur_title = "浠婃棩寰呬繚鍏�"; //褰撳墠閫変腑椤电
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //
+ var HModName = "Sb_EquipMaintainTaskReport";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟垜涓诲鐨勶級
+ var titleData = ["HInterID","HEntryID","HSourceID","HMaterID","HDeptID","婧愬崟瀛愬唴鐮�","婧愬崟绫诲瀷","鍗曟嵁绫诲瀷"];
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+
+ //閫�鍑�
+ form.on('submit(get_Exit)', function (data) {
+ Pub_Close(2);
+ });
+
+ //鍒锋柊
+ form.on('submit(btn_refresh)', function (data) {
+ get_Refresh();
+ });
+
+
+ //鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
+ element.on('tab(tab-TabTest)', function (data) {
+ HMaterInfo = table.cache['mainTable'];
+ cur_title = data.elem.context.innerText;
+ if (cur_title == "浠婃棩寰呬繚鍏�") {
+ TableTab = "mainTable_waitMaintain";
+ } else if (cur_title == "浠婃棩宸蹭繚鍏�") {
+ TableTab = "mainTable_finishMaintain";
+ } else if (cur_title == "浠婂ぉ鍏ㄩ儴浠诲姟") {
+ TableTab = "mainTable_task";
+ }
+ })
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+ function set_ClearBill() {
+ //鍒濆鍖栦粖鏃ュ緟淇濆吇鍒楄〃
+ set_InitGrid_waitMaintain();
+ //鍒濆鍖栦粖鏃ュ凡淇濆吇鍒楄〃
+ set_InitGrid_finishMaintain();
+ //鍒濆鍖栦粖澶╁叏閮ㄤ换鍔″垪琛�
+ set_InitGrid_task();
+ //鏌ヨ
+ get_FastQuery();
+ }
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //鍒濆鍖栦粖鏃ュ緟淇濆吇鍒楄〃
+ function set_InitGrid_waitMaintain() {
+ option_waitMaintain = {
+ elem: '#mainTable_waitMaintain'
+ //, toolbar: '#toolbarDemo'
+ , page: true
+ , height: 300
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: []
+ };
+ //table.render(option);
+ }
+
+ //鍒濆鍖栦粖鏃ュ凡淇濆吇鍒楄〃
+ function set_InitGrid_finishMaintain() {
+ option_finishMaintain = {
+ elem: '#mainTable_finishMaintain'
+ , page: false
+ , height: 500
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+ //鍒濆鍖栦粖澶╁叏閮ㄤ换鍔″垪琛�
+ function set_InitGrid_task() {
+ option_task = {
+ elem: '#mainTable_task'
+ , page: false
+ , height: 500
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + '/Sb_EquipMaintainTaskReport/Maintainlist',
+ type: "GET",
+ async: false,
+ data: { "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ var HBillNo_wait = "";
+ var HRowBackgroundColor_wait = "#E0F5F7";
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option_waitMaintain = {
+ elem: '#mainTable_waitMaintain'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sb_EquipMaintainTaskReport
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_wait == "") {
+ HBillNo_wait = item.璁惧淇濆吇璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ } else if (HBillNo_wait == item.璁惧淇濆吇璁″垝鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ } else if (HBillNo_wait != item.璁惧淇濆吇璁″垝鍗曞彿 && HBillNo_wait != "") {
+ if (HRowBackgroundColor_wait == "#E0F5F7") {
+ HRowBackgroundColor_wait = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_wait = "#E0F5F7"
+ }
+ HBillNo_wait = item.璁惧淇濆吇璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ }
+
+ })
+ }
+ }
+ table.render(option_waitMaintain);
+
+ var HBillNo_finish = "";
+ var HRowBackgroundColor_finish = "#E0F5F7";
+ option_finishMaintain = {
+ elem: '#mainTable_finishMaintain'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sb_EquipMaintainTaskReport1
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_finish == "") {
+ HBillNo_finish = item.璁惧淇濆吇璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ } else if (HBillNo_finish == item.璁惧淇濆吇璁″垝鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ } else if (HBillNo_finish != item.璁惧淇濆吇璁″垝鍗曞彿 && HBillNo_finish != "") {
+ if (HRowBackgroundColor_finish == "#E0F5F7") {
+ HRowBackgroundColor_finish = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_finish = "#E0F5F7"
+ }
+ HBillNo_finish = item.璁惧淇濆吇璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ }
+
+ })
+ }
+ }
+ table.render(option_finishMaintain);
+
+ var HBillNo_task = "";
+ var HRowBackgroundColor_task = "#E0F5F7";
+ option_task = {
+ elem: '#mainTable_task'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sb_EquipMaintainTaskReport2
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_task == "") {
+ HBillNo_task = item.璁惧淇濆吇璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ } else if (HBillNo_task == item.璁惧淇濆吇璁″垝鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ } else if (HBillNo_task != item.璁惧淇濆吇璁″垝鍗曞彿 && HBillNo_task != "") {
+ if (HRowBackgroundColor_task == "#E0F5F7") {
+ HRowBackgroundColor_task = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_task = "#E0F5F7"
+ }
+ HBillNo_task = item.璁惧淇濆吇璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ }
+
+ })
+ }
+ }
+ table.render(option_task);
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "璁惧淇濆吇浠诲姟";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ //DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ get_FastQuery();
+ }
+ //#endregion
+
+ function getActiveTab() {
+ var tabs = document.getElementsByClassName("layui-tab-title")[0].getElementsByTagName("li");
+ var activeTab;
+ for (var i = 0; i < tabs.length; i++) {
+ if (tabs[i].classList.contains("layui-this")) {
+ activeTab = tabs[i].innerText;
+ break;
+ }
+ }
+ return activeTab;
+
+ }
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipRepairCheckTaskReport.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipRepairCheckTaskReport.html"
new file mode 100644
index 0000000..6110d00
--- /dev/null
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipRepairCheckTaskReport.html"
@@ -0,0 +1,506 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<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>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+
+</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 style="padding: 10px; ">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="get_Exit" lay-filter="get_Exit">閫�鍑�</button>
+ </div>
+ <div class="layui-tab layui-tab-card" style="margin-top:20px;" lay-filter="tab-TabTest">
+ <ul class="layui-tab-title">
+ <li lay-id="1" class="layui-this">寰呯淮淇�</li>
+ <li lay-id="2">宸茬淮淇�</li>
+ <li lay-id="3">宸查獙鏀�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--寰呯淮淇�-->
+ <table class="layui-hide" id="mainTable_waitRepair" lay-filter="mainTable_waitRepair"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--宸茬淮淇�-->
+ <table class="layui-hide" id="mainTable_finishRepair" lay-filter="mainTable_finishRepair"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--宸查獙鏀�-->
+ <table class="layui-hide" id="mainTable_finishTask" lay-filter="mainTable_finishTask"></table>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , soulTable = layui.soulTable
+ var sWhere = "";
+ var option_waitRepair = ""; //寰呯淮淇�
+ var option_finishRepair = ""; //宸茬淮淇�
+ var option_task = ""; //宸查獙鏀�
+ var ins;
+ var TableTab = "mainTable_waitRepair"; //鍒濆鍖栭〉闈㈡椂榛樿涓� 鈥滃緟缁翠慨鈥� 椤电
+ var cur_title = "寰呯淮淇�"; //褰撳墠閫変腑椤电
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //
+ var HModName = "Sb_EquipRepairCheckTaskReport";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟垜涓诲鐨勶級
+ var titleData = ["HInterID","HEntryID","HSourceID","HMaterID","HDeptID","婧愬崟瀛愬唴鐮�","婧愬崟绫诲瀷","鍗曟嵁绫诲瀷"];
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+
+ //閫�鍑�
+ form.on('submit(get_Exit)', function (data) {
+ Pub_Close(2);
+ });
+
+ //鍒锋柊
+ form.on('submit(btn_refresh)', function (data) {
+ get_Refresh();
+ });
+
+
+ //鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
+ element.on('tab(tab-TabTest)', function (data) {
+ HMaterInfo = table.cache['mainTable'];
+ cur_title = data.elem.context.innerText;
+ if (cur_title == "寰呯淮淇�") {
+ TableTab = "mainTable_waitRepair";
+ } else if (cur_title == "宸茬淮淇�") {
+ TableTab = "mainTable_finishRepair";
+ } else if (cur_title == "宸查獙鏀�") {
+ TableTab = "mainTable_finishTask";
+ }
+ })
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+ function set_ClearBill() {
+ //鍒濆鍖栧緟缁翠慨鍒楄〃
+ set_InitGrid_waitRepair();
+ //鍒濆鍖栧凡缁翠慨鍒楄〃
+ set_InitGrid_finishRepair();
+ //鍒濆鍖栧凡楠屾敹鍒楄〃
+ set_InitGrid_finishTask();
+ //鏌ヨ
+ get_FastQuery();
+ }
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //鍒濆鍖栧緟缁翠慨鍒楄〃
+ function set_InitGrid_waitRepair() {
+ option_waitRepair = {
+ elem: '#mainTable_waitRepair'
+ //, toolbar: '#toolbarDemo'
+ , page: true
+ , height: 300
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: []
+ };
+ //table.render(option);
+ }
+
+ //鍒濆鍖栧凡缁翠慨鍒楄〃
+ function set_InitGrid_finishRepair() {
+ option_finishRepair = {
+ elem: '#mainTable_finishRepair'
+ , page: false
+ , height: 500
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+ //鍒濆鍖栧凡楠屾敹鍒楄〃
+ function set_InitGrid_finishTask() {
+ option_task = {
+ elem: '#mainTable_finishTask'
+ , page: false
+ , height: 500
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + '/Sb_EquipRepairCheckTaskReport/RepairCheckList',
+ type: "GET",
+ async: false,
+ data: { "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ var HBillNo_wait = "";
+ var HRowBackgroundColor_wait = "#E0F5F7";
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option_waitRepair = {
+ elem: '#mainTable_waitRepair'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sb_EquipRepairCheckTaskReport
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_wait == "") {
+ HBillNo_wait = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ } else if (HBillNo_wait == item.鏁呴殰鐧昏鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ } else if (HBillNo_wait != item.鏁呴殰鐧昏鍗曞彿 && HBillNo_wait != "") {
+ if (HRowBackgroundColor_wait == "#E0F5F7") {
+ HRowBackgroundColor_wait = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_wait = "#E0F5F7"
+ }
+ HBillNo_wait = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ }
+
+ })
+ }
+ }
+ table.render(option_waitRepair);
+
+ var HBillNo_finish = "";
+ var HRowBackgroundColor_finish = "#E0F5F7";
+ option_finishRepair = {
+ elem: '#mainTable_finishRepair'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sb_EquipRepairCheckTaskReport1
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_finish == "") {
+ HBillNo_finish = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ } else if (HBillNo_finish == item.鏁呴殰鐧昏鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ } else if (HBillNo_finish != item.鏁呴殰鐧昏鍗曞彿 && HBillNo_finish != "") {
+ if (HRowBackgroundColor_finish == "#E0F5F7") {
+ HRowBackgroundColor_finish = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_finish = "#E0F5F7"
+ }
+ HBillNo_finish = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ }
+
+ })
+ }
+ }
+ table.render(option_finishRepair);
+
+ var HBillNo_task = "";
+ var HRowBackgroundColor_task = "#E0F5F7";
+ option_task = {
+ elem: '#mainTable_finishTask'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sb_EquipRepairCheckTaskReport2
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_task == "") {
+ HBillNo_task = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ } else if (HBillNo_task == item.鏁呴殰鐧昏鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ } else if (HBillNo_task != item.鏁呴殰鐧昏鍗曞彿 && HBillNo_task != "") {
+ if (HRowBackgroundColor_task == "#E0F5F7") {
+ HRowBackgroundColor_task = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_task = "#E0F5F7"
+ }
+ HBillNo_task = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ }
+
+ })
+ }
+ }
+ table.render(option_task);
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "璁惧缁翠慨浠诲姟";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ //DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ get_FastQuery();
+ }
+ //#endregion
+
+ function getActiveTab() {
+ var tabs = document.getElementsByClassName("layui-tab-title")[0].getElementsByTagName("li");
+ var activeTab;
+ for (var i = 0; i < tabs.length; i++) {
+ if (tabs[i].classList.contains("layui-this")) {
+ activeTab = tabs[i].innerText;
+ break;
+ }
+ }
+ return activeTab;
+
+ }
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipRepairTaskReport.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipRepairTaskReport.html"
new file mode 100644
index 0000000..877c94d
--- /dev/null
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipRepairTaskReport.html"
@@ -0,0 +1,506 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<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>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+
+</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 style="padding: 10px; ">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="get_Exit" lay-filter="get_Exit">閫�鍑�</button>
+ </div>
+ <div class="layui-tab layui-tab-card" style="margin-top:20px;" lay-filter="tab-TabTest">
+ <ul class="layui-tab-title">
+ <li lay-id="1" class="layui-this">寰呯淮淇�</li>
+ <li lay-id="2">宸茬淮淇�</li>
+ <li lay-id="3">鍏ㄩ儴浠诲姟</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--寰呯淮淇�-->
+ <table class="layui-hide" id="mainTable_waitRepair" lay-filter="mainTable_waitRepair"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--宸茬淮淇�-->
+ <table class="layui-hide" id="mainTable_finishRepair" lay-filter="mainTable_finishRepair"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--鍏ㄩ儴浠诲姟-->
+ <table class="layui-hide" id="mainTable_task" lay-filter="mainTable_task"></table>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , soulTable = layui.soulTable
+ var sWhere = "";
+ var option_waitRepair = ""; //寰呯淮淇�
+ var option_finishRepair = ""; //宸茬淮淇�
+ var option_task = ""; //鍏ㄩ儴浠诲姟
+ var ins;
+ var TableTab = "mainTable_waitRepair"; //鍒濆鍖栭〉闈㈡椂榛樿涓� 鈥滃緟缁翠慨鈥� 椤电
+ var cur_title = "寰呯淮淇�"; //褰撳墠閫変腑椤电
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //
+ var HModName = "Sb_EquipRepairTaskReport";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟垜涓诲鐨勶級
+ var titleData = ["HInterID","HEntryID","HSourceID","HMaterID","HDeptID","婧愬崟瀛愬唴鐮�","婧愬崟绫诲瀷","鍗曟嵁绫诲瀷"];
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+
+ //閫�鍑�
+ form.on('submit(get_Exit)', function (data) {
+ Pub_Close(2);
+ });
+
+ //鍒锋柊
+ form.on('submit(btn_refresh)', function (data) {
+ get_Refresh();
+ });
+
+
+ //鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
+ element.on('tab(tab-TabTest)', function (data) {
+ HMaterInfo = table.cache['mainTable'];
+ cur_title = data.elem.context.innerText;
+ if (cur_title == "寰呯淮淇�") {
+ TableTab = "mainTable_waitRepair";
+ } else if (cur_title == "宸茬淮淇�") {
+ TableTab = "mainTable_finishRepair";
+ } else if (cur_title == "鍏ㄩ儴浠诲姟") {
+ TableTab = "mainTable_task";
+ }
+ })
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+ function set_ClearBill() {
+ //鍒濆鍖栧緟缁翠慨鍒楄〃
+ set_InitGrid_waitRepair();
+ //鍒濆鍖栧凡缁翠慨鍒楄〃
+ set_InitGrid_finishRepair();
+ //鍒濆鍖栧叏閮ㄤ换鍔″垪琛�
+ set_InitGrid_task();
+ //鏌ヨ
+ get_FastQuery();
+ }
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //鍒濆鍖栧緟缁翠慨鍒楄〃
+ function set_InitGrid_waitRepair() {
+ option_waitRepair = {
+ elem: '#mainTable_waitRepair'
+ //, toolbar: '#toolbarDemo'
+ , page: true
+ , height: 300
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: []
+ };
+ //table.render(option);
+ }
+
+ //鍒濆鍖栧凡缁翠慨鍒楄〃
+ function set_InitGrid_finishRepair() {
+ option_finishRepair = {
+ elem: '#mainTable_finishRepair'
+ , page: false
+ , height: 500
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+ //鍒濆鍖栧叏閮ㄤ换鍔″垪琛�
+ function set_InitGrid_task() {
+ option_task = {
+ elem: '#mainTable_task'
+ , page: false
+ , height: 500
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + '/Sb_EquipRepairTaskReport/RepairList',
+ type: "GET",
+ async: false,
+ data: { "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ var HBillNo_wait = "";
+ var HRowBackgroundColor_wait = "#E0F5F7";
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option_waitRepair = {
+ elem: '#mainTable_waitRepair'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sb_EquipRepairTaskReport
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_wait == "") {
+ HBillNo_wait = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ } else if (HBillNo_wait == item.鏁呴殰鐧昏鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ } else if (HBillNo_wait != item.鏁呴殰鐧昏鍗曞彿 && HBillNo_wait != "") {
+ if (HRowBackgroundColor_wait == "#E0F5F7") {
+ HRowBackgroundColor_wait = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_wait = "#E0F5F7"
+ }
+ HBillNo_wait = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_wait)
+ }
+
+ })
+ }
+ }
+ table.render(option_waitRepair);
+
+ var HBillNo_finish = "";
+ var HRowBackgroundColor_finish = "#E0F5F7";
+ option_finishRepair = {
+ elem: '#mainTable_finishRepair'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sb_EquipRepairTaskReport1
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_finish == "") {
+ HBillNo_finish = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ } else if (HBillNo_finish == item.鏁呴殰鐧昏鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ } else if (HBillNo_finish != item.鏁呴殰鐧昏鍗曞彿 && HBillNo_finish != "") {
+ if (HRowBackgroundColor_finish == "#E0F5F7") {
+ HRowBackgroundColor_finish = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_finish = "#E0F5F7"
+ }
+ HBillNo_finish = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_finish)
+ }
+
+ })
+ }
+ }
+ table.render(option_finishRepair);
+
+ var HBillNo_task = "";
+ var HRowBackgroundColor_task = "#E0F5F7";
+ option_task = {
+ elem: '#mainTable_task'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sb_EquipRepairTaskReport2
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_task == "") {
+ HBillNo_task = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ } else if (HBillNo_task == item.鏁呴殰鐧昏鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ } else if (HBillNo_task != item.鏁呴殰鐧昏鍗曞彿 && HBillNo_task != "") {
+ if (HRowBackgroundColor_task == "#E0F5F7") {
+ HRowBackgroundColor_task = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_task = "#E0F5F7"
+ }
+ HBillNo_task = item.鏁呴殰鐧昏鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_task)
+ }
+
+ })
+ }
+ }
+ table.render(option_task);
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "璁惧缁翠慨浠诲姟";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ //DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ get_FastQuery();
+ }
+ //#endregion
+
+ function getActiveTab() {
+ var tabs = document.getElementsByClassName("layui-tab-title")[0].getElementsByTagName("li");
+ var activeTab;
+ for (var i = 0; i < tabs.length; i++) {
+ if (tabs[i].classList.contains("layui-this")) {
+ activeTab = tabs[i].innerText;
+ break;
+ }
+ }
+ return activeTab;
+
+ }
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
index 4c67dfb..45d91c8 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
@@ -498,7 +498,7 @@
, limit: 50
, limits: [50, 500, 5000, 20000]
, done: function (res, curr, count) {
- soulTable.render(this);
+
}
}
option.cols = [col];
@@ -736,15 +736,15 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁鎵撳嵃锛�');
+ if (checkStatus.data.length != 1) {
+ return layer.msg('璇蜂竴琛屾暟鎹墦鍗帮紒');
}
else {
- var hmainid = [];
- for (var i = 0; i < checkStatus.data.length; i++) {
- hmainid.push((data[i].hmainid * (10 ** 8)) + data[i].hsubid)
- }
+ //var hmainid = [];
+ //for (var i = 0; i < checkStatus.data.length; i++) {
+ // hmainid.push((data[i].hmainid * (10 ** 8)) + data[i].hsubid)
+ //}
layer.open({
type: 2
@@ -753,7 +753,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + hmainid.toString() + '&MyMsg=' + hmainid.toString() + '&Type=HPayMentBill', 'yes']
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HPayMentBill', 'yes']
, resize: false
})
}
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
index 8093dbe..b7ee0f5 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
@@ -1134,9 +1134,8 @@
var hmainid = [];
for (var i = 0; i < checkStatus.data.length; i++) {
- hmainid.push((data[i].hmainid * (10 ** 8)) + data[i].hsubid)
+ hmainid.push(data[i].hmainid.toString() + padStart(data[i].hsubid.toString(),8))
}
-
layer.open({
type: 2
, area: ['50%', '50%']
@@ -1149,7 +1148,15 @@
})
}
}
-
+ //瀛楃涓茶ˉ闆�
+ function padStart(str, targetLength, padString) {
+ padString = padString || '0';
+ targetLength = targetLength || 8;
+ while (str.length < targetLength) {
+ str = padString + str;
+ }
+ return str;
+ }
//鎵撳嵃1鏀舵枡鍗�
function get_PrintReport1() {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutRequestBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutRequestBillList.html"
index 4c429ce..ec8d37c 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutRequestBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutRequestBillList.html"
@@ -61,6 +61,15 @@
<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-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnResCnz" style="padding:0 5px">閲嶆柊鍚屾</button>
+
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<div class="layui-inline" style="margin-left:5px;">
<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
@@ -287,6 +296,44 @@
};
});
+ //#region 閲嶆柊鍚屾鎸夐挳
+ form.on('submit(btnResCnz)', function (data) {
+ set_ResCnz();
+ });
+
+ //閲嶆柊鍚屾鎸夐挳
+ function set_ResCnz() {
+ var HBillno2 = $('#HBillno2').val();
+ if (HBillno2 == "") {
+ layer.msg('璇疯緭鍏ラ渶瑕佸悓姝ョ殑鍗曟嵁鍙凤紒');
+ return;
+ }
+ $.ajax({
+ url: GetWEBURL() + '/Kf_MateOutRequestBillController/GetKf_MateOutRequestBill_Sync_Json',
+ type: "GET",
+ data: { "HBillNo": HBillno2, "HBillType": 1214 },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
index 84d39d3..f01268e 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
@@ -837,7 +837,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + '&MyMsg=' + linterid.toString() + '&Type=HPOStockInBillList', 'yes']
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + '&MyMsg=' + linterid.toString() + '&Type=HPOStockInBillByID', 'yes']
, resize: false
})
}
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
index 70c8e66..41583a4 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
@@ -854,7 +854,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + hmainid.toString() + '&MyMsg=' + hmainid.toString() + '&Type=HPOInStockBill', 'yes']
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + hmainid.toString() + '&MyMsg=' + hmainid.toString() + '&Type=HPOStockInBill', 'yes']
, resize: false
})
}
--
Gitblit v1.9.1