日常更新

public/static/common/js/core.js

@@ -1362,14 +1362,20 @@ $(function() {
 	if($('select[data-form-type="tree"]').length > 0){
 		$('select[data-form-type="tree"]').each(function(){
 			var url = $(this).data('url');
+			var currentId = $(this).data('value') || 0;
+			var tree = $(this).data('tree') || 1;
 			var that = this;
 			$.ajax({
 				url: url,
 				type: 'get',
-				data: {tree:1},
+				data: {tree:tree},
 				success: function(res){
 					$(res.data).each(function(i, item){
-						$(that).append('<option value="'+item.id+'">'+item.title_show+'</option>');
+						if(currentId == item.id){
+							$(that).append('<option value="'+item.id+'" selected>'+item.title_show+'</option>');
+						}else{
+							$(that).append('<option value="'+item.id+'">'+item.title_show+'</option>');
+						}
 					})
 					$(that).select2()
 				},
@@ -1394,9 +1400,11 @@ $(function() {
 			var laydate = layui.laydate;
 			var startDate = laydate.render({
 				elem: '#startTime',
+				type: 'datetime',
 				max: $('#endTime').val(),
 				theme: 'molv',
 				trigger: 'click',
+				format: 'yyyy-MM-dd HH:mm:ss',
 				done: function(value, date) {
 					// 结束时间大于开始时间
 					if (value !== '') {
@@ -1412,8 +1420,10 @@ $(function() {
 			});
 			var endDate = laydate.render({
 				elem: '#endTime',
+				type: 'datetime',
 				min: $('#startTime').val(),
 				theme: 'molv',
+				format: 'yyyy-MM-dd HH:mm:ss',
 				trigger: 'click',
 				done: function(value, date) {
 					// 开始时间小于结束时间