From 4e60273930b31cc25f7c2a4ab1b7d5a8088a378b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 27 六月 2020 08:30:29 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs
---
src/main/webapp/static/js/wrkDetl/wrkDetl.js | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/static/js/wrkDetl/wrkDetl.js b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
index 015665d..f1cfa59 100644
--- a/src/main/webapp/static/js/wrkDetl/wrkDetl.js
+++ b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
@@ -21,19 +21,19 @@
{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿', width: 160}
,{field: 'matnr', align: 'center',title: '鐗╂枡'}
- ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
- ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
- ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
- ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
+ // ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
+ // ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
+ // ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
+ // ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
- ,{field: 'werks', align: 'center',title: '宸ュ巶'}
+ // ,{field: 'werks', align: 'center',title: '宸ュ巶'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'altme', align: 'center',title: '鍗曚綅'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
- ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
+ // ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
// ,{field: 'memo', align: 'center',title: '澶囨敞'}
- // ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser', style: 'cursor:pointer'}
- // ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
// ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'}
// ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
// ,{field: 'nista', align: 'center',title: ''}
@@ -200,7 +200,7 @@
title: '璇︽儏',
maxmin: true,
area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
+ shadeClose: true,
content: 'wrkDetl_detail.html',
success: function(layero, index){
setFormVal(layer.getChildFrame('#detail', index), data, true);
@@ -407,7 +407,11 @@
elem: '#appeTime\\$',
type: 'datetime'
});
-
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
});
--
Gitblit v1.9.1