From c2e8facf26a66f589f84080b22b78e0f61b0c8bb Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 27 十二月 2021 23:20:13 +0800
Subject: [PATCH] SRM送货单上 预计到货日期,批次号,物流单号设为不是必填项(根据系统参数判断安瑞为必填,其他为非必填)

---
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html |   34 +++++++++++++++-------------------
 1 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html
index 6e4d393..0f03e51 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html
@@ -138,17 +138,12 @@
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-report" id="btn_report"><i class="layui-icon layui-icon-close-fill"></i>姹囨姤</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
-                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-barcode"><i class="layui-icon layui-icon-file"></i>鐢熸垚鏉$爜</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
-
                         </div>
                     </script>
-
                 </div>
-
-
-
             </div>
         </div>
     </div>
@@ -235,21 +230,22 @@
                 , cellMinWidth: 100
                 , cols: [[
                     //{ checkbox: true, fixed: true }
-                    { type: 'checkbox', fixed: 'left' }
+                    { type: 'checkbox'/*, fixed: 'left'*/ }
                     //{ type: 'radio', fixed: true }
-                    , { field: 'sorderid', title: '搴忓彿', width: 80, fixed: true }
-                    , { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
-                    , { field: 'hsubid', title: 'hsubid', sort: true, fixed: true, hide: true }
-                    , { field: '鐘舵��', title: '鐘舵��', sort: true, fixed: true }
-                    , { field: '鍙嶉鐘舵��', title: '鍙嶉鐘舵��', width: 100, fixed: true }
-                    , { field: '浼樺厛绾�', title: '浼樺厛绾�', width: 100, fixed: true }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 180, sort: true, fixed: 'left' }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 180, sort: true, fixed: 'left' }
-                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 180, sort: true, fixed: 'left' }
+                    , { field: 'sorderid', title: '搴忓彿', width: 80/*, fixed: true*/ }
+                    , { field: 'hmainid', title: 'hmainid', sort: true  /*, fixed: true*/, hide: true }
+                    , { field: 'hsubid', title: 'hsubid', sort: true  /*, fixed: true*/, hide: true }
+                    , { field: '鐘舵��', title: '鐘舵��', sort: true  /*, fixed: true*/ }
+                    , { field: '鍙嶉鐘舵��', title: '鍙嶉鐘舵��', width: 100  /*, fixed: true*/ }
+                    , { field: '浼樺厛绾�', title: '浼樺厛绾�', width: 100  /*, fixed: true*/ }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 180, sort: true/*, fixed: 'left'*/ }
+                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 180, sort: true/*, fixed: 'left' */ }
+                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 180, sort: true/*, fixed: 'left' */ }
                     , { field: '璁″垝璺熻釜鍗曞彿', title: '璁″垝璺熻釜鍗曞彿', sort: true, hide: true }
-                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 180, sort: true }
-                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 180, sort: true }
-                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 180, sort: true }
+                    , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 120, sort: true }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 120, sort: true }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120, sort: true }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120, sort: true }
                     , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 80, sort: true }
                     , { field: '鏁伴噺', title: '璁㈣揣鏁伴噺', sort: true }
                     , { field: '浜よ揣鍦扮偣', title: '浜よ揣鍦扮偣', sort: true }

--
Gitblit v1.9.1