From 30cc3b174a0ff8e40f25a7a0bd4e7dc53a7e5286 Mon Sep 17 00:00:00 2001
From: black-goat-me <226547893@qq.com>
Date: 星期六, 20 五月 2023 04:31:32 +0800
Subject: [PATCH] 白坯发布汇总、明细报表:列宽自适应

---
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html |  256 ++++++++++++++++++++++++++++++++++----------------
 1 files changed, 172 insertions(+), 84 deletions(-)

diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
index 163322d..bbb19c8 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
@@ -73,23 +73,16 @@
                                 <div class="layui-form-item" style="padding-top: 10px;">
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                            <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�*</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                 <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
                                                 <input type="hidden" name="HSTOCKINORGID" id="HSTOCKINORGID" lay-verify="HSTOCKINORGID">
                                             </div>
                                         </div>
+
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
-                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
-                                                <select name="HPRDORGID" id="HPRDORGID" lay-filter="HPRDORGID">
-                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
+                                            <label class="layui-form-label" style="width: 85px;">鏃ユ湡*</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
                                             </div>
@@ -105,6 +98,15 @@
                                                 </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; width: 185px;">
+                                                <select name="HIsStockQty" lay-filter="HIsStockQty" id="HIsStockQty">
+                                                    <option value="0" selected>鍚�</option>
+                                                    <option value="1">鏄�</option>
+                                                </select>
+                                            </div>
+                                        </div>
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
@@ -117,32 +119,14 @@
                                                 </button>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+
+
+                                        <div class="layui-inline" style="width: 51%;">
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCus" id="btnHCus" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">宸ヤ綔涓績</label>
-                                            <div class="layui-input-block" style="margin-left: 75px;">
-                                                <input type="text" class="layui-input" lay-verify="HCenterName" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" name="HCenterID" id="HCenterID" lay-verify="HCenterID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCenter" id="btnHCenter" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鐢熶骇杞﹂棿</label>
-                                            <div class="layui-input-block" style="margin-left: 71px;">
-                                                <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCus" id="btnHCus" style="padding: 0 10px; float: right; margin-right: 210px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
@@ -150,13 +134,13 @@
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">璁″垝鐢熶骇鏁伴噺</label>
+                                            <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="HQty" lay-verify="HQty" id="HQty">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鐗╂枡缂栫爜</label>
+                                            <label class="layui-form-label" style="width: 85px;">鐗╂枡缂栫爜*</label>
                                             <div class="layui-input-block" style="margin-left: 71px;">
                                                 <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
@@ -166,13 +150,13 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+                                            <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О*</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" style="background-color:#efefef4d;display: inline-block;" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+                                            <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="HModel" lay-verify="HModel" id="HModel" style="background-color:#efefef4d;display: inline-block;" readonly>
                                             </div>
@@ -180,17 +164,17 @@
                                     </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: 75px;">
-                                                <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-                                        </div>-->
+            <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮</label>
+            <div class="layui-input-block" style="margin-left: 75px;">
+                <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
+                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
+                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                </button>
+            </div>
+        </div>-->
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">璁¢噺鍗曚綅</label>
+                                            <label class="layui-form-label" style="width: 85px;">璁¢噺鍗曚綅*</label>
                                             <div class="layui-input-block" style="margin-left: 71px;">
                                                 <input type="text" class="layui-input" lay-verify="HUnitName" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
@@ -206,7 +190,7 @@
                                                     <option value="1">璁″垝</option>
                                                     <option value="2">璁″垝纭</option>
                                                     <option value="3">涓嬭揪</option>
-                                                    <option value="4">寮�宸�</option>
+                                                    <option value="4" selected>寮�宸�</option>
                                                     <option value="5">瀹屽伐</option>
                                                     <option value="6">缁撴</option>
                                                     <option value="7">缁撶畻</option>
@@ -214,13 +198,11 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 95px;">BOM</label>
-                                            <div class="layui-input-block" style="margin-left: 80px;">
-                                                <input type="text" class="layui-input" lay-verify="HBomName" name="HBomName" id="HBomName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" name="HBomID" id="HBomID" lay-verify="HBomID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnBom" id="btnBom" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
+                                            <label class="layui-form-label" style="width: 85px;">缁勭粐*</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 505px;">
+                                                <select name="HPRDORGID" id="HPRDORGID" lay-filter="HPRDORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
                                             </div>
                                         </div>
                                     </div>
@@ -256,6 +238,12 @@
                                     </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="HColorRemark" lay-verify="HColorRemark" id="HColorRemark" style="background-color:#efefef4d;display: inline-block;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">璁″垝寮�宸ユ棩鏈�</label>
                                             <div class="layui-input-block" style="margin-left: 115px;">
                                                 <input type="date" class="layui-input" lay-verify="HPlanBeginDate" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 80px;">
@@ -267,24 +255,20 @@
                                                 <input type="date" class="layui-input" lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 80px;">
                                             </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="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 80px;">
-                                            </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="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
-                                            </div>
-                                        </div>
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline" style="width: 56%;">
                                             <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline" style="width: 56%;">
+                                            <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="HRemark3" id="HRemark3" lay-verify="HRemark3" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
                                             </div>
                                         </div>
                                     </div>
@@ -374,6 +358,52 @@
                                             </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: 75px;">
+                                                <input type="text" class="layui-input" lay-verify="HCenterName" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HCenterID" id="HCenterID" lay-verify="HCenterID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCenter" id="btnHCenter" 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: 95px;">BOM</label>
+                                            <div class="layui-input-block" style="margin-left: 80px;">
+                                                <input type="text" class="layui-input" lay-verify="HBomName" name="HBomName" id="HBomName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HBomID" id="HBomID" lay-verify="HBomID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnBom" id="btnBom" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鏈�杩熷紑宸ユ棩鏈�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 80px;">
+                                            </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="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鐢熶骇杞﹂棿</label>
+                                            <div class="layui-input-block" style="margin-left: 71px;">
+                                                <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -427,7 +457,19 @@
                     }
                 });
             }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰
+            else if (OperationType == 2) {
+                RoadBillMain(linterid);
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3710' },
+                    success: function (d) {
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                    }
+                });
+            }
+            else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰
                 //绂佺敤缁勭粐閫夐」
                 $("#HPRDORGID").attr("disabled", true);
                 $("#HDate").attr("disabled", true);
@@ -737,8 +779,10 @@
                         $("#HModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
                         $("#HUnitID").val(checkStatus.data[0].HUnitID);//璁¢噺鍗曚綅id
                         $("#HUnitName").val(checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О);//璁¢噺鍗曚綅鍚嶇О
-                        $("#HWidth").val(checkStatus.data[0].HWidth);//骞呭
-                        $("#HWeight").val(checkStatus.data[0].HWeight);//鍏嬮噸
+                        $("#HWidth").val(checkStatus.data[0].骞呭);//骞呭
+                        $("#HWeight").val(checkStatus.data[0].鍏嬮噸);//鍏嬮噸
+                        $("#HColorRemark").val(checkStatus.data[0].鏌撹壊瑕佹眰);//鏌撹壊瑕佹眰
+                        $("#HRemark").val(checkStatus.data[0].澶囨敞);//澶囨敞
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
@@ -876,7 +920,7 @@
                             ////$('#set_CancelCloseBill').removeClass("layui-btn-disabled").attr("disabled", false);
                             //$('#set_CancelltionBill').removeClass("layui-btn-disabled").attr("disabled", false);
                             ////$('#set_AbandonCancelltion').removeClass("layui-btn-disabled").attr("disabled", false);
-                           
+
                         }
                         else {
                             layer.close(index);
@@ -954,6 +998,7 @@
                             , "HUnitID": d.data[0].HUnitID
                             , "HUnitName": d.data[0].璁¢噺鍗曚綅
                             , "HSTATUS": HSTATUS
+                            , "HIsStockQty": d.data[0].HIsStockQty
                             , "HBomID": d.data[0].HBomID
                             , "HBomName": d.data[0].BOM鍗曠紪鐮�
                             , "HPlanBeginDate": Format(new Date(d.data[0].璁″垝寮�宸ユ棩鏈�), "yyyy-MM-dd")
@@ -961,23 +1006,25 @@
                             , "HBeginDate": Format(new Date(d.data[0].鏈�杩熷紑宸ユ棩鏈�), "yyyy-MM-dd")
                             , "HEndDate": Format(new Date(d.data[0].鏈�杩熷畬宸ユ棩鏈�), "yyyy-MM-dd")
                             , "HRemark": d.data[0].琛ㄥご澶囨敞
+                            , "HRemark3": d.data[0].搴曢儴澶囨敞
                             , "HAuxQty": d.data[0].HAuxQty
                             , "HAuxUnit": d.data[0].HAuxUnit
                             , "HAuxUnitName": d.data[0].HAuxUnitName
                             , "HWidth": d.data[0].HWidth
                             , "HWeight": d.data[0].HWeight
+                            , "HColorRemark": d.data[0].鏌撹壊瑕佹眰
                             //鍏朵粬淇℃伅
-                            , "hmakers": d.data[0].鍒跺崟浜�
-                            , "hmakedate": d.data[0].鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd")
-                            , "hchecker": d.data[0].瀹℃牳浜�
-                            , "hcheckdate": d.data[0].瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(d.data[0].瀹℃牳鏃ユ湡), "yyyy-MM-dd")
-                            , "hupdater": d.data[0].淇敼浜�
-                            , "hupdatedate": d.data[0].淇敼鏃ユ湡 == null ? "" : Format(new Date(d.data[0].淇敼鏃ユ湡), "yyyy-MM-dd")
-                            , "hdeleteman": d.data[0].浣滃簾浜�
-                            , "hdeletedate": d.data[0].浣滃簾鏃ユ湡 == null ? "" : Format(new Date(d.data[0].浣滃簾鏃ユ湡), "yyyy-MM-dd")
+                            , "hmakers": OperationType == 2 ? "" : d.data[0].鍒跺崟浜�
+                            , "hmakedate": OperationType == 2 ? "" : d.data[0].鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd")
+                            , "hchecker": OperationType == 2 ? "" : d.data[0].瀹℃牳浜�
+                            , "hcheckdate": OperationType == 2 ? "" : d.data[0].瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(d.data[0].瀹℃牳鏃ユ湡), "yyyy-MM-dd")
+                            , "hupdater": OperationType == 2 ? "" : d.data[0].淇敼浜�
+                            , "hupdatedate": OperationType == 2 ? "" : d.data[0].淇敼鏃ユ湡 == null ? "" : Format(new Date(d.data[0].淇敼鏃ユ湡), "yyyy-MM-dd")
+                            , "hdeleteman": OperationType == 2 ? "" : d.data[0].浣滃簾浜�
+                            , "hdeletedate": OperationType == 2 ? "" : d.data[0].浣滃簾鏃ユ湡 == null ? "" : Format(new Date(d.data[0].浣滃簾鏃ユ湡), "yyyy-MM-dd")
                         });
                         form.render('select');
-                       
+
                     }
                 })
             }
@@ -1202,10 +1249,26 @@
             //闈炵┖楠岃瘉
             function AllowLoadData(data) {
 
+                if ($("#HBillNo").val() == "") {
+                    layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
+                    return false;
+                }
+
                 if ($("#HMaterNumber").val() == "") {
                     layer.msg("鐗╂枡缂栫爜娌℃湁閫夋嫨");
                     return false;
                 }
+
+                if ($("#HMaterName").val() == "") {
+                    layer.msg("鐗╂枡鍚嶇О涓嶈兘涓虹┖!");
+                    return false;
+                }
+
+                if ($("#HModel").val() == "") {
+                    layer.msg("瑙勬牸鍨嬪彿涓嶈兘涓虹┖!");
+                    return false;
+                }
+
                 //if ($("#HSourceName").val() == "") {
                 //    layer.msg("鐢熶骇璧勬簮娌℃湁閫夋嫨");
                 //    return false;
@@ -1215,21 +1278,46 @@
                     return false;
                 }
 
+
+                var HQty = $('#HQty').val();
+                if (HQty.substring(HQty.length - 1, HQty.length) == ".") {
+                    layer.msg("璁″垝鐢熶骇鏁伴噺鐨勭粨灏句笉鑳芥槸.锛�");
+                    return;
+                } else {
+                    var ref = /^[0-9]+\.?[0-9]*$/;
+                    if (!ref.test(HQty)) {
+                        layer.msg("璁″垝鐢熶骇鏁伴噺璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                        return;
+                    }
+                }
+
+                var HAuxQty = $('#HAuxQty').val();
+                if (HAuxQty.substring(HAuxQty.length - 1, HAuxQty.length) == ".") {
+                    layer.msg("杈呮暟閲忕殑缁撳熬涓嶈兘鏄�.锛�");
+                    return;
+                } else {
+                    var ref = /^[0-9]+\.?[0-9]*$/;
+                    if (!ref.test(HAuxQty)) {
+                        layer.msg("杈呮暟閲忚杈撴纭叆鏁板瓧锛�");
+                        return;
+                    }
+                }
+
                 //if ($("#HDeptName").val() == "") {
                 //    layer.msg("鐢熶骇杞﹂棿娌℃湁閫夋嫨");
                 //    return false;
                 //}
 
-                if ($("#HMainCenterIDName").val() == "") {
-                    layer.msg("宸ヤ綔涓績娌℃湁閫夋嫨");
-                    return false;
-                }
+                //if ($("#HMainCenterIDName").val() == "") {
+                //    layer.msg("宸ヤ綔涓績娌℃湁閫夋嫨");
+                //    return false;
+                //}
 
                 //if ($("#BomName").val() == "") {
                 //    layer.msg("BOM娌℃湁閫夋嫨");
                 //    return false;
                 //}
-              
+
 
                 return true;
             }

--
Gitblit v1.9.1