From d5a456fee1dd3b6beda90ec6cc1b91814ec2750f Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期四, 24 三月 2022 12:59:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/static/js/pickout/pickout.js | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/static/js/pickout/pickout.js b/src/main/webapp/static/js/pickout/pickout.js
index aaa9c24..316ce54 100644
--- a/src/main/webapp/static/js/pickout/pickout.js
+++ b/src/main/webapp/static/js/pickout/pickout.js
@@ -71,7 +71,7 @@
table.on('row(leftTable)', function (obj) {
selObj = obj;
obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
- insTb2.reload({where: {doc_type: obj.data.docId}, page: {curr: 1}});
+ tableIns.reload({where: {head_id: obj.data.id}, page: {curr: 1}});
});
/* 鍒犻櫎 */
@@ -101,6 +101,13 @@
})
});
}
+ form.on('submit(leftResearch)', function (data) {
+
+ leftTB.reload({where: {wrk_no: data.field.docName}});
+ return false;
+ });
+
+
/****************************************** 鍙宠竟琛� *************************************************/
// 鏁版嵁娓叉煋
@@ -142,7 +149,7 @@
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳ID', hide:true}
,{field: 'memo', align: 'center',title: '澶囨敞', hide:true}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150, hide:true}
]],
request: {
pageName: 'curr',
@@ -167,7 +174,12 @@
limit();
}
});
+ /* 琛ㄦ牸2鎼滅储 */
+ form.on('submit(rightSearch)', function (data) {
+ tableIns.reload({where: data.field , page: {curr: 1}});
+ return false;
+ });
// // 鐩戝惉鎺掑簭浜嬩欢
// table.on('sort(pickout)', function (obj) {
// var searchData = {};
@@ -259,18 +271,18 @@
// tableReload(false);
// });
//
- // // 鏃堕棿閫夋嫨鍣�
- // function layDateRender() {
- // layDate.render({
- // elem: '#createTime\\$',
- // type: 'datetime'
- // });
- // layDate.render({
- // elem: '#updateTime\\$',
- // type: 'datetime'
- // });
- //
- // }
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender() {
+ layDate.render({
+ elem: '#createTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#updateTime\\$',
+ type: 'datetime'
+ });
+
+ }
layDateRender();
});
--
Gitblit v1.9.1