From c88bb176fabeb8e7a6f89ba3662cda1e4fd2dc9d Mon Sep 17 00:00:00 2001
From: 仲国强 <519541279@qq.com>
Date: 星期六, 18 九月 2021 16:36:45 +0800
Subject: [PATCH] 优化流转卡维护页面

---
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 77771b6..1153b96 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -85,15 +85,6 @@
                                 <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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
-
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
-                                <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-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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
-
                             </div>
                         </script>
                     </form>
@@ -122,6 +113,7 @@
                 , element = layui.element
                 , laypage = layui.laypage
                 , laydate = layui.laydate
+                , util = layui.util
             //var sWhere = " 浜у搧浠g爜 = 'BX0002'";
             var sWhere = "";
             var option = "";
@@ -148,7 +140,6 @@
                     //鍒犻櫎
                     case 'set_DeleteBill': set_DeleteBill();
                         break;
-
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
                         break;
@@ -171,6 +162,7 @@
                 get_FastQuery();
             });
             //#endregion
+
             //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
             function set_ClearBill() {
                 //鍒濆鍖栦富琛ㄥ垪琛�
@@ -190,7 +182,7 @@
                 $("#HDate1").val("");//缁撴潫鏃ユ湡
                 $("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
                 $("#SHname").val("");//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
-                $("#btnSearch").click();
+                //$("#btnSearch").click();
                 sWhere = "";
             }
             //#endregion
@@ -307,6 +299,7 @@
             table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
                 var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
                 var HMainID = datas.hmainid;
+                var wait = layer.load();
                 $.ajax({
                     url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuerySub_Json',
                     type: "GET",
@@ -315,10 +308,13 @@
                         if (data1.count == 1) {
                             option2.data = data1.data;
                             table.render(option2);
+                            layer.close(wait);
                         } else {
                             layer.alert(data1.code + data1.Message, { icon: 5 });
+                            layer.close(wait);
                         }
                     }, error: function () {
+                        layer.close(wait);
                         layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
                     }
                 });
@@ -333,14 +329,21 @@
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
                     , page: true
-                    , height: 256
+                    , height: 300
                     , cellMinWidth: 90
                     , cols: [[
                         { type: 'checkbox', fixed: 'left' }
                         //{ field: 'hmainid', title: 'hmainid', width: 90 }
                         , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟' }
                         , { field: '绫诲瀷', title: '绫诲瀷' }
-                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort: true }
+                        , {
+                            field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort: true, templet: function (d) {
+                                if (d.鏃ユ湡 == null) {
+                                    return "";
+                                }
+                                return util.toDateString(d.鏃ユ湡, "yyyy-MM-dd");
+                            }
+                        }
                         , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', width: 120 }
                         , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 190 }
                         //, { field: 'hicmointerid', title: 'hicmointerid', width: 80 }
@@ -397,7 +400,7 @@
                     elem: '#mainTable2'
                     //, toolbar: '#toolbarDemo'
                     , page: true
-                    , height: 226
+                    , height: 300
                     , cellMinWidth: 90
                     , cols: [[
 

--
Gitblit v1.9.1