From 34f99d106551b51bf2af3bbd40c64624a3af25eb Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 09 九月 2023 09:43:57 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/order/order.js |   29 ++++++++++++++++++++++++++---
 1 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index aa4958f..6ca4607 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -59,7 +59,7 @@
                 case 1:
                     // 妯℃澘涓嬭浇
                     layer.load(1, {shade: [0.1,'#fff']});
-                    location.href = baseUrl + "/mould/鐢叉柟鍗曚綅瀵煎叆妯℃澘.xls";
+                    location.href = baseUrl + "/mould/璺熻釜椤圭洰瀵煎叆妯℃澘.xls";
                     layer.closeAll('loading');
                     break
                 case 2:
@@ -120,6 +120,11 @@
         })
     }
 
+    let where = {}
+    if (getQueryVariable('status') !== false) {
+        where = {status: getQueryVariable('status')}
+    }
+
     // 鏁版嵁娓叉煋
     tableIns = table.render({
         elem: '#order',
@@ -132,14 +137,15 @@
         height: 'full-148',
         // size: 'sm',
         skin: 'line',
+        where: where,
         cols: [[
             {type: 'checkbox'}
             ,{field: 'name', align: 'left',title: '璺熻釜椤圭洰鍚嶇О', style: 'color: #1890ff;cursor:pointer', event: 'more', width: 300}
             ,{field: 'uuid', align: 'left',title: '椤圭洰浠e彿'}
-            ,{field: 'cstmrId$', align: 'left',title: '鐢叉柟鍗曚綅', templet:function(d){return emptyShow(d.cstmrId$)}}
+            ,{field: 'cstmrId$', align: 'left',title: '鐢叉柟鍗曚綅', style: 'color: #1890ff;cursor:pointer', event: 'cstmrMore', templet:function(d){return emptyShow(d.cstmrId$)}}
             ,{field: 'pcd$', align: 'left',title: '鎵�灞炲尯鍩�', templet:function(d){return emptyShow(d.pcd$)}}
             ,{field: 'addr', align: 'left',title: '椤圭洰鍦板潃', templet:function(d){return emptyShow(d.addr)}}
-            ,{field: 'money', align: 'right',title: '椤圭洰鎬婚噾棰�', templet:function(d){return emptyShow(d.money)}}
+            ,{field: 'money', align: 'right',title: '椤圭洰棰勭畻閲戦', templet:function(d){return emptyShow(d.money)}}
             ,{field: 'director$', align: 'left',title: '椤圭洰璐熻矗浜�', templet:function(d){return emptyShow(d.director$)}}
             ,{field: 'remarks', align: 'left',title: '澶囨敞', templet:function(d){return emptyShow(d.remarks)}}
             ,{field: 'createTime$', align: 'left',title: '娣诲姞鏃堕棿'}
@@ -148,6 +154,7 @@
             ,{field: 'city', align: 'left',title: '甯�', hide: true}
             ,{field: 'district', align: 'left',title: '鍘�', hide: true}
             ,{field: 'town', align: 'left',title: '闀�', hide: true}
+            ,{field: 'status$', align: 'left',title: '鐘舵��'}
             ,{field: 'files', align: 'left',title: '闄勪欢', hide: true}
             ,{field: 'updateBy$', align: 'left',title: '淇敼浜哄憳', hide: true}
             ,{field: 'updateTime$', align: 'left',title: '淇敼鏃堕棿', hide: true}
@@ -228,6 +235,18 @@
                     }
                 })
                 break;
+            case 'cstmrMore':
+                top.cstmrByMore = data.cstmrId;
+                admin.popupRight({
+                    type: 1,
+                    window: "top",
+                    area: "1250px",
+                    url: "../cstmr/cstmr_more.html",
+                    end: function () {
+                        // $(".layui-laypage-btn")[0].click();
+                    }
+                })
+                break;
             case 'edit':
                 showEditModel(data);
                 break;
@@ -262,6 +281,10 @@
                         layer.msg("鎵�灞炲叕鍙镐笉鑳戒负绌�", {icon: 2});
                         return false;
                     }
+                    if (!data.field.cstmrId) {
+                        layer.msg("鐢叉柟鍗曚綅涓嶈兘涓虹┖", {icon: 2});
+                        return false;
+                    }
                     var loadIndex = layer.load(2);
                     $.ajax({
                         url: baseUrl+"/order/"+(mData?'update':'add')+"/auth",

--
Gitblit v1.9.1