From 2791b0178a84d8f8e82a7b53d70a54ab5756ab8f Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期四, 09 九月 2021 14:22:35 +0800
Subject: [PATCH] 恢复物料

---
 WebTM/layuiadmin/Scripts/webConfig.js             |    2 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html |  655 +++++++++++++++++++++++++++-----------------------
 WebTM/views/基础资料/公用基础资料/Gy_Material.html          |   90 +++---
 3 files changed, 407 insertions(+), 340 deletions(-)

diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index d7bc36b..e6b0b20 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -10,7 +10,7 @@
     //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://localhost/API/";
+    //var WEBURL = "http://localhost/API/";
     return WEBURL
 }
 
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
index 7bcf018..9bc94a3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
@@ -8,325 +8,383 @@
     <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">
-    <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>
-    <style>
-        .layui-form-item .layui-inline {
-            margin-top: 5px;
-            margin-bottom: 5px;
-            margin-right: 0px;
-        }
-
+    <style type="text/css">
         .layui-form-label {
-            width: 25%;
+            width: 85px;
         }
     </style>
 </head>
 <body>
 
-    <div class="layui-fluid" style="padding: 0;">
-        <div class="layui-card" style="padding: 15px;">
-            <div class="layui-card-body" style="padding: 1px;">
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+                                <button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">澶嶅埗</button>
+                                <button type="button" id="addnew-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">鏂板</button>
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                                <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">棰勮</button>
 
-                <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
-                    <div class="layui-card-header">
-
-                        <div class="layui-btn-group">
-                            <!--<button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">澶嶅埗</button>-->
-                            <!--<button type="button" id="addnew-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">鏂板</button>-->
-                            <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
-                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-                            <!--<button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">棰勮</button>-->
-
-                        </div>
-                    </div>
-                    <div class="layui-form-item" style="padding-top: 10px;">
-                        <div class="layui-row">
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">鐗╂枡浠g爜</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HNumber" id="HNumber" class="layui-input" value="" style="float:left;width:150px;">
-                                    <input type="hidden" name="HItemID" id="HItemID" value="0">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT" style="width:40px;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                    </button>
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">鐗╂枡鍚嶇О</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HModel" id="HModel" autocomplete="off">
-
-                                </div>
                             </div>
                         </div>
-                        <div class="layui-row">
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">鍔╄鐮�</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">涓昏閲忓崟浣�</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HUnitName" id="HUnitName" class="layui-input" value="" style="float:left;width:150px;">
-                                    <input type="hidden" name="HUnitID" id="HUnitID" value="0">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT" style="width:40px;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                    </button>
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">璁¢噺鍗曚綅缁�</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HUnitGroupName" id="HUnitGroupName" class="layui-input" value="" style="float:left;width:150px;">
-                                    <input type="hidden" name="HUnitGroupID" id="HUnitGroupID" value="0">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT" style="width:40px;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                    </button>
-                                </div>
-                            </div>
-                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <ul class="layui-tab-title">
+                                    <li class="layui-this">鍩烘湰淇℃伅</li>
+                                </ul>
+                                <h1 style="text-align:center;"><b>鐗╂枡璁剧疆</b></h1>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
 
-                        <div class="layui-row">
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 闄勫姞灞炴��1</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HSubjoin" lay-verify="HSubjoin" id="HSubjoin" autocomplete="off">
-
-                                </div>
-                            </div>
-
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 闄勫姞灞炴��2</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HSubjoin2" lay-verify="HSubjoin2" id="HSubjoin2" autocomplete="off">
-
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 棰滆壊</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HColor" lay-verify="HColor" id="HColor" autocomplete="off">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-row">
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 鐗╂枡鍒嗙被</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HMaterClsID" lay-verify="HMaterClsID" id="HMaterClsID" autocomplete="off" value="0">
-                                </div>
-                            </div>
-
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 鐗╂枡灞炴��</label>
-                                <div class="layui-input-inline">
-                                    <div class="layui-form">
                                         <div class="layui-form-item">
-                                            <select name="HMaterTypeID" id="HMaterTypeID" lay-verify="HMaterTypeID">
-                                                <option value="1" selected>澶栬喘</option>
-                                                <option value="2">鑷埗</option>
-                                                <option value="3">濮斿</option>
-                                            </select>
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label">鐗╂枡浠g爜锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+                                                        <input id="HItemID" name="HItemID" type="hidden" />
+                                                    </div>
+                                                </div>
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label">鐗╂枡鍚嶇О锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HName" id="HName" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label">瑙勬牸鍨嬪彿锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HModel" id="HModel" autocomplete="off">
+
+                                                    </div>
+                                                </div>
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label">鍔╄鐮侊細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <!--<button class="layui-btn" data-type="reload">閫夋嫨</button>-->
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">涓昏閲忓崟浣�</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" readonly name="HUnitName" id="HUnitName" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <input type="hidden" name="HUnitID" id="HUnitID" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HUnitList" id="HUnitList" style="width:40px;">
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                    <!--<div class="layui-inline">
+                                                        <label class="layui-form-label">涓昏閲忓崟浣嶏細</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
+                                                            <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>-->
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <!--<label class="layui-form-label"> 璁¢噺鍗曚綅缁勶細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
+                                                    </div>-->
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">璁¢噺鍗曚綅缁�</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" readonly name="HUnitGroupName" id="HUnitGroupName" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <input type="hidden" name="HUnitGroupID" id="HUnitGroupID" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HUnitGroupList" id="HUnitGroupList" style="width:40px;">
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>
+
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 闄勫姞灞炴��1锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HSubjoin" lay-verify="HSubjoin" id="HSubjoin" autocomplete="off">
+
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 闄勫姞灞炴��2锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HSubjoin2" lay-verify="HSubjoin2" id="HSubjoin2" autocomplete="off">
+
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 棰滆壊锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HColor" lay-verify="HColor" id="HColor" autocomplete="off">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鐗╂枡鍒嗙被锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HMaterClsID" lay-verify="HMaterClsID" id="HMaterClsID" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鐗╂枡灞炴�э細</label>
+                                                    <div class="layui-input-inline">
+                                                        <div class="layui-form">
+                                                            <div class="layui-form-item">
+                                                                <select name="HMaterTypeID" id="HMaterTypeID" lay-verify="HMaterTypeID">
+                                                                    <option value="1" selected>澶栬喘</option>
+                                                                    <option value="2">鑷埗</option>
+                                                                    <option value="3">濮斿</option>
+                                                                </select>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <!--<label class="layui-form-label"> 榛樿浠撳簱锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HWhID" lay-verify="HWhID " id="HWhID " autocomplete="off" value="0">
+                                                    </div>-->
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">榛樿浠撳簱</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" readonly name="HWhName" id="HWhName" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <input type="hidden" name="HWhID" id="HWhID" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HWhList" id="HWhList" style="width:40px;">
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 榛樿浠撲綅缁勶細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HSPGroupID" lay-verify="HSPGroupID" id="HSPGroupID" autocomplete="off" value="0">
+
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 榛樿浠撲綅锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HSPID" lay-verify="HSPID" id="HSPID" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 榛樿宸ヨ壓璺嚎锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HRoutingID" lay-verify="HRoutingID" id="HRoutingID" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 榛樿bom锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HBomID" lay-verify="HBomID" id="HBomID" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+
+                                            </div>
+                                        </div>
+
+
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <!--<label class="layui-form-label"> 杈呭姪璁¢噺鍗曚綅锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
+                                                    </div>-->
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">杈呭姪璁¢噺鍗曚綅</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" readonly name="HSecUnitName" id="HSecUnitName" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <input type="hidden" name="HSecUnitID" id="HSecUnitID" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecUnitList" id="HSecUnitList" style="width:40px;">
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鎹㈢畻鐜囷細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HSecUnitRate" lay-verify="HSecUnitRate" id="HSecUnitRate" autocomplete="off" value="0">
+                                                        <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HDormID-BT">
+                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                        </button>-->
+                                                        <!--<input id="HDormID" name="HDormID" type="hidden" />-->
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鏈�楂樺簱瀛橈細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HHighStock" lay-verify="HHighStock" id="HHighStock" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鏈�浣庡簱瀛橈細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HLowStock" lay-verify="HLowStock" id="HLowStock" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 瀹夊叏搴撳瓨锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HSafeStock" lay-verify="HSafeStock" id="HSafeStock" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 閲囪喘鍗曚环锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HOrderPrice" lay-verify="HOrderPrice" id="HOrderPrice" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 閿�鍞崟浠凤細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HSalePrice" lay-verify="HSalePrice" id="HSalePrice" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 璁″垝鍗曚环锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HPlanPrice" lay-verify="HPlanPrice" id="HPlanPrice" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鏍囧噯鎴愭湰锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HstdPrice" lay-verify="HstdPrice" id="HstdPrice" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 淇濊川鏈燂細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HKeepDays" lay-verify="HKeepDays" id="HKeepDays" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鏈�灏忓寘瑁呴噺锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HMinPickQty" lay-verify="HMinPickQty" id="HMinPickQty" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鏈�澶ц璐ч噺锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HQtyMax" lay-verify="HQtyMax" id="HQtyMax" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鐗堟湰鍙凤細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HVersion" lay-verify="HVersion" id="HVersion" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鑻辨枃鍚嶇О锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HEngName" lay-verify="HEngName" id="HEngName" autocomplete="off">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鑻辨枃瑙勬牸锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HEngModel" lay-verify="HEngModel" id="HEngModel" autocomplete="off">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 杈呭姪灞炴�э細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HPropertyTypeID" lay-verify="HPropertyTypeID" id="HPropertyTypeID" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 澶囨敞锛�</label>
+                                                    <div class="layui-input-inline ">
+                                                        <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label">绂佺敤鏍囧織锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="鏄惁绂佺敤">
+                                                        <input type="hidden" name="UnitType" id="UnitType">
+                                                    </div>
+                                                </div>
+
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">榛樿浠撳簱</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HWhName" id="HWhName" class="layui-input" value="" style="float:left;width:150px;">
-                                    <input type="hidden" name="HWhID" id="HWhID" value="0">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT" style="width:40px;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                    </button>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-row">
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 榛樿浠撲綅缁�</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HSPGroupID" lay-verify="HSPGroupID" id="HSPGroupID" autocomplete="off" value="0">
-
-                                </div>
-                            </div>
-
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 榛樿浠撲綅</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HSPID" lay-verify="HSPID" id="HSPID" autocomplete="off" value="0">
-                                </div>
-                            </div>
-
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 榛樿宸ヨ壓璺嚎</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HRoutingID" lay-verify="HRoutingID" id="HRoutingID" autocomplete="off" value="0">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-row">
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 榛樿bom</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HBomID" lay-verify="HBomID" id="HBomID" autocomplete="off" value="0">
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">杈呭姪璁¢噺鍗曚綅</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HSecUnitName" id="HSecUnitName" class="layui-input" value="" style="float:left;width:150px;">
-                                    <input type="hidden" name="HSecUnitID" id="HSecUnitID" value="0">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT" style="width:40px;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                    </button>
-                                </div>
-                            </div>
-
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 鎹㈢畻鐜�</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HSecUnitRate" lay-verify="HSecUnitRate" id="HSecUnitRate" autocomplete="off" value="0">
 
                                 </div>
                             </div>
                         </div>
-                        <div class="layui-row">
 
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 鏈�楂樺簱瀛�</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HHighStock" lay-verify="HHighStock" id="HHighStock" autocomplete="off" value="0">
-                                </div>
-                            </div>
-
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 鏈�浣庡簱瀛�</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HLowStock" lay-verify="HLowStock" id="HLowStock" autocomplete="off" value="0">
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 瀹夊叏搴撳瓨</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HSafeStock" lay-verify="HSafeStock" id="HSafeStock" autocomplete="off" value="0">
-                                </div>
-                            </div>
-
-
-                        </div>
-                        <div class="layui-row">
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 閲囪喘鍗曚环</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HOrderPrice" lay-verify="HOrderPrice" id="HOrderPrice" autocomplete="off" value="0">
-                                </div>
-                            </div>
-
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 閿�鍞崟浠�</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HSalePrice" lay-verify="HSalePrice" id="HSalePrice" autocomplete="off" value="0">
-                                </div>
-                            </div>
-
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 璁″垝鍗曚环</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HPlanPrice" lay-verify="HPlanPrice" id="HPlanPrice" autocomplete="off" value="0">
-                                </div>
-                            </div>
-
-                        </div>
-                        <div class="layui-row">
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 鏍囧噯鎴愭湰</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HstdPrice" lay-verify="HstdPrice" id="HstdPrice" autocomplete="off" value="0">
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 淇濊川鏈�</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HKeepDays" lay-verify="HKeepDays" id="HKeepDays" autocomplete="off" value="0">
-                                </div>
-                            </div>
-
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 鏈�灏忓寘瑁呴噺</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HMinPickQty" lay-verify="HMinPickQty" id="HMinPickQty" autocomplete="off" value="0">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-row">
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 鏈�澶ц璐ч噺</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HQtyMax" lay-verify="HQtyMax" id="HQtyMax" autocomplete="off" value="0">
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 鐗堟湰鍙�</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HVersion" lay-verify="HVersion" id="HVersion" autocomplete="off">
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 鑻辨枃鍚嶇О</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HEngName" lay-verify="HEngName" id="HEngName" autocomplete="off">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-row">
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 鑻辨枃瑙勬牸</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HEngModel" lay-verify="HEngModel" id="HEngModel" autocomplete="off">
-                                </div>
-                            </div>
-
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 杈呭姪灞炴��</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HPropertyTypeID" lay-verify="HPropertyTypeID" id="HPropertyTypeID" autocomplete="off" value="0">
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">绂佺敤鏍囧織</label>
-                                <div class="layui-input-inline">
-                                    <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="鏄惁绂佺敤">
-                                    <input type="hidden" name="UnitType" id="UnitType">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-row">
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 澶囨敞</label>
-                                <div class="layui-input-inline ">
-                                    <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </form>
+                    </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>
 
@@ -473,7 +531,6 @@
                     },
                     success: function (result) {
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            debugger;
                             var data = result.data.h_v_Edit_Gy_MaterialList[0];
                             console.log("杩斿洖鐨刣ata.HStopFlag" + JSON.stringify(data.绂佺敤鏍囪));
                             console.log("杩斿洖鐨刣ata.HNoBrushFlag" + JSON.stringify(data.鏄惁鎵撳崱));
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
index 0d409c1..3ee2c24 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
@@ -1,7 +1,7 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <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">
@@ -9,7 +9,7 @@
     <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">
@@ -19,18 +19,18 @@
                     <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-colla-title layui-inline">
                                     <div class="layui-inline">
-                                        <span>鏇村</span>
+                                        <span></span>
                                     </div>
-                                </div>
+                                </div>-->
                                 <div class="layui-inline">
                                     <label class="layui-form-label">鐗╂枡浠g爜</label>
                                     <div class="layui-input-block">
                                         <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                     </div>
-                                </div>
-                                <div class="layui-inline">
+                                    <!--</div>
+                                    <div class="layui-inline">-->
                                     <label class="layui-form-label">鐗╂枡鍚嶇О</label>
                                     <div class="layui-input-block">
                                         <input type="text" class="layui-input" name="HName" id="HName">
@@ -41,34 +41,28 @@
                                     <div class="layui-input-block">
                                         <input type="text" class="layui-input" name="HModel" id="HModel">
                                     </div>
-
+                                    <!--</div>
+                                    <div class="layui-inline">-->
+                                    <label class="layui-form-label">缁勭粐鍚嶇О</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HOrgName" id="HOrgName">
+                                    </div>
                                 </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                 </button>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-                                <div class="layui-colla-content">
-                                    <div class="layui-inline">
-                                        <div class="layui-inline">
-                                            <span>鍏朵粬鏉′欢></span>
-                                        </div>
-                                    </div>
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">缁勭粐鍚嶇О</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" class="layui-input" name="HOrgName" id="HOrgName">
-                                        </div>
-                                    </div>
-                                </div>
+
                             </div>
                         </div>
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>-->
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="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" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
@@ -88,17 +82,17 @@
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
-            //#region 鍏敤鍙橀噺 
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
-            , admin = layui.admin
-            , layer = layui.layer
-            , table = layui.table
-            , form = layui.form
-            , element = layui.element
-            , laypage = layui.laypage
-            , laydate = layui.laydate
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
             var sWhere = "";
-          
+
             var option = [];
             //#endregion
 
@@ -107,7 +101,7 @@
             //鍒濆鍖栫晫闈�
             set_ClearBill();
 
-             //#endregion
+            //#endregion
 
             //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
@@ -124,6 +118,9 @@
                         break;
                     case 'btn-Delete':
                         set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
                         break;
                     //瀹℃牳鎸夐挳
                     case 'btn-Audit':
@@ -147,10 +144,7 @@
 
             //#region 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
-                $("#HNumber").val("");
-                $("#HName").val("");
-                $("#HModel").val("");
-                $("#HOrgName").val("");
+                set_ClearQuery();
                 //$("#btnSearch").click();
             });
             //#endregion
@@ -161,7 +155,7 @@
             });
             //#endregion
 
-         //#endregion
+            //#endregion
 
             //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
 
@@ -204,6 +198,16 @@
             }
             //#endregion
 
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#HModel").val("");
+                $("#HOrgName").val("");
+                sWhere = "";
+            }
+            //#endregion
             //#region 鏌ヨ
             function get_Display(sWhere) {
                 var wait = layer.load();//閬僵
@@ -343,6 +347,12 @@
                 }
             }
             //#endregion
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
 
             //#region 棰勮
             function get_PrintReport() {
@@ -360,8 +370,8 @@
             }
             //#endregion
         });
-        //#endregion
+            //#endregion
     </script>
 
 </body>
-</html>
+</html>
\ No newline at end of file

--
Gitblit v1.9.1