From fc9bf0fe5d73cfc171fecc0e4b9e227e78710e37 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期五, 25 二月 2022 12:17:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/views/车间管理/叫料管理/Ji_CallGoodsBillMain.html          |  359 +++++++++++++++++++++++++++
 WebTM/views/基础资料/公用基础资料/xmlLBM_MouldProdInStockBill.aspx |    2 
 WebTM/views/基础资料/公用基础资料/grf/物料条码.grf                     |  402 ++++++++++++++++++++++++++++++
 WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html          |    4 
 WebTM/views/index.html                                   |    7 
 WebTM/WebTM.csproj                                       |    3 
 6 files changed, 774 insertions(+), 3 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 6171e2d..2514906 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -184,6 +184,7 @@
     <Content Include="views\grf\璁惧妗f.grf" />
     <Content Include="views\grf\鍣ㄥ叿妗f.grf" />
     <Content Include="views\grf\閿�鍞��璐у崟.grf" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鐗╂枡鏉$爜.grf" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>
@@ -874,6 +875,7 @@
     <Content Include="views\璐ㄩ噺绠$悊\妫�楠屾柟妗堝崟\QC_CheckProjectList.html" />
     <Content Include="views\璐ㄩ噺绠$悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckBillList.html" />
     <Content Include="views\璐ㄩ噺绠$悊\棣栦欢妫�楠屽崟\QC_Add_Edit_FirstPieceCheckBill.html" />
+    <Content Include="views\杞﹂棿绠$悊\鍙枡绠$悊\Ji_CallGoodsBillMain.html" />
     <Content Include="views\杞﹂棿绠$悊\濮斿宸ュ簭鍙戝嚭鍗昞Cj_StationEntrustInBill_Mul_PDA.html" />
     <Content Include="views\杞﹂棿绠$悊\濮斿宸ュ簭鍙戝嚭鍗昞Cj_StationEntrustInBill_PDA.html" />
     <Content Include="views\杞﹂棿绠$悊\濮斿宸ュ簭鍙戝嚭鍗昞Cj_StationEntrustInBill_Mul.html" />
@@ -1200,6 +1202,7 @@
   <ItemGroup>
     <Folder Include="views\浠撳瓨绠$悊\璋冩嫧鍗曟牳瀵筡" />
     <Folder Include="views\浠撳瓨绠$悊\璋冩嫧鍗曠ń鏍竆" />
+    <Folder Include="views\杞﹂棿绠$悊\鍙枡绠$悊\鎷f枡閰嶉�佸崟\" />
   </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 92ecd2c..4d9174d 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -408,6 +408,13 @@
                                         <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_StationInBillList.html">鏍囧噯宸ユ椂鎶ヨ〃</a></dd>
                                     </dl>
                                 </dd>
+                                <dd>
+                                    <a>鍙枡绠$悊</a>
+                                    <dl class="layui-nav-child append" id="append">
+                                        <dd><a lay-href="杞﹂棿绠$悊/鍙枡绠$悊/Ji_CallGoodsBillMain.html">鍙枡鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/鍙枡绠$悊/鎷f枡閰嶉�佸崟/Ji_CallGoodsBillMain.html">鎷f枡閰嶉�佸崟鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>
                             </dl>
                         </li>
                         <!-- 璐ㄩ噺绠$悊 -->
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/grf/\347\211\251\346\226\231\346\235\241\347\240\201.grf" "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/grf/\347\211\251\346\226\231\346\235\241\347\240\201.grf"
new file mode 100644
index 0000000..3c2017a
--- /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/grf/\347\211\251\346\226\231\346\235\241\347\240\201.grf"
@@ -0,0 +1,402 @@
+锘縊bject Report
+	Version='6.0.0.6'
+	Title='鐢熶骇浠诲姟鍗�'
+	PrintAsDesignPaper=F
+	Object Font
+		Name='瀹嬩綋'
+		Size=135000,0
+		Weight=400
+		Charset=134
+	End
+	Object Printer
+		Size=256
+		Width=9.75
+		Height=6
+		LeftMargin=0
+		TopMargin=0
+		RightMargin=0
+		BottomMargin=0
+	End
+	Object DetailGrid
+		CenterView=T
+		ShowColLine=F
+		ShowRowLine=F
+		Object Border
+			Styles=[]
+		End
+		Object Recordset
+			Items Field
+				Item
+					Name='鏂欏彿'
+				End
+				Item
+					Name='鐗╂枡鍚嶇О'
+				End
+				Item
+					Name='瑙勬牸鍨嬪彿'
+				End
+				Item
+					Name='鏁伴噺'
+				End
+				Item
+					Name='鏉$爜缂栧彿'
+				End
+				Item
+					Name='鏈哄彴缂栧彿'
+				End
+				Item
+					Name='鐢熶骇鎵瑰彿'
+				End
+				Item
+					Name='鍒剁▼'
+				End
+				Item
+					Name='鍑�閲�'
+					Type=Currency
+					Format='0.#########;;#'
+				End
+				Item
+					Name='姣涢噸'
+					Type=Currency
+					Format='0.#########;;#'
+				End
+				Item
+					Name='閿�鍞鍗曞彿'
+				End
+				Item
+					Name='鎵瑰彿'
+				End
+				Item
+					Name='鏃ユ湡'
+					Type=DateTime
+					Format='yyyy/MM/dd'
+				End
+				Item
+					Name='鍒朵綔浜�'
+				End
+				Item
+					Name='瀹㈡埛鍨嬪彿'
+				End
+				Item
+					Name='鍘嬫満鍨嬪彿'
+				End
+				Item
+					Name='鎵瑰彿2'
+				End
+				Item
+					Name='璁¢噺鍗曚綅'
+				End
+				Item
+					Name='鐗╂枡浠g爜'
+				End
+				Item
+					Name='婧愬崟鍗曞彿'
+				End
+				Item
+					Name='渚涘簲鍟�'
+				End
+				Item
+					Name='鐢熶骇宸ュ崟鍙�'
+				End
+			End
+		End
+		Items Column
+			Item
+				Name='Column3'
+				Width=9.60438
+			End
+		End
+		Object ColumnContent
+			Height=6.00604
+			RowsPerPage=1
+			Items ColumnContentCell
+				Item
+					Column='Column3'
+					FreeCell=T
+					CanGrow=T
+					Items Control
+						Item
+							Type=MemoBox
+							Name='鍑礉濂堢壒'
+							Left=0.79375
+							Top=0.211667
+							Width=5.3975
+							Height=1.37583
+							Object Font
+								Name='瀹嬩綋'
+								Size=142500,0
+								Weight=400
+								Charset=134
+							End
+							ShrinkFontToFit=T
+							TextAlign=MiddleCenter
+							CharSpacing=4
+							Text='鍑礉濂堢壒绉戞妧'
+						End
+						Item
+							Type=Barcode
+							Name='Barcode1'
+							Left=6.79979
+							Top=0.211667
+							Width=1.79917
+							Height=1.37583
+							BarcodeType=QRCode
+							CaptionPosition=None
+							Text='[#鏉$爜缂栧彿#]'
+							Object Font
+								Name='瀹嬩綋'
+								Size=105000,0
+								Weight=400
+								Charset=134
+							End
+						End
+						Item
+							Type=FreeGrid
+							Name='FreeGrid1'
+							Left=0.132292
+							Top=1.69333
+							Object Border
+								Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+							End
+							ColumnCount=6
+							Items FreeGridColumn
+								Item[1]
+									Width=1.56104
+								End
+								Item[2]
+									Width=1.85208
+								End
+								Item[3]
+									Width=1.16417
+								End
+								Item[4]
+									Width=1.69333
+								End
+								Item[5]
+									Width=1.00542
+								End
+								Item[6]
+									Width=2.11667
+								End
+							End
+							Items FreeGridRow
+								Item[1]
+									Height=0.820208
+								End
+								Item[2]
+									Height=0.79375
+								End
+								Item[3]
+									Height=0.79375
+								End
+								Item[4]
+									Height=0.820208
+								End
+								Item[5]
+									Height=0.740833
+								End
+							End
+							Items FreeGridCell
+								Item[1,1]
+									Object Font
+										Name='瀹嬩綋'
+										Weight=400
+										Charset=134
+									End
+									Text='宸ュ崟鍙�'
+								End
+								Item[1,2]
+									Object Font
+										Name='瀹嬩綋'
+										Size=105000,0
+										Weight=400
+										Charset=134
+									End
+									ShrinkFontToFit=T
+									Text='[#鐢熶骇宸ュ崟鍙�#]'
+									ColSpan=2
+								End
+								Item[1,4]
+									Object Font
+										Name='瀹嬩綋'
+										Size=105000,0
+										Weight=400
+										Charset=134
+									End
+									Text='渚涘簲鍟�'
+								End
+								Item[1,5]
+									Object Font
+										Name='瀹嬩綋'
+										Size=105000,0
+										Weight=400
+										Charset=134
+									End
+									Text='[#渚涘簲鍟�#]'
+									ColSpan=2
+								End
+								Item[2,1]
+									Object Font
+										Name='瀹嬩綋'
+										Size=105000,0
+										Weight=400
+										Charset=134
+									End
+									Text='鐗╂枡鍚嶇О'
+								End
+								Item[2,2]
+									Object Font
+										Name='瀹嬩綋'
+										Size=105000,0
+										Weight=400
+										Charset=134
+									End
+									Text='[#鐗╂枡鍚嶇О#]'
+									ColSpan=5
+								End
+								Item[3,1]
+									Object Font
+										Name='瀹嬩綋'
+										Size=105000,0
+										Weight=400
+										Charset=134
+									End
+									Text='鐗╂枡缂栫爜'
+								End
+								Item[3,2]
+									Object Font
+										Name='瀹嬩綋'
+										Size=105000,0
+										Weight=400
+										Charset=134
+									End
+									Text='[#鐗╂枡浠g爜#]'
+									ColSpan=5
+								End
+								Item[4,1]
+									Object Font
+										Name='瀹嬩綋'
+										Size=105000,0
+										Weight=400
+										Charset=134
+									End
+									Text='鏁伴噺'
+									DataName='鏁伴噺'
+								End
+								Item[4,2]
+									Object Font
+										Name='瀹嬩綋'
+										Size=105000,0
+										Weight=400
+										Charset=134
+									End
+									Text='[#鏁伴噺#]'
+								End
+								Item[4,3]
+									Object Font
+										Name='瀹嬩綋'
+										Size=105000,0
+										Weight=400
+										Charset=134
+									End
+									Text='鍗曚綅'
+									DataName='鍗曚綅'
+								End
+								Item[4,4]
+									Object Font
+										Name='瀹嬩綋'
+										Size=105000,0
+										Weight=400
+										Charset=134
+									End
+									Text='[#璁¢噺鍗曚綅#]'
+								End
+								Item[4,5]
+									Object Font
+										Name='瀹嬩綋'
+										Size=105000,0
+										Weight=400
+										Charset=134
+									End
+									Text='鎵瑰彿'
+								End
+								Item[4,6]
+									Object Font
+										Name='瀹嬩綋'
+										Size=105000,0
+										Weight=400
+										Charset=134
+									End
+									Text='[#鎵瑰彿#]'
+								End
+								Item[5,1]
+									Object Font
+										Name='瀹嬩綋'
+										Size=105000,0
+										Weight=400
+										Charset=134
+									End
+									Text='鎵撳嵃浜哄憳'
+									DataName='鎵撳嵃浜哄憳'
+								End
+								Item[5,2]
+									Object Font
+										Name='瀹嬩綋'
+										Size=105000,0
+										Weight=400
+										Charset=134
+									End
+									Text='[#鍒朵綔浜�#]'
+									ColSpan=2
+								End
+								Item[5,4]
+									Object Font
+										Name='瀹嬩綋'
+										Size=105000,0
+										Weight=400
+										Charset=134
+									End
+									Text='鎵撳嵃鏃ユ湡'
+									DataName='鎵撳嵃鏃ユ湡'
+								End
+								Item[5,5]
+									Object Font
+										Name='瀹嬩綋'
+										Size=105000,0
+										Weight=400
+										Charset=134
+									End
+									Text='[#鏃ユ湡#]'
+									ColSpan=2
+								End
+							End
+						End
+					End
+				End
+			End
+		End
+		Object ColumnTitle
+			Height=0
+			Items ColumnTitleCell
+				Item
+					GroupTitle=F
+					Column='Column3'
+					Text='Column1'
+				End
+			End
+		End
+	End
+	Items ReportHeader
+		Item
+			Name='ReportHeader1'
+			Height=0
+			RepeatOnPage=T
+		End
+	End
+	Items ReportFooter
+		Item
+			Name='ReportFooter1'
+			Height=0
+		End
+	End
+End
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_MouldProdInStockBill.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_MouldProdInStockBill.aspx"
index 01fc745..b8826cb 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/xmlLBM_MouldProdInStockBill.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_MouldProdInStockBill.aspx"
@@ -15,7 +15,7 @@
 
         //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
         //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
-        SqlXMLReportData.GenOneRecordset(this, "select 搴撳瓨缁勭粐, 寰�鏉ュ崟浣�,鍗曟嵁鍙�,鏀舵枡浠撳簱,鏃ユ湡,鐗╂枡浠g爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,璁¢噺鍗曚綅,瀹炴敹鏁伴噺,琛ㄤ綋澶囨敞,鍒跺崟浜�,鍒跺崟鏃ユ湡,瀹℃牳浜� from h_v_Sc_MouldProdInHouseBillList where hmainid=" + Request.Params["linterid"]+ " group by 搴撳瓨缁勭粐,寰�鏉ュ崟浣�,鍗曟嵁鍙�,鏀舵枡浠撳簱,鏃ユ湡,鐗╂枡浠g爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,璁¢噺鍗曚綅,瀹炴敹鏁伴噺,琛ㄤ綋澶囨敞,鍒跺崟浜�,鍒跺崟鏃ユ湡,瀹℃牳浜� order by 鍗曟嵁鍙�");
+        SqlXMLReportData.GenOneRecordset(this, "select 搴撳瓨缁勭粐, 寰�鏉ュ崟浣�,鍗曟嵁鍙�,鏀舵枡浠撳簱,鏃ユ湡,鐗╂枡浠g爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,璁¢噺鍗曚綅,sum(瀹炴敹鏁伴噺) 瀹炴敹鏁伴噺,琛ㄤ綋澶囨敞,鍒跺崟浜�,鍒跺崟鏃ユ湡,瀹℃牳浜� from h_v_Sc_MouldProdInHouseBillList where hmainid=" + Request.Params["linterid"]+ " group by 搴撳瓨缁勭粐,寰�鏉ュ崟浣�,鍗曟嵁鍙�,鏀舵枡浠撳簱,鏃ユ湡,鐗╂枡浠g爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,璁¢噺鍗曚綅,琛ㄤ綋澶囨敞,鍒跺崟浜�,鍒跺崟鏃ユ湡,瀹℃牳浜� order by 鍗曟嵁鍙�");
     }
 </script>
 </head>
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/Gy_BarCodeBillList.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/Gy_BarCodeBillList.html"
index 7395a66..cd5ea55 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/Gy_BarCodeBillList.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/Gy_BarCodeBillList.html"
@@ -245,7 +245,7 @@
                                 , shade: 0.6 //閬僵閫忔槑搴�
                                 , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
                                 , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdBackBill', 'yes']
+                                , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HGy_BarCodeBill', 'yes']
                                 , resize: false
                             })
                         }
@@ -264,7 +264,7 @@
                                 , shade: 0.6 //閬僵閫忔槑搴�
                                 , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
                                 , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdBackBill', 'yes']
+                                , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HGy_BarCodeBill', 'yes']
                                 , resize: false
                             })
                         }
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Ji_CallGoodsBillMain.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Ji_CallGoodsBillMain.html"
new file mode 100644
index 0000000..c1fbc68
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Ji_CallGoodsBillMain.html"
@@ -0,0 +1,359 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鍙枡鍗曞垪琛�</title>
+    <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/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.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 class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <div class="layui-colla-content">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">閮ㄩ棬</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HDeptID" id="HDeptID" style="width:190px;">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐗╂枡浠g爜</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="MaterialCode" id="MaterialCode" style="width:190px;">
+                                        </div>
+                                    </div>
+                                    <!--<hr />-->
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="MaterialName" id="MaterialName" style="width:190px;">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="SpecificationModel" id="SpecificationModel" style="width:190px;">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鍙戞枡浠撳簱</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="Warehouse" id="Warehouse" style="width:190px;">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">婧愬崟鍗曞彿</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo" style="width:190px;">
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鍒跺崟浜�</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="Hmaker" id="Hmaker" style="width:190px;">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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
+            
+            var sWhere = "";
+            var option = [];
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    ////鏂板
+                    //case 'set_AddNew': set_AddNew();
+                    //    break;
+                    ////缂栬緫
+                    //case 'set_ShowBill': set_ShowBill();
+                    //    break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    ////鍒锋柊
+                    //case 'get_Refresh': get_Refresh();
+                    //    break;
+                    ////閫�鍑烘寜閽�
+                    //case 'get_Exit': Pub_Close(2);
+                    //    break;
+                };
+            });
+
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+                get_FastQuery();
+            });
+            //#endregion
+
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+                //鏃ユ湡鍒濆鍖�
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+            }
+            //#endregion
+
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        /*    { field: 'hmainid', title: 'hmainid', width: 110 }*/
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 170 }
+                        , { field: '閫�鍥炰汉', title: '閫�鍥炰汉', width: 170 }
+                        , { field: '閫�鍥炴棩鏈�', title: '閫�鍥炴棩鏈�', width: 200, templet: "<div>{{d.閫�鍥炴棩鏈� ==null ?'':layui.util.toDateString(d.閫�鍥炴棩鏈�, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '閫�鍥炲師鍥�', title: '閫�鍥炲師鍥�', width: 170 }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '淇敼浜�', title: '淇敼浜�' }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 170 }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 170 }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 170 }
+                        , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 170 }
+                        , { field: '婧愬崟鍙�', title: '婧愬崟鍙�', width: 170 }
+                        , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟', width: 170 }
+                        , { field: '鍙枡浜轰唬鐮�', title: '鍙枡浜轰唬鐮�', width: 170 }
+                        , { field: '鍙枡浜�', title: '鍙枡浜�', width: 170 }
+                        , { field: '閰嶉�佷汉浠g爜', title: '閰嶉�佷汉浠g爜', width: 170 }
+                        , { field: '閰嶉�佷汉', title: '閰嶉�佷汉', width: 170 }
+                        , { field: '淇濈浜轰唬鐮�', title: '淇濈浜轰唬鐮�', width: 170 }
+                        , { field: '淇濈浜�', title: '淇濈浜�', width: 170 }
+                        , { field: '鍙枡妯″紡', title: '鍙枡妯″紡', width: 170 }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 170 }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 170 }
+                        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 170 }
+                        , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 170 }
+                        , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 170 }
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 170 }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
+                        , { field: '鏁伴噺', title: '鏁伴噺', width: 170 }
+                        , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜', width: 170 }
+                        , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 170 }
+                        , { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜', width: 170 }
+                        , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О', width: 170 }
+                        , { field: '浠撲綅鍚嶇О', title: '浠撲綅鍚嶇О', width: 170 }
+                    ]]
+                };
+            }
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+                $("#HBillNo").val("");//鍗曟嵁鍙�
+                $("#HDeptID").val("");//閮ㄩ棬
+                $("#MaterialCode").val("");//鐗╂枡浠g爜
+                $("#MaterialName").val("");//鐗╂枡鍚嶇О
+                $("#SpecificationModel").val("");//瑙勬牸鍨嬪彿
+                $("#Warehouse").val("");//鍙戞枡浠撳簱
+                $("#HSourceBillNo").val("");//婧愬崟鍗曞彿
+                $("#Hmaker").val("");//鍒跺崟浜�
+
+                $("#btnSearch").click();//鍒锋柊
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Cj_CallGoodsBillMain/CallGoodsBillMainList',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                            //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_FastQuery() {
+                var HBeginDate =   $("#HBeginDate").val("");//寮�濮嬫椂闂�
+                var HEndDate = $("#HEndDate").val("");//缁撴潫鏃堕棿
+                var HBillNo = $("#HBillNo").val("");//鍗曟嵁鍙�
+                var HDeptID =$("#HDeptID").val("");//閮ㄩ棬
+                var MaterialCode = $("#MaterialCode").val("");//鐗╂枡浠g爜
+                var MaterialName =$("#MaterialName").val("");//鐗╂枡鍚嶇О
+                var SpecificationModel =$("#SpecificationModel").val("");//瑙勬牸鍨嬪彿
+                var Warehouse = $("#Warehouse").val("");//鍙戞枡浠撳簱
+                var HSourceBillNo = $("#HSourceBillNo").val("");//婧愬崟鍗曞彿
+                var Hmaker =$("#Hmaker").val("");//鍒跺崟浜�
+
+                if (HBeginDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
+                }
+                if (HEndDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                if (HDeptID) {
+                    sWhere += " and 閮ㄩ棬鍚嶇О like '%" + HDeptID + "%'";
+                }
+                if (MaterialCode) {
+                    sWhere += " and 鐗╂枡浠g爜 like '%" + MaterialCode + "%'";
+                }
+                if (MaterialName) {
+                    sWhere += " and 鐗╂枡鍚嶇О like '%" + MaterialName + "%'";
+                }
+                if (SpecificationModel) {
+                    sWhere += " and 瑙勬牸鍨嬪彿 like '%" + SpecificationModel + "%'";
+                }
+                if (Warehouse) {
+                    sWhere += " and 浠撳簱鍚嶇О like '%" + Warehouse + "%'";
+                }
+                if (HSourceBillNo) {
+                    sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'";
+                }
+                if (Hmaker) {
+                    sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            ////#region 鍒锋柊
+            //function get_Refresh() {
+            //    set_ClearQuery();
+            //    get_Display(sWhere);
+            //}
+            ////#endregion
+
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file

--
Gitblit v1.9.1