From edb5baaa0af5dc30f122770b9064c8f71dd81818 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 09 四月 2021 18:36:35 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/order.js | 85 ------------------------------------------
src/main/webapp/views/order/order.html | 17 +-------
2 files changed, 4 insertions(+), 98 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 498c583..485af69 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -185,7 +185,6 @@
// ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳',event: 'updateBy', style: 'cursor:pointer'}
// ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
// ,{field: 'memo', align: 'center',title: '澶囨敞'}
-
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
]],
request: {
@@ -220,7 +219,7 @@
}
});
/* 琛ㄦ牸2鎼滅储 */
- form.on('submit(orderTable)', function (data) {
+ form.on('submit(orderTbSearch)', function (data) {
insTb2.reload({where: data.field, page: {curr: 1}});
return false;
});
@@ -318,88 +317,6 @@
-// // 鏁版嵁娓叉煋
-// tableIns = table.render({
-// elem: '#order',
-// headers: {token: localStorage.getItem('token')},
-// url: baseUrl+'/order/list/auth',
-// page: true,
-// limit: 16,
-// limits: [16, 30, 50, 100, 200, 500],
-// even: true,
-// toolbar: '#toolbar',
-// cellMinWidth: 50,
-// cols: [[
-// {type: 'checkbox'}
-// // ,{field: 'id', align: 'center',title: 'ID'}
-// // ,{field: 'uuid', align: 'center',title: '缂栧彿'}
-// ,{field: 'orderNo', align: 'center',title: '璁㈠崟缂栧彿'}
-// ,{field: 'orderTime', align: 'center',title: '鍗曟嵁鏃ユ湡'}
-// ,{field: 'docType$', align: 'center',title: '鍗曟嵁绫诲瀷'}
-// ,{field: 'itemId$', align: 'center',title: '椤圭洰缂栧彿'}
-// ,{field: 'allotItemId$', align: 'center',title: '璋冩嫧椤圭洰缂栧彿', hide: true}
-// ,{field: 'defNumber', align: 'center',title: '鍒濆绁ㄦ嵁鍙�', hide: true}
-// ,{field: 'number', align: 'center',title: '绁ㄦ嵁鍙�'}
-// // ,{field: 'cstmr$', align: 'center',title: '瀹㈡埛缂栧彿'}
-// ,{field: 'cstmrName', align: 'center',title: '瀹㈡埛', hide: true}
-// ,{field: 'tel', align: 'center',title: '鑱旂郴鏂瑰紡', hide: true}
-// ,{field: 'operMemb', align: 'center',title: '鎿嶄綔浜哄憳'}
-// ,{field: 'totalFee', align: 'center',title: '鍚堣閲戦'}
-// ,{field: 'discount', align: 'center',title: '浼樻儬鐜�', hide: true}
-// ,{field: 'discountFee', align: 'center',title: '浼樻儬閲戦', hide: true}
-// ,{field: 'otherFee', align: 'center',title: '閿�鍞垨閲囪喘璐圭敤鍚堣', hide: true}
-// ,{field: 'actFee', align: 'center',title: '瀹炰粯閲戦', hide: true}
-// ,{field: 'payType$', align: 'center',title: '浠樻绫诲瀷'}
-// ,{field: 'salesman', align: 'center',title: '涓氬姟鍛�', hide: true}
-// ,{field: 'accountDay', align: 'center',title: '缁撶畻澶╂暟', hide: true}
-// ,{field: 'postFeeType$', align: 'center',title: '閭垂鏀粯绫诲瀷', hide: true}
-// ,{field: 'postFee', align: 'center',title: '閭垂', hide: true}
-// ,{field: 'payTime$', align: 'center',title: '浠樻鏃堕棿', hide: true}
-// ,{field: 'sendTime$', align: 'center',title: '鍙戣揣鏃堕棿', hide: true}
-// ,{field: 'shipName', align: 'center',title: '鐗╂祦鍚嶇О', hide: true}
-// ,{field: 'shipCode', align: 'center',title: '鐗╂祦鍗曞彿', hide: true}
-// ,{field: 'settle$', align: 'center',title: '璁㈠崟鐘舵��'}
-// // ,{field: 'status$', align: 'center',title: '鐘舵��'}
-// // ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳',event: 'createBy', style: 'cursor:pointer'}
-// // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
-// // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳',event: 'updateBy', style: 'cursor:pointer'}
-// // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
-// // ,{field: 'memo', align: 'center',title: '澶囨敞'}
-//
-// ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
-// ]],
-// request: {
-// pageName: 'curr',
-// pageSize: 'limit'
-// },
-// parseData: function (res) {
-// return {
-// 'code': res.code,
-// 'msg': res.msg,
-// 'count': res.data.total,
-// 'data': res.data.records
-// }
-// },
-// response: {
-// statusCode: 200
-// },
-// done: function(res, curr, count) {
-// if (res.code === 403) {
-// top.location.href = baseUrl+"/";
-// }
-// pageCurr=curr;
-// limit();
-// form.on('checkbox(tableCheckbox)', function (data) {
-// var _index = $(data.elem).attr('table-index')||0;
-// if(data.elem.checked){
-// res.data[_index][data.value] = 'Y';
-// }else{
-// res.data[_index][data.value] = 'N';
-// }
-// });
-// }
-// });
-//
// // 鐩戝惉鎺掑簭浜嬩欢
// table.on('sort(locMast)', function (obj) {
// var searchData = {};
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index fd88883..4740aa0 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -86,19 +86,13 @@
<form class="layui-form toolbar">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">瀛楀吀鍚嶇О:</label>
+ <label class="layui-form-label">璁㈠崟缂栧彿:</label>
<div class="layui-input-inline">
- <input name="dictDataName" class="layui-input" placeholder="杈撳叆瀛楀吀鍚嶇О"/>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">瀛楀吀閿��:</label>
- <div class="layui-input-inline">
- <input name="dictDataCode" class="layui-input" placeholder="杈撳叆瀛楀吀閿��"/>
+ <input name="order_no" class="layui-input" placeholder="杈撳叆璁㈠崟缂栧彿"/>
</div>
</div>
<div class="layui-inline"> 
- <button class="layui-btn icon-btn" lay-filter="dictDataTbSearch" lay-submit>
+ <button class="layui-btn icon-btn" lay-filter="orderTbSearch" lay-submit>
<i class="layui-icon"></i>鎼滅储
</button>
</div>
@@ -141,11 +135,6 @@
<button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
</div>
</form>
-</script>
-
-<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
- <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
--
Gitblit v1.9.1