From 3b769a1bd9a30aa6a131ab62966030990b731d4f Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 19 一月 2024 14:13:01 +0800
Subject: [PATCH] 销售订单:维护界面,下推生产订单功能  带出 白坯要求、染色要求,将销售订单 表头备注 带到生产订单的 底部备注 信用额度申请单:列表需要反审核按钮 特批申请单:取消销售主管

---
 WebTM/views/销售管理/特批申请单/Xs_ExceptiveCheckRequestBill.html |   22 ++++++++++++----------
 WebTM/views/销售管理/信用额度申请单/Xs_CusRatingChangeBillList.html |    2 +-
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html      |    4 +++-
 WebTM/Properties/PublishProfiles/JFTM.pubxml.user        |    6 +++---
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index de70e5e..e51a4c1 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -3921,7 +3921,7 @@
       <publishTime>01/09/2024 17:04:29</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillEdit_NoTable.html">
-      <publishTime>12/26/2023 09:31:26</publishTime>
+      <publishTime>01/19/2024 14:02:16</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillImport.html">
       <publishTime>04/11/2023 16:34:43</publishTime>
@@ -5214,7 +5214,7 @@
       <publishTime>11/15/2023 20:48:54</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/淇$敤棰濆害鐢宠鍗�/Xs_CusRatingChangeBillList.html">
-      <publishTime>01/18/2024 14:20:10</publishTime>
+      <publishTime>01/19/2024 13:39:46</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Add_Edit_Xs_SeOutStockBillList.html">
       <publishTime>11/13/2023 11:07:47</publishTime>
@@ -5241,7 +5241,7 @@
       <publishTime>01/18/2024 14:22:57</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/鐗规壒鐢宠鍗�/Xs_ExceptiveCheckRequestBill.html">
-      <publishTime>01/19/2024 12:38:25</publishTime>
+      <publishTime>01/19/2024 13:38:25</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/鐗规壒鐢宠鍗�/Xs_ExceptiveCheckRequestBillList.html">
       <publishTime>01/19/2024 12:39:17</publishTime>
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 bde7ce5..78be081 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"
@@ -1003,7 +1003,9 @@
                                 , "HUnitName": data.璁¢噺鍗曚綅
                                 , "HWidth": data.骞呭
                                 , "HWeight": data.鍏嬮噸
-                                , "HRemark": data.琛ㄥご澶囨敞
+                                , "HColorRemark": data.鏌撹壊瑕佹眰
+                                , "HRemark": data.鐧藉澂瑕佹眰
+                                , "HRemark3": data.琛ㄥご澶囨敞
                             });
 
                             layer.close(ajaxLoad);
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\344\277\241\347\224\250\351\242\235\345\272\246\347\224\263\350\257\267\345\215\225/Xs_CusRatingChangeBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\344\277\241\347\224\250\351\242\235\345\272\246\347\224\263\350\257\267\345\215\225/Xs_CusRatingChangeBillList.html"
index 0ef332e..9370f07 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\344\277\241\347\224\250\351\242\235\345\272\246\347\224\263\350\257\267\345\215\225/Xs_CusRatingChangeBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\344\277\241\347\224\250\351\242\235\345\272\246\347\224\263\350\257\267\345\215\225/Xs_CusRatingChangeBillList.html"
@@ -96,7 +96,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><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-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><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-radio"></i>鍏抽棴</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html"
index 8d128e0..f24480b 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html"
@@ -166,16 +166,6 @@
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label">閿�鍞富绠�</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
-                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" 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">
                                                 <select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
@@ -365,6 +355,18 @@
                                             </div>
                                         </div>
                                     </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">閿�鍞富绠�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" 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>

--
Gitblit v1.9.1