From 43a843bc96530149741647cf6bc54b28a2cadba5 Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期日, 02 一月 2022 19:14:26 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI --- WebTM/views/生产管理/生产退库单/Sc_ProductionReturnList.html | 321 +++++ WebTM/views/基础资料/公用基础资料/xmlLBM_ICStockBill.aspx.cs | 17 WebTM/views/grf/销售退货单.grf | 702 +++++++++++ WebTM/views/user/login.html | 23 WebTM/views/验收入库/产品入库/Kf_ProductInBillList.html | 236 +- WebTM/views/销售管理/销售退货单/Kf_ICStockBillMainList.html | 132 - WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 59 WebTM/views/仓存管理/分步式调入单/Fb_StepFoldinBillList.html | 346 +++++ WebTM/views/采购管理/采购退料单/Cg_PurchaseReturnList.html | 92 - WebTM/views/领料发货/其他出库/Kf_OtherOutBillList.html | 452 ++++-- WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 21 WebTM/views/Baseset/SRM_OpenTmpList.html | 2 WebTM/views/index.html | 11 WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 3 WebTM/views/验收入库/其他入库/Kf_OtherInBillList.html | 313 ++-- WebTM/views/销售管理/销售退货单/Add_Edit_Kf_ICStockBillMainList.html | 5 WebTM/WebTM.csproj.user | 2 WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 12 WebTM/views/基础资料/基础资料/Sc_MouldStockBillMain_Temp.html | 262 ++++ WebTM/views/验收入库/委外入库/Kf_EntrustInBillList.html | 457 ++++--- WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html | 5 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html | 5 WebTM/views/基础资料/基础资料/Gy_StockCheckItemEdit.html | 4 WebTM/views/基础资料/公用基础资料/xmlLBM_ICStockBill.aspx | 28 WebTM/views/video/jingbao.wav | 0 WebTM/views/领料发货/领料出库/Kf_MateOutBackBillList.html | 47 WebTM/views/基础资料/公用基础资料/xmlLBM_EquipFileMainBill.aspx.designer.cs | 2 WebTM/views/采购管理/委外订单/WW_EntrustOrderBillList.html | 18 WebTM/views/基础资料/公用基础资料/xmlLBM_ICStockBill.aspx.designer.cs | 26 WebTM/layuiadmin/Scripts/webConfig.js | 4 WebTM/WebTM.csproj | 13 WebTM/views/基础资料/基础资料/InventoryAnalysis.html | 127 + 32 files changed, 2,809 insertions(+), 938 deletions(-) diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user index 5dd12ea..318aba9 100644 --- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user +++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user @@ -15,10 +15,10 @@ <publishTime>12/20/2021 13:06:38</publishTime> </File> <File Include="bin/WebTM.dll"> - <publishTime>12/28/2021 20:37:45</publishTime> + <publishTime>12/30/2021 13:12:31</publishTime> </File> <File Include="bin/WebTM.pdb"> - <publishTime>12/28/2021 20:37:45</publishTime> + <publishTime>12/30/2021 13:12:31</publishTime> </File> <File Include="layuiadmin/config.js"> <publishTime>12/20/2021 13:06:37</publishTime> @@ -771,7 +771,7 @@ <publishTime>12/20/2021 13:06:38</publishTime> </File> <File Include="views/Baseset/SRM_OpenTmpList.html"> - <publishTime>12/20/2021 13:06:38</publishTime> + <publishTime>12/29/2021 20:35:08</publishTime> </File> <File Include="views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html"> <publishTime>12/27/2021 08:49:42</publishTime> @@ -1127,6 +1127,9 @@ <File Include="views/grf/璁惧妗f.grf"> <publishTime>12/27/2021 08:49:42</publishTime> </File> + <File Include="views/grf/閿�鍞��璐у崟.grf"> + <publishTime>12/29/2021 20:20:27</publishTime> + </File> <File Include="views/GRInstall.js"> <publishTime>12/20/2021 13:06:38</publishTime> </File> @@ -1158,7 +1161,7 @@ <publishTime>12/20/2021 13:06:38</publishTime> </File> <File Include="views/index.html"> - <publishTime>12/28/2021 20:15:31</publishTime> + <publishTime>12/30/2021 13:08:32</publishTime> </File> <File Include="views/indexMenu.html"> <publishTime>12/20/2021 13:06:38</publishTime> @@ -1440,7 +1443,7 @@ <publishTime>12/20/2021 13:06:38</publishTime> </File> <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html"> - <publishTime>12/27/2021 08:49:42</publishTime> + <publishTime>12/30/2021 09:06:05</publishTime> </File> <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_FastList.html"> <publishTime>12/27/2021 08:49:42</publishTime> @@ -1450,6 +1453,9 @@ </File> <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_UpMoveStockBill.html"> <publishTime>12/20/2021 13:06:38</publishTime> + </File> + <File Include="views/浠撳瓨绠$悊/鍒嗘寮忚皟鍏ュ崟/Fb_StepFoldinBillList.html"> + <publishTime>12/30/2021 09:37:05</publishTime> </File> <File Include="views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html"> <publishTime>12/20/2021 13:06:38</publishTime> @@ -1543,6 +1549,9 @@ </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/grf/鍣ㄥ叿閲囪喘鍏ュ簱鍗�.grf"> <publishTime>12/20/2021 13:06:38</publishTime> + </File> + <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/grf/閿�鍞��璐у崟.grf"> + <publishTime>12/29/2021 20:32:10</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html"> <publishTime>12/20/2021 13:06:38</publishTime> @@ -1698,7 +1707,7 @@ <publishTime>12/20/2021 13:06:38</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html"> - <publishTime>12/27/2021 08:49:42</publishTime> + <publishTime>12/29/2021 20:31:56</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Pay_PeriodInfoSet.html"> <publishTime>12/20/2021 13:06:38</publishTime> @@ -1726,6 +1735,9 @@ </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Gy_Material.aspx"> <publishTime>12/20/2021 13:06:38</publishTime> + </File> + <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_ICStockBill.aspx"> + <publishTime>12/29/2021 20:29:19</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_MouldDotCheckBill.aspx"> <publishTime>12/20/2021 13:06:38</publishTime> @@ -1833,7 +1845,7 @@ <publishTime>12/20/2021 13:06:38</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html"> - <publishTime>12/27/2021 08:49:42</publishTime> + <publishTime>12/29/2021 20:31:56</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/test.html"> <publishTime>08/27/2021 09:06:17</publishTime> @@ -2151,7 +2163,7 @@ <publishTime>12/20/2021 13:06:38</publishTime> </File> <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillList.html"> - <publishTime>12/20/2021 13:06:38</publishTime> + <publishTime>12/29/2021 20:40:25</publishTime> </File> <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBill.html"> <publishTime>12/27/2021 08:49:42</publishTime> @@ -2633,6 +2645,9 @@ <File Include="views/鐢熶骇绠$悊/鐢熶骇璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBillList.html"> <publishTime>09/08/2021 08:34:08</publishTime> </File> + <File Include="views/鐢熶骇绠$悊/鐢熶骇閫�搴撳崟/Sc_ProductionReturnList.html"> + <publishTime>12/29/2021 15:47:51</publishTime> + </File> <File Include="views/鐢熶骇绠$悊/缁勮鍗�/Sc_GroupOrderBillList.html"> <publishTime>12/20/2021 13:06:39</publishTime> </File> @@ -3036,7 +3051,7 @@ <publishTime>10/19/2021 16:08:25</publishTime> </File> <File Include="views/閲囪喘绠$悊/閲囪喘閫�鏂欏崟/Cg_PurchaseReturnList.html"> - <publishTime>12/28/2021 20:37:26</publishTime> + <publishTime>12/29/2021 19:52:18</publishTime> </File> <File Include="views/閲囪喘绠$悊/閲囪喘閫�鏂欏崟/Cg_PurchaseReturn_Add_Up.html"> <publishTime>12/28/2021 15:13:35</publishTime> @@ -3084,7 +3099,7 @@ <publishTime>12/28/2021 15:08:32</publishTime> </File> <File Include="views/閿�鍞鐞�/閿�鍞��璐у崟/Kf_ICStockBillMainList.html"> - <publishTime>12/28/2021 20:00:18</publishTime> + <publishTime>12/29/2021 20:11:20</publishTime> </File> <File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBackBill_Fast.html"> <publishTime>12/20/2021 13:06:39</publishTime> @@ -3132,10 +3147,10 @@ <publishTime>12/20/2021 13:06:39</publishTime> </File> <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html"> - <publishTime>12/27/2021 13:30:20</publishTime> + <publishTime>12/30/2021 10:51:05</publishTime> </File> <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html"> - <publishTime>12/27/2021 13:30:20</publishTime> + <publishTime>12/30/2021 10:51:05</publishTime> </File> <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html"> <publishTime>12/27/2021 08:49:42</publishTime> @@ -3144,7 +3159,7 @@ <publishTime>12/28/2021 15:14:46</publishTime> </File> <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBillList.html"> - <publishTime>12/20/2021 13:06:39</publishTime> + <publishTime>12/30/2021 10:07:04</publishTime> </File> <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBill_Fast.html"> <publishTime>09/07/2021 17:39:21</publishTime> @@ -3162,7 +3177,7 @@ <publishTime>12/20/2021 13:06:39</publishTime> </File> <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Fast.html"> - <publishTime>12/27/2021 08:49:42</publishTime> + <publishTime>12/29/2021 09:26:12</publishTime> </File> <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_FastList.html"> <publishTime>12/27/2021 08:49:42</publishTime> @@ -3180,7 +3195,7 @@ <publishTime>12/28/2021 15:56:41</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html"> - <publishTime>12/27/2021 08:49:42</publishTime> + <publishTime>12/29/2021 09:26:12</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_FastList.html"> <publishTime>12/27/2021 08:49:42</publishTime> @@ -3195,10 +3210,10 @@ <publishTime>12/20/2021 13:06:39</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBillList.html"> - <publishTime>12/20/2021 13:06:39</publishTime> + <publishTime>12/29/2021 14:27:19</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBillList.html"> - <publishTime>12/20/2021 13:06:39</publishTime> + <publishTime>12/29/2021 14:27:19</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html"> <publishTime>12/20/2021 13:06:39</publishTime> @@ -3222,10 +3237,10 @@ <publishTime>12/20/2021 13:06:39</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html"> - <publishTime>12/20/2021 13:06:39</publishTime> + <publishTime>12/29/2021 09:26:12</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_FastList.html"> - <publishTime>12/27/2021 08:49:42</publishTime> + <publishTime>12/29/2021 09:26:12</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/qrscan.js"> <publishTime>12/20/2021 13:06:39</publishTime> @@ -3237,10 +3252,10 @@ <publishTime>12/20/2021 13:06:39</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBillList.html"> - <publishTime>12/20/2021 13:06:39</publishTime> + <publishTime>12/29/2021 16:19:41</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBillList.html"> - <publishTime>12/20/2021 13:06:39</publishTime> + <publishTime>12/29/2021 16:19:41</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html"> <publishTime>12/20/2021 13:06:39</publishTime> @@ -3249,7 +3264,7 @@ <publishTime>12/20/2021 13:06:39</publishTime> </File> <File Include="Web.config"> - <publishTime>12/28/2021 20:37:53</publishTime> + <publishTime>12/30/2021 13:12:41</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj index 46f3c65..abaa193 100644 --- a/WebTM/WebTM.csproj +++ b/WebTM/WebTM.csproj @@ -124,7 +124,9 @@ <Content Include="views\PublicPage\transfer.html" /> <Content Include="views\ReportHtml.html" /> <Content Include="views\test\testRenderAutomationList.html" /> + <Content Include="views\video\jingbao.wav" /> <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Kf_MoveStockStepOutBill_Fast.html" /> + <Content Include="views\浠撳瓨绠$悊\鍒嗘寮忚皟鍏ュ崟\Fb_StepFoldinBillList.html" /> <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderBackInfo.html" /> <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderBackInfo.html.html" /> <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderLev.html" /> @@ -167,6 +169,7 @@ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿閲囪喘鍏ュ簱鍗�.grf" /> <Content Include="views\grf\璁惧妗f.grf" /> <Content Include="views\grf\鍣ㄥ叿妗f.grf" /> + <Content Include="views\grf\閿�鍞��璐у崟.grf" /> <None Include="Web.Debug.config"> <DependentUpon>Web.config</DependentUpon> </None> @@ -578,6 +581,7 @@ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx" /> <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Material.aspx" /> <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_DepartmentList.html" /> + <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_ICStockBill.aspx" /> <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldDotCheckBill.aspx" /> <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldDotCheckPlanBill.aspx" /> <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldFileMainBill.aspx" /> @@ -609,6 +613,7 @@ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemEdit.html" /> <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemList.html" /> <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\InventoryAnalysis.html" /> + <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Sc_MouldStockBillMain_Temp.html" /> <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceList.html" /> <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_Group_Add_Edit.html" /> <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPrice.html" /> @@ -780,6 +785,7 @@ <Content Include="views\鐢熶骇绠$悊\鐢熶骇姹囨姤鍗昞Sc_ICMOReportBill_FastNew.html" /> <Content Include="views\鐢熶骇绠$悊\鐢熶骇姹囨姤鍗昞Sc_Add_ICMOReportBillList.html" /> <Content Include="views\鐢熶骇绠$悊\鐢熶骇缁勮杩芥函鍗昞Sc_AssemblyBillList.html" /> + <Content Include="views\鐢熶骇绠$悊\鐢熶骇閫�搴撳崟\Sc_ProductionReturnList.html" /> <Content Include="views\鐢熶骇绠$悊\缁勮鍗昞Sc_GroupOrderBillList.html" /> <Content Include="views\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBill.html" /> <Content Include="views\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillList.html" /> @@ -1011,6 +1017,13 @@ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Department_Edit.aspx.designer.cs"> <DependentUpon>xmlLBM_Gy_Department_Edit.aspx</DependentUpon> </Compile> + <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_ICStockBill.aspx.cs"> + <DependentUpon>xmlLBM_ICStockBill.aspx</DependentUpon> + <SubType>ASPXCodeBehind</SubType> + </Compile> + <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_ICStockBill.aspx.designer.cs"> + <DependentUpon>xmlLBM_ICStockBill.aspx</DependentUpon> + </Compile> <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldDotCheckBill.aspx.cs"> <DependentUpon>xmlLBM_MouldDotCheckBill.aspx</DependentUpon> <SubType>ASPXCodeBehind</SubType> diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user index c6cc746..a1d4016 100644 --- a/WebTM/WebTM.csproj.user +++ b/WebTM/WebTM.csproj.user @@ -2,7 +2,7 @@ <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <NameOfLastUsedPublishProfile>D:\鏅轰簯MES\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile> - <ProjectView>ProjectFiles</ProjectView> + <ProjectView>ShowAllFiles</ProjectView> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> <Use64BitIISExpress /> diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js index cd0b984..7200798 100644 --- a/WebTM/layuiadmin/Scripts/webConfig.js +++ b/WebTM/layuiadmin/Scripts/webConfig.js @@ -6,8 +6,8 @@ //var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃� //var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃� //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆 - //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃� - var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆 + var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃� + //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆 //var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW //var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣� //var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃� diff --git a/WebTM/views/Baseset/SRM_OpenTmpList.html b/WebTM/views/Baseset/SRM_OpenTmpList.html index 6ddf1e8..a1f1ed6 100644 --- a/WebTM/views/Baseset/SRM_OpenTmpList.html +++ b/WebTM/views/Baseset/SRM_OpenTmpList.html @@ -88,6 +88,7 @@ var linterid = params[params[0]]; var MyMsg = params[params[1]]; var Type = params[params[2]]; + //var lentryid = params[params[1]]; ///鍔犺浇鏄剧ず鏁版嵁 function RoadList(Where) { @@ -227,6 +228,7 @@ var checkStatus = table.checkStatus('mainTable') , data = checkStatus.data; var OpenTmp = data[0].妯℃澘鍚嶇О; + //鎵撳紑鎵撳嵃妯℃澘 window.open("../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString()); //鏍规嵁妯″潡鑾峰彇WEBAPI閾炬帴 diff --git "a/WebTM/views/grf/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225.grf" "b/WebTM/views/grf/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225.grf" new file mode 100644 index 0000000..f6c5d41 --- /dev/null +++ "b/WebTM/views/grf/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225.grf" @@ -0,0 +1,702 @@ +锘縊bject Report + Version='6.0.0.6' + Object Font + Name='瀹嬩綋' + Size=105000,0 + Weight=400 + Charset=134 + End + Object Printer + Size=256 + Width=21.7 + Height=13.97 + LeftMargin=1.5 + TopMargin=1.5 + RightMargin=1.5 + BottomMargin=1.5 + End + Object DetailGrid + Object Recordset + Items Field + Item + Name='鎺ユ敹鍗曚綅' + DBFieldName='搴撳瓨缁勭粐' + End + Item + Name='閮ㄩ棬' + End + Item + Name='鍗曟嵁鍙�' + End + Item + Name='鏀舵枡浠撳簱' + DBFieldName='鏀舵枡浠撳簱鍚嶇О' + End + Item + Name='鏃ユ湡' + Type=DateTime + Format='yyyy/MM/dd' + End + Item + Name='鐗╂枡浠g爜' + End + Item + Name='鐗╂枡鍚嶇О' + End + Item + Name='瑙勬牸鍨嬪彿' + End + Item + Name='璁¢噺鍗曚綅' + End + Item + Name='瀹炴敹鏁伴噺' + End + Item + Name='瀛愬娉�' + End + Item + Name='鍒跺崟浜�' + End + Item + Name='鍒跺崟鏃ユ湡' + Type=DateTime + Format='yyyy/MM/dd' + End + Item + Name='瀹℃牳浜�' + End + End + End + Items Column + Item + Name='Column14' + Width=1.69333 + End + Item + Name='Column1' + Width=2.98979 + End + Item + Name='Column2' + Width=5.21229 + End + Item + Name='Column3' + Width=2.80458 + End + Item + Name='Column8' + Width=2.19604 + End + Item + Name='Column9' + Width=1.98438 + End + Item + Name='Column12' + Width=1.48167 + End + End + Object ColumnContent + Height=1.00542 + AdjustRowHeight=F + RowsPerPage=6 + Items ColumnContentCell + Item + Column='Column14' + FreeCell=T + Items Control + Item + Type=SystemVarBox + Name='SystemVarBox3' + Left=0.5 + Top=-0.8 + Width=1.5875 + Height=0.608542 + SystemVar=RowNo + End + Item + Type=SystemVarBox + Name='SystemVarBox4' + Center=Both + Left=0.238125 + Top=0.079375 + Width=1.19063 + Height=0.79375 + Object Font + Name='瀹嬩綋' + Size=90000,0 + Weight=400 + Charset=134 + End + TextAlign=MiddleCenter + SystemVar=RowNo + End + End + End + Item + Column='Column1' + Object Font + Name='瀹嬩綋' + Size=90000,0 + Weight=400 + Charset=134 + End + TextAlign=MiddleCenter + DataField='鐗╂枡浠g爜' + End + Item + Column='Column2' + Object Font + Name='瀹嬩綋' + Size=90000,0 + Weight=400 + Charset=134 + End + TextAlign=MiddleCenter + CanGrow=T + CanShrink=T + ShrinkFontToFit=T + DataField='鐗╂枡鍚嶇О' + End + Item + Column='Column3' + Object Font + Name='瀹嬩綋' + Size=90000,0 + Weight=400 + Charset=134 + End + TextAlign=MiddleCenter + DataField='瑙勬牸鍨嬪彿' + End + Item + Column='Column8' + Object Font + Name='瀹嬩綋' + Size=90000,0 + Weight=400 + Charset=134 + End + WordWrap=T + DataField='璁¢噺鍗曚綅' + End + Item + Column='Column9' + Object Font + Name='瀹嬩綋' + Size=90000,0 + Weight=400 + Charset=134 + End + WordWrap=T + ShrinkFontToFit=T + DataField='瀹炴敹鏁伴噺' + End + Item + Column='Column12' + Object Font + Name='瀹嬩綋' + Size=90000,0 + Weight=400 + Charset=134 + End + DataField='瀛愬娉�' + End + End + End + Object ColumnTitle + Height=1.00542 + RepeatStyle=OnPage + Items ColumnTitleCell + Item + GroupTitle=F + Column='Column14' + Object Font + Name='瀹嬩綋' + Size=90000,0 + Weight=400 + Charset=134 + End + TextAlign=MiddleCenter + Text='搴忓彿' + End + Item + GroupTitle=F + Column='Column1' + Object Font + Name='瀹嬩綋' + Size=90000,0 + Weight=400 + Charset=134 + End + TextAlign=MiddleCenter + Text='鐗╂枡浠g爜' + End + Item + GroupTitle=F + Column='Column2' + Object Font + Name='瀹嬩綋' + Size=90000,0 + Weight=400 + Charset=134 + End + TextAlign=MiddleCenter + Text='瀹瑰櫒鍚嶇О' + End + Item + GroupTitle=F + Column='Column3' + Object Font + Name='瀹嬩綋' + Size=90000,0 + Weight=400 + Charset=134 + End + TextAlign=MiddleCenter + Text='瑙勬牸鍨嬪彿' + End + Item + GroupTitle=F + Column='Column8' + Object Font + Name='瀹嬩綋' + Size=90000,0 + Weight=400 + Charset=134 + End + TextAlign=MiddleCenter + Text='鍗曚綅' + End + Item + GroupTitle=F + Column='Column9' + Object Font + Name='瀹嬩綋' + Size=90000,0 + Weight=400 + Charset=134 + End + TextAlign=MiddleCenter + Text='鏁伴噺' + End + Item + GroupTitle=F + Column='Column12' + Object Font + Name='瀹嬩綋' + Size=90000,0 + Weight=400 + Charset=134 + End + TextAlign=MiddleCenter + Text='澶囨敞' + End + End + End + End + Items Parameter + Item + Name='椤电爜' + End + End + Items ReportHeader + Item + Name='ReportHeader1' + CanGrow=T + CanShrink=T + Height=3.81 + Object Font + Name='瀹嬩綋' + Size=105000,0 + Bold=T + Charset=134 + End + Items Control + Item + Type=MemoBox + Name='MemoBox1' + Left=5.00063 + Top=0.211667 + Width=8.59896 + Height=0.396875 + Object Font + Name='瀹嬩綋' + Size=120000,0 + Bold=T + Charset=134 + End + TextAlign=MiddleCenter + Text='[#鎺ュ彈鍗曚綅#]' + End + Item + Type=MemoBox + Name='MemoBox3' + Left=11.5888 + Top=1.79917 + Width=2.61938 + Height=0.608542 + Object Font + Name='瀹嬩綋' + Size=90000,0 + Bold=T + Charset=134 + End + Text='鍗曟嵁缂栧彿锛�' + End + Item + Type=MemoBox + Name='MemoBox4' + Left=6.64104 + Top=1.19063 + Width=5.42396 + Height=0.396875 + TextAlign=MiddleCenter + Text='鍣ㄥ叿鍏朵粬鍏ュ簱鍗�' + End + Item + Type=MemoBox + Name='MemoBox8' + Left=11.5888 + Top=2.59292 + Width=1.40229 + Height=0.608542 + Object Font + Name='瀹嬩綋' + Size=90000,0 + Bold=T + Charset=134 + End + Text='鏃ユ湡锛�' + End + Item + Type=FieldBox + Name='FieldBox1' + Left=13.2027 + Top=1.79917 + Width=2.98979 + Height=0.608542 + Object Font + Name='瀹嬩綋' + Size=90000,0 + Bold=T + Charset=134 + End + DataField='鍗曟嵁鍙�' + End + Item + Type=FieldBox + Name='FieldBox6' + Left=12.5942 + Top=2.59292 + Width=2.59292 + Height=0.608542 + Object Font + Name='瀹嬩綋' + Size=90000,0 + Bold=T + Charset=134 + End + DataField='鏃ユ湡' + End + Item + Type=PictureBox + Name='PictureBox1' + Left=0.608542 + Top=0.238125 + Width=2.98979 + Height=1.34938 + Picture=-8055 +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 + End + Item + Type=MemoBox + Name='MemoBox18' + Left=0.79375 + Top=2.59292 + Width=2.61938 + Height=0.608542 + Text='鏀舵枡浠撳簱锛�' + End + Item + Type=MemoBox + Name='MemoBox19' + Left=0.79375 + Top=1.79917 + Width=2.80458 + Height=0.608542 + Text='鍏ュ簱閮ㄩ棬锛�' + End + Item + Type=FieldBox + Name='FieldBox10' + Left=2.80458 + Top=2.59292 + Width=7.59354 + Height=0.608542 + DataField='鏀舵枡浠撳簱' + End + Item + Type=Barcode + Name='Barcode1' + Left=15.0019 + Width=2.19604 + Height=1.5875 + BarcodeType=QRCode + CaptionPosition=None + CheckSum=T + Text='#鍗曟嵁缂栧彿#' + End + Item + Type=FieldBox + Name='FieldBox11' + Left=2.80458 + Top=1.79917 + Width=6.19125 + Height=0.608542 + DataField='閮ㄩ棬' + End + End + RepeatOnPage=T + End + End + Items ReportFooter + Item + Name='ReportFooter1' + Height=0.79375 + Items Control + Item + Type=FreeGrid + Name='FreeGrid1' + Left=-0.0264583 + Top=-0.105833 + Object Border + Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom] + End + ColumnCount=2 + RowCount=1 + Items FreeGridColumn + Item[2] + Width=15.3988 + End + End + Items FreeGridRow + Item[1] + Height=0.555625 + End + End + Items FreeGridCell + Item[1,1] + FreeCell=T + Items Control + Item + Type=MemoBox + Name='MemoBox16' + Left=12.8058 + Width=1.79917 + Height=0.396875 + TextAlign=TopCenter + Text='鍚堣锛歕r\n' + End + Item + Type=SummaryBox + Name='SummaryBox1' + Left=14.2081 + Width=2.59292 + Height=0.396875 + TextAlign=MiddleCenter + DataField='瀹炴敹鏁伴噺' + End + End + ColSpan=2 + End + End + End + End + End + Item + Name='ReportFooter2' + CanGrow=T + CanShrink=T + Height=1.79917 + Items Control + Item + Type=MemoBox + Name='MemoBox10' + Left=0.211667 + Top=0.211667 + Width=1.98438 + Height=0.79375 + Object Font + Name='瀹嬩綋' + Size=105000,0 + Bold=T + Charset=134 + End + Text='鍒跺崟浜猴細' + End + Item + Type=FieldBox + Name='FieldBox7' + Left=1.5875 + Top=0.211667 + Width=2.61938 + Height=0.79375 + Object Font + Name='瀹嬩綋' + Size=105000,0 + Bold=T + Charset=134 + End + DataField='鍒跺崟浜�' + End + Item + Type=MemoBox + Name='MemoBox17' + Left=13.2027 + Top=0.238125 + Width=2.80458 + Height=0.79375 + Object Font + Name='瀹嬩綋' + Size=105000,0 + Bold=T + Charset=134 + End + Text='瀹℃牳浜猴細' + End + Item + Type=FieldBox + Name='FieldBox8' + Left=14.7902 + Top=0.211667 + Width=2.61938 + Height=0.79375 + Object Font + Name='瀹嬩綋' + Size=105000,0 + Bold=T + Charset=134 + End + DataField='瀹℃牳浜�' + End + Item + Type=MemoBox + Name='MemoBox20' + Left=4.60375 + Top=0.238125 + Width=2.59292 + Height=0.767292 + Object Font + Name='瀹嬩綋' + Size=105000,0 + Bold=T + Charset=134 + End + Text='纭锛�' + End + Item + Type=MemoBox + Name='MemoBox21' + Left=8.81062 + Top=0.211667 + Width=2.59292 + Height=0.79375 + Object Font + Name='瀹嬩綋' + Size=105000,0 + Bold=T + Charset=134 + End + Text='鎺ュ彈锛�' + End + End + RepeatOnPage=T + End + End +End diff --git a/WebTM/views/index.html b/WebTM/views/index.html index ae34278..ca09426 100644 --- a/WebTM/views/index.html +++ b/WebTM/views/index.html @@ -198,11 +198,11 @@ <dd><a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillList.html">閲囪喘鍏ュ簱鍗曠淮鎶�</a></dd> <dd><a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBillList.html">閲囪喘閫�鏂欏崟缁存姢</a></dd> <dd><a lay-href="楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBillList.html">鐢熶骇鍏ュ簱鍗曠淮鎶�</a></dd> - <dd><a lay-href="">鐢熶骇閫�搴撳崟缁存姢n</a></dd> + <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇閫�搴撳崟/Sc_ProductionReturnList.html">鐢熶骇閫�搴撳崟缁存姢</a></dd> <dd><a lay-href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBillList.html">鍏朵粬鍏ュ簱鍗曠淮鎶�</a></dd> <dd><a lay-href="楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBillList.html">濮斿鍔犲伐鍏ュ簱鍗曠淮鎶�</a></dd> <dd><a lay-href="棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBillList.html">濮斿鍔犲伐鍑哄簱鍗曠淮鎶�</a></dd> - <dd><a lay-href="">鍒嗘寮忚皟鍏ュ崟缁存姢n</a></dd> + <dd><a lay-href="浠撳瓨绠$悊/鍒嗘寮忚皟鍏ュ崟/Fb_StepFoldinBillList.html">鍒嗘寮忚皟鍏ュ崟缁存姢</a></dd> </dl> </dd> <dd> @@ -212,7 +212,7 @@ <dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBillList.html">鐢熶骇閫�鏂欏崟缁存姢</a></dd> <dd><a lay-href="">鐢熶骇琛ユ枡鍗曠淮鎶</a></dd> <dd><a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">閿�鍞嚭搴撳崟缁存姢</a></dd> - <dd><a lay-href="">閿�鍞��搴撳崟缁存姢</a></dd> + <dd><a lay-href="閿�鍞鐞�/閿�鍞��璐у崟/Kf_ICStockBillMainList.html">閿�鍞��璐у崟缁存姢</a></dd> <dd><a lay-href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBillList.html">鍏朵粬鍑哄簱鍗曠淮鎶�</a></dd> <dd><a lay-href="">鍒嗘寮忚皟鍑哄崟缁存姢n</a></dd> </dl> @@ -542,6 +542,9 @@ <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportMaterialReceipt.html">鐗╂枡鏀跺彂鏄庣粏鍙婃眹鎬�</a></dd> <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportInventoryAccount.html">搴撳瓨鍙拌处</a></dd> <dd><a lay-href="">鍣ㄥ叿灞ュ巻琛╪</a></dd> + <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_StockCheckItemList.html">鐩樼偣鏂规鍒楄〃</a></dd> + <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Sc_MouldStockBillMain_Temp.html">鐩樼偣璁板綍琛�</a></dd> + <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/InventoryAnalysis.html">鐩樼偣鍒嗘瀽鍒楄〃</a></dd> </dl> </dd> </dl> @@ -792,8 +795,6 @@ <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html">鐢熶骇鐝粍鍒楄〃</a></dd> <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html">涓嶈壇鍘熷洜鍒楄〃</a></dd> <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_ConkReasonList.html">鏁呴殰鍘熷洜鍒楄〃</a></dd> - <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_StockCheckItemList.html">鐩樼偣鏂规鍒楄〃</a></dd> - <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/InventoryAnalysis.html">鐩樼偣鍒嗘瀽鍒楄〃</a></dd> </dl> </dd> <dd> diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html index a4c05e0..f32fc94 100644 --- a/WebTM/views/user/login.html +++ b/WebTM/views/user/login.html @@ -18,6 +18,9 @@ </style> </head> <body> + <!--<audio id="cs" hidden controls> + <source src="../video/jingbao.wav" type="audio/ogg"> + </audio>--> <div class="layadmin-user-login layadmin-user-display-show" id="LAY-user-login" style="display: none;background-image:url(../userfiles/images/2.jpg);background-size: 100%;"> <div class="layadmin-user-login-main" style="margin: -5.8% auto;"> <div class="layadmin-user-login-box layadmin-user-login-header"> @@ -39,6 +42,7 @@ <input type="password" name="password" id="LAY-user-login-password" lay-verify="required" placeholder="瀵嗙爜" class="layui-input" style="background-color:transparent;color:white" autocomplete="off"> </div> <div class="layui-form-item"> + <!--<input type="button" onclick="playSound('wavFileId');" value="play" />--> <button type="button" lay-submit="" class="layui-btn layui-btn-fluid" id="LAY-user-login-submit" name="LAY-user-login-submit" lay-filter="LAY-user-login-submit">鐧� 鍏�</button> </div> </div> @@ -125,21 +129,18 @@ form.on("submit(LAY-user-login-submit)", function (obj) { loging(); }) - //瀵嗙爜妗嗗洖杞︽墽琛岀櫥褰� $('#LAY-user-login-password').on('keydown', function (e) { if (e.keyCode == 13) { - loging(); + playSound(); } }); - //鐢ㄦ埛鍚嶆鍥炶溅鍏夋爣绉诲埌瀵嗙爜妗� $('#LAY-user-login-username').on('keydown', function (e) { if (e.keyCode == 13) { $("#LAY-user-login-password").focus(); } }) - //鐧诲綍 function loging() { if ($("#Organization").val() == 0) { @@ -153,7 +154,7 @@ type: "get", //url: "http://61.130.49.162:9090/WMSAPI///Web/GetUser", url: GetWEBURL() + "/Web/GetUser", - data: { "UserName": UserName, "PassWord": PassWord, "HOrgName": $("#Organization").val()}, + data: { "UserName": UserName, "PassWord": PassWord, "HOrgName": $("#Organization").val() }, success: function (result) { if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝 layer.msg(result.Message, { icon: 1 }); @@ -189,7 +190,7 @@ sessionStorage["HProcName"] = result.data[0].HProcName; sessionStorage["HProcID"] = result.data[0].HProcID; sessionStorage["login"] = "login"; - sessionStorage["OrganizationID"] = $("#Organization").val(); + sessionStorage["OrganizationID"] = $("#Organization").val(); sessionStorage["Organization"] = $("#Organization option:selected").text(); //sessionStorage["IP"] = System.Configuration.ConfigurationSettings.AppSettings("name"); if (!judgeMorPCflag) {//绉诲姩绔� @@ -211,8 +212,14 @@ } }) } - - + function playSound() { + var audio = document.getElementById("cs"); + if (audio == null) + $("body").append('<audio id="cs" hidden controls> <source src = "../video/jingbao.wav" type = "audio/ogg"> </audio >'); + var audio = document.getElementById("cs"); + audio.play(); + } + }); </script> </body> diff --git a/WebTM/views/video/jingbao.wav b/WebTM/views/video/jingbao.wav new file mode 100644 index 0000000..093bc4c --- /dev/null +++ b/WebTM/views/video/jingbao.wav Binary files differ diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" index 7ff5d02..2a413c6 100644 --- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" +++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" @@ -48,10 +48,11 @@ <select name=" HBillType" id="HBillType"> <option value="-1">鎵嬪伐褰曞叆</option> <option value="3720">鐢熶骇浠诲姟鍗�-鎶曟枡</option> + <option value="1243">璋冩嫧鐢宠鍗�</option> <!--<option value="1201">濮斿璁㈠崟-鎶曟枡</option> <option value="1402">鍙戣揣閫氱煡鍗�</option> - <option value="1234">涓嬫灦閫氱煡鍗�</option>--> - <option value="1243">璋冩嫧鐢宠鍗�</option> + <option value="1234">涓嬫灦閫氱煡鍗�</option> + <option value="1243">璋冩嫧鐢宠鍗�</option>--> </select> <!--<input type="text" name="cmbSourceType" id="cmbSourceType" lay-verify="cmbSourceType" autocomplete="off" class="layui-input">--> </div> diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillList.html" new file mode 100644 index 0000000..630d212 --- /dev/null +++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillList.html" @@ -0,0 +1,346 @@ +锘�<!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/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> + + <style type="text/css"> + input.layui-input.layui-unselect { + padding-right: 0; + } + </style> +</head> +<body> + <div class="layui-fluid"> + <div class="layui-col-md12"> + <div class="layui-card" style="padding: 1px"> + <div class="layui-card-body" style="padding: 1px;"> + <form class="layui-form" action="" lay-filter="component-form-group"> + <div class="layui-collapse"> + <div class="layui-colla-item"> + <div class="layui-colla-title layui-inline"> + <div class="layui-inline"> + <span>鏇村</span> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">寮�濮嬫棩鏈�</label> + <div class="layui-input-block"> + <input type="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="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="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="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="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-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="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button> + </div> + </script> + </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 + , util = layui.util + //鏌ヨ鏉′欢 + var sWhere = ""; + var option = []; + //#endregion + + //#region 杩涘叆椤甸潰鍔犺浇 + //鍒濆鍖栫晫闈� + set_ClearBill(); + //#endregion + + //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛� + // 閲嶇疆鎸夐挳 + form.on('submit(btnReSearch)', function (data) { + //娓呯┖杩囨护鏉′欢 + set_ClearQuery(); + }); + // 鏌ヨ鎸夐挳 + form.on('submit(btnSearch)', function (data) { + get_FastQuery(); + }); + + //#endregion + + //#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")); + } + // 鍒濆鍖栬〃鏍兼柟娉� + function set_InitGrid() { + option = { + elem: '#mainTable' + , toolbar: '#toolbarDemo' + , height: 'full-50' + , page: true + , cellMinWidth: 90 + , limits: [50, 500, 1000, 5000, 10000] + , limit: 50 + , cols: [[ + { type: 'checkbox', fixed: 'left' } + , { field: 'hmainid', title: '鍗曟嵁ID', hide: true } + , { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" } + , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195 } + , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110 } + , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 110 } + , { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜', width: 125 } + , { field: '浠撳簱鍚嶇О', title: '浠撳簱', width: 125 } + , { field: '棰嗘枡浜轰唬鐮�', title: '棰嗘枡浜轰唬鐮�', width: 180 } + , { field: '棰嗘枡浜�', title: '棰嗘枡浜�', width: 125 } + , { field: '鍙戞枡浜轰唬鐮�', title: '鍙戞枡浜轰唬鐮�', width: 180 } + , { field: '鍙戞枡浜�', title: '鍙戞枡浜�', width: 125 } + , { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true } + , { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true } + , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true } + , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 115 } + , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125 } + , { field: '鎽樿', title: '鎽樿', width: 125 } + , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 125 } + , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 115 } + , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true } + , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 125 } + , { field: 'HUnitID', title: 'Hunitid', width: 200, hide: true } + //, { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 125 } + //, { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 125 } + , { field: '璋冩嫧绫诲瀷', title: '璋冩嫧绫诲瀷', width: 100 } + , { field: '璋冨叆缁勭粐', title: '璋冨叆缁勭粐', width: 125 } + , { field: 'HWHID', title: 'HWHID', width: 200, hide: true } + , { field: '璋冨叆浠撳簱浠g爜', title: '璋冨叆浠撳簱浠g爜', width: 125 } + , { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 125 } + , { field: 'HSPID', title: 'HSPID', width: 200, hide: true } + , { field: '璋冨叆浠撲綅浠g爜', title: '璋冨叆浠撲綅浠g爜', width: 125, hide: true } + , { field: '璋冨叆浠撲綅', title: '璋冨叆浠撲綅', width: 125, hide: true } + , { field: 'HSCWHID', title: 'HSCWHID', width: 200, hide: true } + , { field: '璋冨嚭浠撳簱浠g爜', title: '璋冨嚭浠撳簱浠g爜', width: 125 } + , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 125 } + , { field: 'HSCSPID', title: 'HSCSPID', width: 200, hide: true } + , { field: '璋冨嚭浠撲綅浠g爜', title: '璋冨嚭浠撲綅浠g爜', width: 125, hide: true } + , { field: '璋冨嚭浠撲綅', title: '璋冨嚭浠撲綅', width: 125, hide: true } + , { field: '搴斿彂鏁伴噺', title: '搴斿彂鏁伴噺', width: 125 } + , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', width: 125 } + , { field: '鍗曚环', title: '鍗曚环', width: 125 } + , { field: '閲戦', title: '閲戦', width: 125 } + , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 125 } + , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 125 } + , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 125 } + , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 } + , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } + , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125 } + , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } + , { field: '淇敼浜�', title: '淇敼浜�', width: 125 } + , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } + , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125 } + , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } + , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125 } + , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } + , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 125 } + , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 125 } + , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true } + , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true } + , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 125 } + , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 125 } + ]] + }; + } + //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� + function get_Display(sWhere) { + var ajaxLoad = layer.load(); + $.ajax({ + url: GetWEBURL() + '/Kf_StepFoldinBill/GetStepFoldinBillList', + type: "GET", + data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] }, + success: function (data1) { + if (data1.count == 1) { + option.data = data1.data; + table.render(option); + layer.close(ajaxLoad); + } else { + layer.close(ajaxLoad); + layer.alert(data1.code + data1.Message, { icon: 5 }); + } + }, error: function () { + layer.close(ajaxLoad); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } + + // 蹇�熻繃婊� + function get_FastQuery() { + var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈� + var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡 + var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙� + var HDeptID = $("#HDeptID").val();//閮ㄩ棬 + var MaterialCode = $("#MaterialCode").val();//鐗╂枡浠g爜 + var MaterialName = $("#MaterialName").val();//鐗╂枡鍚嶇О + var SpecificationModel = $("#SpecificationModel").val();//瑙勬牸鍨嬪彿 + var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿 + var Warehouse = $("#Warehouse").val();//浠撳簱 + var Hmaker = $("#Hmaker").val();//鍒跺崟浜� + if (HDate) { + sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'"; + } + if (HDate1) { + sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'"; + } + 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 (HSourceBillNo) { + sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'"; + } + if (Warehouse) { + sWhere += " and 浠撳簱鍚嶇О like '%" + Warehouse + "%'"; + } + if (Hmaker) { + sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'"; + } + get_Display(sWhere); + sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨 + } + + // 閲嶇疆杩囨护鏉′欢 + 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();//瑙勬牸鍨嬪彿 + $("#HSourceBillNo").val();//婧愬崟鍗曞彿 + $("#Warehouse").val();//浠撳簱 + $("#Hmaker").val();//鍒跺崟浜� + sWhere = ""; + get_Display(sWhere); + } + + //#endregion + + //浠ヤ笂鏄痩ayui妯″潡 + }); + + + + + </script> +</body> +</html> \ 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/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 af32e3c..b48b294 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" @@ -144,6 +144,9 @@ case "HMouldFileMainBill"://妯″叿妗f鎵撳嵃 CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_MouldFileMainBill.aspx?linterid=" + value, true, ""); break; + case "ICStockBill"://閿�鍞��璐у崟鎵撳嵃 + CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_ICStockBill.aspx?linterid=" + value, true, ""); + break; } </script> 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_EquipFileMainBill.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_EquipFileMainBill.aspx.designer.cs" index b8aa324..c488bb6 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_EquipFileMainBill.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_EquipFileMainBill.aspx.designer.cs" @@ -11,7 +11,7 @@ { - public partial class xmlLBM_EquipFileMainBill + public partial class xmlLBM_ICStockBill { /// <summary> 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_ICStockBill.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_ICStockBill.aspx" new file mode 100644 index 0000000..7a1efe4 --- /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_ICStockBill.aspx" @@ -0,0 +1,28 @@ +锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_ICStockBill.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_ICStockBill1" %> + +<!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_K3 where hmainid=1781"); + SqlXMLReportData.GenOneRecordset(this, "select * from h_v_IF_Kf_ICStockBillMain where hmainid=" + Request.Params["linterid"]); + } +</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_ICStockBill.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_ICStockBill.aspx.cs" new file mode 100644 index 0000000..4ac5a2d --- /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_ICStockBill.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_ICStockBill1 : 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_ICStockBill.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_ICStockBill.aspx.designer.cs" new file mode 100644 index 0000000..4598a8b --- /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_ICStockBill.aspx.designer.cs" @@ -0,0 +1,26 @@ +锘�//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆� +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆� +// </鑷姩鐢熸垚> +//------------------------------------------------------------------------------ + +namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡 +{ + + + public partial class xmlLBM_ICStockBill1 + { + + /// <summary> + /// form1 鎺т欢銆� + /// </summary> + /// <remarks> + /// 鑷姩鐢熸垚鐨勫瓧娈点�� + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲�� + /// </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\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemEdit.html" index 0ce17de..f15cf38 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemEdit.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemEdit.html" @@ -267,6 +267,10 @@ layer.msg("璇峰~鍐欏悕绉�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); return false; } + if ($("#HEndDate").val() == '') { + layer.msg("璇峰~鍐欐埅姝㈡椂闂�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return false; + } else { return true; } diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html" index 495f989..91be80f 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html" @@ -17,37 +17,42 @@ </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;"> - + <div class="layui-row layui-col-space15"> + <div class="layui-col-md12"> + <div class="layui-card"> <form class="layui-form" action="" lay-filter="component-form-group"> - <div class="layui-collapse"> - <div class="layui-colla-item"> - <div style="padding:20px;margin:0px 700px"> - <h1>鐩樼偣鍒嗘瀽琛�</h1> - </div> - </div> - <div class="layui-form-item"> - <div class="layui-inline"> - <label class="layui-form-label">鐩樼偣鏂规</label> - <div class="layui-input-block"> - <input type="text" class="layui-input" id="HItemID"> - <button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceInterList" style="width:40px;"> - <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> - </button> + + <div class="layui-card-body"> + <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief"> + <h1 style="text-align:center;margin-top:20px"><b>鐩樼偣鍒嗘瀽鍒楄〃</b></h1> + + <div class="layui-tab-content"> + <div class="layui-tab-item layui-show"> + <div class="layui-form-item"> + <div class="layui-inline"> + <label class="layui-form-label">鐩樼偣鏂规</label> + <div class="layui-input-inline"> + <input type="text" name="HName" id="HName" readonly class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HItemID" id="HItemID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceInterList" 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"> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch1" id="btnSearch1"> + 鏌ヨ + </button> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch1" id="btnReSearch1"> + 閲嶇疆 + </button> + </div> + </div> </div> - </div> - <div class="layui-inline"> - <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch1" id="btnSearch1"> - 鏌ヨ - </button> - <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch1" id="btnReSearch1"> - 閲嶇疆 - </button> </div> </div> </div> + <div class="layui-tab layui-tab-card" style="margin-top:10px"> <ul class="layui-tab-title"> @@ -206,7 +211,7 @@ //#region 杩涘叆椤甸潰鍗冲姞杞� //鍒濆鍖栫晫闈� - set_ClearBill(); + set_ClearBill(); //#endregion //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛� @@ -315,7 +320,7 @@ }; }); //#endregion - + //鏌ヨ鎸夐挳 form.on('submit(btnSearch1)', function (data) { var HItemID = $("#HItemID").val();//鐩樼偣 @@ -364,7 +369,7 @@ //椤甸潰灞�-鑷畾涔� layer.open({ type: 2, - skin: 'layui-layer-rim', + skin: 'layui-layer-rim', title: '鐩樼偣鏂规鍒楄〃', closeBtn: 1, shift: 2, @@ -380,6 +385,7 @@ return layer.msg('璇烽�夋嫨鏁版嵁'); } $("#HItemID").val(checkStatus.data[0].hitemid); + $("#HName").val(checkStatus.data[0].鐩樼偣鏂规); layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� } , btn2: function (index, layero) { @@ -432,34 +438,33 @@ tk_Display(); }); //#endregion - - //#endregion - //#region 褰撳墠椤甸潰鍔犺浇鎵�鏈夋柟娉� - // #region 鍒濆鍖栫晫闈� - function set_ClearBill() { + //#endregion + + //#region 褰撳墠椤甸潰鍔犺浇鎵�鏈夋柟娉� + // #region 鍒濆鍖栫晫闈� + function set_ClearBill() { //鍒濆鍖栬〃鏍�(姝e父) set_InitGrid1(); //鍒濆鍖栬〃鏍�(璋冩嫧) - set_InitGrid2(); - //鍒濆鍖栬〃鏍�(鍑哄簱) - set_InitGrid3(); - //鍒濆鍖栬〃鏍�(鍏ュ簱) - set_InitGrid4(); - //鍒濆鍖栬〃鏍�(鐩樼泩) - set_InitGrid5(); - //鍒濆鍖栬〃鏍�(鐩樹簭) - set_InitGrid6(); - //鍒濆鍖栬〃鏍�(閫�搴�) - set_InitGrid7(); + set_InitGrid2(); + //鍒濆鍖栬〃鏍�(鍑哄簱) + set_InitGrid3(); + //鍒濆鍖栬〃鏍�(鍏ュ簱) + set_InitGrid4(); + //鍒濆鍖栬〃鏍�(鐩樼泩) + set_InitGrid5(); + //鍒濆鍖栬〃鏍�(鐩樹簭) + set_InitGrid6(); + //鍒濆鍖栬〃鏍�(閫�搴�) + set_InitGrid7(); //鏌ヨ zc_Display(); } //鍒濆鍖栬〃鏍�(姝e父) - function set_InitGrid1() - { + function set_InitGrid1() { var ajaxLoad = layer.load(); option1 = { elem: '#mainTable1' @@ -592,9 +597,9 @@ } }); } - //璋冩嫧鏌ヨ + //璋冩嫧鏌ヨ function db_Display() { - sWhere = "k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3 and k.HCorrespondentTypeID=m.HNowSupTypeID and k.HCorrespondentTypeID=4 and k.HCorrespondentID!=m.HNowSupID"; + var sWhere = "k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3 and k.HCorrespondentTypeID=m.HNowSupTypeID and k.HCorrespondentTypeID=4 and k.HCorrespondentID!=m.HNowSupID"; var HItemID = $("#HItemID").val();//鐩樼偣 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� $.ajax({ @@ -613,9 +618,9 @@ } }); } - //鍑哄簱鏌ヨ + //鍑哄簱鏌ヨ function ck_Display() { - sWhere = "k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3 and m.HNowSupTypeID=4 and isnull(m.HNowSupID,'')!='' and (k.HCorrespondentTypeID=1 or k.HCorrespondentTypeID=2) and isnull(k.HCorrespondentID,'')!=''"; + var sWhere = "k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3 and m.HNowSupTypeID=4 and isnull(m.HNowSupID,'')!='' and (k.HCorrespondentTypeID=1 or k.HCorrespondentTypeID=2) and isnull(k.HCorrespondentID,'')!=''"; var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� $.ajax({ @@ -634,9 +639,9 @@ } }); } - //鍏ュ簱鏌ヨ + //鍏ュ簱鏌ヨ function rk_Display() { - sWhere = "k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3 and (k.HCorrespondentTypeID=1 or k.HCorrespondentTypeID=2) and (m.HNowSupTypeID=1 or m.HNowSupTypeID=2) and k.HCorrespondentID!=m.HNowSupID"; + var sWhere = "k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3 and (k.HCorrespondentTypeID=1 or k.HCorrespondentTypeID=2) and (m.HNowSupTypeID=1 or m.HNowSupTypeID=2) and k.HCorrespondentID!=m.HNowSupID"; var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� $.ajax({ @@ -655,9 +660,9 @@ } }); } - //鐩樼泩鏌ヨ + //鐩樼泩鏌ヨ function py_Display() { - sWhere = "isnull(m.HNowSupID,'')='' and isnull(k.HCorrespondentID,'')!='' and k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3"; + var sWhere = "isnull(m.HNowSupID,'')='' and isnull(k.HCorrespondentID,'')!='' and k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3"; var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� $.ajax({ @@ -676,9 +681,9 @@ } }); } - //鐩樹簭鏌ヨ + //鐩樹簭鏌ヨ function pk_Display() { - sWhere = "isnull(m.HNowSupID,'')!='' and isnull(k.HCorrespondentID,'')='' and k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3"; + var sWhere = "isnull(m.HNowSupID,'')!='' and isnull(k.HCorrespondentID,'')='' and k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3"; var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� $.ajax({ @@ -697,9 +702,9 @@ } }); } - //閫�搴撴煡璇� + //閫�搴撴煡璇� function tk_Display() { - sWhere = "k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3 and k.HCorrespondentTypeID=4 and isnull(k.HCorrespondentID,'')!='' and (m.HNowSupTypeID=1 or m.HNowSupTypeID=2)"; + var sWhere = "k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3 and k.HCorrespondentTypeID=4 and isnull(k.HCorrespondentID,'')!='' and (m.HNowSupTypeID=1 or m.HNowSupTypeID=2)"; var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� $.ajax({ @@ -721,7 +726,7 @@ //#endregion - //#region 瀹℃牳 + //#region 瀹℃牳 //瀹℃牳 璋冩嫧 function set_CheckBill2() { var checkStatus = table.checkStatus('mainTable2') @@ -922,7 +927,7 @@ } //#endregion - + //#endregion //浠ヤ笂鏄痩ayui妯″潡 diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_MouldStockBillMain_Temp.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_MouldStockBillMain_Temp.html" new file mode 100644 index 0000000..74cf174 --- /dev/null +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_MouldStockBillMain_Temp.html" @@ -0,0 +1,262 @@ +锘�<!DOCTYPE html> +<html> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>鐩樼偣璁板綍琛�</title> + <meta name="renderer" content="webkit"> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> + <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all"> + <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all"> + <script src="../../../layuiadmin/layui/layui.js"></script> +</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-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> + <div class="layui-inline"> + <label class="layui-form-label">鐗╂枡鍚嶇О</label> + <div class="layui-input-block"> + <input type="text" class="layui-input" name="HMaterName" id="HMaterName" 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> + <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> + </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="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button> + </div> + </script> + </form> + </div> + </div> + </div> + </div> + <script src="../../../layuiadmin/layui/layui.js"></script> + <script src="../../../layuiadmin/Scripts/json2.js"></script> + <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script> + <script src="../../../layuiadmin/Scripts/webConfig.js"></script> + + <script> + 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(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛� + //澶村伐鍏锋爮浜嬩欢 + table.on('toolbar(mainTable)', function (obj) { + var checkStatus = table.checkStatus(obj.config.id); + switch (obj.event) { + //鍒犻櫎 + case 'btn-Delete': set_DeleteBill(); + break; + }; + }); + //鏌ヨ鎸夐挳 + form.on('submit(btnSearch)', function (data) { + get_FastQuery(); + }); + // 閲嶇疆鎸夐挳 + form.on('submit(btnReSearch)', function (data) { + set_ClearQuery(); + }); + //#endregion + + + //#region 姝ら〉闈㈡墍鏈夋柟娉� + // 鍒濆鍖栫晫闈� + function set_ClearBill() { + //鍒濆鍖栬〃鏍� + set_InitGrid(); + //鏌ヨ + get_Display(sWhere); + } + //鍒濆鍖栬〃鏍� + function set_InitGrid() { + option = { + elem: '#mainTable' + , toolbar: '#toolbarDemo' + , height: 'full-50' + , limits: [100,1000,10000,50000] + , limit: 20 + , page: true + , cellMinWidth: 90 + , cols: [[ + { type: 'checkbox', fixed: 'left' } + , { field: 'hitemid', title: 'HItemID', sort: true, hide: true } + , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' } + , { field: '鐩樼偣鏂规', title: '鐩樼偣鏂规' } + , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜'} + , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' } + , { field: '鐗╂枡瑙勬牸', title: '鐗╂枡瑙勬牸' } + , { field: '鍣ㄥ叿鏉$爜', title: '鍣ㄥ叿鏉$爜' } + , { field: '鏁伴噺', title: '鏁伴噺' } + , { field: '瀹為檯浣嶇疆绫诲瀷', title: '瀹為檯浣嶇疆绫诲瀷' } + , { field: '瀹為檯浣嶇疆', title: '瀹為檯浣嶇疆' } + , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' } + , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" } + ]] + }; + } + //鏌ヨ + function get_Display(sWhere) { + var index = layer.load(0, { shade: false }); + //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� + $.ajax({ + url: GetWEBURL() + '/Gy_StockCheckItemBill/Get_MouldStockBillMainTemp', + type: "GET", + data: { "sWhere": sWhere }, + success: function (data1) { + if (data1.count == 1) { + option.data = data1.data; + table.render(option); + layer.close(index); + } else { + layer.close(index); + layer.alert(data1.code + data1.Message, { icon: 5 }); + } + }, error: function () { + layer.close(index); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } + //蹇�熸煡璇� + function get_FastQuery() { + var HBillNo = $("#HBillNo").val(); + var HMaterName = $("#HMaterName").val(); + var HSourceBillNo = $("#HSourceBillNo").val(); + var HMaker = $("#HMaker").val(); + + if (HBillNo) { + sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'"; + } + if (HMaterName) { + sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'"; + } + if (HSourceBillNo) { + sWhere += " and 鐩樼偣鏂规 like '%" + HSourceBillNo + "%'"; + } + if (HMaker) { + sWhere += " and 鍒跺崟浜� like '%" + HMaker + "%'"; + } + + $.ajax({ + url: GetWEBURL() + '/Gy_StockCheckItemBill/Get_MouldStockBillMainTemp', + type: "GET", + data: { "sWhere": sWhere }, + success: function (data1) { + if (data1.count == 1) { + option.data = data1.data; + table.render(option); + layer.alert("鏌ヨ鎴愬姛", { icon: 1 }); + } else { + layer.alert(data1.code + data1.Message, { icon: 5 }); + } + }, error: function () { + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨 + } + //閲嶇疆蹇�熸煡璇� + function set_ClearQuery() { + $("#HBillNo").val(""); + $("#HMaterName").val(""); + $("#HSourceBillNo").val(""); + $("#HMaker").val(""); + $("#btnSearch").click(); + } + //鍒犻櫎 + function set_DeleteBill() { + var checkStatus = table.checkStatus('mainTable') + , data = checkStatus.data; + if (checkStatus.data.length === 1) { + var HItemID = data[0].hitemid.toString(); + //閫昏緫鍒犻櫎鏂规硶 + layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) { + $.ajax({ + type: "GET", + url: GetWEBURL() + "/Gy_StockCheckItemBill/set_DeleteBill_Temp", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� + data: { "HItemID": HItemID }, + 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.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + }) + } + else { + layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒'); + } + } + //#endregion + + //浠ヤ笂鏄痩ayui妯″潡 + }); + </script> +</body> +</html> \ No newline at end of file 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html" index feffc9e..c25f78d 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html" @@ -44,12 +44,9 @@ </div> </div> + <div class="layui-card-body"> <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief"> - <!--<ul class="layui-tab-title"> - <li class="layui-this">鍩烘湰淇℃伅</li>--> - <!--<li>鍏朵粬淇℃伅</li>--> - <!--</ul>--> <h1 style="text-align:center;"><b>鍣ㄥ叿閲囪喘鍏ュ簱鍗�</b></h1> <div class="layui-tab-content"> <div class="layui-tab-item layui-show"> 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_MouldFile.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_MouldFile.html" index 10d6877..9306423 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_MouldFile.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_MouldFile.html" @@ -321,27 +321,6 @@ </button> </div> </div> - <div class="layui-inline"> - <label class="layui-form-label">铏氭嫙浠撶被鍨�</label> - <div class="layui-input-block"> - <select name="HNowSupTypeID" lay-filter="HNowSupTypeID" id="HNowSupTypeID"> - <option value="1" selected="selected">渚涘簲鍟�</option> - <option value="2">瀹㈡埛</option> - <option value="3">閮ㄩ棬</option> - <option value="4">浠撳簱</option> - </select> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">铏氭嫙浠�</label> - <div class="layui-input-block" style="margin-left: 77px;"> - <input type="text" class="layui-input" name="HNowSupName" id="HNowSupName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly> - <input type="hidden" class="layui-input" name="HNowSupID" id="HNowSupID" style="background-color:#efefef4d;width: 60%;display: inline-block;"> - <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HNowSupList" id="HNowSupList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;"> - <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i> - </button> - </div> - </div> </div> </div> </div> diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_ProductionReturnList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_ProductionReturnList.html" new file mode 100644 index 0000000..13009ba --- /dev/null +++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_ProductionReturnList.html" @@ -0,0 +1,321 @@ +锘�<!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/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> + <style type="text/css"> + input.layui-input.layui-unselect { + padding-right: 0; + } + </style> +</head> +<body> + <div class="layui-fluid"> + <div class="layui-col-md12"> + <div class="layui-card" style="padding: 1px"> + <div class="layui-card-body" style="padding: 1px;"> + <form class="layui-form" action="" lay-filter="component-form-group"> + <div class="layui-collapse"> + <div class="layui-colla-item"> + <div class="layui-colla-title layui-inline"> + <div class="layui-inline"> + <span>鏇村</span> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">寮�濮嬫棩鏈�</label> + <div class="layui-input-block"> + <input type="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="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="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="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="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></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="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="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 + , util = layui.util + //鏌ヨ鏉′欢 + var sWhere = ""; + var option = []; + + //#endregion + + //#region 杩涘叆椤甸潰鍗冲姞杞� + + //鍒濆鍖栫晫闈� + set_ClearBill(); + $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd")); + $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); + //#endregion + + //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛� + + // 鏌ヨ鎸夐挳 + form.on('submit(btnSearch)', function (data) { + get_FastQuery(); + }); + // 閲嶇疆鎸夐挳 + form.on('submit(btnReSearch)', function (data) { + //娓呯┖杩囨护鏉′欢 + set_ClearQuery(); + }); + + //#endregion + + //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶 + + // 鍒濆鍖栫晫闈� + function set_ClearBill() { + //鍒濆鍖栬〃鏍� + set_InitGrid(); + //鏌ヨ + get_Display(sWhere); + } + + //鍒濆鍖栬〃鏍� + function set_InitGrid() { + option = { + elem: '#mainTable' + , toolbar: '#toolbarDemo' + , height: 'full-50' + , page: true + , cellMinWidth: 90 + , cols: [[ + { type: 'checkbox', fixed: 'left' } + , { field: 'hmainid', title: 'hmainid', sort: true, hide: true } + , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', hide: true } + , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 } + , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 } + , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 160 } + , { field: 'HCusID', title: 'HCusID', width: 160, hide: true } + , { field: '瀹㈡埛', title: '瀹㈡埛', width: 200 } + , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200, hide: true } + , { field: '楠屾敹鍛�', title: '楠屾敹鍛�', width: 200 } + , { field: 'hkeeperid', title: 'hkeeperid', width: 200, hide: true } + , { field: '淇濈鍛�', title: '淇濈鍛�', width: 200 } + , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true } + , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 160 } + , { field: '浠撳簱', title: '浠撳簱', width: 160 } + , { field: 'hsubid', title: 'hsubid', width: 160, hide: true } + , { field: 'hmaterid', title: 'hmaterid', width: 200, hide: true } + , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 200 } + , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 } + , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 } + , { field: '鎵规', title: '鎵规', width: 200 } + , { field: 'hunitid', title: 'hunitid', width: 200, hide: true } + , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 200 } + , { field: '搴旀敹鏁伴噺', title: '搴旀敹鏁伴噺', width: 115 } + , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 115 } + , { field: '鍑哄簱鏁伴噺', title: '鍑哄簱鏁伴噺', width: 200 } + , { field: '鍗曚环', title: '鍗曚环', width: 200 } + , { field: '閲戦', title: '閲戦', width: 115 } + , { field: 'hwhid', title: 'hwhid', width: 200, hide: true } + , { field: '鏀舵枡浠撳簱浠g爜', title: '鏀舵枡浠撳簱浠g爜', width: 200 } + , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 200 } + , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 } + , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 } + , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } + , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125 } + , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } + , { field: '淇敼浜�', title: '淇敼浜�', width: 125 } + , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } + , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125 } + , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } + , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125 } + , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } + + ]] + }; + } + + //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� + function get_Display(sWhere) { + var ajaxLoad = layer.load(); + $.ajax({ + url: GetWEBURL() + '/Sc_ProductionReturnBill/list', + type: "GET", + data: { "sWhere": sWhere }, + success: function (data1) { + if (data1.count == 1) { + option.data = data1.data; + table.render(option); + layer.close(ajaxLoad); + } else { + layer.close(ajaxLoad); + layer.alert(data1.code + data1.Message, { icon: 5 }); + } + }, error: function () { + layer.close(ajaxLoad); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } + + // 蹇�熻繃婊� + function get_FastQuery() { + var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈� + var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡 + var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙� + var HDeptID = $("#HDeptID").val();//閮ㄩ棬 + var MaterialCode = $("#MaterialCode").val();//鐗╂枡浠g爜 + var MaterialName = $("#MaterialName").val();//鐗╂枡鍚嶇О + var SpecificationModel = $("#SpecificationModel").val();//瑙勬牸鍨嬪彿 + var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿 + var Warehouse = $("#Warehouse").val();//浠撳簱 + var Hmaker = $("#Hmaker").val();//鍒跺崟浜� + if (HDate) { + sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'"; + } + if (HDate1) { + sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'"; + } + 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 (HSourceBillNo) { + sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'"; + } + if (Warehouse) { + sWhere += " and 鍙戣揣浠撳簱 like '%" + Warehouse + "%'"; + } + if (Hmaker) { + sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'"; + } + get_Display(sWhere); + sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨 + } + + // 閲嶇疆杩囨护鏉′欢 + 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();//瑙勬牸鍨嬪彿 + $("#HSourceBillNo").val();//婧愬崟鍗曞彿 + $("#Warehouse").val();//浠撳簱 + $("#Hmaker").val();//鍒跺崟浜� + + sWhere = ""; + } + //#endregion + + }) + </script> +</body> +</html> \ No newline at end of file diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html" index b83db50..3cb44c7 100644 --- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html" +++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html" @@ -59,10 +59,10 @@ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button> <div class="layui-colla-content"> <!--<div class="layui-inline"> - <div class="layui-inline"> - <span>鍏朵粬鏉′欢></span> - </div> - </div>--> + <div class="layui-inline"> + <span>鍏朵粬鏉′欢></span> + </div> + </div>--> <div class="layui-inline"> <label class="layui-form-label">鍗曟嵁鍙�</label> <div class="layui-input-block"> @@ -89,6 +89,12 @@ <label class="layui-form-label">鍙嶉鐘舵��</label> <div class="layui-input-block"> <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" 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="HMaterShortNumber" id="HMaterShortNumber" style="width:190px;"> </div> </div> <div class="layui-inline"> @@ -951,6 +957,7 @@ var HMaterName = $("#HMaterName").val(); var HXTStatus = $("select[name='HXTStatus']").val(); var HXTFKStatus = $("#HXTFKStatus").val(); + var HMaterShortNumber = $("#HMaterShortNumber").val(); if (HStatus) { switch (HStatus) { @@ -978,6 +985,9 @@ if (HBillNo) { sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'"; } + if (HMaterShortNumber) { + sWhere += " and 鐗╂枡缂栫爜 like '%" + HMaterShortNumber + "%'"; + } if (HMaterNumber) { sWhere += " and 鐗╂枡浠g爜 like '%" + HMaterNumber + "%'"; } diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" index cc78ae5..c7ef99c 100644 --- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" +++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" @@ -87,6 +87,12 @@ </div> </div> <div class="layui-inline"> + <label class="layui-form-label">鐗╂枡缂栫爜</label> + <div class="layui-input-block"> + <input type="text" class="layui-input" name="HMaterShortNumber" id="HMaterShortNumber" 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="HMaterNumber" id="HMaterNumber" style="width:190px;"> @@ -942,10 +948,11 @@ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙� var HEmpName = $("#HEmpName").val(); var HMaterNumber = $("#HMaterNumber").val(); + var HMaterShortNumber = $("#HMaterShortNumber").val(); var HMaterName = $("#HMaterName").val(); var HXTStatus = $("select[name='HXTStatus']").val(); var HXTFKStatus = $("#HXTFKStatus").val(); - + if (HStatus) { switch (HStatus) { case '-1': //鍏ㄩ儴 @@ -972,6 +979,9 @@ if (HBillNo) { sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'"; } + if (HMaterShortNumber) { + sWhere += " and 鐗╂枡缂栫爜 like '%" + HMaterShortNumber + "%'"; + } if (HMaterNumber) { sWhere += " and 鐗╂枡浠g爜 like '%" + HMaterNumber + "%'"; } diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\351\200\200\346\226\231\345\215\225/Cg_PurchaseReturnList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\351\200\200\346\226\231\345\215\225/Cg_PurchaseReturnList.html" index 45d39dd..24499ff 100644 --- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\351\200\200\346\226\231\345\215\225/Cg_PurchaseReturnList.html" +++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\351\200\200\346\226\231\345\215\225/Cg_PurchaseReturnList.html" @@ -118,8 +118,8 @@ <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="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button> - <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print"><i class="layui-icon layui-icon-print"></i>棰勮</button> - <button type="button" class="layui-btn layui-btn-sm" lay-event=""><i class="layui-icon layui-icon-search"></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> @@ -167,6 +167,7 @@ table.on('toolbar(mainTable)', function (obj) { var checkStatus = table.checkStatus(obj.config.id); switch (obj.event) { + //鏂板 case 'btn-Add': //椤甸潰灞�-鑷畾涔� layer.open({ @@ -187,76 +188,13 @@ } }); break; - case 'btn-Edit': - var checkStatus = table.checkStatus('mainTable') - , data = checkStatus.data; - if (checkStatus.data.length === 1) { - var hID = data[0].hmainid.toString(); - //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉 - layer.open({ - type: 2 - , area: ['100%', '100%'] - , title: '缂栬緫閫�鏂欓�氱煡鍗�' - , closeBtn: 1 - , shade: 0.6 //閬僵閫忔槑搴� - , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 - , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� - , content: '../../閲囪喘绠$悊/閫�鏂欓�氱煡鍗�/Add_Edit_Cg_POInStockBackBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1' - , resize: false, - end: function () { - //鍒锋柊椤甸潰, - location.reload(); - } - , cancel: function () { - //$(".layui-btn").removeClass("layui-btn-disabled"); - } - }) - - } else { - layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒'); - } - - break; + //瀹℃牳 case 'btn-Audit': set_AuditBill(); break; + //鍙嶅鏍� case 'btn-DeAudit': set_DeAuditBill(); - break; - case 'btn-Delete': - var checkStatus = table.checkStatus('mainTable') - , data = checkStatus.data; - if (checkStatus.data.length === 1) { - var InterID = data[0].hmainid.toString(); - //閫昏緫鍒犻櫎鏂规硶 - layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) { - $.ajax({ - type: "GET", - url: GetWEBURL() + "Xs_SeOrderBill/DeltetSeOrderBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� - data: { "HInterID": InterID }, - 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.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); - } - }); - }) - } - else { - layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒'); - } break; //鍒锋柊 case 'get_Refresh': get_Refresh(); @@ -498,7 +436,27 @@ layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�'); } } + // 鍒锋柊 + function get_Refresh() { + set_ClearQuery(); + get_Display(sWhere); + } + // 閲嶇疆杩囨护鏉′欢 + 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("");//鍗曟嵁鍙� + $("#Hname").val("");//渚涘簲鍟� + $("#HDeptID").val();//閮ㄩ棬 + $("#MaterialCode").val();//鐗╂枡浠g爜 + $("#MaterialName").val();//鐗╂枡鍚嶇О + $("#SpecificationModel").val();//瑙勬牸鍨嬪彿 + $("#HSourceBillNo").val();//婧愬崟鍗曞彿 + $("#Warehouse").val();//浠撳簱 + $("#Hmaker").val();//鍒跺崟浜� + sWhere = ""; + } //#endregion diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Add_Edit_Kf_ICStockBillMainList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Add_Edit_Kf_ICStockBillMainList.html" index cffcf96..ce518e7 100644 --- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Add_Edit_Kf_ICStockBillMainList.html" +++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Add_Edit_Kf_ICStockBillMainList.html" @@ -311,7 +311,7 @@ //#region 杩涘叆椤甸潰鍗冲姞杞� //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤� - get_LoginIs(); + //get_LoginIs(); @@ -397,11 +397,12 @@ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" + alert(JSON.stringify(checkStatus)) if (checkStatus.data.length === 0) { return layer.msg('璇烽�夋嫨鏁版嵁'); } $("#HBillNo").val(checkStatus.data[0].HName); - $("#Hmainid").val(checkStatus.data[0].HItemID); + $("#Hmainid").val(checkStatus.data[0].hmainid); layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� } , btn2: function (index, layero) { } diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html" index 3417638..b1dd755 100644 --- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html" +++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html" @@ -7,7 +7,6 @@ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all"> <!--<script src="../../../layuiadmin/layui/layui.js"></script>--> <script src="../../../layuiadmin/layui/layui.js"></script> - <script src="../../../layuiadmin/layui/layui.js"></script> <script src="../../../layuiadmin/Scripts/json2.js"></script> <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script> <script src="../../../layuiadmin/Scripts/webConfig.js"></script> @@ -57,11 +56,6 @@ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button> <div class="layui-colla-content"> <div class="layui-inline"> - <div class="layui-inline"> - <span>鍏朵粬鏉′欢></span> - </div> - </div> - <div class="layui-inline"> <label class="layui-form-label">瀹㈡埛</label> <div class="layui-input-block"> <input type="text" class="layui-input" name="HCusID" id="HCusID" style="width:190px;"> @@ -98,7 +92,6 @@ <input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo" style="width:190px;"> </div> </div> - <br /> <div class="layui-inline"> <label class="layui-form-label">浠撳簱</label> <div class="layui-input-block"> @@ -124,8 +117,8 @@ <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="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button> - <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print"><i class="layui-icon layui-icon-print"></i>棰勮</button> - <button type="button" class="layui-btn layui-btn-sm" lay-event=""><i class="layui-icon layui-icon-search"></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> @@ -158,9 +151,6 @@ //#region 鍒濆鍖栫晫闈� set_ClearBill(); - $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd")); - $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); - //#endregion //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛� @@ -171,16 +161,16 @@ set_ClearQuery(); }); - // 鏌ヨ鎸夐挳 form.on('submit(btnSearch)', function (data) { - get_FastQuery(table, option); + get_FastQuery(); }); //澶村伐鍏锋爮浜嬩欢 table.on('toolbar(mainTable)', function (obj) { var checkStatus = table.checkStatus(obj.config.id); switch (obj.event) { + //鏂板 case 'btn-Add': //椤甸潰灞�-鑷畾涔� layer.open({ @@ -201,76 +191,16 @@ } }); break; + //瀹℃牳 case 'btn-Audit': set_AuditBill(); break; + //鍙嶅鏍� case 'btn-DeAudit': set_DeAuditBill(); break; - case 'btn-Edit': - var checkStatus = table.checkStatus('mainTable') - , data = checkStatus.data; - if (checkStatus.data.length === 1) { - var hID = data[0].hmainid.toString(); - //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉 - layer.open({ - type: 2 - , area: ['100%', '100%'] - , title: '缂栬緫閫�璐ч�氱煡鍗�' - , closeBtn: 1 - , shade: 0.6 //閬僵閫忔槑搴� - , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 - , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� - , content: '../../閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Add_Edit_Cg_POInStockBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1' - , resize: false, - end: function () { - //鍒锋柊椤甸潰, - location.reload(); - } - , cancel: function () { - //$(".layui-btn").removeClass("layui-btn-disabled"); - } - }) - - } else { - layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒'); - } - - break; - case 'btn-Delete': - var checkStatus = table.checkStatus('mainTable') - , data = checkStatus.data; - if (checkStatus.data.length === 1) { - var InterID = data[0].hmainid.toString(); - //閫昏緫鍒犻櫎鏂规硶 - layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) { - $.ajax({ - type: "GET", - url: GetWEBURL() + "Kf_SellOutBill/DeltetSellOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� - data: { "HInterID": InterID }, - 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.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); - } - }); - }) - } - else { - layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒'); - } + //鎵撳嵃 + case 'btn-print': get_PrintReport(); break; //鍒锋柊 case 'get_Refresh': get_Refresh(); @@ -282,7 +212,6 @@ }); //#endregion - //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶 // 鍒濆鍖栫晫闈� @@ -291,6 +220,9 @@ 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")); } function set_InitGrid() { @@ -371,7 +303,7 @@ } // 蹇�熻繃婊� - function get_FastQuery(table, option) { + function get_FastQuery() { var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈� var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡 var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙� @@ -423,12 +355,18 @@ // 閲嶇疆杩囨护鏉′欢 function set_ClearQuery() { - $("#HDate").val("");//寮�濮嬫棩鏈� - $("#HDate1").val("");//缁撴潫鏃ユ湡 - $("#HBillNo").val("");// - $("#HCusID").val(""); - $("#HDeptID").val(""); - $("#HMangerID").val(""); + $("#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("");//鍗曟嵁鍙� + $("#HCusID").val("");//瀹㈡埛 + $("#HDeptID").val();//閮ㄩ棬 + $("#MaterialCode").val();//鐗╂枡浠g爜 + $("#MaterialName").val();//鐗╂枡鍚嶇О + $("#SpecificationModel").val();//瑙勬牸鍨嬪彿 + $("#HSourceBillNo").val();//婧愬崟鍗曞彿 + $("#Warehouse").val();//浠撳簱 + $("#Hmaker").val();//鍒跺崟浜� + sWhere = ""; } @@ -511,6 +449,28 @@ } } + //鎵撳嵃 + function get_PrintReport() { + var checkStatus = table.checkStatus('mainTable') + , data = checkStatus.data; + + if (checkStatus.data.length === 1) { + layer.open({ + type: 2 + , area: ['50%', '50%'] + , title: '鎵撳嵃妯$増閫夋嫨' + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=ICStockBill', 'yes'] + , resize: false + }) + } + else { + layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒'); + } + } + //#endregion }); diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html" index 2d0b929..815b4ae 100644 --- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html" +++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html" @@ -1,14 +1,19 @@ 锘�<!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 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/PubCustom.js"></script> + <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script> <style type="text/css"> input.layui-input.layui-unselect { padding-right: 0; @@ -28,63 +33,94 @@ <span>鏇村</span> </div> </div> - <!--<div class="layui-inline"> - <label class="layui-form-label">鍗曟嵁绫诲瀷</label> + <div class="layui-inline"> + <label class="layui-form-label">寮�濮嬫棩鏈�</label> <div class="layui-input-block"> - <select name="HBillType" id="HBillType"> - <option value="">鎵�鏈�</option> - <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option> - <option value="ZHSJ">涓婃灦褰掕繕鍗�</option> - </select> + <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"> + <input type="text" class="layui-input" name="HBillNo" id="HBillNo" 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="HCreateBy" id="HCreateBy"> - </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"> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button> + <div class="layui-colla-content"> <div class="layui-inline"> - <div class="layui-inline"> - <span>鍏朵粬鏉′欢></span> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label">寮�濮嬫椂闂�</label> + <label class="layui-form-label">閮ㄩ棬</label> <div class="layui-input-block"> - <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate"> + <input type="text" class="layui-input" name="HDeptID" id="HDeptID" style="width:190px;"> </div> </div> <div class="layui-inline"> - <label class="layui-form-label">缁撴潫鏃堕棿</label> + <label class="layui-form-label">鐗╂枡浠g爜</label> <div class="layui-input-block"> - <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate"> + <input type="text" class="layui-input" name="MaterialCode" id="MaterialCode" style="width:190px;"> </div> </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="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="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="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="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>--> - <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></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="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></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="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="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> @@ -103,6 +139,8 @@ }).extend({ index: 'lib/index', //涓诲叆鍙fā鍧� }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () { + + //#region 鍏叡鍙橀噺 var $ = layui.$ , admin = layui.admin , layer = layui.layer @@ -115,167 +153,33 @@ //鏌ヨ鏉′欢 var sWhere = ""; - var option = { - elem: '#mainTable' - //, toolbar: '#toolbarDemo' - , height: 'full-50' - , page: true - , cellMinWidth: 90 - , cols: [[ - { field: 'hmainid', title: '鍗曟嵁ID', hide: true } - , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 } - , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 } - , { field: 'hmanagerid', title: 'hmanagerid', width: 160, hide: true } - , { field: '涓荤浠g爜', title: '涓荤浠g爜', width: 200 } - , { field: '涓荤', title: '涓荤', width: 200 } - , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200 } - , { field: '楠屾敹鍛樹唬鐮�', title: '楠屾敹鍛樹唬鐮�', width: 200 } - , { field: '楠屾敹鍛�', title: '楠屾敹鍛�', width: 200 } - , { field: 'hkeeperid', title: 'hkeeperid', width: 200, width: 200 } - , { field: '淇濈鍛樹唬鐮�', title: '淇濈鍛樹唬鐮�', width: 160 } - , { field: '淇濈鍛�', title: '淇濈鍛�', width: 160} - , { field: 'HDeptID', title: 'HDeptID', width: 160, hide: true } - , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 200 } - , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 200 } - , { field: '浠撳簱', title: '浠撳簱', width: 200 } - , { field: '鎽樿', title: '鎽樿', width: 200 } - , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200 } - , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 } - , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 200 } - , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115 } - , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 115 } - , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 } - , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200 } - , { field: '淇敼浜�', title: '淇敼浜�', width: 115 } - , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200 } - , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 } - , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 } - , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 } - , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115 } - , { field: 'hsubid', title: 'hsubid', width: 200, hide: true } - , { field: '瀛愯〃涓婚敭', title: '瀛愯〃涓婚敭', width: 200, hide: true } - , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 200 } - , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 115 } - , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 } - , { field: '闄勫姞灞炴��', title: '闄勫姞灞炴��', width: 200 } - , { field: '棰滆壊', title: '棰滆壊', width: 200 } - , { field: 'hunitid', title: 'hunitid', width: 200, hide: true } - , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 200 } - , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 200 } - , { field: '搴旀敹鏁伴噺', title: '搴旀敹鏁伴噺', width: 115 } - , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 200 } - , { field: '鍗曚环', title: '鍗曚环', width: 200 } - , { field: '閲戦', title: '閲戦', width: 200 } - , { field: 'HSPID', title: 'HSPID', width: 115, hide: true } - , { field: 'hwhid', title: 'hwhid', width: 115, hide: true } - , { field: '鏀舵枡浠撳簱浠g爜', title: '鏀舵枡浠撳簱浠g爜', width: 200 } - , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 200 } - , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 200 } - , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 115 } - , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 115 } - , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 115, hide: true } - , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true } - , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 } - , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 } - , { field: '閲囪喘璁㈠崟涓籌D', title: '閲囪喘璁㈠崟涓籌D', width: 115, hide: true } - , { field: '閲囪喘璁㈠崟瀛怚D', title: '閲囪喘璁㈠崟瀛怚D', width: 115, hide: true } - , { field: '閲囪喘璁㈠崟鍙�', title: '閲囪喘璁㈠崟鍙�', width: 115 } - , { field: '閿�鍞鍗曚富ID', title: '閿�鍞鍗曚富ID', width: 200, hide: true } - , { field: '閿�鍞鍗曞瓙ID', title: '閿�鍞鍗曞瓙ID', width: 200, hide: true } - , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 200 } - , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 115 } - , { field: 'HBillType', title: 'HBillType', width: 200, hide: true } - ]] - }; + var option = []; - var index = layer.load(0); - //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� - $.ajax({ - //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum", - url: GetWEBURL() + '/Kf_OtherOutBill/GetOtherOutBillList', - type: "GET", - data: { "sWhere": sWhere}, - success: function (data1) { - if (data1.count == 1) { - option.data = data1.data; - table.render(option); - layer.close(index); - } else { - layer.close(index); - layer.alert(data1.code + data1.Message, { icon: 5 }); - } - }, error: function () { - layer.close(index); - layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); - } + //#endregion + + //#region 鍒濆鍖栫晫闈� + + set_ClearBill(); + + + //#endregion + + //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛� + + // 鏌ヨ鎸夐挳 + form.on('submit(btnSearch)', function (data) { + get_FastQuery(); }); - - //閲嶇疆鎸夐挳 - //form.on('submit(btnReSearch)', function (data) { - // $("#HBillType").val("");//鍗曟嵁绫诲瀷 - // $("#HBillNo").val("");//鍗曟嵁鍙� - // $("#HSourceBillNo").val("");//婧愬崟鍙� - // $("#HCreateBy").val("");//鍒跺崟浜� - // $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂� - // $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿 - // $("#btnSearch").click(); - //}); - - //鏌ヨ鎸夐挳 - form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅 - //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷 - //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙� - //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜� - //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂� - //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿 - //if (HBillNo) { - // sWhere += " and HBillNo like '%" + HBillNo + "%'"; - //} - //if (HCreateBy) { - // sWhere += " and HCreateBy like '%" + HCreateBy + "%'"; - //} - //if (BenginHCreateDate) { - // sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'"; - //} - //if (EndHCreateDate) { - // sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'"; - //} - var index = layer.load(0); - $.ajax({ - //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum", - url: GetWEBURL1() + '/Kf_OtherOutBill/GetOtherOutBillList', - type: "GET", - data: { "sWhere": sWhere}, - success: function (data1) { - if (data1.count == 1) { - option.data = data1.data; - table.render(option); - layer.close(index); - layer.alert("鏌ヨ鎴愬姛", { icon: 1 }); - } else { - layer.close(index); - layer.alert(data1.code + data1.Message, { icon: 5 }); - } - }, error: function () { - layer.close(index); - layer.alert("鎺ュ彛澶辨晥!", { icon: 5 }); - } - }); - //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨 - sWhere = ""; - //$("#HBillType").val("");//鍗曟嵁绫诲瀷 - //$("#HBillNo").val("");//鍗曟嵁鍙� - //$("#HSourceBillNo").val("");//婧愬崟鍙� - //$("#HCreateBy").val("");//鍒跺崟浜� - //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂� - //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿 - }); - + //鐩戝惉琛屽弻鍑讳簨浠� table.on('rowDouble(mainTable)', function (obj) { layer.alert("鍙屽嚮浜嬩欢", { icon: 1 }); }); - + //閲嶇疆鎸夐挳 + form.on('submit(btnReSearch)', function (data) { + //娓呯┖杩囨护鏉′欢 + set_ClearQuery(); + }); //laydate.render({ // elem: '#HDate' @@ -284,8 +188,186 @@ // , format:'yyyy-MM-dd HH:mm' //}); + //#endregion - //浠ヤ笂鏄痩ayui妯″潡 + //#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")); + } + //鍒濆鍖栬〃鏍� + function set_InitGrid() { + option = { + elem: '#mainTable' + //, toolbar: '#toolbarDemo' + , height: 'full-50' + , page: true + , cellMinWidth: 90 + , cols: [[ + { field: 'hmainid', title: '鍗曟嵁ID', hide: true } + , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 } + , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 } + , { field: 'hmanagerid', title: 'hmanagerid', width: 160, hide: true } + , { field: '涓荤浠g爜', title: '涓荤浠g爜', width: 200 } + , { field: '涓荤', title: '涓荤', width: 200 } + , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200 } + , { field: '楠屾敹鍛樹唬鐮�', title: '楠屾敹鍛樹唬鐮�', width: 200 } + , { field: '楠屾敹鍛�', title: '楠屾敹鍛�', width: 200 } + , { field: 'hkeeperid', title: 'hkeeperid', width: 200, width: 200 } + , { field: '淇濈鍛樹唬鐮�', title: '淇濈鍛樹唬鐮�', width: 160 } + , { field: '淇濈鍛�', title: '淇濈鍛�', width: 160 } + , { field: 'HDeptID', title: 'HDeptID', width: 160, hide: true } + , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 200 } + , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 200 } + , { field: '浠撳簱', title: '浠撳簱', width: 200 } + , { field: '鎽樿', title: '鎽樿', width: 200 } + , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200 } + , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 } + , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 200 } + , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115 } + , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 115 } + , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 } + , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200 } + , { field: '淇敼浜�', title: '淇敼浜�', width: 115 } + , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200 } + , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 } + , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 } + , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 } + , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115 } + , { field: 'hsubid', title: 'hsubid', width: 200, hide: true } + , { field: '瀛愯〃涓婚敭', title: '瀛愯〃涓婚敭', width: 200, hide: true } + , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 200 } + , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 115 } + , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 } + , { field: '闄勫姞灞炴��', title: '闄勫姞灞炴��', width: 200 } + , { field: '棰滆壊', title: '棰滆壊', width: 200 } + , { field: 'hunitid', title: 'hunitid', width: 200, hide: true } + , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 200 } + , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 200 } + , { field: '搴旀敹鏁伴噺', title: '搴旀敹鏁伴噺', width: 115 } + , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 200 } + , { field: '鍗曚环', title: '鍗曚环', width: 200 } + , { field: '閲戦', title: '閲戦', width: 200 } + , { field: 'HSPID', title: 'HSPID', width: 115, hide: true } + , { field: 'hwhid', title: 'hwhid', width: 115, hide: true } + , { field: '鏀舵枡浠撳簱浠g爜', title: '鏀舵枡浠撳簱浠g爜', width: 200 } + , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 200 } + , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 200 } + , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 115 } + , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 115 } + , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 115, hide: true } + , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true } + , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 } + , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 } + , { field: '閲囪喘璁㈠崟涓籌D', title: '閲囪喘璁㈠崟涓籌D', width: 115, hide: true } + , { field: '閲囪喘璁㈠崟瀛怚D', title: '閲囪喘璁㈠崟瀛怚D', width: 115, hide: true } + , { field: '閲囪喘璁㈠崟鍙�', title: '閲囪喘璁㈠崟鍙�', width: 115 } + , { field: '閿�鍞鍗曚富ID', title: '閿�鍞鍗曚富ID', width: 200, hide: true } + , { field: '閿�鍞鍗曞瓙ID', title: '閿�鍞鍗曞瓙ID', width: 200, hide: true } + , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 200 } + , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 115 } + , { field: 'HBillType', title: 'HBillType', width: 200, hide: true } + ]] + } + } + //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� + function get_Display(sWhere) { + var index = layer.load(0); + //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� + $.ajax({ + //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum", + url: GetWEBURL() + '/Kf_OtherOutBill/GetOtherOutBillList', + type: "GET", + data: { "sWhere": sWhere }, + success: function (data1) { + if (data1.count == 1) { + option.data = data1.data; + table.render(option); + layer.close(index); + } else { + layer.close(index); + layer.alert(data1.code + data1.Message, { icon: 5 }); + } + }, error: function () { + layer.close(index); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } + + // 蹇�熻繃婊� + function get_FastQuery() { + var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈� + var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡 + var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙� + var HDeptID = $("#HDeptID").val();//閮ㄩ棬 + var MaterialCode = $("#MaterialCode").val();//鐗╂枡浠g爜 + var MaterialName = $("#MaterialName").val();//鐗╂枡鍚嶇О + var SpecificationModel = $("#SpecificationModel").val();//瑙勬牸鍨嬪彿 + var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿 + var Warehouse = $("#Warehouse").val();//浠撳簱 + var Hmaker = $("#Hmaker").val();//鍒跺崟浜� + + if (HDate) { + sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'"; + } + if (HDate1) { + sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'"; + } + 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 (HSourceBillNo) { + sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'"; + } + if (Warehouse) { + sWhere += " and 鍙戣揣浠撳簱 like '%" + Warehouse + "%'"; + } + if (Hmaker) { + sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'"; + } + get_Display(sWhere); + sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨 + } + + // 閲嶇疆杩囨护鏉′欢 + 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")); + $("#HDate").val("");//寮�濮嬫棩鏈� + $("#HDate1").val("");//缁撴潫鏃ユ湡 + $("#HBillNo").val("");//鍗曟嵁鍙� + $("#HDeptID").val();//閮ㄩ棬 + $("#MaterialCode").val();//鐗╂枡浠g爜 + $("#MaterialName").val();//鐗╂枡鍚嶇О + $("#SpecificationModel").val();//瑙勬牸鍨嬪彿 + $("#HSourceBillNo").val();//婧愬崟鍗曞彿 + $("#Warehouse").val();//浠撳簱 + $("#Hmaker").val();//鍒跺崟浜� + + sWhere = ""; + } + + //#endregion }); 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_MateOutBackBillList.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_MateOutBackBillList.html" index fbd23d3..059007d 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_MateOutBackBillList.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_MateOutBackBillList.html" @@ -115,11 +115,11 @@ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><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-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button> - <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-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="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button> </div> @@ -135,6 +135,8 @@ }).extend({ index: 'lib/index', //涓诲叆鍙fā鍧� }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () { + + //#region 鍏叡鍙橀噺 var $ = layui.$ , admin = layui.admin , layer = layui.layer @@ -149,13 +151,17 @@ var option = []; var Name = "MouldProdInHouseCellWidth"; + //#endregion + //#region 杩涘叆椤甸潰鏃㈠姞杞� //鍒濆鍖栬〃鏍� set_InitGrid(); //鍔犺浇鏁版嵁鍒扮綉鏍� get_Display(sWhere); //#endregion + //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛� + //澶村伐鍏锋爮浜嬩欢 table.on('toolbar(mainTable)', function (obj) { switch (obj.event) { @@ -177,20 +183,14 @@ //鍒锋柊 case 'get_Refresh': set_Refresh(); break; - //閫�鍑� case 'get_Exit': Pub_Close(2); break; - //鍒嗛厤 - case 'btn-fp': set_Distribut(); + //瀹℃牳 + case 'btn-Audit': set_CheckBill(); break; - //鍙戝竷 - case 'btn-fb': set_Release(); - break; - //浼樺厛绾� - case 'btn-yxj': set_Yxj(); - break; - case 'btn-back': set_Back(); + //鍙嶅鏍� + case 'btn-DeAudit': set_AbandonCheck(); break; }; }); @@ -202,6 +202,10 @@ form.on('submit(btnSearch)', function (data) { get_FastQuery(table, option); }); + + //#endregion + + //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶 //鍒濆鍖栬〃鏍� function set_InitGrid() { $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd")); @@ -269,14 +273,7 @@ //鍔犺浇缃戞牸 function get_Display(sWhere) { var wait = layer.load();//閬僵 - var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈� - var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡 - if (HBeginDate) { - sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'"; - } - if (HEndDate) { - sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'"; - } + $.ajax({ url: GetWEBURL() + '/Kf_MateOutBackBill/GetMateOutBillList', type: "GET", @@ -434,7 +431,7 @@ var wait = layer.load(); $.ajax({ type: "GET", - url: GetWEBURL() + "/Sc_MouldProdInBill/set_CheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� + url: GetWEBURL() + "/Kf_MateOutBackBill/set_CheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] }, success: function (result) { if (result.count == 1) { @@ -470,7 +467,7 @@ var wait = layer.load(); $.ajax({ type: "GET", - url: GetWEBURL() + "/Sc_MouldProdInBill/set_AbandonCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� + url: GetWEBURL() + "/Kf_MateOutBackBill/set_AbandonCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] }, success: function (result) { if (result.count == 1) { @@ -697,6 +694,8 @@ function set_Refresh() { $("#btnSearch").click(); } + + //#endregion }); </script> </body> diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillList.html" index 92dde06..2422c6a 100644 --- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillList.html" +++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillList.html" @@ -113,10 +113,10 @@ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></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_CheckBill"><i class="layui-icon layui-icon-search"></i>瀹℃牳</button> - <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck"><i class="layui-icon layui-icon-search"></i>鍙嶅鏍�</button> - <button type="button" class="layui-btn layui-btn-sm" lay-event="get_PrintReport"><i class="layui-icon layui-icon-search"></i>棰勮</button> - <button type="button" class="layui-btn layui-btn-sm" lay-event=""><i class="layui-icon layui-icon-search"></i>鎵撳嵃</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="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> @@ -134,6 +134,8 @@ }).extend({ index: 'lib/index', //涓诲叆鍙fā鍧� }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () { + + //#region 鍏叡鍙橀噺 var $ = layui.$ , admin = layui.admin , layer = layui.layer @@ -146,112 +148,24 @@ //鏌ヨ鏉′欢 var sWhere = ""; var option = []; - - //鍒濆鍖栫晫闈� - set_ClearBill(); - //#endregion - //#region 閲嶇疆鎸夐挳 + //#region 鍒濆鍖栫晫闈� + //鍒濆鍖栫晫闈� + set_ClearBill(); + //#endregion + + //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛� + + // 閲嶇疆鎸夐挳 form.on('submit(btnReSearch)', function (data) { //娓呯┖杩囨护鏉′欢 set_ClearQuery(); }); - //#endregion - - //#region 鏌ヨ鎸夐挳 + // 鏌ヨ鎸夐挳 form.on('submit(btnSearch)', function (data) { - get_FastQuery(table, option); + get_FastQuery(); }); - //#endregion - - //#region 鍒濆鍖栫晫闈� - function set_ClearBill() { - //鍒濆鍖栬〃鏍� - set_InitGrid(); - //鏌ヨ - get_Display(sWhere); - } - //#endregion - //#region 鍒濆鍖栬〃鏍兼柟娉� - $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd")); - $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); - function set_InitGrid() { - option = { - elem: '#mainTable' - , toolbar: '#toolbarDemo' - , height: 'full-50' - , page: true - , cellMinWidth: 90 - , cols: [[ - { type: 'checkbox', fixed: 'left' } - ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true } - ,{ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', hide: true } - , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 } - , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 } - , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 160 } - , { field: 'HCusID', title: 'HCusID', width: 160, hide: true } - , { field: '瀹㈡埛', title: '瀹㈡埛', width: 200 } - , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200, hide: true } - , { field: '楠屾敹鍛�', title: '楠屾敹鍛�', width: 200 } - , { field: 'hkeeperid', title: 'hkeeperid', width: 200, hide: true } - , { field: '淇濈鍛�', title: '淇濈鍛�', width: 200 } - , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true } - , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 160 } - , { field: '浠撳簱', title: '浠撳簱', width: 160 } - , { field: 'hsubid', title: 'hsubid', width: 160, hide: true } - , { field: 'hmaterid', title: 'hmaterid', width: 200, hide: true } - , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 200 } - , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 } - , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 } - , { field: '鎵规', title: '鎵规', width: 200 } - , { field: 'hunitid', title: 'hunitid', width: 200, hide: true } - , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 200 } - , { field: '搴旀敹鏁伴噺', title: '搴旀敹鏁伴噺', width: 115 } - , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 115 } - , { field: '鍑哄簱鏁伴噺', title: '鍑哄簱鏁伴噺', width: 200 } - , { field: '鍗曚环', title: '鍗曚环', width: 200 } - , { field: '閲戦', title: '閲戦', width: 115 } - , { field: 'hwhid', title: 'hwhid', width: 200, hide: true } - , { field: '鏀舵枡浠撳簱浠g爜', title: '鏀舵枡浠撳簱浠g爜', width: 200 } - , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 200 } - , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 } - , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 } - , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } - , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125 } - , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } - , { field: '淇敼浜�', title: '淇敼浜�', width: 125 } - , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } - , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125 } - , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } - , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125 } - , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } - - ]] - }; - } - //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� - function get_Display(sWhere) { - var ajaxLoad = layer.load(); - $.ajax({ - url: GetWEBURL() + '/Kf_ProductInBill/GetProductInBill', - type: "GET", - data: { "sWhere": sWhere }, - success: function (data1) { - if (data1.count == 1) { - option.data = data1.data; - table.render(option); - layer.close(ajaxLoad); - } else { - layer.close(ajaxLoad); - layer.alert(data1.code + data1.Message, { icon: 5 }); - } - }, error: function () { - layer.close(ajaxLoad); - layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); - } - }); - } //澶村伐鍏锋爮浜嬩欢 table.on('toolbar(mainTable)', function (obj) { var checkStatus = table.checkStatus(obj.config.id); @@ -350,9 +264,98 @@ }; }); + //#endregion - //#region 蹇�熻繃婊� - function get_FastQuery(table, option) { + //#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")); + } + // 鍒濆鍖栬〃鏍兼柟娉� + function set_InitGrid() { + option = { + elem: '#mainTable' + , toolbar: '#toolbarDemo' + , height: 'full-50' + , page: true + , cellMinWidth: 90 + , cols: [[ + { type: 'checkbox', fixed: 'left' } + , { field: 'hmainid', title: 'hmainid', sort: true, hide: true } + , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', hide: true } + , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 } + , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 } + , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 160 } + , { field: 'HCusID', title: 'HCusID', width: 160, hide: true } + , { field: '瀹㈡埛', title: '瀹㈡埛', width: 200 } + , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200, hide: true } + , { field: '楠屾敹鍛�', title: '楠屾敹鍛�', width: 200 } + , { field: 'hkeeperid', title: 'hkeeperid', width: 200, hide: true } + , { field: '淇濈鍛�', title: '淇濈鍛�', width: 200 } + , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true } + , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 160 } + , { field: '浠撳簱', title: '浠撳簱', width: 160 } + , { field: 'hsubid', title: 'hsubid', width: 160, hide: true } + , { field: 'hmaterid', title: 'hmaterid', width: 200, hide: true } + , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 200 } + , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 } + , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 } + , { field: '鎵规', title: '鎵规', width: 200 } + , { field: 'hunitid', title: 'hunitid', width: 200, hide: true } + , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 200 } + , { field: '搴旀敹鏁伴噺', title: '搴旀敹鏁伴噺', width: 115 } + , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 115 } + , { field: '鍑哄簱鏁伴噺', title: '鍑哄簱鏁伴噺', width: 200 } + , { field: '鍗曚环', title: '鍗曚环', width: 200 } + , { field: '閲戦', title: '閲戦', width: 115 } + , { field: 'hwhid', title: 'hwhid', width: 200, hide: true } + , { field: '鏀舵枡浠撳簱浠g爜', title: '鏀舵枡浠撳簱浠g爜', width: 200 } + , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 200 } + , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 } + , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 } + , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } + , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125 } + , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } + , { field: '淇敼浜�', title: '淇敼浜�', width: 125 } + , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } + , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125 } + , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } + , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125 } + , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } + + ]] + }; + } + //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� + function get_Display(sWhere) { + var ajaxLoad = layer.load(); + $.ajax({ + url: GetWEBURL() + '/Kf_ProductInBill/GetProductInBill', + type: "GET", + data: { "sWhere": sWhere }, + success: function (data1) { + if (data1.count == 1) { + option.data = data1.data; + table.render(option); + layer.close(ajaxLoad); + } else { + layer.close(ajaxLoad); + layer.alert(data1.code + data1.Message, { icon: 5 }); + } + }, error: function () { + layer.close(ajaxLoad); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } + // 蹇�熻繃婊� + function get_FastQuery() { var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈� var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡 var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙� @@ -396,26 +399,27 @@ get_Display(sWhere); sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨 } - //#endregion - //#region 閲嶇疆杩囨护鏉′欢 + // 閲嶇疆杩囨护鏉′欢 function set_ClearQuery() { - $("#HDate").val("");//寮�濮嬫棩鏈� - $("#HDate1").val("");//缁撴潫鏃ユ湡 - $("#HBillNo").val("");// - $("#HCusID").val(""); - $("#HDeptID").val(""); - $("#HMangerID").val(""); + $("#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();//瑙勬牸鍨嬪彿 + $("#HSourceBillNo").val();//婧愬崟鍗曞彿 + $("#Warehouse").val();//浠撳簱 + $("#Hmaker").val();//鍒跺崟浜� + sWhere = ""; } - //#endregion - - //#region 鍒锋柊 + // 鍒锋柊 function get_Refresh() { set_ClearQuery(); get_Display(sWhere); } //#endregion - //浠ヤ笂鏄痩ayui妯″潡 }); diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html" index ad50ea4..8692a21 100644 --- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html" +++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html" @@ -60,26 +60,46 @@ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button> <div class="layui-colla-content"> <div class="layui-inline"> - <div class="layui-inline"> - <span>鍏朵粬鏉′欢></span> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label">瀹㈡埛</label> - <div class="layui-input-block"> - <input type="text" class="layui-input" name="HCusID" id="HCusID" 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="HDeptID" id="HDeptID" style="width:190px;"> </div> </div> <div class="layui-inline"> - <label class="layui-form-label">涓荤</label> + <label class="layui-form-label">鐗╂枡浠g爜</label> <div class="layui-input-block"> - <input type="text" class="layui-input" name="HMangerID" id="HMangerID" style="width:190px;"> + <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="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="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="Hmaker" id="Hmaker" style="width:190px;"> </div> </div> </div> @@ -93,6 +113,10 @@ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></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="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="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> @@ -110,6 +134,8 @@ }).extend({ index: 'lib/index', //涓诲叆鍙fā鍧� }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () { + + //#region 鍏叡鍙橀噺 var $ = layui.$ , admin = layui.admin , layer = layui.layer @@ -123,111 +149,27 @@ var sWhere = ""; var option = []; - //鍒濆鍖栫晫闈� - set_ClearBill(); - //#endregion - //#region 閲嶇疆鎸夐挳 + //#region 杩涘叆椤甸潰鍗冲姞杞� + + //鍒濆鍖栫晫闈� + set_ClearBill(); + //#endregion + + //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛� + + // 閲嶇疆鎸夐挳 form.on('submit(btnReSearch)', function (data) { //娓呯┖杩囨护鏉′欢 set_ClearQuery(); }); - //#endregion - //#region 鏌ヨ鎸夐挳 + // 鏌ヨ鎸夐挳 form.on('submit(btnSearch)', function (data) { - get_FastQuery(table, option); + get_FastQuery(); }); - //#endregion - //#region 鍒濆鍖栫晫闈� - function set_ClearBill() { - //鍒濆鍖栬〃鏍� - set_InitGrid(); - //鏌ヨ - get_Display(sWhere); - } - //#endregion - //#region 鍒濆鍖栬〃鏍兼柟娉� - $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd")); - $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); - function set_InitGrid() { - option = { - elem: '#mainTable' - , toolbar: '#toolbarDemo' - , height: 'full-50' - , page: true - , cellMinWidth: 90 - , cols: [[ - { type: 'checkbox', fixed: 'left' } - ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true } - ,{ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', hide: true } - , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 } - , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 } - , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 160 } - , { field: 'HCusID', title: 'HCusID', width: 160, hide: true } - , { field: '瀹㈡埛', title: '瀹㈡埛', width: 200 } - , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200, hide: true } - , { field: '楠屾敹鍛�', title: '楠屾敹鍛�', width: 200 } - , { field: 'hkeeperid', title: 'hkeeperid', width: 200, hide: true } - , { field: '淇濈鍛�', title: '淇濈鍛�', width: 200 } - , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true } - , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 160 } - , { field: '浠撳簱', title: '浠撳簱', width: 160 } - , { field: 'hsubid', title: 'hsubid', width: 160, hide: true } - , { field: 'hmaterid', title: 'hmaterid', width: 200, hide: true } - , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 200 } - , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 } - , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 } - , { field: '鎵规', title: '鎵规', width: 200 } - , { field: 'hunitid', title: 'hunitid', width: 200, hide: true } - , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 200 } - , { field: '搴旀敹鏁伴噺', title: '搴旀敹鏁伴噺', width: 115 } - , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 115 } - , { field: '鍑哄簱鏁伴噺', title: '鍑哄簱鏁伴噺', width: 200 } - , { field: '鍗曚环', title: '鍗曚环', width: 200 } - , { field: '閲戦', title: '閲戦', width: 115 } - , { field: 'hwhid', title: 'hwhid', width: 200, hide: true } - , { field: '鏀舵枡浠撳簱浠g爜', title: '鏀舵枡浠撳簱浠g爜', width: 200 } - , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 200 } - , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 } - , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 } - , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } - , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125 } - , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } - , { field: '淇敼浜�', title: '淇敼浜�', width: 125 } - , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } - , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125 } - , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } - , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125 } - , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } - - ]] - }; - } - //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� - function get_Display(sWhere) { - var ajaxLoad = layer.load(); - $.ajax({ - url: GetWEBURL() + '/Kf_OtherInBill/GetOtherInBill', - type: "GET", - data: { "sWhere": sWhere }, - success: function (data1) { - if (data1.count == 1) { - option.data = data1.data; - table.render(option); - layer.close(ajaxLoad); - } else { - layer.close(ajaxLoad); - layer.alert(data1.code + data1.Message, { icon: 5 }); - } - }, error: function () { - layer.close(ajaxLoad); - layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); - } - }); - } //澶村伐鍏锋爮浜嬩欢 table.on('toolbar(mainTable)', function (obj) { var checkStatus = table.checkStatus(obj.config.id); @@ -326,15 +268,113 @@ }; }); + //#endregion - //#region 蹇�熻繃婊� - function get_FastQuery(table, option) { + //#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")); + } + + // 鍒濆鍖栬〃鏍兼柟娉� + function set_InitGrid() { + option = { + elem: '#mainTable' + , toolbar: '#toolbarDemo' + , height: 'full-50' + , page: true + , cellMinWidth: 90 + , cols: [[ + { type: 'checkbox', fixed: 'left' } + ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true } + ,{ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', hide: true } + , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 } + , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 } + , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 160 } + , { field: 'HCusID', title: 'HCusID', width: 160, hide: true } + , { field: '瀹㈡埛', title: '瀹㈡埛', width: 200 } + , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200, hide: true } + , { field: '楠屾敹鍛�', title: '楠屾敹鍛�', width: 200 } + , { field: 'hkeeperid', title: 'hkeeperid', width: 200, hide: true } + , { field: '淇濈鍛�', title: '淇濈鍛�', width: 200 } + , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true } + , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 160 } + , { field: '浠撳簱', title: '浠撳簱', width: 160 } + , { field: 'hsubid', title: 'hsubid', width: 160, hide: true } + , { field: 'hmaterid', title: 'hmaterid', width: 200, hide: true } + , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 200 } + , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 } + , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 } + , { field: '鎵规', title: '鎵规', width: 200 } + , { field: 'hunitid', title: 'hunitid', width: 200, hide: true } + , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 200 } + , { field: '搴旀敹鏁伴噺', title: '搴旀敹鏁伴噺', width: 115 } + , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 115 } + , { field: '鍑哄簱鏁伴噺', title: '鍑哄簱鏁伴噺', width: 200 } + , { field: '鍗曚环', title: '鍗曚环', width: 200 } + , { field: '閲戦', title: '閲戦', width: 115 } + , { field: 'hwhid', title: 'hwhid', width: 200, hide: true } + , { field: '鏀舵枡浠撳簱浠g爜', title: '鏀舵枡浠撳簱浠g爜', width: 200 } + , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 200 } + , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 } + , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 } + , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } + , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125 } + , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } + , { field: '淇敼浜�', title: '淇敼浜�', width: 125 } + , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } + , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125 } + , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } + , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125 } + , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } + + ]] + }; + } + + //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� + function get_Display(sWhere) { + var ajaxLoad = layer.load(); + $.ajax({ + url: GetWEBURL() + '/Kf_OtherInBill/GetOtherInBill', + type: "GET", + data: { "sWhere": sWhere }, + success: function (data1) { + if (data1.count == 1) { + option.data = data1.data; + table.render(option); + layer.close(ajaxLoad); + } else { + layer.close(ajaxLoad); + layer.alert(data1.code + data1.Message, { icon: 5 }); + } + }, error: function () { + layer.close(ajaxLoad); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } + + // 蹇�熻繃婊� + function get_FastQuery() { var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈� var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡 var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙� - var HCusID = $("#HCusID").val(); - var HDeptID = $("#HDeptID").val(); - var HMangerID = $("#HMangerID").val(); + var HDeptID = $("#HDeptID").val();//閮ㄩ棬 + var MaterialCode = $("#MaterialCode").val();//鐗╂枡浠g爜 + var MaterialName = $("#MaterialName").val();//鐗╂枡鍚嶇О + var SpecificationModel = $("#SpecificationModel").val();//瑙勬牸鍨嬪彿 + var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿 + var Warehouse = $("#Warehouse").val();//浠撳簱 + var Hmaker = $("#Hmaker").val();//鍒跺崟浜� + if (HDate) { sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'"; } @@ -344,36 +384,51 @@ if (HBillNo) { sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'"; } - if (HCusID) { - sWhere += " and 瀹㈡埛 like '%" + HCusID + "%'"; - } if (HDeptID) { sWhere += " and 閮ㄩ棬 like '%" + HDeptID + "%'"; } - if (HMangerID) { - sWhere += " and 涓荤 like '%" + HMangerID + "%'"; + if (MaterialCode) { + sWhere += " and 鐗╂枡浠g爜 like '%" + MaterialCode + "%'"; } + if (MaterialName) { + sWhere += " and 鐗╂枡鍚嶇О like '%" + MaterialName + "%'"; + } + if (SpecificationModel) { + sWhere += " and 瑙勬牸鍨嬪彿 like '%" + SpecificationModel + "%'"; + } + if (HSourceBillNo) { + sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'"; + } + if (Warehouse) { + sWhere += " and 鍙戣揣浠撳簱 like '%" + Warehouse + "%'"; + } + if (Hmaker) { + sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'"; + } + get_Display(sWhere); sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨 } - //#endregion - //#region 閲嶇疆杩囨护鏉′欢 + // 閲嶇疆杩囨护鏉′欢 function set_ClearQuery() { - $("#HDate").val("");//寮�濮嬫棩鏈� - $("#HDate1").val("");//缁撴潫鏃ユ湡 - $("#HBillNo").val("");// - $("#HCusID").val(""); - $("#HDeptID").val(""); - $("#HMangerID").val(""); + $("#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();//瑙勬牸鍨嬪彿 + $("#HSourceBillNo").val();//婧愬崟鍗曞彿 + $("#Warehouse").val();//浠撳簱 + $("#Hmaker").val();//鍒跺崟浜� sWhere = ""; } - //#endregion - - //#region 鍒锋柊 + // 鍒锋柊 function get_Refresh() { set_ClearQuery(); get_Display(sWhere); } + //#endregion diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html" index 01e925a..0ecfd4b 100644 --- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html" +++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html" @@ -1,14 +1,19 @@ 锘�<!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 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/PubCustom.js"></script> + <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script> <style type="text/css"> input.layui-input.layui-unselect { padding-right: 0; @@ -28,64 +33,93 @@ <span>鏇村</span> </div> </div> - <!--<div class="layui-inline"> - <label class="layui-form-label">鍗曟嵁绫诲瀷</label> + <div class="layui-inline"> + <label class="layui-form-label">寮�濮嬫棩鏈�</label> <div class="layui-input-block"> - <select name="HBillType" id="HBillType"> - <option value="">鎵�鏈�</option> - <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option> - <option value="ZHSJ">涓婃灦褰掕繕鍗�</option> - </select> + <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"> + <input type="text" class="layui-input" name="HBillNo" id="HBillNo" 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="HCreateBy" id="HCreateBy"> - </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"> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button> + <div class="layui-colla-content"> <div class="layui-inline"> - <div class="layui-inline"> - <span>鍏朵粬鏉′欢></span> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label">寮�濮嬫椂闂�</label> + <label class="layui-form-label">閮ㄩ棬</label> <div class="layui-input-block"> - <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate"> + <input type="text" class="layui-input" name="HDeptID" id="HDeptID" style="width:190px;"> </div> </div> <div class="layui-inline"> - <label class="layui-form-label">缁撴潫鏃堕棿</label> + <label class="layui-form-label">鐗╂枡浠g爜</label> <div class="layui-input-block"> - <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate"> + <input type="text" class="layui-input" name="MaterialCode" id="MaterialCode" style="width:190px;"> </div> </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="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="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="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="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>--> - <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></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="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button> - + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="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> @@ -93,16 +127,15 @@ </div> </div> </div> - <script src="../../../layuiadmin/layui/layui.js"></script> - <script src="../../../layuiadmin/Scripts/json2.js"></script> - <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script> - <script src="../../../layuiadmin/Scripts/webConfig.js"></script> + <script> 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 @@ -114,188 +147,218 @@ , util = layui.util //鏌ヨ鏉′欢 var sWhere = ""; + var option = []; - var option = { - elem: '#mainTable' - //, toolbar: '#toolbarDemo' - , height: 'full-50' - , page: true - , cellMinWidth: 90 - , cols: [[ - { field: 'hmainid', title: '鍗曟嵁ID', hide: true } - , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 } - , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 } - , { field: 'hsupid', title: 'hsupid', width: 160, hide: true } - , { field: '鍔犲伐鍗曚綅浠g爜', title: '鍔犲伐鍗曚綅浠g爜', width: 200 } - , { field: '鍔犲伐鍗曚綅鍚嶇О', title: '鍔犲伐鍗曚綅鍚嶇О', width: 200 } - , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true } - , { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 200 } - , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 200 } - , { field: 'hmanagerid', title: 'hmanagerid', width: 200, hide: true } - , { field: '涓荤浠g爜', title: '涓荤浠g爜', width: 160 } - , { field: '涓荤', title: '涓荤', width: 160} - , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 160, hide: true } - , { field: '楠屾敹鍛樹唬鐮�', title: '楠屾敹鍛樹唬鐮�', width: 200 } - , { field: '楠屾敹鍛�', title: '楠屾敹鍛�', width: 200 } - , { field: 'hkeeperid', title: 'hkeeperid', width: 200, hide: true } - , { field: '淇濈鍛樹唬鐮�', title: '淇濈鍛樹唬鐮�', width: 200 } - , { field: '淇濈鍛�', title: '淇濈鍛�', width: 200 } - , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true } - , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 200 } - , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 115 } - , { field: '鎽樿', title: '鎽樿', width: 115 } - , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200 } - , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 } - , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 115 } - , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 } - , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 } - , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 } - , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200 } - , { field: '淇敼浜�', title: '淇敼浜�', width: 200 } - , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200 } - , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 115 } - , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 } - , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 } - , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200 } - , { field: 'hsubid', title: 'hsubid', width: 115, hide: true } - , { field: 'hmaterid', title: 'hmaterid', width: 200, hide: true } - , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 200 } - , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 } - , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 } - , { field: '闄勫姞灞炴��', title: '闄勫姞灞炴��', width: 200 } - , { field: '棰滆壊', title: '棰滆壊', width: 200 } - , { field: 'hunitid', title: 'hunitid', width: 200, hide: true } - , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 200 } - , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 200 } - , { field: '搴斿彂鏁伴噺', title: '搴斿彂鏁伴噺', width: 200 } - , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', width: 200 } - , { field: '鍗曚环', title: '鍗曚环', width: 200 } - , { field: '閲戦', title: '閲戦', width: 200 } - , { field: 'hwhid', title: 'hwhid', width: 200, hide: true } - , { field: '鍙戣揣浠撳簱浠g爜', title: '鍙戣揣浠撳簱浠g爜', width: 200 } - , { field: '鍙戣揣浠撳簱', title: '鍙戣揣浠撳簱', width: 200 } - , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 200 } - , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 } - , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 } - , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true } - , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200 } - , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 } - , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 } - , { field: '閲囪喘璁㈠崟涓籌D', title: '閲囪喘璁㈠崟涓籌D', width: 200, hide: true } - , { field: '閲囪喘璁㈠崟瀛怚D', title: '閲囪喘璁㈠崟瀛怚D', width: 200, hide: true } - , { field: '閲囪喘璁㈠崟鍙�', title: '閲囪喘璁㈠崟鍙�', width: 200 } - , { field: '閿�鍞鍗曚富ID', title: '閿�鍞鍗曚富ID', width: 200, hide: true } - , { field: '閿�鍞鍗曞瓙ID', title: '閿�鍞鍗曞瓙ID', width: 200, hide: true } - , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 200 } - , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 } - , { field: 'HBillType', title: 'HBillType', width: 200, hide: true } - ]] - }; + //#endregion - var index = layer.load(0); - //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� - $.ajax({ - //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum", - url: GetWEBURL() + '/Kf_EntrustInBill/GetEntrustInBill', - type: "GET", - data: { "sWhere": sWhere}, - success: function (data1) { - if (data1.count == 1) { - option.data = data1.data; - table.render(option); - layer.close(index); - } else { - layer.close(index); - layer.alert(data1.code + data1.Message, { icon: 5 }); - } - }, error: function () { - layer.close(index); - layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); - } - }); + //#region 杩涘叆椤甸潰鍗冲姞杞� - //閲嶇疆鎸夐挳 - //form.on('submit(btnReSearch)', function (data) { - // $("#HBillType").val("");//鍗曟嵁绫诲瀷 - // $("#HBillNo").val("");//鍗曟嵁鍙� - // $("#HSourceBillNo").val("");//婧愬崟鍙� - // $("#HCreateBy").val("");//鍒跺崟浜� - // $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂� - // $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿 - // $("#btnSearch").click(); - //}); + //鍒濆鍖栫晫闈� + set_ClearBill(); + //#endregion + + //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛� //鏌ヨ鎸夐挳 - form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅 - //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷 - //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙� - //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜� - //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂� - //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿 - //if (HBillNo) { - // sWhere += " and HBillNo like '%" + HBillNo + "%'"; - //} - //if (HCreateBy) { - // sWhere += " and HCreateBy like '%" + HCreateBy + "%'"; - //} - //if (BenginHCreateDate) { - // sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'"; - //} - //if (EndHCreateDate) { - // sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'"; - //} - var index = layer.load(0); - $.ajax({ - //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum", - url: GetWEBURL1() + '/Kf_EntrustInBill/GetEntrustInBill', - type: "GET", - data: { "sWhere": sWhere}, - success: function (data1) { - if (data1.count == 1) { - option.data = data1.data; - table.render(option); - layer.close(index); - layer.alert("鏌ヨ鎴愬姛", { icon: 1 }); - } else { - layer.close(index); - layer.alert(data1.code + data1.Message, { icon: 5 }); - } - }, error: function () { - layer.close(index); - layer.alert("鎺ュ彛澶辨晥!", { icon: 5 }); - } - }); - //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨 - sWhere = ""; - //$("#HBillType").val("");//鍗曟嵁绫诲瀷 - //$("#HBillNo").val("");//鍗曟嵁鍙� - //$("#HSourceBillNo").val("");//婧愬崟鍙� - //$("#HCreateBy").val("");//鍒跺崟浜� - //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂� - //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿 + form.on('submit(btnSearch)', function (data) { + get_FastQuery(); + }); + // 閲嶇疆鎸夐挳 + form.on('submit(btnReSearch)', function (data) { + //娓呯┖杩囨护鏉′欢 + set_ClearQuery(); }); //鐩戝惉琛屽弻鍑讳簨浠� table.on('rowDouble(mainTable)', function (obj) { layer.alert("鍙屽嚮浜嬩欢", { icon: 1 }); }); + //#endregion + //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶 - //laydate.render({ - // elem: '#HDate' - // , type: 'datetime' - // , trigger: 'click' - // , format:'yyyy-MM-dd HH:mm' - //}); + // 鍒濆鍖栫晫闈� + 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")); + } + //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� + function get_Display(sWhere) { + var index = layer.load(); + $.ajax({ + //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum", + url: GetWEBURL() + '/Kf_EntrustInBill/GetEntrustInBill', + type: "GET", + data: { "sWhere": sWhere }, + success: function (data1) { + if (data1.count == 1) { + option.data = data1.data; + table.render(option); + layer.close(index); + } else { + layer.close(index); + layer.alert(data1.code + data1.Message, { icon: 5 }); + } + }, error: function () { + layer.close(index); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } - //浠ヤ笂鏄痩ayui妯″潡 - }); + // 鍒濆鍖栬〃鏍兼柟娉� + function set_InitGrid() { + option = { + elem: '#mainTable' + //, toolbar: '#toolbarDemo' + , height: 'full-50' + , page: true + , cellMinWidth: 90 + , cols: [[ + { field: 'hmainid', title: '鍗曟嵁ID', hide: true } + , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 } + , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 } + , { field: 'hsupid', title: 'hsupid', width: 160, hide: true } + , { field: '鍔犲伐鍗曚綅浠g爜', title: '鍔犲伐鍗曚綅浠g爜', width: 200 } + , { field: '鍔犲伐鍗曚綅鍚嶇О', title: '鍔犲伐鍗曚綅鍚嶇О', width: 200 } + , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true } + , { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 200 } + , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 200 } + , { field: 'hmanagerid', title: 'hmanagerid', width: 200, hide: true } + , { field: '涓荤浠g爜', title: '涓荤浠g爜', width: 160 } + , { field: '涓荤', title: '涓荤', width: 160 } + , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 160, hide: true } + , { field: '楠屾敹鍛樹唬鐮�', title: '楠屾敹鍛樹唬鐮�', width: 200 } + , { field: '楠屾敹鍛�', title: '楠屾敹鍛�', width: 200 } + , { field: 'hkeeperid', title: 'hkeeperid', width: 200, hide: true } + , { field: '淇濈鍛樹唬鐮�', title: '淇濈鍛樹唬鐮�', width: 200 } + , { field: '淇濈鍛�', title: '淇濈鍛�', width: 200 } + , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true } + , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 200 } + , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 115 } + , { field: '鎽樿', title: '鎽樿', width: 115 } + , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200 } + , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 } + , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 115 } + , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 } + , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 } + , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 } + , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200 } + , { field: '淇敼浜�', title: '淇敼浜�', width: 200 } + , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200 } + , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 115 } + , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 } + , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 } + , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200 } + , { field: 'hsubid', title: 'hsubid', width: 115, hide: true } + , { field: 'hmaterid', title: 'hmaterid', width: 200, hide: true } + , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 200 } + , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 } + , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 } + , { field: '闄勫姞灞炴��', title: '闄勫姞灞炴��', width: 200 } + , { field: '棰滆壊', title: '棰滆壊', width: 200 } + , { field: 'hunitid', title: 'hunitid', width: 200, hide: true } + , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 200 } + , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 200 } + , { field: '搴斿彂鏁伴噺', title: '搴斿彂鏁伴噺', width: 200 } + , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', width: 200 } + , { field: '鍗曚环', title: '鍗曚环', width: 200 } + , { field: '閲戦', title: '閲戦', width: 200 } + , { field: 'hwhid', title: 'hwhid', width: 200, hide: true } + , { field: '鍙戣揣浠撳簱浠g爜', title: '鍙戣揣浠撳簱浠g爜', width: 200 } + , { field: '鍙戣揣浠撳簱', title: '鍙戣揣浠撳簱', width: 200 } + , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 200 } + , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 } + , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 } + , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true } + , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200 } + , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 } + , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 } + , { field: '閲囪喘璁㈠崟涓籌D', title: '閲囪喘璁㈠崟涓籌D', width: 200, hide: true } + , { field: '閲囪喘璁㈠崟瀛怚D', title: '閲囪喘璁㈠崟瀛怚D', width: 200, hide: true } + , { field: '閲囪喘璁㈠崟鍙�', title: '閲囪喘璁㈠崟鍙�', width: 200 } + , { field: '閿�鍞鍗曚富ID', title: '閿�鍞鍗曚富ID', width: 200, hide: true } + , { field: '閿�鍞鍗曞瓙ID', title: '閿�鍞鍗曞瓙ID', width: 200, hide: true } + , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 200 } + , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 } + , { field: 'HBillType', title: 'HBillType', width: 200, hide: true } + ]] + }; + } + // 蹇�熻繃婊� + function get_FastQuery() { + var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈� + var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡 + var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙� + var HDeptID = $("#HDeptID").val();//閮ㄩ棬 + var MaterialCode = $("#MaterialCode").val();//鐗╂枡浠g爜 + var MaterialName = $("#MaterialName").val();//鐗╂枡鍚嶇О + var SpecificationModel = $("#SpecificationModel").val();//瑙勬牸鍨嬪彿 + var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿 + var Warehouse = $("#Warehouse").val();//浠撳簱 + var Hmaker = $("#Hmaker").val();//鍒跺崟浜� + if (HDate) { + sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'"; + } + if (HDate1) { + sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'"; + } + 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 (HSourceBillNo) { + sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'"; + } + if (Warehouse) { + sWhere += " and 鍙戣揣浠撳簱 like '%" + Warehouse + "%'"; + } + if (Hmaker) { + sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'"; + } + get_Display(sWhere); + sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨 + } + // 閲嶇疆杩囨护鏉′欢 + 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();//瑙勬牸鍨嬪彿 + $("#HSourceBillNo").val();//婧愬崟鍗曞彿 + $("#Warehouse").val();//浠撳簱 + $("#Hmaker").val();//鍒跺崟浜� + sWhere = ""; + } + //#endregion + + //浠ヤ笂鏄痩ayui妯″潡 + + }) </script> - </body> </html> -- Gitblit v1.9.1