From cfc5e6fa347eadeddd94a2a2e0d8dafccb4e452b Mon Sep 17 00:00:00 2001 From: zgq <519541279@qq.com> Date: 星期二, 20 七月 2021 23:28:47 +0800 Subject: [PATCH] 1 --- WebTM/views/Baseset/基础资料/Gy_QCCheckProjectListView.html | 102 ++++++++++++ WebTM/views/home/console_Mobile.html | 42 +++++ WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 43 ++-- WebTM/layuiadmin/Scripts/webConfig.js | 4 WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 242 +++++++++++++++++++----------- WebTM/views/index.html | 6 WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html | 2 WebTM/WebTM.csproj | 1 8 files changed, 328 insertions(+), 114 deletions(-) diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user index 6b0a846..604a435 100644 --- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user +++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user @@ -15,10 +15,10 @@ <publishTime>03/23/2021 14:14:38</publishTime> </File> <File Include="bin/WebTM.dll"> - <publishTime>07/19/2021 20:55:58</publishTime> + <publishTime>07/20/2021 21:30:33</publishTime> </File> <File Include="bin/WebTM.pdb"> - <publishTime>07/19/2021 20:55:58</publishTime> + <publishTime>07/20/2021 21:30:33</publishTime> </File> <File Include="layuiadmin/config.js"> <publishTime>03/23/2021 14:14:38</publishTime> @@ -633,7 +633,7 @@ <publishTime>03/23/2021 14:14:38</publishTime> </File> <File Include="layuiadmin/Scripts/webConfig.js"> - <publishTime>07/20/2021 15:02:24</publishTime> + <publishTime>07/20/2021 23:24:33</publishTime> </File> <File Include="layuiadmin/style/admin.css"> <publishTime>03/23/2021 14:14:38</publishTime> @@ -799,6 +799,9 @@ </File> <File Include="views/Baseset/鍩虹璧勬枡/Gy_QCCheckItemListView.html"> <publishTime>07/19/2021 19:30:28</publishTime> + </File> + <File Include="views/Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.html"> + <publishTime>07/20/2021 21:27:45</publishTime> </File> <File Include="views/Baseset/鍩虹璧勬枡/Gy_RepairList.html"> <publishTime>06/30/2021 11:17:08</publishTime> @@ -1059,7 +1062,7 @@ <publishTime>07/06/2021 16:01:53</publishTime> </File> <File Include="views/home/console_Mobile.html"> - <publishTime>05/08/2021 13:44:31</publishTime> + <publishTime>07/20/2021 23:24:03</publishTime> </File> <File Include="views/home/homepage1.html"> <publishTime>03/23/2021 14:14:38</publishTime> @@ -1077,13 +1080,13 @@ <publishTime>07/12/2021 15:38:26</publishTime> </File> <File Include="views/index.html"> - <publishTime>07/14/2021 20:10:46</publishTime> + <publishTime>07/20/2021 19:42:04</publishTime> </File> <File Include="views/index_Mobile.html"> <publishTime>07/16/2021 17:40:57</publishTime> </File> <File Include="views/IpadIndex.html"> - <publishTime>07/20/2021 14:58:15</publishTime> + <publishTime>07/20/2021 17:07:50</publishTime> </File> <File Include="views/PublicPage/CheckItemType.html"> <publishTime>06/15/2021 16:41:12</publishTime> @@ -1860,10 +1863,10 @@ <publishTime>06/24/2021 16:58:24</publishTime> </File> <File Include="views/鐢熶骇绠$悊/浜ч噺姹囨姤鍗�/Sc_Add_ProductReportBillList.html"> - <publishTime>07/19/2021 15:36:50</publishTime> + <publishTime>07/20/2021 17:07:50</publishTime> </File> <File Include="views/鐢熶骇绠$悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList.html"> - <publishTime>07/20/2021 14:58:15</publishTime> + <publishTime>07/20/2021 17:07:50</publishTime> </File> <File Include="views/鐢熶骇绠$悊/鎶ュ伐骞冲彴鍔熻兘椤�/LineBind.html"> <publishTime>07/19/2021 15:36:50</publishTime> @@ -1881,7 +1884,7 @@ <publishTime>07/19/2021 15:36:50</publishTime> </File> <File Include="views/鐢熶骇绠$悊/鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList.html"> - <publishTime>07/20/2021 14:58:15</publishTime> + <publishTime>07/20/2021 17:07:50</publishTime> </File> <File Include="views/鐢熶骇绠$悊/鐢熶骇鍋滃伐鍗�/Sc_MESStopWorkBillList.html"> <publishTime>06/28/2021 11:17:20</publishTime> @@ -1899,7 +1902,7 @@ <publishTime>07/19/2021 15:36:51</publishTime> </File> <File Include="views/鐢熶骇绠$悊/鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html"> - <publishTime>07/20/2021 14:58:15</publishTime> + <publishTime>07/20/2021 17:07:50</publishTime> </File> <File Include="views/鐢熶骇绠$悊/鐢熶骇寮�宸ュ崟/Sc_MESBeginWorkBillList.html"> <publishTime>06/18/2021 16:05:28</publishTime> @@ -1914,7 +1917,7 @@ <publishTime>06/28/2021 11:17:20</publishTime> </File> <File Include="views/鐢熶骇绠$悊/鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html"> - <publishTime>07/20/2021 14:58:15</publishTime> + <publishTime>07/20/2021 17:07:50</publishTime> </File> <File Include="views/鐢熶骇绠$悊/鐢熶骇寮�宸ュ崟/Sc_MESBeginWorkBillList.html"> <publishTime>06/18/2021 16:05:28</publishTime> @@ -1923,10 +1926,10 @@ <publishTime>03/29/2021 10:46:21</publishTime> </File> <File Include="views/鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html"> - <publishTime>07/13/2021 17:09:13</publishTime> + <publishTime>07/20/2021 17:07:50</publishTime> </File> <File Include="views/鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html"> - <publishTime>07/13/2021 17:09:13</publishTime> + <publishTime>07/20/2021 17:07:50</publishTime> </File> <File Include="views/鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBillList.html"> <publishTime>07/12/2021 15:38:26</publishTime> @@ -2079,7 +2082,7 @@ <publishTime>07/19/2021 08:17:34</publishTime> </File> <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html"> - <publishTime>07/20/2021 14:56:47</publishTime> + <publishTime>07/20/2021 22:33:39</publishTime> </File> <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html"> <publishTime>05/24/2021 10:08:23</publishTime> @@ -2163,7 +2166,7 @@ <publishTime>05/24/2021 10:08:23</publishTime> </File> <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html"> - <publishTime>07/20/2021 14:56:47</publishTime> + <publishTime>07/20/2021 22:33:39</publishTime> </File> <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html"> <publishTime>05/24/2021 10:08:23</publishTime> @@ -2226,13 +2229,13 @@ <publishTime>07/19/2021 16:04:47</publishTime> </File> <File Include="views/杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html"> - <publishTime>07/20/2021 09:37:24</publishTime> + <publishTime>07/20/2021 19:37:19</publishTime> </File> <File Include="views/杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html"> <publishTime>07/19/2021 16:04:47</publishTime> </File> <File Include="views/杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html"> - <publishTime>07/20/2021 09:37:24</publishTime> + <publishTime>07/20/2021 19:37:19</publishTime> </File> <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Qk_OutProcessList.html"> <publishTime>03/23/2021 14:14:38</publishTime> @@ -2298,7 +2301,7 @@ <publishTime>04/16/2021 14:21:33</publishTime> </File> <File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Fast.html"> - <publishTime>03/29/2021 10:48:23</publishTime> + <publishTime>07/20/2021 17:07:50</publishTime> </File> <File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_FastList.html"> <publishTime>03/29/2021 10:48:23</publishTime> @@ -2391,7 +2394,7 @@ <publishTime>04/16/2021 14:21:33</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html"> - <publishTime>07/16/2021 17:40:57</publishTime> + <publishTime>07/20/2021 17:07:50</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_FastList.html"> <publishTime>03/29/2021 10:48:24</publishTime> @@ -2430,7 +2433,7 @@ <publishTime>04/16/2021 14:21:33</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html"> - <publishTime>07/20/2021 14:58:15</publishTime> + <publishTime>07/20/2021 17:07:50</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_FastList.html"> <publishTime>03/29/2021 10:48:24</publishTime> diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj index f841eb6..972565b 100644 --- a/WebTM/WebTM.csproj +++ b/WebTM/WebTM.csproj @@ -83,6 +83,7 @@ <Content Include="layuiadmin\myicon\杞﹂棿绠$悊.svg" /> <Content Include="layuiadmin\treeTable.js" /> <Content Include="views\Baseset\HBarPlanPrint.html" /> + <Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckProjectListView.html" /> <Content Include="views\Baseset\鍩虹璧勬枡\Sc_ICMOBillListView2.html" /> <Content Include="views\Baseset\鍩虹璧勬枡\Sc_ProcessExchangeBillListView.html" /> <Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckItemListView.html" /> diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js index 7980c71..e8bcf45 100644 --- a/WebTM/layuiadmin/Scripts/webConfig.js +++ b/WebTM/layuiadmin/Scripts/webConfig.js @@ -1,7 +1,7 @@ 锘縡unction GetWEBURL() { //var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒 //var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴 - var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴 + //var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴 //var WEBURL = "http://192.168.2.21:8081/lubaoWebAPI/";//鐜嬫案娉㈡湰鍦伴厤缃紝璇峰嬁鏇存敼 //var WEBURL = "http://101.37.171.70/API/"; //鍏徃鏈嶅姟鍣� //var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃� @@ -10,7 +10,7 @@ //var WEBURL = "http://10.1.4.154/API/"; //姹熶赴瀹㈡埛 //var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW //var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣� - //var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣� + var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣� return WEBURL } diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckProjectListView.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckProjectListView.html" new file mode 100644 index 0000000..347bcb3 --- /dev/null +++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckProjectListView.html" @@ -0,0 +1,102 @@ +锘�<!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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0"> + <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all"> + <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all"> +</head> +<body> + <div class="layui-fluid"> + <div class="layui-card"> + <div class="layui-card-body" style="padding: 15px;"> + <form class="layui-form" action="" lay-filter="component-form-group"> + <div class="layui-form-item"> + <div class="layui-inline"> + <label class="layui-form-label">杩囨护鍒�</label> + <div class="layui-input-inline"> + <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input"> + </div> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button> + </div> + </div> + </form> + </div> + </div> + </div> + <table class="layui-hide" id="ck-table"></table> + <script src="../../../layuiadmin/layui/layui.js"></script> + <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script> + <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script> + <script src="../../../layuiadmin/Scripts/webConfig.js"></script> + <script> + //寮曠敤鐨勫崟鎹強妯″潡锛氶浠舵楠屽崟銆� + layui.use(['table', 'form', 'layer'], function () { + var table = layui.table + , form = layui.form + , layer = layui.layer; + + form.on('submit(HQuery)', function () {//閫夋嫨鍗曚綅 + //var sMainStr = JSON.stringify(table.cache['ck-table']); + RoadQuery($('#Value').val()); + }); + RoadQuery($('#Value').val()); + table.render({ + elem: '#ck-table' + // , url: '/demo/table/user/' + , data: [] + , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板 + , cols: [[ + { type: 'radio' } + , { field: 'HItemID', title: 'HItemID', hide: true } + , { field: '妫�楠屾柟妗堜唬鐮�', title: '妫�楠屾柟妗堜唬鐮�' } + , { field: '鏂规鍚嶇О', title: '鏂规鍚嶇О' } + ]] + , page: true + }); + ///鍔犺浇鏄剧ず鏁版嵁 + function RoadQuery(Where) { + var index = layer.load(); + var Value = Where; + if (Value == null) { + Value = ''; + } + $.ajax({ + type: "get", + url: GetWEBURL() + "/Web/GetGy_QCCheckProject", + async: true, + data: { "CheckProject": Value, "OrganizationID": sessionStorage["OrganizationID"] }, + //data: { "Value": Value }, + success: function (result) { + if (result.count == 1) { + ajaxReturnData = JSON.parse(JSON.stringify(result)).data; + table.reload('ck-table', { + data: ajaxReturnData + , height: 'full-10' + , loading: false + , done: function (index, res) { + + } + }); + layer.close(index); + } + else { + layer.close(index); + layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + } + }, + error: function (result) { + layer.close(index); + console.log(result); + //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 }); + } + }); + }; + }); + </script> + +</body> +</html> diff --git a/WebTM/views/home/console_Mobile.html b/WebTM/views/home/console_Mobile.html index 4dbd623..5278b38 100644 --- a/WebTM/views/home/console_Mobile.html +++ b/WebTM/views/home/console_Mobile.html @@ -40,6 +40,48 @@ <cite>濮斿宸ュ簭鍙戝嚭鍗�</cite> </a> </li> + <li class="layui-col-xs3"> + <a href="../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html" target="main_self_frame"> + <i class="layui-icon layui-icon-console"></i> + <cite>澶栬喘鍏ュ簱</cite> + </a> + </li> + <li class="layui-col-xs3"> + <a href="../楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html" target="main_self_frame"> + <i class="layui-icon layui-icon-template-1"></i> + <cite>濮斿鍏ュ簱</cite> + </a> + </li> + <li class="layui-col-xs3"> + <a href="../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html" target="main_self_frame"> + <i class="layui-icon layui-icon-template-1"></i> + <cite>浜у搧鍏ュ簱</cite> + </a> + </li> + <li class="layui-col-xs3"> + <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Fast.html" target="main_self_frame"> + <i class="layui-icon layui-icon-chart"></i> + <cite>棰嗘枡鍑哄簱</cite> + </a> + </li> + <li class="layui-col-xs3"> + <a href="../棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html" target="main_self_frame"> + <i class="layui-icon layui-icon-chart"></i> + <cite>濮斿鍑哄簱</cite> + </a> + </li> + <li class="layui-col-xs3"> + <a href="../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html" target="main_self_frame"> + <i class="layui-icon layui-icon-chat"></i> + <cite>閿�鍞嚭搴�</cite> + </a> + </li> + <li class="layui-col-xs3"> + <a href="../浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html" target="main_self_frame"> + <i class="layui-icon layui-icon-find-fill"></i> + <cite>璋冩嫧鍗�</cite> + </a> + </li> </ul> </div> </div> diff --git a/WebTM/views/index.html b/WebTM/views/index.html index 66241e0..a4f902d 100644 --- a/WebTM/views/index.html +++ b/WebTM/views/index.html @@ -397,16 +397,16 @@ <dl class="layui-nav-child"> <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QCCheckClass.html">妫�楠岄」鐩垎绫诲垪琛�</a></dd> <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_QCCheckClass.html">妫�楠岄」鐩垪琛�</a></dd> - <dd><a href="璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_Add_CheckProject.html" target="main_self_frame">妫�楠屾柟妗�</a></dd> + <dd><a lay-href="璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_Add_CheckProject.html">妫�楠屾柟妗�</a></dd> <dd><a lay-href="璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html">妫�楠屾柟妗堢淮鎶�</a></dd> </dl> </dd> <dd> <a>杩囩▼妫�楠�</a> <dl class="layui-nav-child"> - <dd><a href="璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html" target="main_self_frame">棣栦欢妫�楠屽崟</a></dd> + <dd><a lay-href="璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html">棣栦欢妫�楠屽崟</a></dd> <dd><a lay-href="璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html">棣栦欢妫�楠屽崟缁存姢</a></dd> - <dd><a href="璐ㄩ噺绠$悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckBill.html" target="main_self_frame">宸℃璁板綍鍗�</a></dd> + <dd><a lay-href="璐ㄩ噺绠$悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckBill.html">宸℃璁板綍鍗�</a></dd> <dd><a lay-href="璐ㄩ噺绠$悊/宸℃璁板綍鍗�/QC_PatrolProcCheckBillList.html">宸℃璁板綍鍗曠淮鎶�</a></dd> <dd><a lay-href="璐ㄩ噺绠$悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html">宸ュ簭杞Щ妫�楠屽崟</a></dd> <dd><a lay-href="璐ㄩ噺绠$悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList.html">宸ュ簭杞Щ妫�楠屽崟缁存姢</a></dd> diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" index 2e291ce..67cc7fa 100644 --- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" +++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" @@ -42,18 +42,15 @@ <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 layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch"> - <i class="layui-icon layui-icon-print layuiadmin-button-btn"><span class="btn-title">棰勮</span></i> - </button> - <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch"> - <i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"><span class="btn-title">鏂板</span></i> - </button> - <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch"> - <i class="layui-icon layui-icon-edit layuiadmin-button-btn"><span class="btn-title">淇敼</span></i> - </button> - <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSave" id="btnSave"> - <i class="layui-icon layui-icon-delete layuiadmin-button-btn"><span class="btn-title">淇濆瓨</span></i> - </button> + <!--<button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch"> + <i class="layui-icon layui-icon-print layuiadmin-button-btn"><span class="btn-title">棰勮</span></i> + </button>--> + <!--<button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch"> + <i class="layui-icon layui-icon-edit layuiadmin-button-btn"><span class="btn-title">淇敼</span></i> + </button>--> + <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button> + <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button> + <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button> </div> <div class="layui-tab" lay-filter="tab-POStockInBill"> <ul class="layui-tab-title" lay-filter="tab-all"> @@ -102,7 +99,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="HICMOQty" id="HICMOQty"> + <input type="text" class="layui-input" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly> </div> </div> <div class="layui-inline"> @@ -125,7 +122,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="HProcExchQty" id="HProcExchQty"> + <input type="text" class="layui-input" name="HProcExchQty" id="HProcExchQty" style="background-color:#efefef4d;" readonly> </div> </div> <div class="layui-inline"> @@ -159,6 +156,18 @@ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> </button> <input type="hidden" name="HFirstCheckEmp" id="HFirstCheckEmp" value="0"> + </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="HQCCheckProjectName" id="HQCCheckProjectName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckProject" id="btnSearchCheckProject" style="padding: 0 10px;float: left;margin-right: 3px;"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> + </button> + <input type="hidden" name="HQCCheckProjectID" id="HQCCheckProjectID" value="0"> </div> </div> </div> @@ -263,6 +272,11 @@ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button> </div> </script> + <!--闅愯棌瀛楁--> + <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType"> + <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0"> + <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="1"> + <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo"> </form> </div> </div> @@ -272,12 +286,12 @@ <!--<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 type="text/html" id="inputSel"> - <select name="HCloseType" lay-filter="HCloseType"> + <!--琛屼笅鎷夐�夋嫨(缁撹)--> + <script type="text/html" id="HResult"> + <select name="HResult" lay-filter="HResult" id="HResult{{d.LAY_TABLE_INDEX+1}}"> <option value="">璇烽�夋嫨</option> - <option value="true">鏄�</option> - <option value="false">鍚�</option> + <option value="鍚堟牸">鍚堟牸</option> + <option value="涓嶅悎鏍�">涓嶅悎鏍�</option> </select> </script> <script src="../../../layuiadmin/layui/layui.js"></script> @@ -340,6 +354,7 @@ if (OperationType == 1) { $("#HInterID").val(""); $("#HBillNo").val(""); + $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂淇濆瓨鎸夐挳绂佺敤 //鑾峰彇鏈�澶у崟鎹彿 $.ajax({ url: GetWEBURL() + "/Web/GetMAXNum", @@ -357,6 +372,11 @@ else if (OperationType == 2) { $("#HInterID").val(""); $("#HBillNo").val(""); + $('#btn-AddNew').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂鏂板鎸夐挳绂佺敤 + $('#btnSearchSource').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂鐢熶骇璧勬簮鎸夐挳绂佺敤 + $('#btnSearchICMOBill').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂浠诲姟鍗曞彿鎸夐挳绂佺敤 + $('#btnSearchMater').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂浜у搧鍐呯爜鎸夐挳绂佺敤 + $('#btnSearchProcExch').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂娴佽浆鍗″彿鎸夐挳绂佺敤 //鑾峰彇鏈�澶у崟鎹彿 $.ajax({ url: GetWEBURL() + "/Web/GetMAXNum", @@ -400,6 +420,9 @@ $("#HSourceName").val(data.鐢熶骇璧勬簮); $("#HSourceID").val(data.HSourceID); $("#HMaterID").val(data.HMaterID); + $("#HMainSourceBillNo").val(data.鍗曟嵁鍙�); + $("#HMainSourceBillType").val(data.HBillType); + $("#HMainSourceInterID").val(data.HInterID); } else { layer.alert(result.Message, { icon: 5 }); } @@ -417,15 +440,17 @@ //鏂板琛岃〃鏍兼暟鎹� var NewRow = { "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HResult": "", - "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HSourceInterID": "", - "HSourceEntryID": "", "HSourceBillNo": "", "HSourceBillType": "", "HRelationQty": "", "HRelationMoney": "", - "HCloseMan": "", "HEntryCloseDate": "", "HCloseType": "" + "HMax": "", "HMin": "", "HAvg": "", "HRemark": "" }; switch (obj.event) { case 'btn-AddLine': table.cache["mainTable"].push(NewRow); option.data = table.cache["mainTable"]; table.render(option); + for (var i = 1; i <= option.data.length; i++) { + $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true); + } + form.render('select'); break; case 'btn-CopyLine': var copydata = JSON.stringify(data); @@ -441,11 +466,38 @@ table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂 option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓� table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓� - //layer.alert(copyrow); + for (var i = 1; i <= option.data.length; i++) { + $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true); + } + form.render('select'); } break; } }); + + //閫�鍑烘寜閽� + form.on('submit(btn-Exit)', function (data) { + get_Exit(); + }); + + //鏂板鎸夐挳 + form.on('submit(btn-AddNew)', function (data) { + window.location.reload(); + }); + + + //閫�鍑� + function get_Exit() { + if (OperationType == 1) { + parent.layui.admin.events.closeThisTabs(); + } else if (OperationType == 2) { + var index = parent.layer.getFrameIndex(window.name); + parent.layer.close(index); + } else if (OperationType == 3) { + var index = parent.layer.getFrameIndex(window.name); + parent.layer.close(index); + } + } //琛屽唴浜嬩欢 table.on('tool(mainTable)', function (obj) { @@ -539,51 +591,26 @@ //淇濆瓨 function set_SaveBill(data) { - //if ($("#HICMOQty").val() == "" || $("#HICMOQty").val() <= 0) { - // layer.msg("浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - // return; - //} - //if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) { - // layer.msg("娴佽浆鍗℃暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - // return; - //} - //if ($("#HFirstCheckEmp").val() == 0) { - // layer.msg("妫�楠屽憳鏈�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - // return; - //} - //var sSubTable = table.cache['mainTable']; - //for (var i = 0; i < sSubTable.length; i++) { - // if (!sSubTable[i].HQCCheckItemID) { - // var indexRow = i + 1; - // layer.msg("绗�" + indexRow + "琛岋紝妫�楠岄」鐩笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - // return; - // } - // if (!sSubTable[i].HSourceInterID) { - // var indexRow = i + 1; - // layer.msg("绗�" + indexRow + "琛岋紝婧愬崟涓诲唴鐮佷笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - // return; - // } - // if (!sSubTable[i].HSourceEntryID) { - // var indexRow = i + 1; - // layer.msg("绗�" + indexRow + "琛岋紝婧愬崟瀛愬唴鐮佷笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - // return; - // } - // if (!sSubTable[i].HRelationQty) { - // var indexRow = i + 1; - // layer.msg("绗�" + indexRow + "琛岋紝鍏宠仈鏁伴噺涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - // return; - // } - // if (!sSubTable[i].HRelationMoney) { - // var indexRow = i + 1; - // layer.msg("绗�" + indexRow + "琛岋紝鍏宠仈閲戦涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - // return; - // } - // if (!sSubTable[i].HEntryCloseDate) { - // var indexRow = i + 1; - // layer.msg("绗�" + indexRow + "琛岋紝鍏抽棴鏃堕棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - // return; - // } - //} + if ($("#HICMOQty").val() == "" || $("#HICMOQty").val() <= 0) { + layer.msg("浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return; + } + if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) { + layer.msg("娴佽浆鍗℃暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return; + } + if ($("#HFirstCheckEmp").val() == 0) { + layer.msg("妫�楠屽憳鏈�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return; + } + var sSubTable = table.cache['mainTable']; + for (var i = 0; i < sSubTable.length; i++) { + if (!sSubTable[i].HQCCheckItemID) { + var indexRow = i + 1; + layer.msg("绗�" + indexRow + "琛岋紝妫�楠岄」鐩笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return; + } + } var sMainStr = JSON.stringify(data.field); var sSubStr = JSON.stringify(table.cache['mainTable']); var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType; @@ -630,11 +657,60 @@ // console.log(d.data); $("#HInterID").val(d.data[0].HInterID); $("#HBillNo").val(d.data[0].HBillNo); - $("#HSourceBillNo").val(d.data[0].HSourceBillNo); } }) } + //琛ㄥご淇℃伅妫�楠屾柟妗堝脊绐� + form.on('submit(btnSearchCheckProject)', function () { + //椤甸潰灞�-鑷畾涔� + layer.open({ + type: 2, + skin: 'layui-layer-rim', //鍔犱笂杈规 + title: '妫�楠屾柟妗堝垪琛�', + closeBtn: 1, + shift: 2, + area: ['90%', '90%'], + maxmin: true, + content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.html', 'yes'], + btn: ['纭畾', '鍙栨秷'] + , btn1: function (index, layero) { + + //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 + var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length === 0) { + return layer.msg('璇烽�夋嫨鏁版嵁'); + } + $("#HQCCheckProjectID").val(checkStatus.data[0].HItemID); + $("#HQCCheckProjectName").val(checkStatus.data[0].鏂规鍚嶇О); + get_CheckItem(); + layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� + } + , btn2: function (index, layero) { + //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟 + //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴 + }, + end: function () { + + }, + success: function (layero, index) { + + } + }); + }); + + function get_CheckItem() { + $.ajax({ + url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID", + type: "GET", + data: { "CheckProjectID": $("#HQCCheckProjectID").val()}, + success: function (result) { + option.data = result.data; + table.render(option); + } + }) + } //琛ㄥご淇℃伅宸ュ簭娴佽浆鍗″脊绐� form.on('submit(btnSearchProcExch)', function () { @@ -837,13 +913,12 @@ //鍒濆鍖栬〃鏍� function set_InitGrid() { - $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); + $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); + $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd")); //鍒濆琛ㄦ牸鏁版嵁 rowdata = [{ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HResult": "", - "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HSourceInterID": "", - "HSourceEntryID": "", "HSourceBillNo": "", "HSourceBillType": "", "HRelationQty": "", "HRelationMoney": "", - "HCloseMan": "", "HEntryCloseDate": "", "HCloseType": "" + "HMax": "", "HMin": "", "HAvg": "", "HRemark": "" }]; option = { elem: '#mainTable' @@ -858,23 +933,14 @@ , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' } , { field: 'HUnit', title: '鍗曚綅', edit: 'text' } , { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' } - , { field: 'HResult', title: '缁撹', edit: 'text' } + , { field: 'HResult', title: '缁撹', templet: '#HResult' } , { field: 'HMax', title: '鏈�澶у��', edit: 'text' } , { field: 'HMin', title: '鏈�灏忓��', edit: 'text' } , { field: 'HAvg', title: '骞冲潎鍊�', edit: 'text', totalRow: true } , { field: 'HRemark', title: '澶囨敞', edit: 'text' } - , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', edit: 'text' } - , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text' } - , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿' } - , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷' } - , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', edit: 'text' } - , { field: 'HRelationMoney', title: '鍏宠仈閲戦', edit: 'text' } - , { field: 'HCloseMan', title: '琛屽叧闂汉' } - , { field: 'HEntryCloseDate', title: '鍏抽棴鏃堕棿', edit: 'text' } - , { field: 'HCloseType', title: '鎵嬪伐鍏抽棴', templet: '#inputSel' } , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' } ]] - ,done: function (res, curr, count) { + , done: function (res, curr, count) { option.data = res.data; //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊� $('.layui-form-select').find('input').unbind("blur"); @@ -884,7 +950,7 @@ var dataIndex = $cr.attr("data-index"); $.each(option.data, function (index, value) { if (value.LAY_TNDEX == dataIndex) { - $cr.find('input').val(value.HCloseType); + $cr.find('input').val(value.HResult); } }); }); @@ -898,14 +964,14 @@ table.render(option); } - - form.on('select(HCloseType)', function (data) { + //琛岄�夋嫨澶勭悊锛堢粨璁猴級 + form.on('select(HResult)', function (data) { //鑾峰彇涓嬫媺妗嗛�変腑鐨勫�� var elem = data.othis.parents('tr'); var dataindex = elem.attr("data-index"); $.each(option.data, function (index, value) { if (value.LAY_TABLE_INDEX == dataindex) { - value.HCloseType = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨 + value.HResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨 } }); }); diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html" index 0b0ef8d..c5db658 100644 --- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html" +++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html" @@ -345,7 +345,7 @@ if (checkStatus.data.length === 1) { var linterid = data[0].HInterID.toString(); var OperationType = 2; - layer.open({ + var FirstPieceCheck = layer.open({ type: 2 , area: ['100%', '100%'] , title: '棣栦欢妫�楠屽崟-缂栬緫' -- Gitblit v1.9.1