From afa3bc1e2f39f66f59ee9b15d6af16593acdc9a4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 02 十二月 2023 10:38:27 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/order/order.js |   96 ++++++++++++++++++++++++++++++++++++------------
 1 files changed, 72 insertions(+), 24 deletions(-)

diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 1a2ec37..03d616a 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -141,30 +141,76 @@
         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: '鐢叉柟鍗曚綅', 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: 'transactionRate', align: 'right',title: '椤圭洰棰勪及鎴愪氦鐜�', templet:function(d){return emptyShow(d.transactionRate+"%")}}
-            ,{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: '娣诲姞鏃堕棿'}
-            ,{field: 'company$', align: 'left',title: '鎵�灞炲叕鍙�', hide: false}
-            ,{field: 'orderProductTypeId$', align: 'left',title: '浜у搧绫诲瀷', hide: false}
-            ,{field: 'province', align: 'left',title: '鐪�', hide: true}
-            ,{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}
-            ,{field: 'memo', align: 'left',title: '娉ㄩ噴', hide: true}
+            {type: 'checkbox'},
+            {field: 'id', align: 'left',title: '椤圭洰鍙�',hide: false},
+            {
+                field: 'name',
+                align: 'left',
+                title: '璺熻釜椤圭洰鍚嶇О',
+                style: 'color: #1890ff;cursor:pointer',
+                event: 'more',
+                width: 300
+            },
+            {field: 'uuid', align: 'left',title: '椤圭洰浠e彿',hide: false},
+            {
+                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: 'transactionRate',
+                align: 'right',
+                title: '椤圭洰棰勪及鎴愪氦鐜�',
+                templet:function(d){
+                    return emptyShow(d.transactionRate+"%")
+                }
+            },
+            {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: '娣诲姞鏃堕棿', hide: false},
+            {field: 'company$', align: 'left',title: '鎵�灞炲叕鍙�', hide: false},
+            {field: 'orderProductTypeId$', align: 'left',title: '浜у搧绫诲瀷', hide: false},
+            {field: 'province', align: 'left',title: '鐪�', hide: true},
+            {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: '鐘舵��', hide: false},
+            {field: 'status', align: 'left',title: '鐘舵��', hide: true},
+            {field: 'files', align: 'left',title: '闄勪欢', hide: true},
+            {field: 'updateBy$', align: 'left',title: '淇敼浜哄憳', hide: true},
+            {field: 'updateTime$', align: 'left',title: '淇敼鏃堕棿', hide: true},
+            {field: 'memo', align: 'left',title: '娉ㄩ噴', hide: true},
 
-            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:180}
+            {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:180}
         ]],
         request: {
             pageName: 'curr',
@@ -343,6 +389,7 @@
                             layer.close(loadIndex);
                             if (res.code === 200){
                                 layer.close(dIndex);
+                                layer.closeAll()
                                 layer.msg(res.msg, {icon: 1});
                                 tableReload();
                             } else if (res.code === 403){
@@ -398,6 +445,7 @@
                             layer.close(loadIndex);
                             if (res.code === 200){
                                 layer.close(dIndex);
+                                layer.closeAll()
                                 layer.msg(res.msg, {icon: 1});
                                 tableReload();
                             } else if (res.code === 403){
@@ -465,7 +513,7 @@
                         return false;
                     }
                     if (!data.field.cstmrId) {
-                        layer.msg("鐢叉柟鍗曚綅涓嶈兘涓虹┖", {icon: 2});
+                        layer.msg("瀹㈡埛淇℃伅涓嶈兘涓虹┖", {icon: 2});
                         return false;
                     }
                     if (!data.field.transactionRate) {

--
Gitblit v1.9.1