From 0d3e515a8aded9c1fefd79a748a675572deb2557 Mon Sep 17 00:00:00 2001 From: zgq <519541279@qq.com> Date: 星期二, 06 七月 2021 10:55:14 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI --- WebTM/App_Data/MssqlReportData.cs | 3 WebTM/WebTM.csproj.user | 2 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapInBillList.html | 54 ++++ WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdOutBillList.html | 26 +- WebTM/views/生产管理/生产完工单/Sc_Add_MESEndWorkBillList.html | 18 WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html | 48 ++-- WebTM/views/设备管理/Sb_Add_EqpConkBookBillList.html | 30 +- WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdBackBillList.html | 24 +- WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html | 34 +- WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html | 6 WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldScrapOutBillList.html | 34 +- WebTM/views/模治具管理/模治具管理/Sc_Add_MouldRepairCheckBillList.html | 24 +- WebTM/views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList.html | 18 WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldScrapInBillList.html | 43 ++- WebTM/views/设备管理/Sb_Add_EqpRepairCheckBillList.html | 24 +- WebTM/views/模治具管理/模治具管理/Sb_MouldRepairWorkBillList.html | 131 ++++++++---- WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldLifeChangeBillList.html | 18 WebTM/views/模治具管理/模治具管理/Sc_Add_MouldConkBookBillList.html | 30 +- WebTM/WebTM.csproj | 13 + 19 files changed, 343 insertions(+), 237 deletions(-) diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs index dd05001..a19eb5d 100644 --- a/WebTM/App_Data/MssqlReportData.cs +++ b/WebTM/App_Data/MssqlReportData.cs @@ -17,7 +17,8 @@ //public const string SqlConnStr = "Data Source=10.0.2.9;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;"; //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;"; - public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch娴嬭瘯 + //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch娴嬭瘯 + public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL娴嬭瘯 //public string sServer; //public string sDataBase; diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj index 257e5e0..fc8665d 100644 --- a/WebTM/WebTM.csproj +++ b/WebTM/WebTM.csproj @@ -549,6 +549,18 @@ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldMaintainBill_PDA.html" /> <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_CheckToolsFileMainList.html" /> <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_Mould.html" /> + <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_Mould_Edit.html" /> + <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sb_Add_MouldRepairWorkBillList.html" /> + <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_Add_MouldConkBookBillList.html" /> + <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_Add_MouldDotCheckBillList.html" /> + <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_Add_MouldDotCheckPlanBillList.html" /> + <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_Add_MouldMaintainBillList.html" /> + <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_Add_MouldMaintainPlanBillList.html" /> + <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_Add_MouldRepairCheckBillList.html" /> + <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldOtherInBill.html" /> + <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldOtherInBillList.html" /> + <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldOtherOutBill.html" /> + <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldOtherOutBillList.html" /> <Content Include="views\鐢熶骇宸ュ簭绠$悊\濮斿宸ュ崟\WW__Add_EntrustWorkOrderBill.html" /> <Content Include="views\鐢熶骇宸ュ簭绠$悊\濮斿宸ュ簭娲惧伐鍗昞WW_AddEntrustProcSendWork.html" /> <Content Include="views\鐢熶骇宸ュ簭绠$悊\濮斿宸ュ簭璁″垝姹囨姤鍗昞WW_Add_EntrustProcessReport.html" /> @@ -602,6 +614,7 @@ <Content Include="views\璁惧绠$悊\Sb_EquipMaintainPlanBillEdit.html" /> <Content Include="views\璁惧绠$悊\Sb_EquipMaintainPlanBillList.html" /> <Content Include="views\璁惧绠$悊\Sc_Add_MouldDotCheckBillList.html" /> + <Content Include="views\璐ㄩ噺绠$悊\鍑哄巶妫�楠屽崟\QC_OutCompCheckBill.html" /> <Content Include="views\璐ㄩ噺绠$悊\宸℃璁板綍鍗昞QC_Add_Edit_PatrolProcCheckBill.html" /> <Content Include="views\璐ㄩ噺绠$悊\浜у搧鍏ュ簱妫�楠屽崟\QC_LastPieceCheckBill.html" /> <Content Include="views\璐ㄩ噺绠$悊\浜у搧鍏ュ簱妫�楠屽崟\QC_LastPieceCheckBillList.html" /> diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user index 06468a2..c147982 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>JFTM</NameOfLastUsedPublishProfile> - <ProjectView>ProjectFiles</ProjectView> + <ProjectView>ShowAllFiles</ProjectView> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> <Use64BitIISExpress /> 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_Add_MouldLifeChangeBillList.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_Add_MouldLifeChangeBillList.html" index 196a492..10a196a 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_Add_MouldLifeChangeBillList.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_Add_MouldLifeChangeBillList.html" @@ -64,9 +64,9 @@ <div class="layui-inline"> <label class="layui-form-label">璋冩暣浜�</label> <div class="layui-input-inline"> - <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEmpList" style="width:40px;"> + <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -76,9 +76,9 @@ <div class="layui-inline"> <label class="layui-form-label">璐熻矗浜�</label> <div class="layui-input-inline"> - <input type="text" name="HMangerName" id="HMangerName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HMangerID" id="HMangerID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HMangerList" style="width:40px;"> + <input type="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HMangerID" id="HMangerID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HMangerList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -86,9 +86,9 @@ <div class="layui-inline"> <label class="layui-form-label">閮ㄩ棬</label> <div class="layui-input-inline"> - <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;"> + <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> 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_Add_MouldProdBackBillList.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_Add_MouldProdBackBillList.html" index 266147b..67dbfec 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_Add_MouldProdBackBillList.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_Add_MouldProdBackBillList.html" @@ -64,9 +64,9 @@ <div class="layui-inline"> <label class="layui-form-label">浠撳簱</label> <div class="layui-input-inline"> - <input type="text" name="HWHName" id="HWHName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="WareHouse" style="width:40px;"> + <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="WareHouse" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -76,9 +76,9 @@ <div class="layui-inline"> <label class="layui-form-label">楠屾敹鍛�</label> <div class="layui-input-inline"> - <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HSecManagerList" style="width:40px;"> + <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -86,9 +86,9 @@ <div class="layui-inline"> <label class="layui-form-label">淇濈鍛�</label> <div class="layui-input-inline"> - <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HKeeperList" style="width:40px;"> + <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -96,9 +96,9 @@ <div class="layui-inline"> <label class="layui-form-label">閮ㄩ棬</label> <div class="layui-input-inline"> - <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;"> + <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> 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_Add_MouldProdOutBillList.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_Add_MouldProdOutBillList.html" index a1d986f..78aebb1 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_Add_MouldProdOutBillList.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_Add_MouldProdOutBillList.html" @@ -64,9 +64,9 @@ <div class="layui-inline"> <label class="layui-form-label">妯″叿浠撳簱</label> <div class="layui-input-inline"> - <input type="text" name="HWHName" id="HWHName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="WareHouse" style="width:40px;"> + <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="WareHouse" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -76,9 +76,9 @@ <div class="layui-inline"> <label class="layui-form-label">楠屾敹鍛�</label> <div class="layui-input-inline"> - <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HSecManagerList" style="width:40px;"> + <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -86,9 +86,9 @@ <div class="layui-inline"> <label class="layui-form-label">淇濈鍛�</label> <div class="layui-input-inline"> - <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HKeeperList" style="width:40px;"> + <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -96,9 +96,9 @@ <div class="layui-inline"> <label class="layui-form-label">閮ㄩ棬</label> <div class="layui-input-inline"> - <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;"> + <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -118,7 +118,7 @@ <div class="layui-inline"> <label class="layui-form-label">閫夊崟鍙�</label> <div class="layui-input-inline"> - <input type="text" name="XDH" id="XDH" class="layui-input" value="0" style="float:left;width:150px;"> + <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;"> </div> </div> <div class="layui-inline"> 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_Add_MouldScrapInBillList.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_Add_MouldScrapInBillList.html" index 7a3ffa6..847c440 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_Add_MouldScrapInBillList.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_Add_MouldScrapInBillList.html" @@ -26,6 +26,7 @@ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button> <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button> + <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="print">棰勮</button> </div> @@ -64,9 +65,9 @@ <div class="layui-inline"> <label class="layui-form-label">浠撳簱</label> <div class="layui-input-inline"> - <input type="text" name="HWHName" id="HWHName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="WareHouse" style="width:40px;"> + <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="WareHouse" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -76,9 +77,9 @@ <div class="layui-inline"> <label class="layui-form-label">楠屾敹鍛�</label> <div class="layui-input-inline"> - <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HSecManagerList" style="width:40px;"> + <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -86,9 +87,9 @@ <div class="layui-inline"> <label class="layui-form-label">淇濈鍛�</label> <div class="layui-input-inline"> - <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HKeeperList" style="width:40px;"> + <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -96,9 +97,9 @@ <div class="layui-inline"> <label class="layui-form-label">璐熻矗浜�</label> <div class="layui-input-inline"> - <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HManagerList" style="width:40px;"> + <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -106,9 +107,9 @@ <div class="layui-inline"> <label class="layui-form-label">閮ㄩ棬</label> <div class="layui-input-inline"> - <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;"> + <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -118,13 +119,13 @@ <div class="layui-inline"> <label class="layui-form-label">婧愬崟绫诲瀷</label> <div class="layui-input-inline"> - <input type="text" name="HSourceBillType" id="HSourceBillType" class="layui-input" value="0" style="float:left;width:150px;"> + <input type="text" name="HSourceBillType" id="HSourceBillType" class="layui-input" value="" style="float:left;width:150px;"> </div> </div> <div class="layui-inline"> <label class="layui-form-label">閫夊崟鍙�</label> <div class="layui-input-inline"> - <input type="text" name="XDH" id="XDH" class="layui-input" value="0" style="float:left;width:150px;"> + <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;"> </div> </div> <div class="layui-inline"> @@ -1010,6 +1011,14 @@ } + //鎵撳嵃Printing + form.on("submit(print)", function (data) { + layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + hID); + //window.open("../鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b"); + window.open("HBarPlanPrint.html?linterid=" + hID + "&Type=HDepartMent" + "&OpenTmp=b"); + + }); + //鐩戝惉鎻愪氦 form.verify({ numberOrEmpty: function (value, item) { 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_Add_MouldScrapOutBillList.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_Add_MouldScrapOutBillList.html" index c6a3870..ca7cc30 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_Add_MouldScrapOutBillList.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_Add_MouldScrapOutBillList.html" @@ -64,9 +64,9 @@ <div class="layui-inline"> <label class="layui-form-label">寰�鏉ュ崟浣�</label> <div class="layui-input-inline"> - <input type="text" name="HSupName" id="HSupName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Customer" style="width:40px;"> + <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="Customer" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -76,9 +76,9 @@ <div class="layui-inline"> <label class="layui-form-label">璐熻矗浜�</label> <div class="layui-input-inline"> - <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="ZRPerson" style="width:40px;"> + <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="ZRPerson" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -86,9 +86,9 @@ <div class="layui-inline"> <label class="layui-form-label">浠撳簱</label> <div class="layui-input-inline"> - <input type="text" name="HWHName" id="HWHName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="WareHouse" style="width:40px;"> + <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="WareHouse" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -96,9 +96,9 @@ <div class="layui-inline"> <label class="layui-form-label">鍙戣揣鍛�</label> <div class="layui-input-inline"> - <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="FHPerson" style="width:40px;"> + <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="FHPerson" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -106,9 +106,9 @@ <div class="layui-inline"> <label class="layui-form-label">閮ㄩ棬</label> <div class="layui-input-inline"> - <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;"> + <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -118,13 +118,13 @@ <div class="layui-inline"> <label class="layui-form-label">婧愬崟绫诲瀷</label> <div class="layui-input-inline"> - <input type="text" name="HSourceBillType" id="HSourceBillType" class="layui-input" value="0" style="float:left;width:150px;"> + <input type="text" name="HSourceBillType" id="HSourceBillType" class="layui-input" value="" style="float:left;width:150px;"> </div> </div> <div class="layui-inline"> <label class="layui-form-label">閫夊崟鍙�</label> <div class="layui-input-inline"> - <input type="text" name="XDH" id="XDH" class="layui-input" value="0" style="float:left;width:150px;"> + <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;"> </div> </div> <div class="layui-inline"> 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_MouldScrapInBillList.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_MouldScrapInBillList.html" index 9a3e648..dc042fd 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_MouldScrapInBillList.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_MouldScrapInBillList.html" @@ -13,6 +13,9 @@ input.layui-input.layui-unselect { padding-right: 0; } + .layui-body { + overflow-y: scroll; + } </style> </head> <body> @@ -85,6 +88,8 @@ <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-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-circle"></i>棰勮</button> + </div> @@ -99,6 +104,7 @@ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script> <script src="../../../layuiadmin/Scripts/webConfig.js"></script> <script> + var DataList; layui.config({ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰� }).extend({ @@ -119,13 +125,14 @@ var option = { elem: '#mainTable' , toolbar: '#toolbarDemo' - , height: 'full-50' , page: true , cellMinWidth: 90 + , totalRow: true + ,limit: 10 , cols: [[ { type: 'checkbox', fixed: 'left' } - ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true } - , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"} + , { field: 'hmainid', title: '鍗曟嵁ID', hide: true } + , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, totalRowText: '鍚堣', templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" } , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 } , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160 } , { field: 'HManagerID', title: 'HManagerID', width: 200, hide: true } @@ -158,7 +165,7 @@ , { field: '杈呭姪璁¢噺鍗曚綅鍚嶇О', title: '杈呭姪璁¢噺鍗曚綅鍚嶇О', width: 200 } , { field: '鎹㈢畻鐜�', title: '鎹㈢畻鐜�', width: 200 } , { field: '鎵规', title: '鎵规', width: 200 } - , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 200 } + , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 200, totalRow: true } , { field: '鍗曚环', title: '鍗曚环', width: 200 } , { field: '閲戦', title: '閲戦', width: 200 } , { field: '璁捐瀵垮懡', title: '璁捐瀵垮懡', width: 200 } @@ -189,8 +196,29 @@ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 } , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 } ]] + , done: function (res, curr, count) { + + //鐒跺悗鎶婂�煎啓涓婂幓td[data-field="itemNo" 瀹氫箟鍦ㄥ摢涓垪鍚庢樉绀� + var countQty = 0; + for (var i = 0; i < DataList.length; i++) { + countQty += parseFloat(DataList[i].瀹炴敹鏁伴噺); + } + this.elem.next().find('.layui-table-total td[data-field="瀹炴敹鏁伴噺"] .layui-table-cell').text(countQty); + //soulTable.render(this); + /** + * 寮�鍚悎璁¤鍚庢敼鍙樺叾婊氬姩鏉� + **/ + //$(".layui-table-body").css("overflow", "hidden"); + //$(".layui-table-total").css("overflow-x", "auto"); + //$(".layui-table-total").scroll(function () { + // $(".layui-table-body").off("scroll"); + // $(".layui-table-header").off("scroll"); + // $(".layui-table-body").scrollLeft($(this).scroll(function () { + + // })) + //}) + } }; - var index = layer.load(0); //澶村伐鍏锋爮浜嬩欢 @@ -352,6 +380,19 @@ layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�'); } break; + case 'btn-Print': + var checkStatus = table.checkStatus('mainTable') + , data = checkStatus.data; + if (checkStatus.data.length === 1) { + var InterID = data[0].hmainid.toString(); + layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + InterID); + //window.open("../鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b"); + window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HDepartMent" + "&OpenTmp=b"); + } + else { + layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�'); + } + break; }; }); @@ -363,6 +404,7 @@ data: { "sWhere": sWhere}, success: function (data1) { if (data1.count == 1) { + DataList = data1.data; option.data = data1.data; table.render(option); layer.close(index); @@ -389,6 +431,7 @@ //鏌ヨ鎸夐挳 form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅 + var Status = $("select[name='Status']").val();//鐘舵�� var HDate = $("#HDate").val();//寮�濮嬫棩鏈� var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡 @@ -432,6 +475,7 @@ data: { "sWhere": sWhere}, success: function (data1) { if (data1.count == 1) { + DataList = data1.data; option.data = data1.data; table.render(option); layer.close(index); diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html" index f4264bf..71a267e 100644 --- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html" +++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html" @@ -63,9 +63,9 @@ <div class="layui-inline"> <label class="layui-form-label">鎴愬搧妯″叿</label> <div class="layui-input-inline"> - <input type="text" name="HMouldCode" id="HMouldCode" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="ProductModulList" style="width:40px;"> + <input type="text" name="HMouldCode" id="HMouldCode" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="ProductModulList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -76,9 +76,9 @@ <div class="layui-inline"> <label class="layui-form-label">缁翠慨椤圭洰</label> <div class="layui-input-inline"> - <input type="text" name="HRepairName" id="HRepairName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="RepairItemList" style="width:40px;"> + <input type="text" name="HRepairName" id="HRepairName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="RepairItemList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -109,9 +109,9 @@ <div class="layui-inline"> <label class="layui-form-label">缁翠慨閮ㄩ棬</label> <div class="layui-input-inline"> - <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;"> + <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -119,9 +119,9 @@ <div class="layui-inline"> <label class="layui-form-label">涓荤</label> <div class="layui-input-inline"> - <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HManagerList" style="width:40px;"> + <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -129,9 +129,9 @@ <div class="layui-inline"> <label class="layui-form-label">缁翠慨浜�</label> <div class="layui-input-inline"> - <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEmpList" style="width:40px;"> + <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -148,13 +148,13 @@ <div class="layui-inline"> <label class="layui-form-label">璁″垝缁翠慨宸ユ椂</label> <div class="layui-input-inline"> - <input type="text" name="HPlanTimes" id="HPlanTimes" class="layui-input" value="0"> + <input type="text" name="HPlanTimes" id="HPlanTimes" class="layui-input" value=""> </div> </div> <div class="layui-inline"> <label class="layui-form-label">瀹為檯缁翠慨宸ユ椂</label> <div class="layui-input-inline"> - <input type="text" name="HTimes" id="HTimes" class="layui-input" value="0"> + <input type="text" name="HTimes" id="HTimes" class="layui-input" value=""> </div> </div> <div class="layui-inline"> @@ -166,9 +166,9 @@ <div class="layui-inline"> <label class="layui-form-label">渚涘簲鍟�</label> <div class="layui-input-inline"> - <input type="text" name="HSupName" id="HSupName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HSupList" style="width:40px;"> + <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -193,15 +193,15 @@ <div class="layui-inline"> <label class="layui-form-label">鏂拌璁″鍛�</label> <div class="layui-input-inline"> - <input type="text" name="HNewDesignLife" id="HNewDesignLife" class="layui-input" value="0"> + <input type="text" name="HNewDesignLife" id="HNewDesignLife" class="layui-input" value=""> </div> </div> <div class="layui-inline"> <label class="layui-form-label">璁惧</label> <div class="layui-input-inline"> - <input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEquipList" style="width:40px;"> + <input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HEquipList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_MouldRepairWorkBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_MouldRepairWorkBillList.html" index f38fa40..6d18e3f 100644 --- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_MouldRepairWorkBillList.html" +++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_MouldRepairWorkBillList.html" @@ -28,51 +28,64 @@ <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 name="Status" lay-filter="Status" style="width:190px;"> + <option value="-1" selected="selected">鍏ㄩ儴</option> + <option value="0">鏈鏍�</option> + <option value="1">宸插鏍�</option> + <option value="2">宸插叧闂�</option> </select> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">寮�濮嬫棩鏈�</label> + <div class="layui-input-block"> + <input type="date" class="layui-input" id="HDate" 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="HDate1" 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="HMouldNumber" id="HMouldNumber" style="width:190px;"> </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="EndHCreateDate" id="EndHCreateDate"> + <input type="text" class="layui-input" name="HMouldName" id="HMouldName" style="width:190px;"> </div> </div> - </div>--> + <div class="layui-inline"> + <label class="layui-form-label">缁翠慨椤圭洰</label> + <div class="layui-input-block"> + <input type="text" class="layui-input" name="RepairItem" id="RepairItem" style="width:190px;"> + </div> + </div> + </div> </div> </div> <table class="" id="mainTable" lay-filter="mainTable"></table> @@ -378,35 +391,61 @@ }); //閲嶇疆鎸夐挳 - //form.on('submit(btnReSearch)', function (data) { - // $("#HBillType").val("");//鍗曟嵁绫诲瀷 - // $("#HBillNo").val("");//鍗曟嵁鍙� - // $("#HSourceBillNo").val("");//婧愬崟鍙� - // $("#HCreateBy").val("");//鍒跺崟浜� - // $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂� - // $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿 - // $("#btnSearch").click(); - //}); + form.on('submit(btnReSearch)', function (data) { + $('#Status').find("option[value='-1']").attr("selected", true); + $("#HDate").val("");//寮�濮嬫棩鏈� + $("#HDate1").val("");//缁撴潫鏃ユ湡 + $("#HBillNo").val(""); + $("#HMouldNumber").val(""); + $("#HMouldName").val(""); + $("#RepairItem").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 Status = $("select[name='Status']").val();//鐘舵�� + var HDate = $("#HDate").val();//寮�濮嬫棩鏈� + var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡 + var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙� + var HMouldNumber = $("#HMouldNumber").val(); //妯℃不鍏风紪鐮� + var HMouldName = $("#HMouldName").val(); //妯℃不鍏峰悕绉� + var RepairItem = $("#RepairItem").val(); //缁翠慨椤圭洰 + if (Status) { + switch (Status) { + case '-1': //鍏ㄩ儴 + sWhere += ""; + break; + case '0': //鏈鏍� + sWhere += " and 瀹℃牳浜�=''"; + break; + case '1': //宸插鏍� + sWhere += " and 瀹℃牳浜�<>''"; + break; + case '2': //宸插叧闂� + sWhere += " and 鍏抽棴浜�<>''"; + default: + + } + } + 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 (HMouldNumber) { + sWhere += " and 浜у搧妯″叿浠g爜 like '%" + HMouldNumber + "%'"; + } + if (HMouldName) { + sWhere += " and 浜у搧妯″叿 like '%" + HMouldName + "%'"; + } + if (RepairItem) { + sWhere += " and 缁翠慨椤圭洰 like '%" + RepairItem + "%'"; + } var index = layer.load(0); $.ajax({ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum", diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldConkBookBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldConkBookBillList.html" index 30a2c3b..17cc0b5 100644 --- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldConkBookBillList.html" +++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldConkBookBillList.html" @@ -63,9 +63,9 @@ <div class="layui-inline"> <label class="layui-form-label">浜у搧妯″叿</label> <div class="layui-input-inline"> - <input type="text" name="HName" id="HName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="ProductModulList" style="width:40px;"> + <input type="text" name="HName" id="HName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="ProductModulList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -76,9 +76,9 @@ <div class="layui-inline"> <label class="layui-form-label">鏁呴殰绫诲埆</label> <div class="layui-input-inline"> - <input type="text" name="HConkTypeName" id="HConkTypeName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HConkTypeID" id="HConkTypeID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HConkTypeList" style="width:40px;"> + <input type="text" name="HConkTypeName" id="HConkTypeName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HConkTypeID" id="HConkTypeID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HConkTypeList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -86,9 +86,9 @@ <div class="layui-inline"> <label class="layui-form-label">鍙戠幇浜�</label> <div class="layui-input-inline"> - <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEmpList" style="width:40px;"> + <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> @@ -112,9 +112,9 @@ <div class="layui-inline"> <label class="layui-form-label">璐熻矗浜�</label> <div class="layui-input-inline"> - <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HManagerList" style="width:40px;"> + <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -122,9 +122,9 @@ <div class="layui-inline"> <label class="layui-form-label">浣跨敤閮ㄩ棬</label> <div class="layui-input-inline"> - <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;"> + <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldRepairCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldRepairCheckBillList.html" index 2235806..553e011 100644 --- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldRepairCheckBillList.html" +++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldRepairCheckBillList.html" @@ -63,9 +63,9 @@ <div class="layui-inline"> <label class="layui-form-label">浜у搧妯″叿</label> <div class="layui-input-inline"> - <input type="text" name="HName" id="HName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="ProductModulList" style="width:40px;"> + <input type="text" name="HName" id="HName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="ProductModulList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -85,9 +85,9 @@ <div class="layui-inline"> <label class="layui-form-label">楠屾敹浜�</label> <div class="layui-input-inline"> - <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEmpList" style="width:40px;"> + <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -101,9 +101,9 @@ <div class="layui-inline"> <label class="layui-form-label">楠屾敹閮ㄩ棬</label> <div class="layui-input-inline"> - <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;"> + <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -113,9 +113,9 @@ <div class="layui-inline"> <label class="layui-form-label">璐熻矗浜�</label> <div class="layui-input-inline"> - <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HManagerList" style="width:40px;"> + <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html" index e240ae8..1566b9f 100644 --- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html" +++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html" @@ -58,9 +58,9 @@ <div class="layui-inline"> <label class="layui-form-label">閮ㄩ棬</label> <div class="layui-input-inline"> - <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;"> + <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -68,9 +68,9 @@ <div class="layui-inline"> <label class="layui-form-label">鐝粍</label> <div class="layui-input-inline"> - <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HGroupList" style="width:40px;"> + <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -81,9 +81,9 @@ <div class="layui-inline"> <label class="layui-form-label">璧勬簮</label> <div class="layui-input-inline"> - <input type="text" name="HSourceName" id="HSourceName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HSourceID" id="HSourceID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HSourceList" style="width:40px;"> + <input type="text" name="HSourceName" id="HSourceName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HSourceID" id="HSourceID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html" index e5c83e4..9e29205 100644 --- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html" +++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html" @@ -58,9 +58,9 @@ <div class="layui-inline"> <label class="layui-form-label">閮ㄩ棬</label> <div class="layui-input-inline"> - <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;"> + <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -68,9 +68,9 @@ <div class="layui-inline"> <label class="layui-form-label">鐝粍</label> <div class="layui-input-inline"> - <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HGroupList" style="width:40px;"> + <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -81,9 +81,9 @@ <div class="layui-inline"> <label class="layui-form-label">璧勬簮</label> <div class="layui-input-inline"> - <input type="text" name="HSourceName" id="HSourceName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HSourceID" id="HSourceID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HSourceList" style="width:40px;"> + <input type="text" name="HSourceName" id="HSourceName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HSourceID" id="HSourceID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" index 342cb17..e55d58c 100644 --- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" +++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" @@ -60,7 +60,7 @@ <div class="layui-input-inline"> <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;"> <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HShopList" style="width:40px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HShopList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -70,7 +70,7 @@ <div class="layui-input-inline"> <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;"> <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HGroupList" style="width:40px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -82,7 +82,7 @@ <div class="layui-input-inline"> <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;"> <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEmpList" style="width:40px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html" index 1ed1d4e..bbd1bac 100644 --- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html" +++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html" @@ -64,9 +64,9 @@ <div class="layui-inline"> <label class="layui-form-label">浣跨敤閮ㄩ棬</label> <div class="layui-input-inline"> - <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;"> + <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -78,9 +78,9 @@ <div class="layui-inline"> <label class="layui-form-label">鍙戠幇浜�</label> <div class="layui-input-inline"> - <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEmpList" style="width:40px;"> + <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -88,9 +88,9 @@ <div class="layui-inline"> <label class="layui-form-label">璐熻矗浜�</label> <div class="layui-input-inline"> - <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HManagerList" style="width:40px;"> + <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -98,9 +98,9 @@ <div class="layui-inline"> <label class="layui-form-label">璁惧</label> <div class="layui-input-inline"> - <input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEquipList" style="width:40px;"> + <input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HEquipList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -108,9 +108,9 @@ <div class="layui-inline"> <label class="layui-form-label">鏁呴殰绫诲埆</label> <div class="layui-input-inline"> - <input type="text" name="HConkTypeName" id="HConkTypeName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HConkTypeID" id="HConkTypeID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HConkTypeList" style="width:40px;"> + <input type="text" name="HConkTypeName" id="HConkTypeName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HConkTypeID" id="HConkTypeID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HConkTypeList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html" index 8248c99..0e4f093 100644 --- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html" +++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html" @@ -64,9 +64,9 @@ <div class="layui-inline"> <label class="layui-form-label">缁翠慨浜�</label> <div class="layui-input-inline"> - <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEmpList" style="width:40px;"> + <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -83,9 +83,9 @@ <div class="layui-inline"> <label class="layui-form-label">璁惧</label> <div class="layui-input-inline"> - <input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEquipList" style="width:40px;"> + <input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HEquipList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -93,9 +93,9 @@ <div class="layui-inline"> <label class="layui-form-label">璐熻矗浜�</label> <div class="layui-input-inline"> - <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HManagerList" style="width:40px;"> + <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -111,9 +111,9 @@ <div class="layui-inline"> <label class="layui-form-label">缁翠慨椤圭洰</label> <div class="layui-input-inline"> - <input type="text" name="HRepairName" id="HRepairName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="RepairItemList" style="width:40px;"> + <input type="text" name="HRepairName" id="HRepairName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="RepairItemList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -121,9 +121,9 @@ <div class="layui-inline"> <label class="layui-form-label">缁翠慨閮ㄩ棬</label> <div class="layui-input-inline"> - <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;"> + <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -131,13 +131,13 @@ <div class="layui-inline"> <label class="layui-form-label">璁″垝缁翠慨宸ユ椂</label> <div class="layui-input-inline"> - <input type="text" name="HPlanTimes" id="HPlanTimes" class="layui-input" value="0"> + <input type="text" name="HPlanTimes" id="HPlanTimes" class="layui-input" value=""> </div> </div> <div class="layui-inline"> <label class="layui-form-label">瀹為檯缁翠慨宸ユ椂</label> <div class="layui-input-inline"> - <input type="text" name="HTimes" id="HTimes" class="layui-input" value="0"> + <input type="text" name="HTimes" id="HTimes" class="layui-input" value=""> </div> </div> </div> diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html" index e4d531e..9d9dd50 100644 --- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html" +++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html" @@ -64,9 +64,9 @@ <div class="layui-inline"> <label class="layui-form-label">楠屾敹閮ㄩ棬</label> <div class="layui-input-inline"> - <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;"> + <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -78,9 +78,9 @@ <div class="layui-inline"> <label class="layui-form-label">楠屾敹浜�</label> <div class="layui-input-inline"> - <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEmpList" style="width:40px;"> + <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -88,9 +88,9 @@ <div class="layui-inline"> <label class="layui-form-label">璐熻矗浜�</label> <div class="layui-input-inline"> - <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HManagerList" style="width:40px;"> + <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> @@ -98,9 +98,9 @@ <div class="layui-inline"> <label class="layui-form-label">璁惧</label> <div class="layui-input-inline"> - <input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="0" style="float:left;width:150px;"> - <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="0" style="float:left;width:150px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEquipList" style="width:40px;"> + <input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HEquipList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> -- Gitblit v1.9.1