From 63f9509b749568865b476690bd14c0a505ba9607 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 22 五月 2024 14:46:59 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html |  242 +++++++++++++++++++++++++++++++++++-------------
 1 files changed, 176 insertions(+), 66 deletions(-)

diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
index 81b9bc3..3da6720 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
@@ -51,7 +51,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="HBillNo" id="HBillNo"  readonly>
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" readonly>
                                                 <input type="hidden" name="HInterID" id="HInterID">
                                             </div>
                                         </div>
@@ -75,19 +75,19 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍣ㄥ叿缂栧彿<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HMouldNo" id="HMouldNo" >
+                                                <input type="text" class="layui-input" name="HMouldNo" id="HMouldNo">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍣ㄥ叿鍚嶇О<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HName" id="HName" >
+                                                <input type="text" class="layui-input" name="HName" id="HName">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍣ㄥ叿瑙勬牸<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HModel" id="HModel" >
+                                                <input type="text" class="layui-input" name="HModel" id="HModel">
                                             </div>
                                         </div>
                                     </div>
@@ -101,13 +101,13 @@
                                         <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="HDiameter" id="HDiameter" >
+                                                <input type="text" class="layui-input" name="HDiameter" id="HDiameter">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">杈呭姪灞炴��</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HSubjoin" id="HSubjoin" >
+                                                <input type="text" class="layui-input" name="HSubjoin" id="HSubjoin">
                                             </div>
                                         </div>
                                     </div>
@@ -115,19 +115,19 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">杈呭姪灞炴��2</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HSubjoin2" id="HSubjoin2" >
+                                                <input type="text" class="layui-input" name="HSubjoin2" id="HSubjoin2">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍥惧彿</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HPICNo" id="HPICNo" >
+                                                <input type="text" class="layui-input" name="HPICNo" id="HPICNo">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鐢熶骇浜у搧鍨嬪彿</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HWorkMaterModel" id="HWorkMaterModel" >
+                                                <input type="text" class="layui-input" name="HWorkMaterModel" id="HWorkMaterModel">
                                             </div>
                                         </div>
                                     </div>
@@ -167,7 +167,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="HOutComDate" id="HOutComDate" >
+                                                <input type="text" class="layui-input" name="HOutComDate" id="HOutComDate">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -182,7 +182,7 @@
                                                 <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HDeptID" id="HDeptID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptList" id="btnHDeptList" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
@@ -198,16 +198,25 @@
                                                 </button>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鍣ㄥ叿鐘舵��</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HMouldStatus" id="HMouldStatus" >
+                                        <div class="layui-inline" style="margin-left:10px;">
+                                            <label class="layui-form-label">鍣ㄥ叿鐘舵��</label>
+                                            <div class="layui-input-block">
+                                                <select name="HMouldStatus" lay-filter="HMouldStatus" id="HMouldStatus">
+                                                    <option value="鍦ㄥ簱" selected="selected">鍦ㄥ簱</option>
+                                                    <option value="鍦ㄩ��">鍦ㄩ��</option>
+                                                    <option value="涓㈠け">涓㈠け</option>
+                                                    <option value="閿佸畾">閿佸畾</option>
+                                                    <option value="棰嗗嚭">棰嗗嚭</option>
+                                                    <option value="鎶ュ簾">鎶ュ簾</option>
+                                                    <option value="鏈惎鐢�">鏈惎鐢�</option>
+                                                    <option value="浣滃簾">浣滃簾</option>
+                                                </select>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">瀹夊叏瀵垮懡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HSaveLife" id="HSaveLife" >
+                                                <input type="text" class="layui-input" name="HSaveLife" id="HSaveLife" value="0">
                                             </div>
                                         </div>
                                     </div>
@@ -225,7 +234,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="HVersion" id="HVersion" >
+                                                <input type="text" class="layui-input" name="HVersion" id="HVersion">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -234,62 +243,62 @@
                                                 <input type="text" class="layui-input" name="HSPName" id="HSPName" style="width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HSPID" id="HSPID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSPIDList" id="btnHSPIDList" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
                                         <!--<div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿宸ヨ壓璺嚎</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HRoutingName" id="HRoutingName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <input type="hidden" class="layui-input" name="HRoutingID" id="HRoutingID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHRoutingList" id="btnHRoutingList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿BOM</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HBOMName" id="HBOMName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <input type="hidden" class="layui-input" name="HBOMID" id="HBOMID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHBOMList" id="btnHBOMList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
-                                                </button>
-                                            </div>
-                                        </div>-->
+            <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="HRoutingName" id="HRoutingName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                <input type="hidden" class="layui-input" name="HRoutingID" id="HRoutingID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHRoutingList" id="btnHRoutingList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                </button>
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿BOM</label>
+            <div class="layui-input-block" style="margin-left: 77px;">
+                <input type="text" class="layui-input" name="HBOMName" id="HBOMName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                <input type="hidden" class="layui-input" name="HBOMID" id="HBOMID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHBOMList" id="btnHBOMList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                </button>
+            </div>
+        </div>-->
                                     </div>
                                     <div 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="HSPGroupName" id="HSPGroupName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <input type="hidden" class="layui-input" name="HSPGroupID" id="HSPGroupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSPGroupList" id="btnHSPGroupList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
-                                                </button>
-                                            </div>
-                                        </div>-->
+            <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="HSPGroupName" id="HSPGroupName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                <input type="hidden" class="layui-input" name="HSPGroupID" id="HSPGroupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSPGroupList" id="btnHSPGroupList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                </button>
+            </div>
+        </div>-->
 
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">璁捐瀵垮懡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HDesignLife" id="HDesignLife" >
+                                                <input type="text" class="layui-input" name="HDesignLife" id="HDesignLife">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">浣跨敤瀵垮懡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HUseLife" id="HUseLife" >
+                                                <input type="text" class="layui-input" name="HUseLife" id="HUseLife" value="0" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍓╀綑瀵垮懡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HLeaveLife" id="HLeaveLife" >
+                                                <input type="text" class="layui-input" name="HLeaveLife" id="HLeaveLife" value="0" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -297,19 +306,19 @@
                                         <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="HProdQty" id="HProdQty" >
+                                                <input type="text" class="layui-input" name="HProdQty" id="HProdQty" value="0" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">宸茬敓浜ч噸閲�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HProdWeight" id="HProdWeight">
+                                                <input type="text" class="layui-input" name="HProdWeight" id="HProdWeight" value="0" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">绌存暟<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HCaveQty" id="HCaveQty" >
+                                                <input type="text" class="layui-input" name="HCaveQty" id="HCaveQty">
                                             </div>
                                         </div>
                                     </div>
@@ -341,15 +350,15 @@
                                             </div>
                                         </div>
                                         <!--<div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">铏氭嫙浠�<label style="color:red"> * </label></label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HNowSupName" id="HNowSupName" style="width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" class="layui-input" name="HNowSupID" id="HNowSupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HNowSupList" id="HNowSupList" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-                                        </div>-->
+            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">铏氭嫙浠�<label style="color:red"> * </label></label>
+            <div class="layui-input-block" style="margin-left: 77px;">
+                <input type="text" class="layui-input" name="HNowSupName" id="HNowSupName" style="width: 60%;display: inline-block;" readonly>
+                <input type="hidden" class="layui-input" name="HNowSupID" id="HNowSupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HNowSupList" id="HNowSupList" style="padding: 0 10px;float: right;margin-right: 3px;">
+                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                </button>
+            </div>
+        </div>-->
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
@@ -359,7 +368,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline" style="margin-left:10px;">
-                                            <label class="layui-form-label">鍣ㄥ叿鍒嗙被</label>
+                                            <label class="layui-form-label">鍣ㄥ叿绫诲瀷</label>
                                             <div class="layui-input-block">
                                                 <select name="HMouldClass" lay-filter="HMouldClass" id="HMouldClass">
                                                     <option value="妯″叿" selected="selected">妯″叿</option>
@@ -370,6 +379,28 @@
                                                     <option value="鍛ㄨ浆鍣ㄥ叿">鍛ㄨ浆鍣ㄥ叿</option>
                                                     <option value="鍏朵粬">鍏朵粬</option>
                                                 </select>
+                                            </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="HNowWHName" id="HNowWHName" style="width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" class="layui-input" name="HNowWHID" id="HNowWHID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHNowWHList" id="btnHNowWHList" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">褰撳墠浠撲綅</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HNowSPName" id="HNowSPName" style="width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" class="layui-input" name="HNowSPID" id="HNowSPID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHNowSPList" id="btnHNowSPList" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
                                             </div>
                                         </div>
                                     </div>
@@ -793,6 +824,43 @@
                 });
             });
 
+            //褰撳墠浠撳簱
+            form.on('submit(btnHNowWHList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浠撳簱鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HNowWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
+                        $("#HNowWHID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
             //宸ヨ壓璺嚎
             form.on('submit(btnHRoutingList)', function () {
                 //椤甸潰灞�-鑷畾涔�
@@ -926,6 +994,42 @@
                         }
                         $("#HSPName").val(checkStatus.data[0].浠撲綅鍚嶇О);
                         $("#HSPID").val(checkStatus.data[0].HMainID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //褰撳墠浠撲綅
+            form.on('submit(btnHNowSPList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浠撲綅鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HNowSPName").val(checkStatus.data[0].浠撲綅鍚嶇О);
+                        $("#HNowSPID").val(checkStatus.data[0].HMainID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) {
@@ -1212,7 +1316,7 @@
                     },
                     success: function (d) {
                         ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
-                        
+
                         $("#HInterID").val(d.data[0].hmainid);
                         $("#HBillNo").val(d.data[0].鍗曟嵁鍙�);
                         $("#HDate").val(formatDate(d.data[0].鏃ユ湡));
@@ -1267,10 +1371,16 @@
                         $("#HMouldClass").val(d.data[0].鍣ㄥ叿鍒嗙被);
                         //$("#HNowSupID").val(d.data[0].HNowSupID);
                         //$("#HNowSupName").val(d.data[0].铏氭嫙浠�);
+                        $("#HNowWHID").val(d.data[0].褰撳墠浠撳簱ID);
+                        $("#HNowWHName").val(d.data[0].褰撳墠浠撳簱);
+                        $("#HNowSPID").val(d.data[0].褰撳墠浠撲綅ID);
+                        $("#HNowSPName").val(d.data[0].褰撳墠浠撲綅);
+                        $("#HMouldStatus").val(d.data[0].妯″叿鐘舵��);
+
                         var HCycleUnit = d.data[0].鍛ㄦ湡鍗曚綅;
                         var HCheckCycle = d.data[0].淇濆吇鍛ㄦ湡;
 
-                        if ( !(HCycleUnit == null || HCheckCycle == null ) ) {
+                        if (!(HCycleUnit == null || HCheckCycle == null)) {
                             calculateHNextMainDate(d.data[0].hmainid, HCycleUnit, HCheckCycle);
                         }
 
@@ -1294,7 +1404,7 @@
 
             //淇濆瓨
             function set_btnSave(data) {
-               
+
                 $("#HMaker").val(sessionStorage["HUserName"]);
                 var user = sessionStorage["HUserName"];
                 var ModRightNameAdd = 'Gy_MouldFile_Edit';
@@ -1470,7 +1580,7 @@
             if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
                 layer.msg("榛樿浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return Result = false;
-            } 
+            }
             if ($("#HCaveQty").val() == '' || $("#HCaveQty").val() == null) {
                 layer.msg("绌存暟涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return Result = false;

--
Gitblit v1.9.1