From 18e13ddba707623dc9078d7bffc498f91dba409c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 四月 2021 14:48:26 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/order/order.js |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index a5d4861..d973001 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -156,7 +156,7 @@
             ,{field: 'orderNo', align: 'center',title: '璁㈠崟缂栧彿'}
             ,{field: 'orderTime', align: 'center',title: '鍗曟嵁鏃ユ湡'}
             ,{field: 'docType$', align: 'center',title: '鍗曟嵁绫诲瀷'}
-            ,{field: 'itemId$', align: 'center',title: '椤圭洰缂栧彿'}
+            ,{field: 'itemName', align: 'center',title: '椤圭洰'}
             ,{field: 'allotItemId$', align: 'center',title: '璋冩嫧椤圭洰缂栧彿', hide: true}
             ,{field: 'defNumber', align: 'center',title: '鍒濆绁ㄦ嵁鍙�', hide: true}
             ,{field: 'number', align: 'center',title: '绁ㄦ嵁鍙�'}
@@ -224,6 +224,11 @@
         insTb2.reload({where: data.field, page: {curr: 1}});
         return false;
     });
+    /* 琛ㄦ牸2閲嶇疆 */
+    form.on('submit(orderTbReset)', function (data) {
+        insTb2.reload({page: {curr: 1}});
+        return false;
+    });
 
     /* 琛ㄦ牸2宸ュ叿鏉$偣鍑讳簨浠� */
     table.on('tool(orderTable)', function (obj) {
@@ -239,7 +244,8 @@
     /* 琛ㄦ牸2澶村伐鍏锋爮鐐瑰嚮浜嬩欢 */
     table.on('toolbar(orderTable)', function (obj) {
         if (obj.event === 'add') { // 娣诲姞
-            showEditModel2();
+            // showEditModel2();
+            right();
         } else if (obj.event === 'del') { // 鍒犻櫎
             var checkRows = table.checkStatus('orderTable');
             if (checkRows.data.length === 0) {
@@ -603,6 +609,23 @@
 
 });
 
+function right(){
+    top.popupRight = top.layui.admin.popupRight({
+        id: 'LAY_adminPopupLayerTest'
+        , area: '750px'
+        , type: 2
+        , shade: [0.5,'#000']
+        , content:'order/matQuery.html'
+        , success: function(){
+            // $('#'+ this.id).html('<div style="padding: 20px;">鏀惧叆鍐呭</div>');
+            //admin.view(this.id).render('system/xxx')
+        }
+        , end: function () {
+            $(".layui-laypage-btn")[0].click();
+        }
+    });
+}
+
 // 鍏抽棴鍔ㄤ綔
 $(document).on('click','#data-detail-close', function () {
     parent.layer.closeAll();

--
Gitblit v1.9.1