From dbcc87f39f85b6ec81d53e6dc66e9f51cd34b5d8 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 01 十一月 2023 13:30:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 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 8076540..65de11e 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"
@@ -119,8 +119,6 @@
                                                 </button>
                                             </div>
                                         </div>
-
-
                                         <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;">
@@ -257,6 +255,20 @@
                                         </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="HCusMaterName" lay-verify="HCusMaterName" id="HCusMaterName" style="display: inline-block;" >
+                                            </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="HCusModel" lay-verify="HCusModel" id="HCusModel" style="display: inline-block;">
+                                            </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;">
@@ -273,7 +285,7 @@
                                         </div>
                                     </div>
                                 </div>
-                            </div>
+                                </div>
 
                             <!--鍏朵粬淇℃伅-->
                             <div class="layui-tab-item">
@@ -1013,6 +1025,8 @@
                             , "HWidth": d.data[0].HWidth
                             , "HWeight": d.data[0].HWeight
                             , "HColorRemark": d.data[0].鏌撹壊瑕佹眰
+                            , "HCusMaterName": d.data[0].瀹㈡埛鐗╂枡鍚嶇О
+                            , "HCusModel": 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")

--
Gitblit v1.9.1