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 |   84 ++++++++++++++++++++++++++---------------
 1 files changed, 53 insertions(+), 31 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 a6f4828..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"
@@ -80,7 +80,7 @@
                                                 <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;">
@@ -98,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">
@@ -110,16 +119,7 @@
                                                 </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;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-                                        </div>
+
 
                                         <div class="layui-inline" style="width: 51%;">
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛</label>
@@ -164,15 +164,15 @@
                                     </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>
                                             <div class="layui-input-block" style="margin-left: 71px;">
@@ -261,6 +261,14 @@
                                             <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>
@@ -384,6 +392,18 @@
                                             </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>
@@ -437,7 +457,7 @@
                     }
                 });
             }
-            else if (OperationType==2) {
+            else if (OperationType == 2) {
                 RoadBillMain(linterid);
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetMAXNum",
@@ -759,9 +779,9 @@
                         $("#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);//鍏嬮噸
-                        $("#HColorRemark").val(checkStatus.data[0].鏌撹壊瑕佹眰);//鍏嬮噸
+                        $("#HWidth").val(checkStatus.data[0].骞呭);//骞呭
+                        $("#HWeight").val(checkStatus.data[0].鍏嬮噸);//鍏嬮噸
+                        $("#HColorRemark").val(checkStatus.data[0].鏌撹壊瑕佹眰);//鏌撹壊瑕佹眰
                         $("#HRemark").val(checkStatus.data[0].澶囨敞);//澶囨敞
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -900,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);
@@ -978,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")
@@ -985,6 +1006,7 @@
                             , "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
@@ -992,17 +1014,17 @@
                             , "HWeight": d.data[0].HWeight
                             , "HColorRemark": d.data[0].鏌撹壊瑕佹眰
                             //鍏朵粬淇℃伅
-                            , "hmakers": OperationType == 2 ? "" :d.data[0].鍒跺崟浜�
+                            , "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].瀹℃牳浜�
+                            , "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")
+                            , "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")
+                            , "hdeletedate": OperationType == 2 ? "" : d.data[0].浣滃簾鏃ユ湡 == null ? "" : Format(new Date(d.data[0].浣滃簾鏃ユ湡), "yyyy-MM-dd")
                         });
                         form.render('select');
-                       
+
                     }
                 })
             }
@@ -1295,7 +1317,7 @@
                 //    layer.msg("BOM娌℃湁閫夋嫨");
                 //    return false;
                 //}
-              
+
 
                 return true;
             }

--
Gitblit v1.9.1