From 10933c3b600711a70b74ffbeea41b51f7e7c0924 Mon Sep 17 00:00:00 2001 From: cwjbxqmz <1134865194@qq.com> Date: 星期五, 03 十一月 2023 13:32:55 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI --- WebTM/views/车间管理/单品过站/Cj_ProcessItemBGA.html | 1212 ++++++++++++++----------- WebTM/views/生产管理/齐套分析/JIT_CompleteDetailList.html | 14 WebTM/views/车间管理/单品过站/Cj_ProcessItemBGA_PJGH.html | 461 +++++++++ WebTM/views/基础资料/生产基础资料/Gy_BadType.html | 629 +++++++++++++ WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 165 +-- WebTM/views/生产管理/日计划报表/MaterialShorAnalysisReport.html | 16 WebTM/views/index_Mobile_QiaoYi.html | 266 ++-- WebTM/views/index.html | 1 WebTM/views/车间管理/单品过站/Cj_CollectionOfSingleProductDefects.html | 2 WebTM/WebTM.csproj | 1 10 files changed, 1,974 insertions(+), 793 deletions(-) diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj index 9cd8951..0d0930e 100644 --- a/WebTM/WebTM.csproj +++ b/WebTM/WebTM.csproj @@ -252,6 +252,7 @@ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" /> <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPrice.html" /> <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPriceList.html" /> + <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_BadType.html" /> <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Souce_Excel.html" /> <Content Include="views\宸ヨ祫绠$悊\鍔犵彮鐢宠\Pay_OverApplyBill.html" /> <Content Include="views\宸ヨ祫绠$悊\鍔犵彮鐢宠\Pay_OverApplyBillList.html" /> diff --git a/WebTM/views/index.html b/WebTM/views/index.html index 56d1b76..e1416d7 100644 --- a/WebTM/views/index.html +++ b/WebTM/views/index.html @@ -1090,6 +1090,7 @@ <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html">鐢熶骇璧勬簮鍒楄〃</a></dd> <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html">鐢熶骇鐝粍鍒楄〃</a></dd> <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html">涓嶈壇鍘熷洜鍒楄〃</a></dd> + <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadType.html">涓嶈壇绫诲瀷鍒楄〃</a></dd> <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_ConkReasonList.html">鏁呴殰鍘熷洜鍒楄〃</a></dd> <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_SOPBillList.html">浣滀笟鎸囧涔︾淮鎶�</a></dd> <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_SOPBillEdit.html">浣滀笟鎸囧涔︾紪杈�</a></dd> diff --git a/WebTM/views/index_Mobile_QiaoYi.html b/WebTM/views/index_Mobile_QiaoYi.html index 3f9964f..3fa152e 100644 --- a/WebTM/views/index_Mobile_QiaoYi.html +++ b/WebTM/views/index_Mobile_QiaoYi.html @@ -346,23 +346,23 @@ </a> <dl class="layui-nav-child"> <!--<dd> - <a href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 閲囪喘鍏ュ簱 - </a> - </dd> - <dd> - <a href="楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 濮斿鍏ュ簱 - </a> - </dd> - <dd> - <a href="楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 鐢熶骇鍏ュ簱 - </a> - </dd>--> + <a href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 閲囪喘鍏ュ簱 + </a> + </dd> + <dd> + <a href="楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 濮斿鍏ュ簱 + </a> + </dd> + <dd> + <a href="楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 鐢熶骇鍏ュ簱 + </a> + </dd>--> <dd> <a href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html" target="main_self_frame" style="color: aqua;"> <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> @@ -370,139 +370,145 @@ </a> </dd> <!--<dd> - <a href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBackBill_Fast.html" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 鍏朵粬鍏ュ簱锛堢孩瀛楋級 - </a> - </dd>--> + <a href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBackBill_Fast.html" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 鍏朵粬鍏ュ簱锛堢孩瀛楋級 + </a> + </dd>--> <!--<dd> - <a href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Fast.html" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 鐢熶骇棰嗘枡 - </a> - </dd> - <dd> - <a href="棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 濮斿棰嗘枡 - </a> - </dd> - <dd> - <a href="棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Check_New.html" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 濮斿棰嗘枡鏍¢獙 - </a> - </dd> - <dd> - <a href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 閿�鍞嚭搴� - </a> - <a href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Check_New.html" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 閿�鍞嚭搴撴牎楠� - </a> - </dd>--> + <a href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Fast.html" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 鐢熶骇棰嗘枡 + </a> + </dd> + <dd> + <a href="棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 濮斿棰嗘枡 + </a> + </dd> + <dd> + <a href="棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Check_New.html" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 濮斿棰嗘枡鏍¢獙 + </a> + </dd> + <dd> + <a href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 閿�鍞嚭搴� + </a> + <a href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Check_New.html" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 閿�鍞嚭搴撴牎楠� + </a> + </dd>--> <dd> <a href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Fast.html" target="main_self_frame" style="color: aqua;"> <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> 鍏朵粬鍑哄簱 </a> <!--<a href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Check.html" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 鍏朵粬鍑哄簱鏍¢獙 - </a>--> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 鍏朵粬鍑哄簱鏍¢獙 + </a>--> </dd> <!--<dd> - <a href="棰嗘枡鍙戣揣/鐢熶骇琛ユ枡/Kf_MateReplenishOutBill_Check_New.html" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 鐢熶骇琛ユ枡鏍¢獙 - </a> - </dd> - <dd> - <a href="棰嗘枡鍙戣揣/濮斿琛ユ枡/Kf_EntrustReplenishOutBill_Check_New.html" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 濮斿琛ユ枡鏍¢獙 - </a> - </dd>--> + <a href="棰嗘枡鍙戣揣/鐢熶骇琛ユ枡/Kf_MateReplenishOutBill_Check_New.html" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 鐢熶骇琛ユ枡鏍¢獙 + </a> + </dd> + <dd> + <a href="棰嗘枡鍙戣揣/濮斿琛ユ枡/Kf_EntrustReplenishOutBill_Check_New.html" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 濮斿琛ユ枡鏍¢獙 + </a> + </dd>--> <dd> <a href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html" target="main_self_frame" style="color: aqua;"> <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> 璋冩嫧鍗� </a> </dd> + <dd> + <a href="WMS鎵爜妯″潡/鏉$爜鏌ヨ/Gy_BarCodeBill_QiaoYi_PDA.html" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 鏉$爜鏌ヨ + </a> + </dd> <!--<dd> - <a href="" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 鍒嗘寮忚皟鍏 - </a> - </dd>--> + <a href="" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 鍒嗘寮忚皟鍏 + </a> + </dd>--> <!--<dd> - <a href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockOutBill_Fast.html" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 鍒嗘寮忚皟鍑� - </a> - </dd> - <dd> - <a href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBill.html" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 閲囪喘閫�鏂� - </a> - </dd> - <dd> - <a href="楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBackBill.html" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 鐢熶骇閫�搴� - </a> - </dd> - <dd> - <a href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBill_Fast.html" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 鐢熶骇閫�鏂� - </a> - </dd>--> + <a href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockOutBill_Fast.html" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 鍒嗘寮忚皟鍑� + </a> + </dd> + <dd> + <a href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBill.html" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 閲囪喘閫�鏂� + </a> + </dd> + <dd> + <a href="楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBackBill.html" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 鐢熶骇閫�搴� + </a> + </dd> + <dd> + <a href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBill_Fast.html" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 鐢熶骇閫�鏂� + </a> + </dd>--> <!--<dd> - <a href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBackBill_Fast.html" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 閿�鍞��璐� - </a> - </dd> - <dd> - <a href="棰嗘枡鍙戣揣/鏀舵枡鍏ュ簱/Kf_ReciveBill_Fast.html" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 鍒拌揣纭 - </a> - </dd> - <dd> - <a href="鐢熶骇绠$悊/鐢熶骇瑁呯鍗�/Sc_PackUnionBill_Fast.html" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 鐢熶骇瑁呯鍗� - </a> - </dd> - <dd> - <a href="鐢熶骇绠$悊/鐢熶骇鎷嗙鍗�/Sc_PackSplitBill_Fast.html" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 鐢熶骇鎷嗙鍗� - </a> - </dd> - <dd> - <a href="鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 鐢熶骇姹囨姤鍗� - </a> - </dd>--> + <a href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBackBill_Fast.html" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 閿�鍞��璐� + </a> + </dd> + <dd> + <a href="棰嗘枡鍙戣揣/鏀舵枡鍏ュ簱/Kf_ReciveBill_Fast.html" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 鍒拌揣纭 + </a> + </dd> + <dd> + <a href="鐢熶骇绠$悊/鐢熶骇瑁呯鍗�/Sc_PackUnionBill_Fast.html" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 鐢熶骇瑁呯鍗� + </a> + </dd> + <dd> + <a href="鐢熶骇绠$悊/鐢熶骇鎷嗙鍗�/Sc_PackSplitBill_Fast.html" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 鐢熶骇鎷嗙鍗� + </a> + </dd> + <dd> + <a href="鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 鐢熶骇姹囨姤鍗� + </a> + </dd>--> <!--<dd> - <a href="" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 鏉$爜鏌ヨn - </a> - </dd>--> + <a href="" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 鏉$爜鏌ヨn + </a> + </dd>--> <!--<dd> - <a href="浠撳瓨绠$悊/鏉$爜搴撳瓨/KF_ICInventoryByMaterID.html" target="main_self_frame" style="color: aqua;"> - <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> - 搴撳瓨鏌ヨ - </a> - </dd>--> + <a href="浠撳瓨绠$悊/鏉$爜搴撳瓨/KF_ICInventoryByMaterID.html" target="main_self_frame" style="color: aqua;"> + <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" /> + 搴撳瓨鏌ヨ + </a> + </dd>--> </dl> </li> <!-- 璁惧绠$悊 --> diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html" new file mode 100644 index 0000000..7055c00 --- /dev/null +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html" @@ -0,0 +1,629 @@ +锘�<!DOCTYPE html> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>涓嶈壇绫诲瀷璁剧疆</title> + <meta name="renderer" content="webkit"> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> + <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all"> + <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all"> + <script src="../../../layuiadmin/layui/layui.js"></script> + +</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" style="width: 85px;">涓嶈壇绫诲瀷浠g爜</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" name="HNumber" id="HNumber"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">涓嶈壇绫诲瀷鍚嶇О</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" name="HName" id="HName"> + </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" style="padding: 0px; margin-left: 6%;"> + <div class="layui-row" style="margin-top:5px"> + <div class="layui-inline"> + <label class="layui-form-label">杩囨护</label> + <div class="layui-input-block"> + <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;"> + </select> + </div> + </div> + <div class="layui-inline"> + <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;"> + <option value="0" selected="selected"></option> + <option value="=">=</option> + <option value=">=">>=</option> + <option value=">">></option> + <option value="<="><=</option> + <option value="<"><</option> + <option value="<>"><></option> + <option value="7">鍖呭惈</option> + <option value="8">宸﹀寘鍚�</option> + <option value="9">鍙冲寘鍚�</option> + <option value="10">涓嶅寘鍚�</option> + </select> + </div> + <div class="layui-inline"> + <input type="text" class="layui-input" value="" name="ColContent" id="ColContent"> + </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="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-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></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 = []; + var HModName = "Gy_BadReason"; + //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� + var titleData = ["HItemID"]; + //#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-Add': set_AddNew(); + break; + //缂栬緫 + case 'btn-Edit': set_ShowBill(); + break; + //鍒犻櫎 + case 'btn-Delete': set_DeleteBill(); + break; + //瀹℃牳鎸夐挳 + case 'btn-Audit': + set_CheckBill(0); + break; + //鍙嶅鏍告寜閽� + case 'btn-DeAudit': + set_CheckBill(1); + break; + //绂佺敤鎸夐挳 + case 'btn-Stop': + set_De_Stop(0); + break; + //鍙嶇鐢ㄦ寜閽� + case 'btn-DeStop': + set_De_Stop(1); + break; + //鍒楄缃� + case 'set_HideColumn': get_HideColumn(); + 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' + , page: true + , limits: [50, 500, 5000, 50000] + , limit: 50 + , cellMinWidth: 90 + //, cols: [[ + // { type: 'checkbox', fixed: 'left' } + // , { field: 'HItemID', title: 'HItemID', sort: true, hide: true } + // , { field: '涓嶈壇绫诲瀷浠g爜', title: '涓嶈壇绫诲瀷浠g爜' } + // , { field: '涓嶈壇绫诲瀷鍚嶇О', title: '涓嶈壇绫诲瀷鍚嶇О' } + // , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' } + // , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' } + // , { field: '澶囨敞', title: '澶囨敞' } + //]] + //灏嗙鐢ㄧ殑鏁版嵁鏍囩孩 + //, done: function (res, cuur, count) { + // for (var i = 0; i < res.data.length; i++) + // { + // if (res.data[i].绂佺敤鏍囪=='Y') { + // $("table tbody tr").eq(i).css('color','red') + // } + // } + //} + }; + } + //鏌ヨ + function get_Display(sWhere) { + var index = layer.load(0, { shade: false }); + var ajaxLoad = layer.load(); + //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� + $.ajax({ + url: GetWEBURL() + '/Gy_BadReason/list', + type: "GET", + data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] }, + success: function (data1) { + if (data1.count == 1) { + var data = []; + var col = []; + //缁欑┖鐨勬暟缁勮祴鍊� + for (var key in data1.list) { + data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType }); + } + //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋 + col.push({ type: 'checkbox', fixed: 'left' }); + for (var i = 0; i < data.length; i++) { + // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') { + if ($.inArray(data[i].name, titleData) > -1) { + col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� + } + else { + switch (data[i].Type) { + //int + case 'DateTime': + col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 }); + break; + default: + col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 }); + } + } + } + + //鍔ㄦ�佹樉绀哄垪鍚� + option = { + elem: '#mainTable' + , toolbar: '#toolbarDemo' + , cols: [col] + , data: data1.data + , height: 'full-80' + , page: true + , limits: [50, 500, 5000, 50000] + , limit: 50 + , cellMinWidth: 90 + } + table.render(option); + + //鍒锋柊琛ㄦ牸鏁版嵁 + DisPlay_HideColumn(); + + layer.close(ajaxLoad); + if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") { + ColFilter(); + } + + //layer.alert("鏌ヨ鎴愬姛", { icon: 1 }); + } else { + layer.close(ajaxLoad); + layer.alert(data1.code + data1.Message, { icon: 5 }); + } + }, error: function () { + layer.close(ajaxLoad); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + layer.close(index); + } + //蹇�熸煡璇� + function get_FastQuery() { + var HNumber = $("#HNumber").val(); + var HName = $("#HName").val(); + var ColName = $("#ColName").val();//澶嶉�夋 + var Comparator = $("#Comparator").val() + var ColContent = $("#ColContent").val(); + + if (ColName != 0 && Comparator != 0) { + var com = ""; + switch (Comparator) { + case "7": + com = "like'%" + ColContent + "%'"; + break; + case "8": + com = "like'%" + ColContent + "'"; + break; + case "9": + com = "like'" + ColContent + "%'"; + break; + case "10": + com = "not like'%" + ColContent + "%'"; + break; + default: + com = "" + Comparator + "'" + ColContent + "'"; + break; + } + sWhere += " and " + ColName + " " + com; + } + if (HNumber) { + sWhere += " and 涓嶈壇绫诲瀷浠g爜 like '%" + HNumber + "%'"; + } + if (HName) { + sWhere += " and 涓嶈壇绫诲瀷鍚嶇О like '%" + HName + "%'"; + } + get_Display(sWhere); + sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨 + } + //閲嶇疆蹇�熸煡璇� + function set_ClearQuery() { + $("#HNumber").val(""); + $("#HName").val(""); + $("#btnSearch").click(); + $("#ColContent").val(""); + $("#ColName").val("0"); + $("#Comparator").val("0"); + form.render('select'); + + sWhere = ""; + } + //鏂板 + function set_AddNew() { + layer.open({ + type: 2, + skin: 'layui-layer-rim', //鍔犱笂杈规 + title: '鏂板涓嶈壇绫诲瀷', + closeBtn: 1, + shift: 2, + area: ['100%', '100%'], + maxmin: true, + content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadReason.html?OperationType=1&linterid=&HSouceBillType=', + end: function () { + //鍒锋柊椤甸潰, + location.reload(); + }, + success: function (layero, index) { + + } + }); + } + //缂栬緫 + function set_ShowBill() { + var checkStatus = table.checkStatus('mainTable') + , data = checkStatus.data; + if (checkStatus.data.length === 1) { + var hID = data[0].HItemID.toString(); + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '缂栬緫涓嶈壇绫诲瀷' + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadReason.html?OperationType=3&linterid=' + hID + '&HSouceBillType=' + , resize: false, + end: function () { + //鍒锋柊椤甸潰, + location.reload(); + } + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + }) + + } else { + layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒'); + } + } + //鍒犻櫎 + 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() + "DeltetGy_BadReason", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� + data: { "HItemID": HItemID, "user": sessionStorage["HUserName"]}, + 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 + + //#region 鍙嶅鏍�/瀹℃牳鏁版嵁 + function set_CheckBill(num) { + var checkStatus = table.checkStatus('mainTable') + , data = checkStatus.data; + if (checkStatus.data.length === 1) { + var InterID = data[0].HItemID.toString(); + //閫昏緫瀹℃牳鏂规硶 + $.ajax({ + type: "GET", + url: GetWEBURL() + "/Gy_BadReason/AuditGy_BadReason", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� + data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }, + 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); + //淇敼涓哄姛鍚庡埛鏂扮晫闈� + $("#btnSearch").trigger('click'); + }); + + } else { + layer.alert(result.code + result.Message, { icon: 5 }); + } + }, error: function () { + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } + else { + layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒'); + } + } + //#endregion + + //#region 鍙嶇鐢�/绂佺敤鏁版嵁 + function set_De_Stop(num) { + var checkStatus = table.checkStatus('mainTable') + , data = checkStatus.data; + if (checkStatus.data.length === 1) { + var InterID = data[0].HItemID.toString(); + //閫昏緫瀹℃牳鏂规硶 + $.ajax({ + type: "GET", + url: GetWEBURL() + "/Gy_BadReason/StopGy_BadReason", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� + data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] }, + 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); + //淇敼涓哄姛鍚庡埛鏂扮晫闈� + $("#btnSearch").trigger('click'); + }); + + } else { + layer.alert(result.code + result.Message, { icon: 5 }); + } + }, error: function () { + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } + else { + layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒'); + } + } + //#endregion + + + + //#region 闅愯棌鍒楄缃� + function get_HideColumn() { + var colName = ""; + var contentUrl = ""; + for (var i = 1; i < option.cols[0].length - 1; i++) { + colName += option.cols[0][i]["title"] + ","; + } + var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞 + var urlLen = urlStr.split('/'); + for (var i = 0; i < urlLen.length - 4; i++) { + contentUrl += "../"; + } + colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜 + + contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName; + + layer.open({ + type: 2 + , skin: "layui-layer-rim" //鍔犱笂杈规 + , title: "闅愯棌鍒楄缃�" //鏍囬 + , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡 + , shift: 2 //寮瑰嚭鍔ㄧ敾 + , area: ["50%", "90%"] //绐椾綋澶у皬 + , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀� + , content: [contentUrl, "yes"] + , btn: ["纭畾", "鍙栨秷"] + , btn1: function (index, laero) { + //鍒锋柊琛ㄦ牸鏁版嵁 + DisPlay_HideColumn(); + //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹� + layer.close(index);//鍏抽棴寮圭獥 + } + }) + } + //#endregion + //#region 鏄剧ず鍒楁暟鎹� + function DisPlay_HideColumn() { + $.ajax({ + url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', + type: "GET", + data: { "HModName": HModName, "user": sessionStorage["HUserName"] }, + success: function (data1) { + if (data1.data.length != 0) { + + var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁 + //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� + + dataCol = data1.data[0].HGridString.split(','); + + for (var i = 0; i < option.cols[0].length - 2; i++) { + var dataCols = dataCol[i].split('|'); + //闅愯棌鍒� + if (dataCols[1] == 1) { + option.cols[0][i + 1]["hide"] = true; + } + //璁剧疆鍒楀 + if (dataCols[3] > 0) { + option.cols[0][i + 1]["width"] = dataCols[3]; + } + //璁剧疆鍐呭瀛椾綋澶у皬 + if (data1.data[0].HFontSize != 0) { + option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;"; + } else { + option.cols[0][i + 1]["style"] = "font-size:100%"; + } + //璁剧疆鍒楀 + //if (data1.data[0].HColumnWidth != 0) { + // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;"; + //} else { + // option.cols[0][i + 1]["width"] = ""; + //} + //鏄剧ず鍒� + if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) { + option.cols[0][i + 1]["hide"] = false; + } + //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�) + switch (dataCols[2]) { + case "L": + option.cols[0][i + 1]["align"] = "left"; + break; + case "M": + option.cols[0][i + 1]["align"] = "center"; + break; + case "R": + option.cols[0][i + 1]["align"] = "right"; + break; + } + } + + //鍙栨秷鍐荤粨鍒� + for (var i = 1; i < option.cols[0].length - 1; i++) { + if (option.cols[0][i]["fixed"] != null) { + option.cols[0][i]["fixed"] = null; + } + else { + break; + } + } + //鍐荤粨鍒� + if (data1.data[0].HFixCols != 0) { + for (var i = 0; i < data1.data[0].HFixCols; i++) { + if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) { + data1.data[0].HFixCols += 1; + } + option.cols[0][i + 1]["fixed"] = "left"; + } + } + table.render(option); + } else { + table.render(option); + } + }, error: function () { + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }) + } + //#endregion + + //#region 鍒楁槑鏄剧ず涓嬫媺妗� + function ColFilter() { + var Organization = '<option value="0" selected="selected" ></option>'; + for (var i = 1; i < option.cols[0].length; i++) { + if (option.cols[0][i].hide != true) { + Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>'; + } + } + $("#ColName").empty(); + $("#ColName").append(Organization); + form.render('select'); + } + //#endregion + + //浠ヤ笂鏄痩ayui妯″潡 + }); + </script> + +</body> +</html> \ No newline at end of file diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/MaterialShorAnalysisReport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/MaterialShorAnalysisReport.html" index a6a3528..6648e73 100644 --- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/MaterialShorAnalysisReport.html" +++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/MaterialShorAnalysisReport.html" @@ -51,7 +51,7 @@ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button> <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;"> <div class="layui-row" style="margin-top:10px;"> - + </div> </div> </div> @@ -156,13 +156,13 @@ function set_InitGrid() { var columns = []; - columns.push({ type: 'checkbox', fixed: 'left' }); - columns.push({ field: 'HOrgName', title: '閲囪喘缁勭粐', sort: true}); - columns.push({ field: 'FNUMBER', title: '鐗╂枡缂栫爜', sort: true}); - columns.push({ field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true}); - columns.push({ field: 'HMaterModel', title: '鐗╂枡瑙勬牸', sort: true}); - columns.push({ field: 'CountHQty', title: '鍚堣', sort: true}); - columns.push({ field: 'FBASEQTY', title: '鍗虫椂搴撳瓨鏁伴噺', sort: true}); + columns.push({ field: 'HOrgName', title: '閲囪喘缁勭粐', sort: true }); + columns.push({ field: 'FNUMBER', title: '鐗╂枡缂栫爜', sort: true }); + columns.push({ field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true }); + columns.push({ field: 'HMaterModel', title: '鐗╂枡瑙勬牸', sort: true }); + columns.push({ field: '鍦ㄩ�旀暟閲�', title: '鍦ㄩ�旀暟閲�' }); + columns.push({ field: 'CountHQty', title: '鍚堣', sort: true }); + columns.push({ field: 'FBASEQTY', title: '鍗虫椂搴撳瓨鏁伴噺', sort: true }); //鑾峰彇涓や釜鏈堟湡涔嬮棿鐨勭浉宸� var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//寮�濮嬫椂闂� var time2 = Date.parse(new Date($("#HENDDATE").val()));//缁撴潫鏃堕棿 diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" index 71fd1b9..4d07117 100644 --- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" +++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" @@ -185,7 +185,7 @@ <script type="text/html" id="toolbarDemo"> <div class="layui-btn-container"> <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>鎵归噺濉厖</button> - <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>--> + <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>--> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗琛�</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎琛�</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverUp"><i class="layui-icon layui-icon-delete"></i>涓婄Щ</button> @@ -225,7 +225,6 @@ , soulTable = layui.soulTable , element = layui.element; - var sWhere = ""; var option = []; var HModName = "JIT_DayPlanPlatForm"; @@ -241,7 +240,7 @@ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛� - //琛屽唴榧犳爣绂诲紑浜嬩欢 + //琛屽唴榧犳爣绂诲紑浜嬩欢 table.on('edit(mainTable)', function (obj) { var myDate = new Date(); var yyyy = myDate.getFullYear(); @@ -420,7 +419,7 @@ //淇濆瓨 form.on('submit(btnSave)', function (data) { - var HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿 + var HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿 if (HWorkShopID == 0) { return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!"); } else if (table.cache["mainTable"].length == 0) { @@ -504,7 +503,7 @@ var field = $(this).data('field'); laydate.render({ elem: this.firstChild - , show: true //鐩存帴鏄剧ず + , show: true //鐩存帴鏄剧ず , closeStop: this , done: function (nowDate) { //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊 @@ -558,7 +557,7 @@ //闅愯棌鍕鹃�夊瓧娈� DisPlay_HideColumn(); } - //#endregion + //#endregion //鑾峰彇缁勭粐 function Organ() { @@ -607,166 +606,137 @@ columns.push({ field: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', title: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', width: 150, sort: true });//0 columns.push({ field: '璁″垝寮�濮嬫棩鏈�', title: '棰勮寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.璁″垝寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true }); columns.push({ field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 150, event: "HPlanEndDate", sort: true }); - columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true, sort: true }); - columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150, sort: true }); + columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width: 150}); + columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150, edit: 'text' }); + columns.push({ field: '鏄ㄦ棩鏁伴噺', title: '鏄ㄦ棩鏁伴噺'}); + columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150}); - columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID", sort: true }); + columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID" }); columns.push({ field: Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 0 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 0 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 1 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 1 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 2 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 2 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 3 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 3 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 4 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 4 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 5 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 5 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 6 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 6 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 7 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 7 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 8 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 8 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 9 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 9 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 10 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 10 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 11 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 11 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 12 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 12 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 13 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 13 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 14 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 14 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 15 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 15 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 16 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 16 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 17 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 17 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 18 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 18 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 19 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 19 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 20 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 20 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 21 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 21 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 22 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 22 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 23 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 23 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 24 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 24 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 25 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 25 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 26 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 26 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 27 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 27 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 28 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 28 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 29 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 29 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 30 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) { return DayColor(d[Format(myDate.getTime() + 30 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd')]); - } - })//0 + } })//0 columns.push({ field: 'T31', title: 'T31', width: 70 });//0 columns.push({ field: '璁㈠崟绫诲瀷', title: '璁㈠崟绫诲瀷', width: 150, sort: true }); @@ -787,15 +757,17 @@ columns.push({ field: 'hmainid', title: '鏃ヨ鍒掑伐鍗曚富鐮�', width: 150, sort: true }); columns.push({ field: '鐢靛帇/鍔熺巼/搴曟澘', title: '鐢靛帇/鍔熺巼/搴曟澘', width: 150, sort: true }); columns.push({ field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 150, sort: true }); - columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150, sort: true });//0 - columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width: 150, sort: true }); - columns.push({ field: '鏈叆搴撴暟閲�', title: '鏈叆搴撴暟閲�', width: 150, sort: true });//0 - columns.push({ field: 'HICMOInterID', title: 'HICMOInterID', width: 150, hide: true, sort: true }); - columns.push({ field: 'HGroupID', title: 'HGroupID', width: 150, hide: true, sort: true }); - columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide: true, sort: true }); - columns.push({ field: '鐢熶骇璧勬簮浠g爜', title: '鐢熶骇璧勬簮浠g爜', width: 150, hide: true, sort: true }); - columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true, sort: true }); - columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true, sort: true }); + columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150 });//0 + columns.push({ field: '鏈叆搴撴暟閲�', title: '鏈叆搴撴暟閲�', width: 150 });//0 + columns.push({ field: 'HICMOInterID', title: 'HICMOInterID', width: 150, hide:true }); + columns.push({ field: 'HGroupID', title: 'HGroupID', width: 150, hide:true }); + columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide:true }); + columns.push({ field: '鐢熶骇璧勬簮浠g爜', title: '鐢熶骇璧勬簮浠g爜', width: 150, hide: true }); + columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true }); + columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true }); + columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true }); + columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true }); + columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true }); columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }); option = { @@ -806,9 +778,6 @@ , cellMinWidth: 90 , cols: [columns] , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴 - , done: function (res, curr, count) { - soulTable.render(this); - } //, done: function (res, page, count) { // var that = this.elem.next(); // res.data.forEach(function (item, index) { @@ -878,7 +847,7 @@ url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHinterIDList', type: "GET", async: false, - data: { "sWhere": HinterID_S.toString(), "num": 1 }, + data: { "sWhere": HinterID_S.toString(),"num":1 }, success: function (data1) { if (data1.count == 1) { for (var i = 0; i < 31; i++) { @@ -1099,7 +1068,7 @@ //娓呯┖鏈湴瀛樺偍鐨勬暟鎹� localStorage.removeItem("JIT_DayPlanPlatForm_HWorkShop"); var data = { - HWorkShopID: $("#HWorkShopID").val() + HWorkShopID: $("#HWorkShopID").val() , HWorkShopIDName: $("#HWorkShopIDName").val() } //鏈湴瀛樺偍 @@ -1187,7 +1156,7 @@ , area: ['90%', '90%']//澶у皬 , title: '榻愬鍒嗘瀽鏄庣粏琛�'//鏍囬 , shift: 2//寮瑰嚭鍔ㄧ敾 - , content: ['../../鐢熶骇绠$悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html?OperationType=1&HMainICMOEntryID=' + HMainICMOEntryID + '&HMainICMOInterID=' + HMainICMOInterID + '&HICMOInterID=' + HICMOInterID, 'yes'] + , content: ['../../鐢熶骇绠$悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html?OperationType=1&HMainICMOEntryID=' + HMainICMOEntryID+'&HMainICMOInterID=' + HMainICMOInterID+'&HICMOInterID=' + HICMOInterID, 'yes'] }) } @@ -1296,7 +1265,7 @@ var hmainid = []; //var HEntryID = []; for (var i = 0; i < checkStatus.data.length; i++) { - if ($.inArray(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"], hmainid) == -1) { + if ($.inArray(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"], hmainid)==-1) { hmainid.push(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"]); } } @@ -1573,7 +1542,7 @@ } else { $("tr[data-index='" + i + "']").attr({ "style": "background:White;color:black;" }); - //寮�濮嬫帓鍗� + //寮�濮嬫帓鍗� bFind = false; //瓒呬氦璐ф湡 浠嶇劧鎺掔▼ for (var j = 0; j < ds.length; j++) { @@ -1747,7 +1716,7 @@ } var TableData = []; - function get_HFData(num, nums) { + function get_HFData(num,nums) { if (num == 0) { TableData = option.data; } else { @@ -1824,9 +1793,12 @@ //} } else { - if (sLeftQty > parseFloat(sWorkQty * ds[i]["鏈�澶у墿浣欏伐鏃�"])) { - grd.data[iRow][grd.cols[0][j + HPlanDay].field] = parseFloat(sWorkQty * ds[i]["鏈�澶у墿浣欏伐鏃�"]); - sLeftQty = sLeftQty - (parseFloat(sWorkQty * ds[i]["鏈�澶у墿浣欏伐鏃�"])); + var dayWorkQty = sWorkQty * ds[i]["鍓╀綑宸ユ椂"]; + var Numzu = dayWorkQty.split('.'); + dayWorkQty = Numzu[0] + 1; + if (sLeftQty > dayWorkQty) { + grd.data[iRow][grd.cols[0][j].field] = dayWorkQty; + sLeftQty = sLeftQty - dayWorkQty; //oSub = new ClsGridValues(); //oSub.iRow = iRow; //oSub.iCol = j; @@ -1836,7 +1808,7 @@ //oClsGridValues.Add(oSub); } else { - grd.data[iRow][grd.cols[0][j + HPlanDay].field] = Math.round(sLeftQty * 10) / 10; + grd.data[iRow][grd.cols[0][j + HPlanDay].field] = Math.round(sLeftQty * 10) / 10; sLeftQty = 0; //oSub = new ClsGridValues(); //oSub.iRow = iRow; @@ -1924,7 +1896,6 @@ } else { dayWorkQty = parseInt(Numzu[0]); } - if (sLeftQty > dayWorkQty) { grd.data[iRow][grd.cols[0][j].field] = dayWorkQty; sLeftQty = sLeftQty - dayWorkQty; @@ -1938,7 +1909,7 @@ //oClsGridValues.Add(oSub); } else { - grd.data[iRow][grd.cols[0][j + HPlanDay].field] = Math.round(sLeftQty * 10) / 10; + grd.data[iRow][grd.cols[0][j].field] = Math.round(sLeftQty * 10) / 10; //option.data[iRow]["HUseTimes"] = parseFloat(sLeftQty / sWorkQty); sLeftQty = 0; //oSub = new ClsGridValues(); @@ -1951,11 +1922,11 @@ } } } - } + } } } } - + } } diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html" index b3fd9c1..96b8599 100644 --- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html" +++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html" @@ -59,7 +59,7 @@ <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label> <div class="layui-input-block" style="margin-left: 120px;"> - <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="display: inline-block;" > + <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="display: inline-block;"> </div> </div> <div class="layui-inline"> @@ -83,7 +83,7 @@ <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label> <div class="layui-input-block" style="margin-left: 120px;"> - <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="display: inline-block;" > + <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="display: inline-block;"> </div> </div> <div class="layui-inline"> @@ -143,7 +143,7 @@ //#region 鍒濆鍖栫晫闈� var params = getUrlVars(); - var OperationType = params[params[0]]; + var OperationType = params[params[0]]; //鍒ゆ柇鏄惁鏈夊弬鏁颁紶閫� if (!isNaN(OperationType)) { @@ -153,7 +153,7 @@ } set_ClearBill(); - + //#endregion @@ -241,6 +241,8 @@ , { field: '榻愬鐘舵��', title: '榻愬鐘舵��', sort: true } , { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺', sort: true } , { field: '缂烘枡鏁伴噺', title: '缂烘枡鏁伴噺', sort: true } + , { field: '閲囪喘鍦ㄩ��', title: '閲囪喘鍦ㄩ��' } + , { field: '鐢熶骇鏈叆搴�', title: '鐢熶骇鏈叆搴�' } , { field: '棰嗘枡鍗犵敤鏁伴噺', title: '棰嗘枡鍗犵敤鏁伴噺', sort: true } , { field: '鍙敤鏁伴噺', title: '鍙敤鏁伴噺', sort: true } , { field: '鍗犵敤鏁伴噺', title: '鍗犵敤鏁伴噺', sort: true } @@ -308,7 +310,7 @@ var HComplete = $("#HComplete").val(); var HPlanDate = $("#HPlanDate").val(); var HICMOBillNo = $("#HICMOBillNo").val(); - + if (HMaterID!="0") { sWhere += " and 鐗╂枡ID = '" + HMaterID + "'"; } @@ -377,7 +379,7 @@ } - + //闅愯棌鍒楄缃� function get_HideColumn(value) { diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html" index 9450a98..4d2b7c3 100644 --- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html" +++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html" @@ -129,6 +129,7 @@ <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" value="" style="background-color:#efefef4d;"> <input type="hidden" class="layui-input" name="HICMOInterID" lay-verify="HICMOInterID" id="HICMOInterID" value="0" > + <input type="hidden" class="layui-input" name="HICMOEntryID" lay-verify="HICMOEntryID" id="HICMOEntryID" value="0" > </div> </div> <div class="layui-inline"> @@ -554,6 +555,7 @@ layer.close(index); $("#HICMOBillNo").val(data1.data[0]["鐢熶骇璁㈠崟"]); $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]); + $("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]); $("#HProcExchBillNo").val(data1.data[0]["宸ュ簭娴佽浆鍗�"]); $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]); $("#HMaterNumber").val(data1.data[0]["鐗╂枡缂栫爜"]); diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html" index 67dfbe4..75b3a4c 100644 --- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html" +++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html" @@ -11,147 +11,273 @@ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script> <script src="../../../layuiadmin/Scripts/webConfig.js"></script> <script src="../../../layuiadmin/PubCustom.js"></script> + <script type="text/javascript" src="../../../layuiadmin/lib/extend/echarts.min.js"></script> + <style> + .tr1-1{ + /* margin-left: 3%; + margin-top: 4%;*/ + height: 360px; + /*background-color: #99f6a733;*/ + border: 1px solid rgb(0 0 0 / 10%); + /*width: 95%;*/ + } + </style> </head> <body> <div class="layui-fluid" style="padding: 0;"> <div class="layui-card" style="padding: 2px;background-color: #efefef;"> <div class="layui-card-body" style="padding: 1px;"> <form class="layui-form" action="" lay-filter="formData" style="background-color:white;"> - <!--<div style="padding: 10px;"> - <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button> - <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">閫�鍑�</button> - </div>--> - <div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 49%; float: left; height: 400px;background-color:white;"> + <div style="padding: 2px; "> + <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAdd" id="btnSave">鎵撳嵃</button> + <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAdd" id="btnSave">鏂板</button> + <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCancel" id="btnEdit">閫�鍑�</button> + </div> + <div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 49.5%; float: left; background-color: white;height:430px;"> + <ul class="layui-tab-title" lay-filter="tab-all"> + <li lay-id="1" style="padding:1px;" class="layui-this">褰撳墠宸ュ崟</li> + </ul> <div class="layui-tab-content"> - <!--鍩烘湰淇℃伅--> + <!--褰撳墠宸ュ崟--> + <div class="layui-tab-item layui-show"> + <div class="layui-form-item"> + <div> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" lay-verify="HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly> + <input type="hidden" name="HICMOInterID" id="HICMOInterID" lay-verify="HICMOInterID" value="0"> + <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" lay-verify="HICMOEntryID" value="0"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">宸ュ簭娴佽浆鍗�</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" lay-verify="HProcExchBillNo" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly> + </div> + </div> + + </div> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">浜у搧浠g爜</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;" readonly> + <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly> + </div> + </div> + + </div> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" lay-verify="HMaterModel" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">璁¢噺鍗曚綅</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" lay-verify="HUnitName" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;" readonly> + <input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0"> + </div> + </div> + </div> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;" readonly> + <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label> + <div class="layui-input-block" style="margin-left: 120px; width:180px;"> + <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;"> + </div> + </div> + </div> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">缁翠慨宸ヤ綅</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" lay-verify="HWorkStationName" name="HWorkStationName" id="HWorkStationName" style="background-color:#efefef4d;" readonly> + <input type="hidden" name="HWorkStationID" id="HWorkStationID" lay-verify="HWorkStationID" value="0"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">缁翠慨宸ュ簭</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" style="background-color:#efefef4d;" readonly> + <input type="hidden" name="HProcess" id="HProcess" lay-verify="HProcess" value="0"> + </div> + </div> + </div> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">鐢熶骇缁勭粐<label style="color:red"> * </label></label> + <div class="layui-input-block" style="margin-left: 120px;width:501px;"> + <input type="text" class="layui-input" lay-verify="HOrgName" name="HOrgName" id="HOrgName" style="background-color:#efefef4d;" readonly> + <input type="hidden" name="HProdOrgID" id="HProdOrgID" lay-verify="HProdOrgID" value="0"> + </div> + </div> + </div> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">缁翠慨閮ㄩ棬</label> + <div class="layui-input-block" style="margin-left: 120px;width:501px;"> + <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;" readonly> + <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0"> + </div> + </div> + </div> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;"></label> + <div class="layui-input-block" style="margin-left: 120px; width: 501px;"> + <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ChangeMater" id="ChangeMater"> 鎹� 閰� 浠�</button> + </div> + </div> + </div> + </div> + </div> + </div> + </div> + </div> + <div class="layui-tab" style="width: 50%; float: left; background-color: white; margin-left: 0.5%; height: 430px;"> + <ul class="layui-tab-title" lay-filter="tab-all"> + <li lay-id="1" style="padding:1px;" class="layui-this">閲囬泦淇℃伅</li> + </ul> + <div class="layui-tab-content"> + <!--閲囬泦淇℃伅--> <div class="layui-tab-item layui-show"> <div class="layui-form-item" style="padding-top: 10px;"> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">鏉″舰鐮�:</label> - <div class="layui-input-block" style="margin-left: 120px;"> - <input type="text" class="layui-input" name="HBarCode" lay-verify="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode" style="width: 500px;"> + <div> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">鏉″舰鐮�</label> + <div class="layui-input-block" style="margin-left: 120px; width: 501px;"> + <input type="text" class="layui-input" lay-verify="HBarCode" name="HBarCode" id="HBarCode"> + </div> </div> </div> - </div> - <div class="layui-row"> - <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="HProcName" lay-verify="HProcName" id="HProcName" style="background-color: #efefef4d; width: 60%; display: inline-block;" readonly> - <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0"> - <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;"> - <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> - </button> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly> + <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID"> + <input type="hidden" name="HEntryID" id="HEntryID" lay-verify="HEntryID" value="0"> + </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" lay-verify="HEmpName" name="HEmpName" id="HEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly> + <input type="hidden" name="HEmpID" id="HEmpID" lay-verify="HEmpID" value="0"> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHEmp" id="btnSearchHEmp" style="padding: 0 10px;float: right;margin-right: 3px;"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> + </button> + </div> </div> </div> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">宸ュ簭鍙�</label> - <div class="layui-input-block" style="margin-left: 120px;"> - <input type="text" class="layui-input" name="HProcNo" lay-verify="HProcNo" id="HProcNo"> + <div class="layui-row"> + <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" lay-verify="HBadReasonName" name="HBadReasonName" id="HBadReasonName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly> + <input type="hidden" name="HBadReasonID" id="HBadReasonID" lay-verify="HBadReasonID" value="0"> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHBadReason" id="btnSearchHBadReason" style="padding: 0 10px;float: right;margin-right: 3px;"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> + </button> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">涓嶈壇绫诲瀷</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" name="HBadTypeName" lay-verify="HBadTypeName" id="HBadTypeName" style="background-color:#efefef4d;" readonly> + <input type="hidden" name="HBadTypeID" id="HBadTypeID" lay-verify="HBadTypeID" value="0"> + </div> </div> </div> - </div> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">浜у搧缂栫爜</label> - <div class="layui-input-block" style="margin-left: 120px;"> - <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;" readonly> + <div class="layui-row"> + <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" lay-verify="HBadResultName" name="HBadResultName" id="HBadResultName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly> + <input type="hidden" name="HBadResultID" id="HBadResultID" lay-verify="HBadResultID" value="0"> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHBadResult" id="btnSearchHBadResult" style="padding: 0 10px;float: right;margin-right: 3px;"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> + </button> + </div> + </div> + <div class="layui-inline" style="width:300px;"> + <label class="layui-form-label" style="width: 85px;">缁翠慨缁撴灉</label> + <div class="layui-input-block" style="margin-left: 120px; width: 180px;"> + <select name="HRepairResult" id="HRepairResult" lay-filter="HRepairResult" style="width: 180px;"> + <option style="color:blue;" selected="selected" value="OK">OK</option> + <option style="color:blue;" value="NG">NG</option> + </select> + </div> </div> </div> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label> - <div class="layui-input-block" style="margin-left: 120px;"> - <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">浜у搧MAC</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" lay-verify="HProdMac" name="HProdMac" id="HProdMac" style="background-color:#efefef4d;" readonly> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">浜у搧SN</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" lay-verify="HMaterSN" name="HMaterSN" id="HMaterSN" style="background-color:#efefef4d;" readonly> + </div> </div> </div> - </div> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label> - <div class="layui-input-block" style="margin-left: 120px;"> - <input type="text" class="layui-input" lay-verify="HMaterModel" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">澶囨敞</label> + <div class="layui-input-block" style="margin-left: 120px; width: 501px;"> + <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark"> + </div> + </div> + <div class="layui-inline"> + <div> + <input type="hidden" name="HCreator" id="HCreator" lay-verify="HCreator"> + <input type="hidden" name="HCreateDate" id="HCreateDate" lay-verify="HCreateDate"> + + <input type="hidden" name="HSourceInterID" id="HSourceInterID" lay-verify="HSourceInterID" value="0"> + <input type="hidden" name="HSourceEntryID" id="HSourceEntryID" lay-verify="HSourceEntryID" value="0"> + <input type="hidden" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" value=""> + <input type="hidden" name="HSourceBillType" id="HSourceBillType" lay-verify="HSourceBillType" value=""> + <input type="hidden" name="HRelationQty" id="HRelationQty" lay-verify="HRelationQty" value="0"> + <input type="hidden" name="HRelationMoney" id="HRelationMoney" lay-verify="HRelationMoney" value="0"> + + <input type="hidden" name="HMacAddr" id="HMacAddr" lay-verify="HMacAddr"> + <input type="hidden" name="HIPAddr" id="HIPAddr" lay-verify="HIPAddr"> + + <!--璁板綍瀛愰〉闈�(鏇存崲閰嶄欢)瀛愯〃鐨勪复鏃舵暟鎹�--> + <input type="hidden" name="subMaterList_Temp" id="subMaterList_Temp" lay-verify="subMaterList_Temp"> + + </div> </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" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color: #efefef4d; width: 60%; display: inline-block;" readonly> - <input type="hidden" class="layui-input" lay-verify="HDeptID" name="HDeptID" id="HDeptID"> - <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="padding: 0 10px;float: right;margin-right: 3px;"> - <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> - </button> - </div> - </div> - </div> - <div class="layui-row"> - <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="HGroupName" id="HGroupName" lay-verify="HGroupName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly> - <input type="hidden" class="layui-input" name="HGroupID" lay-verify="HGroupID" id="HGroupID" value="0"> - <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHGroup" id="btnHGroup" style="padding: 0 10px;float: right;margin-right: 3px;"> - <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> - </button> - </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="HSourceName" id="HSourceName" lay-verify="HSourceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly> - <input type="hidden" class="layui-input" name="HSourceID" lay-verify="HSourceID" id="HSourceID" value="0"> - <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;"> - <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> - </button> - </div> - </div> - </div> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">宸ュ簭娴佽浆鍗�</label> - <div class="layui-input-block" style="margin-left: 120px;"> - <input type="text" class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;"> - <input type="hidden" class="layui-input" name="HProcExchInterID" lay-verify="HProcExchInterID" id="HProcExchInterID" value="0"> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟</label> - <div class="layui-input-block" style="margin-left: 120px;"> - <input type="text" class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" value="" style="background-color:#efefef4d;"> - <input type="hidden" class="layui-input" name="HICMOInterID" lay-verify="HICMOInterID" id="HICMOInterID" value="0"> - </div> - </div> - </div> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label> - <div class="layui-input-block" style="margin-left: 120px;"> - <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly> - <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID"> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">浜у搧SN</label> - <div class="layui-input-block" style="margin-left: 120px;"> - <input type="text" class="layui-input" name="HBarCode" lay-verify="HBarCode" id="HBarCode" value="" style="background-color:#efefef4d;display: inline-block;" readonly> - </div> - </div> - </div> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">鎿嶄綔鍛�</label> - <div class="layui-input-block" style="margin-left: 120px;"> - <input type="text" class="layui-input" lay-verify="HMateMAC" name="HMateMAC" id="HMateMAC" style="background-color:#efefef4d;" readonly> - </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" lay-verify="HEmpName" name="HEmpName" id="HEmpName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly> - <input type="hidden" class="layui-input" lay-verify="HEmpID" name="HEmpID" id="HEmpID" value="0"> - <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp" id="btnHEmp" style="padding: 0 10px;float: right;margin-right: 3px;"> - <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> - </button> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;"></label> + <div class="layui-input-block" style="margin-left: 120px; width: 501px;"> + <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="NGSave" id="NGSave">NG淇濆瓨</button> + <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="OKSave" id="OKSave">OK淇濆瓨</button> + </div> </div> </div> </div> @@ -159,477 +285,465 @@ </div> </div> </div> - <div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 39%; float: left; height: 100px; background-color: white;"> - <div class="layui-tab-content" style="padding-top: 10px; padding-left: 40%;"> - <!--鍩烘湰淇℃伅--> - <div class="layui-tab-item layui-show"> - <div class="layui-form-item"> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">鎬诲悎鏍兼暟</label> - <div class="layui-input-block" style="margin-left: 120px;"> - <input type="text" class="layui-input" lay-verify="HMaterModel" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly> - </div> - </div> - </div> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">鎬讳笉鑹暟</label> - <div class="layui-input-block" style="margin-left: 120px;"> - <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly> - <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID"> - </div> - </div> - </div> - </div> - </div> + <div class="layui-tab" style="width: 49.5%; float: left; background-color: white;margin-top:0.5%;"> + <div class="layui-row"> + <div class="tr1-1" id="mychart1"> </div> </div> </div> - <div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 10%; float: left; height: 100px; background-color: white;"> - <div class="layui-tab-content" style="padding-top: 10px;"> - <!--鍩烘湰淇℃伅--> - <div class="layui-tab-item layui-show"> - <div class="layui-form-item"> - <div style="padding: 10px;"> - <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">閫�鍑�</button> - </div> - </div> - </div> - </div> - </div> - <div class="layui-tab layui-tab-card" style="width: 49%; float: left;height:300px;"> + <div class="layui-tab" style="width: 50%; float: left; margin-left: 0.5%; margin-top: 0.5%; background-color: white; "> <ul class="layui-tab-title"> - <li class="layui-this">鍏抽敭浠舵竻鍗�</li> + <li class="layui-this">杩斾慨璁板綍</li> </ul> <div class="layui-tab-content"> <div class="layui-tab-item layui-show"> - <!--鍏抽敭浠舵竻鍗�--> - <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table> - </div> - </div> - </div> - <div class="layui-tab layui-tab-card" style="width: 49%; float: left;"> - <ul class="layui-tab-title"> - <li class="layui-this">涓嶈壇璁板綍</li> - </ul> - <div class="layui-tab-content"> - <div class="layui-tab-item layui-show"> - <!--涓嶈壇璁板綍--> - <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table> - </div> - </div> - </div> - <div class="layui-tab layui-tab-card" style="width: 49%; float: left;"> - <ul class="layui-tab-title"> - <li class="layui-this">鍚堟牸璁板綍</li> - </ul> - <div class="layui-tab-content"> - <div class="layui-tab-item layui-show"> - <!--鍚堟牸璁板綍--> + <!--杩斾慨璁板綍--> <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table> </div> </div> </div> - <script type="text/html" id="toolbarDemo"> - <div class="layui-btn-container"> - <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button> - <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button> - </div> - </script> - <script type="text/html" id="toolbarDemo2"> - <div class="layui-btn-container"> - <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine2"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button> - <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine2"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button> - </div> - </script> - <input type="hidden" id="HProdOrgID" name="HProdOrgID" value="0" /> </form> </div> </div> </div> </body> </html> +<!--瀛愯〃琛細鍒犻櫎--> +<script type="text/html" id="barDemo"> + <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>--> + <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a> +</script> <script> + layui.config({ + base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰� + }).extend({ + index: 'lib/index' //涓诲叆鍙fā鍧� + }).use(['index', 'form', 'laydate', 'table', 'element'], 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 + , tree = layui.tree + var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID","HSourceEntryID"];//瀛愯〃涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� - layui.config({ - base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰� - }).extend({ - index: 'lib/index' //涓诲叆鍙fā鍧� - }).use(['index', 'form', 'laydate', 'table', 'element'], function () { + //#endregion - //#region 鍏叡鍙橀噺 - - var $ = layui.$ - , admin = layui.admin - , layer = layui.layer - , table = layui.table - , form = layui.form - , element = layui.element; - - //瀹氫箟鍏ㄥ眬鍙橀噺 - - var HModName = "Cj_CollectionOfSingleProductDefects"; - //#endregion - - //#region 杩涘叆椤甸潰鍗冲姞杞� - - var params = getUrlVars(); - var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫 4娣诲姞瀛愬伐鑹鸿矾绾� - var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜 - - //鍒跺崟浜� - $("#HMaker").val(sessionStorage["HUserName"]); - $("#hmakedate").val(Format(new Date(), "yyyy-MM-dd")); - - //鍒ゆ柇鏄惁鏂板 - if (linterid == null || linterid == 0) { - //$("#HIDDEN").hide(); - OperationType = 1; - - $.ajax({ - url: GetWEBURL() + "/Web/GetMAXNum", - type: "GET", - data: { "HBillType": '3791' }, - success: function (d) { - //console.log(d.data); - $("#HInterID").val(d.data[0].HInterID); - $("#HBillNo").val(d.data[0].HBillNo); - $("#HBillNo_bak").val(d.data[0].HBillNo); - } - }); + //#region 杩涘叆椤甸潰鍗冲姞杞� //鍒濆鍖栫晫闈� set_ClearBill(); - } else if (OperationType == 2) { - //绂佺敤缁勭粐閫夐」 - //$("#HOrgID").attr("disabled", true); - RoadBillMain(linterid); - $.ajax({ - url: GetWEBURL() + "/Web/GetMAXNum", - type: "GET", - async: false, - data: { "HBillType": '3717' }, - success: function (d) { - $("#HInterID").val(d.data[0].HInterID); - $("#HBillNo").val(d.data[0].HBillNo); - $("#HBillNo_bak").val(d.data[0].HBillNo); + //#endregion + + //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛� + + //鏉″舰鐮佸洖杞︽柟娉� + $('#HBarCode').on('keydown', function (event) { + var HBarCode = $('#HBarCode').val(); + if (event.keyCode == 13) { + if (!HBarCode) { + layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒") + return; + } + txtHBarCode_KeyDown(HBarCode); + } }); - } - - - //#endregion - - //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛� - - //鏉″舰鐮佸洖杞︽柟娉� - $('#HBarCodeSN').on('keydown', function (event) { - var HBarCode = $('#HBarCodeSN').val(); - if (event.keyCode == 13) { - if (!HBarCode) { - layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒") - return; - } - txtHBarCode_KeyDown(HBarCode); - } - }); - - //閫夋嫨涓嶈壇鍘熷洜 - form.on('submit(btnHBadReason)', function () { - btnHBadReason(); - }); - - //閫夋嫨璐ㄦ鍛� - form.on('submit(btnHEmp)', function () { - btnHEmp(); - }); - - //閫夋嫨鐢熶骇璧勬簮 - form.on('submit(btnHSource)', function () { - btnHSource(); - }); - - //閫夋嫨鐢熶骇鐝粍鎸夐挳 - form.on('submit(btnHGroup)', function () { - btnHGroup(); - }); - - //鏂板 - form.on('submit(set_AddNew)', function () { - layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) { - location.replace('Cj_CollectionOfSingleProductDefects.html?OperationType=1&linterid=0'); + //閫夋嫨涓嶈壇鍘熷洜鎸夐挳 + form.on('submit(btnSearchHBadReason)', function () { + get_checkSearchHBadReason(); }); - }); - //淇濆瓨鎻愪氦 - form.on('submit(btnSave_BL)', function (data) {//鎻愪氦 - if (AllowLoadData(data)) { - set_AddNew(data,"涓嶈壇"); + // 鎹㈤厤浠� + form.on('submit(ChangeMater)', function (data) { + get_checkSearchChangeMater(); + }); + + //#endregion + + //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶 + //鍒濆鍖栫晫闈� + function set_ClearBill() { + //鍒濆鍖栧崟鎹� + createBillNo(); + var mychart1 = echarts.init(document.getElementById('mychart1')); + + get_Histogram1(mychart1);//鏌辩姸鍥�1 + get_UsreList(); + get_Display(); } - }); - form.on('submit(btnSave_BF)', function (data) {//鎻愪氦 - if (AllowLoadData(data)) { - set_AddNew(data,"鎶ュ簾"); + // 鐢熸垚鍗曟嵁鍙� + function createBillNo() { + $.ajax({ + url: GetWEBURL() + "/Web/GetMAXNum", + async: false, + type: "GET", + data: { "HBillType": '3748' }, + success: function (d) { + //console.log(d.data); + $("#HInterID").val(d.data[0].HInterID); + $("#HBillNo").val(d.data[0].HBillNo); + $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); + } + }); } - }); - //閫�鍑� - form.on('submit(btnEdit)', function (data) { - if (params[1] != null) { - Pub_Close(1); - } else if (params[1] == null) { - Pub_Close(2); + //鏌辩姸鍥�1 + function get_Histogram1(mychart1) { + + //鐢熶骇璐熻嵎 + var optionData = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; + + //$.ajax({ + // url: GetWEBURL() + "/loaddata/KB_scfh", + // dataType: "JSON", + // async: false,//浣跨敤鍚屾鐨勬柟寮�,true涓哄紓姝ユ柟寮� + // type: "Get", + // data: { "LineCode": "1" }, + // success: function (res) { + + // for (var i = 0; i < res.data[0].length; i++) { + // if (res.data[0][i].HProcID == 191) {//缂稿巶 + // optionData[0] = (res.data[0][i].HQty / 1000).toFixed(0); + // } else if (res.data[0][i].HProcID == 193) {//鐑樺共瀹氬瀷 + // optionData[1] = (res.data[0][i].HQty / 1000).toFixed(0); + // } + // else if (res.data[0][i].HProcID == 194) {//涓婃祮瀹氬瀷 + // optionData[2] = (res.data[0][i].HQty / 1000).toFixed(0); + // } + // else if (res.data[0][i].HProcID == 198) {//鑹插澂鐑厜 + // optionData[3] = (res.data[0][i].HQty / 1000).toFixed(0); + // } + // else if (res.data[0][i].HProcID == 204) {//棰勭儷鍓� + // optionData[4] = (res.data[0][i].HQty / 1000).toFixed(0); + // } + // else if (res.data[0][i].HProcID == 197) {//琛ュ埛 + // optionData[5] = (res.data[0][i].HQty / 1000).toFixed(0); + // } + // else if (res.data[0][i].HProcID == 201) {//鍗版瘺灏� + // optionData[6] = (res.data[0][i].HQty / 1000).toFixed(0); + // } + // else if (res.data[0][i].HProcID == 200) {//鎷夊箙瀹氬瀷 + // optionData[7] = (res.data[0][i].HQty / 1000).toFixed(0); + // } + // else if (res.data[0][i].HProcID == 206) {//鐭嚎鐑� + // optionData[8] = (res.data[0][i].HQty / 1000).toFixed(0); + // } + // else if (res.data[0][i].HProcID == 205) {//闀跨嚎鐑� + // optionData[9] = (res.data[0][i].HQty / 1000).toFixed(0); + // } + // } + // } + //}) + + var option = { + xAxis: { + type: 'category', + data: ['缂告煋', '鐑樺共瀹氬瀷', '涓婃祮瀹氬瀷', '鑹插澂鐑厜', '棰勭儷鍓�', '琛ュ埛', '鍗版瘺灏�', '鎷夊箙瀹氬瀷', '鐭嚎鐑�', '闀跨嚎鐑�'] + }, + yAxis: { + type: 'value' + }, + axisLabel: { + show: true, + interval: 0, + color: '#15b1fa', + formatter: function (value) { + var ret = "";//鎷兼帴鍔燶n杩斿洖鐨勭被鐩」 + var maxLength = 1;//姣忛」鏄剧ず鏂囧瓧涓暟 + var valLength = value.length;//X杞寸被鐩」鐨勬枃瀛椾釜鏁� + var rowN = Math.ceil(valLength / maxLength); //绫荤洰椤归渶瑕佹崲琛岀殑琛屾暟 + if (rowN > 1)//濡傛灉绫荤洰椤圭殑鏂囧瓧澶т簬3, + { + for (var i = 0; i < rowN; i++) { + var temp = "";//姣忔鎴彇鐨勫瓧绗︿覆 + var start = i * maxLength;//寮�濮嬫埅鍙栫殑浣嶇疆 + var end = start + maxLength;//缁撴潫鎴彇鐨勪綅缃� + //杩欓噷涔熷彲浠ュ姞涓�涓槸鍚︽槸鏈�鍚庝竴琛岀殑鍒ゆ柇锛屼絾鏄笉鍔犱篃娌℃湁褰卞搷锛岄偅灏变笉鍔犲惂 + temp = value.substring(start, end) + "\n"; + ret += temp; //鍑�熸渶缁堢殑瀛楃涓� + } + return ret; + } + else { + return value; + } + } + }, + series: [ + { + //data: optionData, + data: [23, 14, 45, 56, 12, 35, 64, 34, 62, 75], + type: 'bar', + label: { + normal: { + show: true, + position: 'top', + formatter: function (params) { + return echarts.format.addCommas(params.value); + } + } + } + , itemStyle: { + // 璁剧疆鏌卞舰鐨勯鑹� + normal: { + color: '#15b1fa', + label: { + show: true // 鍦ㄦ姌绾挎嫄鐐逛笂鏄剧ず鏁版嵁 + } + }, + } + } + ] + }; + mychart1.setOption(option); } - }); + //鏌ヨ鍒楄〃鏁版嵁 + function get_Display() { + var HSourceInterID = $("#HSourceInterID").val(); + var HSourceEntryID = $("#HSourceEntryID").val(); + var sWhere = ""; + if (HSourceInterID != 0 && HSourceEntryID != 0) { + sWhere = " and HSourceInterID=" + HSourceInterID + " and HSourceEntryID=" + HSourceEntryID; + } else { + sWhere = " and HSourceInterID=0 and HSourceEntryID=0 "; + } + var ajaxLoad = layer.load(); + $.ajax({ + url: GetWEBURL() + "/Cj_SingleStation/ProcessItemRepair", + type: "GET", + async: false, + data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] }, + success: function (data1) { + if (data1.count == 1) { + var data = []; + var col = []; + //缁欑┖鐨勬暟缁勮祴鍊� + for (var key in data1.list) { + data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType }); + } + //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋 + col.push({ type: 'checkbox', fixed: 'left' }); + col.push({ type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }); + for (var i = 0; i < data.length; i++) { + // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') { + if ($.inArray(data[i].name, titleData) > -1) { + col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� + } + else { + switch (data[i].Type) { + //int + case 'DateTime': + col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 110 }); + break; + default: + col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 110 }); + } + } + } + col.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }); - //#endregion + if (data1.data.length != 0) { + $("#HBadReasonID").val(data1.data[0]["HBadReasonID"]); + $("#HBadReasonName").val(data1.data[0]["涓嶈壇鍘熷洜"]); + //$("#HBadTypeID").val(); + //$("#HBadTypeName").val(); + //$("#HBadResultID").val(); + //$("#HBadResultName").val(); + } + + var option = { + elem: '#mainTable' + //, toolbar: '#toolbarDemo' + , async: true + , page: false + //, totalRow: true + , cellMinWidth: 120 + , height: 300 + } - //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶 - - //鍒濆鍖栫晫闈� - function set_ClearBill() { - get_Display(); - } - - //鏌ヨ - function get_Display() { - var sWhere = " and 缂栫爜='" + sessionStorage["Czybm"]+"'"; - var ajaxLoad = layer.load(); - //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� - $.ajax({ - url: GetWEBURL() + '/Cj_SingleStation/Cj_CollectionOfSingleProductDefectsUserList', - type: "GET", - data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] }, - success: function (data1) { - if (data1.count == 1) { - - $("#HDeptID").val(data1.data[0]["HDeptID"]); - $("#HDeptName").val(data1.data[0]["杞﹂棿"]); - $("#HProName").val(data1.data[0]["宸ュ簭"]); - $("#HSourceID").val(data1.data[0]["HSourceID"]); - $("#HSourceName").val(data1.data[0]["鐢熶骇璧勬簮"]); - $("#HEmpID").val(data1.data[0]["HEmpID"]); - $("#HEmpName").val(data1.data[0]["璐ㄦ鍛�"]); - $("#HGroupID").val(data1.data[0]["HGroupID"]); - $("#HGroupName").val(data1.data[0]["鐢熶骇鐝粍"]); + option.cols = [col]; + option.data = data1.data; + table.render(option); + //鍒锋柊琛ㄦ牸鏁版嵁 + //DisPlay_HideColumn(); + layer.close(ajaxLoad); + } else { + layer.close(ajaxLoad); + layer.alert(data1.code + data1.Message, { icon: 5 }); + } + }, error: function () { layer.close(ajaxLoad); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }) + } - //layer.alert("鏌ヨ鎴愬姛", { icon: 1 }); - } else { + //鏌ヨ鐢ㄦ埛鍏宠仈鏁版嵁 + function get_UsreList() { + var sWhere = " and 缂栫爜='" + sessionStorage["Czybm"] + "'"; + var ajaxLoad = layer.load(); + //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� + $.ajax({ + url: GetWEBURL() + '/Cj_SingleStation/Cj_CollectionOfSingleProductDefectsUserList', + type: "GET", + data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] }, + success: function (data1) { + if (data1.count == 1) { + + $("#HDeptID").val(data1.data[0]["HDeptID"]); + $("#HDeptName").val(data1.data[0]["杞﹂棿"]); + $("#HProName").val(data1.data[0]["宸ュ簭"]); + $("#HSourceID").val(data1.data[0]["HSourceID"]); + $("#HSourceName").val(data1.data[0]["鐢熶骇璧勬簮"]); + $("#HEmpID").val(data1.data[0]["HEmpID"]); + $("#HEmpName").val(data1.data[0]["璐ㄦ鍛�"]); + //$("#HGroupID").val(data1.data[0]["HGroupID"]); + //$("#HGroupName").val(data1.data[0]["鐢熶骇鐝粍"]); + layer.close(ajaxLoad); + + //layer.alert("鏌ヨ鎴愬姛", { icon: 1 }); + } else { + layer.close(ajaxLoad); + layer.alert(data1.code + data1.Message, { icon: 5 }); + } + }, error: function () { layer.close(ajaxLoad); - layer.alert(data1.code + data1.Message, { icon: 5 }); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); } - }, error: function () { - layer.close(ajaxLoad); - layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); - } - }); - } - - //鏉$爜鍥炶溅鏌ヨ - function txtHBarCode_KeyDown(HBarCode) { - - var index = layer.load(); - $.ajax({ - type: "GET", - url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList", - async: true, - data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"]}, - dataType: "json", - success: function (data1) { - if (data1.count == 1) { - layer.close(index); - $("#HICMOBillNo").val(data1.data[0]["鐢熶骇璁㈠崟"]); - $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]); - $("#HProcExchBillNo").val(data1.data[0]["宸ュ簭娴佽浆鍗�"]); - $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]); - $("#HMaterNumber").val(data1.data[0]["鐗╂枡缂栫爜"]); - $("#HMaterID").val(data1.data[0]["HMaterID"]); - $("#HMaterName").val(data1.data[0]["鐗╂枡鍚嶇О"]); - $("#HModel").val(data1.data[0]["瑙勬牸鍨嬪彿"]); - $("#HBarCode").val(data1.data[0]["鏉$爜"]); - - } - else { - layer.close(index); - layer.msg(data1.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - } - $("#HBarCodeSN").val(""); - }, - error: function (err) { - layer.close(index); - layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - } - }); - } - - //涓嶈壇鍘熷洜閫夋嫨椤甸潰 - function btnHBadReason() { - layer.open({ - type: 2//寮圭獥绫诲瀷 - , skin: 'layui-layer-rim' //鍔犱笂杈规 - , area: ['90%', '90%']//澶у皬 - , title: '涓嶈壇鍘熷洜鍒楄〃'//鏍囬 - , shift: 2//寮瑰嚭鍔ㄧ敾 - , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html', 'yes'] - , btn: ['纭畾', '鍙栨秷'] - , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 - var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 - var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" - if (checkStatus.data.length === 0) { - return layer.msg('璇烽�夋嫨鏁版嵁'); - } - //鑾峰彇鏁版嵁 - $("#HBadReasonID").val(checkStatus.data[0].HItemID); - $("#HBadReasonName").val(checkStatus.data[0].涓嶈壇鍘熷洜鍚嶇О); - - layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� - } - }) - } - - //璐ㄦ鍛橀�夋嫨椤甸潰 - function btnHEmp() { - layer.open({ - type: 2//寮圭獥绫诲瀷 - , skin: 'layui-layer-rim' //鍔犱笂杈规 - , area: ['90%', '90%']//澶у皬 - , title: '璐ㄦ鍛樺垪琛�'//鏍囬 - , shift: 2//寮瑰嚭鍔ㄧ敾 - , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'] - , btn: ['纭畾', '鍙栨秷'] - , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 - var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 - var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" - if (checkStatus.data.length === 0) { - return layer.msg('璇烽�夋嫨鏁版嵁'); - } - //鑾峰彇鏁版嵁 - $("#HEmpID").val(checkStatus.data[0].HItemID); - $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О); - - layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� - } - }) - } - - //鐢熶骇璧勬簮閫夋嫨椤甸潰 - function btnHSource() { - layer.open({ - type: 2//寮圭獥绫诲瀷 - , skin: 'layui-layer-rim' //鍔犱笂杈规 - , area: ['90%', '90%']//澶у皬 - , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬 - , shift: 2//寮瑰嚭鍔ㄧ敾 - , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'] - , btn: ['纭畾', '鍙栨秷'] - , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 - var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 - var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" - if (checkStatus.data.length === 0) { - return layer.msg('璇烽�夋嫨鏁版嵁'); - } - //鑾峰彇鏁版嵁 - $("#HSourceID").val(checkStatus.data[0].HItemID); - $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О); - - layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� - } - , btn2: function (index, layero) { } - }) - } - - //鐢熶骇鐝粍閫夋嫨椤甸潰 - function btnHGroup() { - layer.open({ - type: 2//寮圭獥绫诲瀷 - , skin: 'layui-layer-rim' //鍔犱笂杈规 - , area: ['90%', '90%']//澶у皬 - , title: '鐝粍琛�'//鏍囬 - , shift: 2//寮瑰嚭鍔ㄧ敾 - , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes'] - , btn: ['纭畾', '鍙栨秷'] - , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 - var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 - var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" - if (checkStatus.data.length != 1) { - return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�'); - } - //鑾峰彇鏁版嵁 - $("#HGroupID").val(checkStatus.data[0].HItemID);//鐝粍id - $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);//璁¢噺鍗曚綅鍚嶇О - - layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� - } - , btn2: function (index, layero) { } - }) - } - - //鑾峰彇鍙傛暟 - function getUrlVars() { - var vars = [], hash; - var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&'); - for (var i = 0; i < hashes.length; i++) { - hash = hashes[i].split('='); - vars.push(hash[0]); - vars[hash[0]] = hash[1]; - } - return vars; - } - - //淇濆瓨HMaker - function set_AddNew(data, HResult) { - - var sMainStr = JSON.stringify(data.field); - - var sMainSub = sMainStr + ';' + HResult + ";" + sessionStorage["HUserName"] ; - - var index = layer.load(); - $.ajax({ - type: "POST", - url: GetWEBURL() + "/Cj_SingleStation/ProcessBLSave", - async: false, - data: { "sMainSub": sMainSub }, - dataType: "json", - success: function (data) { - if (data.count == 1) { - $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true); - layer.close(index); - layer.msg("鎻愪氦鎴愬姛"); - } - else { - layer.close(index); - layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - } - }, - error: function (err) { - layer.close(index); - layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - } - }); - } - - //闈炵┖楠岃瘉 - function AllowLoadData(data) { - - var HBarCode = $("#HBarCode").val(); - if (HBarCode == "") { - layer.msg("浜у搧SN涓嶈兘涓虹┖!") - return false; + }); } - var HBadReasonID = $("#HBadReasonID").val(); - if (HBadReasonID == 0) { - layer.msg("涓嶈壇鍘熷洜涓嶈兘涓虹┖!") - return false; + //鏉$爜鍥炶溅鏌ヨ + function txtHBarCode_KeyDown(HBarCode) { + + var index = layer.load(); + $.ajax({ + type: "GET", + url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList", + async: false, + data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] }, + dataType: "json", + success: function (data1) { + if (data1.count == 1) { + layer.close(index); + $("#HICMOBillNo").val(data1.data[0]["鐢熶骇璁㈠崟"]); + $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]); + $("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]); + $("#HProcExchBillNo").val(data1.data[0]["宸ュ簭娴佽浆鍗�"]); + $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]); + $("#HUnitID").val(data1.data[0]["HUnitID"]); + $("#HUnitName").val(data1.data[0]["鍗曚綅"]); + $("#HOrgName").val(data1.data[0]["缁勭粐"]); + $("#HProdOrgID").val(data1.data[0]["HPRDORGID"]); + $("#HMaterNumber").val(data1.data[0]["鐗╂枡缂栫爜"]); + $("#HMaterID").val(data1.data[0]["HMaterID"]); + $("#HMaterName").val(data1.data[0]["鐗╂枡鍚嶇О"]); + $("#HMaterModel").val(data1.data[0]["瑙勬牸鍨嬪彿"]); + $("#HMaterSN").val(data1.data[0]["鏉$爜"]); + + get_Display(); + } + else { + layer.close(index); + layer.msg(data1.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + } + $("#HBarCode").val(""); + }, + error: function (err) { + layer.close(index); + layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + } + }); } - return true; - } - //#endregion + //涓嶈壇鍘熷洜閫夋嫨椤甸潰 + function get_checkSearchHBadReason() { + layer.open({ + type: 2 + , skin: "layui-layer-rim" //鍔犱笂杈规 + , title: "涓嶈壇鍘熷洜鍒楄〃" //鏍囬 + , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡 + , shift: 2 //寮瑰嚭鍔ㄧ敾 + , area: ["90%", "90%"] //绐椾綋澶у皬 + , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀� + , content: ["../../../views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html", "yes"] + , btn: ["纭畾", "鍙栨秷"] + , btn1: function (index, laero) { + //鎸夐挳涓� 鐨勫洖璋� + var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹� - }); + if (checkStatus.data.length != 1) { + return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�"); + } + + $("#HBadReasonID").val(checkStatus.data[0].HItemID);//鍐呯爜 + $("#HBadReasonName").val(checkStatus.data[0].涓嶈壇鍘熷洜鍚嶇О);//鍚嶇О + layer.close(index);//鍏抽棴寮圭獥 + } + , btn2: function (index, layero) { } + }) + } + + + //鎹㈤厤浠堕〉闈� + function get_checkSearchChangeMater() { + var HMaterSN = $("#HMaterSN").val(); + if (HMaterSN == "") { + return layer.msg("璇峰厛鎵潯鐮�!"); + } + //var HInterID = $("#HInterID").val(); + //var HBillNo = $("#HBillNo").val(); + //var HEmpName = $("#HEmpName").val(); + //var HProdMac = $("#HProdMac").val(); + //var HSourceInterID = $("#HSourceInterID").val(); + //var HSourceEntryID = $("#HSourceEntryID").val(); + //var HSourceBillNo = $("#HSourceBillNo").val(); + //var HSourceBillType = $("#HSourceBillType").val(); + //var HBarCode = $("#HBarCode").val(); + + var dataParams = { + 'OperationType': 1 + , 'HMaterSN': HMaterSN + //, 'HInterID': HInterID + //, 'HBillNo': HBillNo + //, 'HEmpName': HEmpName + //, 'HProdMac': HProdMac + //, 'HSourceInterID': HSourceInterID + //, 'HSourceEntryID': HSourceEntryID + //, 'HSourceBillNo': HSourceBillNo + //, 'HSourceBillType': HSourceBillType + //, 'HBarCode': HBarCode + //, 'subMaterList_Temp': $("#subMaterList_Temp").val() + } + var datajson = JSON.stringify(dataParams); + url = encodeURI('../../杞﹂棿绠$悊/鍗曞搧杩囩珯/Cj_ProcessItemBGA_PJGH.html?OperationType=1&HMaterSN=' + HMaterSN); + + layer.open({ + type: 2 + , skin: "layui-layer-rim" //鍔犱笂杈规 + , title: "浜х嚎杩斾慨骞冲彴(鏇存崲閰嶄欢)" //鏍囬 + , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡 + , shift: 2 //寮瑰嚭鍔ㄧ敾 + , area: ["90%", "90%"] //绐椾綋澶у皬 + , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀� + , content: [url, "yes"] + , btn: ["纭畾", "鍙栨秷"] + , btn1: function (index, laero) { + layer.close(index);//鍏抽棴寮圭獥 + } + , btn2: function (index, layero) { } + }) + } + + //#endregion + + }); </script> \ No newline at end of file diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA_PJGH.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA_PJGH.html" index 125a5a8..aacd98f 100644 --- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA_PJGH.html" +++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA_PJGH.html" @@ -2,9 +2,464 @@ <html> <head> <meta charset="utf-8" /> - <title></title> + <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/zgqCustom/zgqCustom.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> </head> <body> - + <div class="layui-fluid" style="padding: 0;"> + <div class="layui-card" style="padding: 2px;background-color: #efefef;"> + <div class="layui-card-body" style="padding: 1px;"> + <form class="layui-form" action="" lay-filter="formData" style="background-color:white;"> + <div style="padding: 10px;"> + <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">鎵撳嵃</button> + <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">鏂板</button> + <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">閫�鍑�</button> + </div> + <div class="layui-tab" lay-filter="tab-POStockInBill"> + <ul class="layui-tab-title" lay-filter="tab-all"> + <li lay-id="1" style="padding:1px;" class="layui-this">淇℃伅閲囬泦</li> + </ul> + <div class="layui-tab-content"> + <!--鍩烘湰淇℃伅--> + <div class="layui-tab-item layui-show"> + <div class="layui-form-item" style="padding-top: 10px;"> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">鏉″舰鐮�:</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" name="HBarCode" lay-verify="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode" style="width: 500px;"> + </div> + </div> + </div> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly> + <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID"> + </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="HEmpName" lay-verify="HEmpName" id="HEmpName" style="background-color: #efefef4d; width: 60%; display: inline-block;" readonly> + <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0"> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp" id="btnHEmp" style="padding: 0 10px;float: right;margin-right: 3px;"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> + </button> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">閰嶄欢鐮�</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" name="HProcName" lay-verify="HProcName" id="HProcName" style="background-color: #efefef4d;" readonly> + <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0"> + </div> + </div> + </div> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">浜у搧MAC</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" name="HProdMac" lay-verify="HProdMac" id="HProdMac"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">浜у搧SN</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" name="HMaterSN" lay-verify="HMaterSN" id="HMaterSN" style="background-color: #efefef4d; display: inline-block;" readonly> + </div> + </div> + </div> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">澶囨敞</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style=" width: 500px;"> + </div> + </div> + </div> + </div> + </div> + </div> + </div> + <div class="layui-tab layui-tab-card"> + <ul class="layui-tab-title"> + <li class="layui-this">閰嶄欢鏇存崲璁板綍</li> + <li>鍏抽敭浠舵竻鍗�</li> + </ul> + <div class="layui-tab-content"> + <div class="layui-tab-item layui-show"> + <!--閰嶄欢鏇存崲璁板綍--> + <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table> + </div> + <div class="layui-tab-item"> + <!--鍏抽敭浠舵竻鍗�--> + <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table> + </div> + </div> + </div> + + <script type="text/html" id="toolbarDemo"> + <div class="layui-btn-container"> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button> + </div> + </script> + <script type="text/html" id="toolbarDemo2"> + <div class="layui-btn-container"> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine2"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine2"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button> + </div> + </script> + <input type="hidden" id="HProdOrgID" name="HProdOrgID" value="0" /> + </form> + </div> + </div> + </div> </body> -</html> \ No newline at end of file +</html> +<script type="text/html" id="barDemo"> + <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a> +</script> +<script type="text/html" id="barDemo2"> + <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del2">鍒犻櫎</a> +</script> +<script> + + layui.config({ + base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰� + }).extend({ + index: 'lib/index' //涓诲叆鍙fā鍧� + }).use(['index', 'form', 'laydate', 'table', 'element'], function () { + + //#region 鍏叡鍙橀噺 + + var $ = layui.$ + , admin = layui.admin + , layer = layui.layer + , table = layui.table + , form = layui.form + , element = layui.element; + + //瀹氫箟鍏ㄥ眬鍙橀噺 + + var HModName = "Cj_CollectionOfSingleProductDefects"; + //#endregion + + //#region 杩涘叆椤甸潰鍗冲姞杞� + + var params = getUrlVars(); + var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫 4娣诲姞瀛愬伐鑹鸿矾绾� + var HMaterSN = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜 + + //鍒跺崟浜� + $("#HMaker").val(sessionStorage["HUserName"]); + $("#hmakedate").val(Format(new Date(), "yyyy-MM-dd")); + + //鍒ゆ柇鏄惁鏂板 + if (HMaterSN != null || HMaterSN != "") { + OperationType = 1; + $("#HMaterSN").val(HMaterSN); + $.ajax({ + url: GetWEBURL() + "/Web/GetMAXNum", + type: "GET", + data: { "HBillType": '3791' }, + success: function (d) { + $("#HInterID").val(d.data[0].HInterID); + $("#HBillNo").val(d.data[0].HBillNo); + $("#HBillNo_bak").val(d.data[0].HBillNo); + } + }); + //鍒濆鍖栫晫闈� + set_ClearBill(); + } else if (OperationType == 2) { + //绂佺敤缁勭粐閫夐」 + //$("#HOrgID").attr("disabled", true); + RoadBillMain(HMaterSN); + $.ajax({ + url: GetWEBURL() + "/Web/GetMAXNum", + type: "GET", + async: false, + data: { "HBillType": '3717' }, + success: function (d) { + $("#HInterID").val(d.data[0].HInterID); + $("#HBillNo").val(d.data[0].HBillNo); + $("#HBillNo_bak").val(d.data[0].HBillNo); + } + }); + } + + + + //#endregion + + //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛� + + //鏉″舰鐮佸洖杞︽柟娉� + $('#HBarCodeSN').on('keydown', function (event) { + var HBarCode = $('#HBarCodeSN').val(); + if (event.keyCode == 13) { + if (!HBarCode) { + layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒") + return; + } + txtHBarCode_KeyDown(HBarCode); + } + }); + + //閫夋嫨涓嶈壇鍘熷洜 + form.on('submit(btnHBadReason)', function () { + btnHBadReason(); + }); + + //閫夋嫨璐ㄦ鍛� + form.on('submit(btnHEmp)', function () { + btnHEmp(); + }); + + //閫夋嫨鐢熶骇璧勬簮 + form.on('submit(btnHSource)', function () { + btnHSource(); + }); + + //閫夋嫨鐢熶骇鐝粍鎸夐挳 + form.on('submit(btnHGroup)', function () { + btnHGroup(); + }); + + //鏂板 + form.on('submit(set_AddNew)', function () { + layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) { + location.replace('Cj_CollectionOfSingleProductDefects.html?OperationType=1&linterid=0'); + }); + }); + + //淇濆瓨鎻愪氦 + form.on('submit(btnSave_BL)', function (data) {//鎻愪氦 + if (AllowLoadData(data)) { + set_AddNew(data, "涓嶈壇"); + } + }); + + form.on('submit(btnSave_BF)', function (data) {//鎻愪氦 + if (AllowLoadData(data)) { + set_AddNew(data, "鎶ュ簾"); + } + }); + + //閫�鍑� + form.on('submit(btnEdit)', function (data) { + if (params[1] != null) { + Pub_Close(1); + } else if (params[1] == null) { + Pub_Close(2); + } + }); + + + //#endregion + + //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶 + + //鍒濆鍖栫晫闈� + function set_ClearBill() { + get_Display(); + } + + //鏌ヨ + function get_Display() { + var sWhere = " and 缂栫爜='" + sessionStorage["Czybm"] + "'"; + var ajaxLoad = layer.load(); + //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� + $.ajax({ + url: GetWEBURL() + '/Cj_SingleStation/Cj_CollectionOfSingleProductDefectsUserList', + type: "GET", + data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] }, + success: function (data1) { + if (data1.count == 1) { + + $("#HSourceID").val(data1.data[0]["HSourceID"]); + $("#HSourceName").val(data1.data[0]["鐢熶骇璧勬簮"]); + $("#HEmpID").val(data1.data[0]["HEmpID"]); + $("#HEmpName").val(data1.data[0]["璐ㄦ鍛�"]); + $("#HGroupID").val(data1.data[0]["HGroupID"]); + $("#HGroupName").val(data1.data[0]["鐢熶骇鐝粍"]); + layer.close(ajaxLoad); + + //layer.alert("鏌ヨ鎴愬姛", { icon: 1 }); + } else { + layer.close(ajaxLoad); + layer.alert(data1.code + data1.Message, { icon: 5 }); + } + }, error: function () { + layer.close(ajaxLoad); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + + }); + } + + //鏉$爜鍥炶溅鏌ヨ + function txtHBarCode_KeyDown(HBarCode) { + + var index = layer.load(); + $.ajax({ + type: "GET", + url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList", + async: true, + data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] }, + dataType: "json", + success: function (data1) { + if (data1.count == 1) { + layer.close(index); + $("#HICMOBillNo").val(data1.data[0]["鐢熶骇璁㈠崟"]); + $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]); + $("#HProcExchBillNo").val(data1.data[0]["宸ュ簭娴佽浆鍗�"]); + $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]); + $("#HMaterNumber").val(data1.data[0]["鐗╂枡缂栫爜"]); + $("#HMaterID").val(data1.data[0]["HMaterID"]); + $("#HMaterName").val(data1.data[0]["鐗╂枡鍚嶇О"]); + $("#HModel").val(data1.data[0]["瑙勬牸鍨嬪彿"]); + $("#HBarCode").val(data1.data[0]["鏉$爜"]); + + } + else { + layer.close(index); + layer.msg(data1.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + } + $("#HBarCodeSN").val(""); + }, + error: function (err) { + layer.close(index); + layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + } + }); + } + + //涓嶈壇鍘熷洜閫夋嫨椤甸潰 + function btnHBadReason() { + layer.open({ + type: 2//寮圭獥绫诲瀷 + , skin: 'layui-layer-rim' //鍔犱笂杈规 + , area: ['90%', '90%']//澶у皬 + , title: '涓嶈壇鍘熷洜鍒楄〃'//鏍囬 + , shift: 2//寮瑰嚭鍔ㄧ敾 + , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html', 'yes'] + , btn: ['纭畾', '鍙栨秷'] + , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 + var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length === 0) { + return layer.msg('璇烽�夋嫨鏁版嵁'); + } + //鑾峰彇鏁版嵁 + $("#HBadReasonID").val(checkStatus.data[0].HItemID); + $("#HBadReasonName").val(checkStatus.data[0].涓嶈壇鍘熷洜鍚嶇О); + + layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� + } + }) + } + + //璐ㄦ鍛橀�夋嫨椤甸潰 + function btnHEmp() { + layer.open({ + type: 2//寮圭獥绫诲瀷 + , skin: 'layui-layer-rim' //鍔犱笂杈规 + , area: ['90%', '90%']//澶у皬 + , title: '璐ㄦ鍛樺垪琛�'//鏍囬 + , shift: 2//寮瑰嚭鍔ㄧ敾 + , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'] + , btn: ['纭畾', '鍙栨秷'] + , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 + var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length === 0) { + return layer.msg('璇烽�夋嫨鏁版嵁'); + } + //鑾峰彇鏁版嵁 + $("#HEmpID").val(checkStatus.data[0].HItemID); + $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О); + + layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� + } + }) + } + + + + + + //鑾峰彇鍙傛暟 + function getUrlVars() { + var vars = [], hash; + var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&'); + for (var i = 0; i < hashes.length; i++) { + hash = hashes[i].split('='); + vars.push(hash[0]); + vars[hash[0]] = hash[1]; + } + return vars; + } + + //淇濆瓨HMaker + function set_AddNew(data, HResult) { + + var sMainStr = JSON.stringify(data.field); + + var sMainSub = sMainStr + ';' + HResult + ";" + sessionStorage["HUserName"]; + + var index = layer.load(); + $.ajax({ + type: "POST", + url: GetWEBURL() + "/Cj_SingleStation/ProcessBLSave", + async: false, + data: { "sMainSub": sMainSub }, + dataType: "json", + success: function (data) { + if (data.count == 1) { + $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true); + layer.close(index); + layer.msg("鎻愪氦鎴愬姛"); + } + else { + layer.close(index); + layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + } + }, + error: function (err) { + layer.close(index); + layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + } + }); + } + + //闈炵┖楠岃瘉 + function AllowLoadData(data) { + + var HBarCode = $("#HBarCode").val(); + if (HBarCode == "") { + layer.msg("浜у搧SN涓嶈兘涓虹┖!") + return false; + } + + var HBadReasonID = $("#HBadReasonID").val(); + if (HBadReasonID == 0) { + layer.msg("涓嶈壇鍘熷洜涓嶈兘涓虹┖!") + return false; + } + return true; + } + + //#endregion + + }); +</script> \ No newline at end of file -- Gitblit v1.9.1