From f8a9a448ae7e2e075ed5b37e3edce64b713c6bd2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 15 三月 2021 10:38:42 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/custOrder/custOrder.html   |    2 +-
 src/main/webapp/static/js/custOrder/custOrder.js |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
index 72f793b..6ea3339 100644
--- a/src/main/webapp/static/js/custOrder/custOrder.js
+++ b/src/main/webapp/static/js/custOrder/custOrder.js
@@ -74,6 +74,7 @@
                 top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
+            tableX.merges('custOrder', [1, 11]);
             limit();
             form.on('checkbox(tableCheckbox)', function (data) {
                 var _index = $(data.elem).attr('table-index')||0;
@@ -207,6 +208,7 @@
                                 // ,area: ['800px','450px']
                                 ,area: '800px'
                                 ,shade: 0.5
+                                ,shadeClose: true
                                 ,id: 'LAY_layuipro'
                                 ,btn: ['绔嬪嵆鐢熸垚', '绋嶅悗澶勭悊']
                                 ,btnAlign: 'c'
diff --git a/src/main/webapp/views/custOrder/custOrder.html b/src/main/webapp/views/custOrder/custOrder.html
index 1161867..abb0e85 100644
--- a/src/main/webapp/views/custOrder/custOrder.html
+++ b/src/main/webapp/views/custOrder/custOrder.html
@@ -65,7 +65,7 @@
 
 <script type="text/html" id="operate">
     {{#if (d.status == 1){ }}
-        <a class="layui-btn layui-btn-sm layui-btn-danger" lay-event="stockOut" style="font-size: 16px">鎷h揣鍗�</a>
+        <a class="layui-btn layui-btn-sm layui-btn-danger" lay-event="stockOut" style="font-size: 16px"><span style="display: none">{{d.number}}</span>鎷h揣鍗�</a>
     {{# } }}
     {{#if (d.status == 2 || d.status == 4){ }}
         <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="print" style="font-size: 16px">鎵撳嵃</a>

--
Gitblit v1.9.1