Selaa lähdekoodia

创建人,创建时间,修改人,修改时间

hfy 4 kuukautta sitten
vanhempi
commit
4f8213ebcb
28 muutettua tiedostoa jossa 359 lisäystä ja 24 poistoa
  1. 1 0
      src/main/resources/views/modules/mes/mesBatchSnList.html
  2. 4 2
      src/main/resources/views/modules/mes/mesDeviceCateList.html
  3. 4 2
      src/main/resources/views/modules/mes/mesDeviceConsumableList.html
  4. 5 1
      src/main/resources/views/modules/mes/mesDeviceConsumableRecordList.html
  5. 4 1
      src/main/resources/views/modules/mes/mesDeviceList.html
  6. 4 1
      src/main/resources/views/modules/mes/mesDevicePreventList.html
  7. 4 1
      src/main/resources/views/modules/mes/mesDevicePreventTaskList.html
  8. 4 1
      src/main/resources/views/modules/mes/mesDevicePreventTaskMyList.html
  9. 5 1
      src/main/resources/views/modules/mes/mesDeviceTimeList.html
  10. 4 1
      src/main/resources/views/modules/mes/mesDeviceUrgencyList.html
  11. 0 1
      src/main/resources/views/modules/mes/mesDeviceUrgencyMyList.html
  12. 4 1
      src/main/resources/views/modules/mes/mesDocumentCateList.html
  13. 4 1
      src/main/resources/views/modules/mes/mesDocumentList.html
  14. 1 1
      src/main/resources/views/modules/mes/mesLineList.html
  15. 4 0
      src/main/resources/views/modules/mes/mesLineProcessList.html
  16. 5 1
      src/main/resources/views/modules/mes/mesMaterialKwList.html
  17. 5 1
      src/main/resources/views/modules/mes/mesMaterialList.html
  18. 3 1
      src/main/resources/views/modules/mes/mesMaterialReportList.html
  19. 5 1
      src/main/resources/views/modules/mes/mesProcessProductList.html
  20. 3 0
      src/main/resources/views/modules/mes/mesProductCateList.html
  21. 6 2
      src/main/resources/views/modules/mes/mesProductList.html
  22. 5 1
      src/main/resources/views/modules/mes/mesProductRecordList.html
  23. 5 1
      src/main/resources/views/modules/mes/mesRepairItemsList.html
  24. 4 1
      src/main/resources/views/modules/mes/mesShiftList.html
  25. 4 0
      src/main/resources/views/modules/mes/mesToolLifeList.html
  26. 3 0
      src/main/resources/views/modules/sys/user/empUserList.html
  27. 167 0
      src/main/resources/views/modules/sys/user/officeList.html
  28. 92 0
      src/main/resources/views/modules/sys/user/postList.html

+ 1 - 0
src/main/resources/views/modules/mes/mesBatchSnList.html

@@ -69,6 +69,7 @@ $('#dataGrid').dataGrid({
 		}},
 		{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:150, align:"center"},
 		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:150, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:150, align:"center"},
 		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
 		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
 			var actions = [];

+ 4 - 2
src/main/resources/views/modules/mes/mesDeviceCateList.html

@@ -56,8 +56,10 @@ $('#dataGrid').dataGrid({
 			return '<a href="${ctx}/mes/mesDeviceCate/form?id='+row.id+'" class="btnList" data-title="${text("编辑设备分类")}">'+(val||row.id)+'</a>';
 		}},
 		{header:'${text("备注")}', name:'remark', index:'a.remark', width:150, align:"left"},
-		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:150, align:"center"},
-		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:120, align:"center"},
+		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:120, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:125, align:"center"},
 		{header:'${text("状态")}', name:'status', index:'a.status', width:150, align:"center", formatter: function(val, obj, row, act){
 			return js.getDictLabel(${@DictUtils.getDictListJson('sys_search_status')}, val, '${text("未知")}', true);
 		}},

+ 4 - 2
src/main/resources/views/modules/mes/mesDeviceConsumableList.html

@@ -55,8 +55,10 @@ $('#dataGrid').dataGrid({
 			return '<a href="${ctx}/mes/mesDeviceConsumable/form?id='+row.id+'" class="btnList" data-title="${text("编辑易耗品")}">'+(val||row.id)+'</a>';
 		}},
 		{header:'${text("备注")}', name:'remark', index:'a.remark', width:150, align:"left"},
-		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:150, align:"center"},
-		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:120, align:"center"},
+		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:120, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:125, align:"center"},
 		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
 			var actions = [];
 			//<% if(hasPermi('mes:mesDeviceConsumable:edit')){ %>

+ 5 - 1
src/main/resources/views/modules/mes/mesDeviceConsumableRecordList.html

@@ -61,7 +61,11 @@ $('#dataGrid').dataGrid({
 		{header:'${text("维修设备")}', name:'deviceRecordId', index:'a.device_record_id', width:150, align:"center", frozen:true},
 
 		{header:'${text("数量")}', name:'num', index:'a.num', width:150, align:"center"},
-		{header:'${text("使用时间")}', name:'createDate', index:'a.create_date', width:150, align:"center"},
+		{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:120, align:"center"},
+		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:120, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:125, align:"center"},
+		//{header:'${text("使用时间")}', name:'createDate', index:'a.create_date', width:150, align:"center"},
 		//{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
 
 	],

+ 4 - 1
src/main/resources/views/modules/mes/mesDeviceList.html

@@ -129,7 +129,10 @@ $('#dataGrid').dataGrid({
 			}},
 		{header:'${text("备注")}', name:'remark', index:'a.remark', width:150, align:"left"},
 		//{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:150, align:"center"},
-		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:120, align:"center"},
+		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:120, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:125, align:"center"},
 		{header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){
 			var actions = [];
 			//<% if(hasPermi('mes:mesDevice:edit')){ %>

+ 4 - 1
src/main/resources/views/modules/mes/mesDevicePreventList.html

@@ -73,7 +73,10 @@ $('#dataGrid').dataGrid({
 		{header:'${text("状态")}', name:'status', index:'a.status', width:150, align:"center", formatter: function(val, obj, row, act){
 			return js.getDictLabel(${@DictUtils.getDictListJson('sys_search_status')}, val, '${text("未知")}', true);
 		}},
-		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:120, align:"center"},
+		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:120, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:125, align:"center"},
 		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
 			var actions = [];
 			//<% if(hasPermi('mes:mesDevicePrevent:edit')){ %>

+ 4 - 1
src/main/resources/views/modules/mes/mesDevicePreventTaskList.html

@@ -93,7 +93,10 @@ $('#dataGrid').dataGrid({
 		{header:'${text("状态")}', name:'state', index:'a.state', width:150, align:"center", formatter: function(val, obj, row, act){
 			return js.getDictLabel(${@DictUtils.getDictListJson('mes_device_prevent_task_status')}, val, '${text("未知")}', true);
 		}},
-		{header:'${text("更新日期")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:120, align:"center"},
+		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:120, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:125, align:"center"},
 		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
 			var actions = [];
 			//<% if(hasPermi('mes:mesDevicePreventTask:edit')){ %>

+ 4 - 1
src/main/resources/views/modules/mes/mesDevicePreventTaskMyList.html

@@ -87,7 +87,10 @@ $('#dataGrid').dataGrid({
 		{header:'${text("状态")}', name:'state', index:'a.state', width:150, align:"center", formatter: function(val, obj, row, act){
 			return js.getDictLabel(${@DictUtils.getDictListJson('mes_device_prevent_task_status')}, val, '${text("未知")}', true);
 		}},
-		{header:'${text("更新日期")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:120, align:"center"},
+		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:120, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:125, align:"center"},
 		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
 			var actions = [];
 				actions.push('<a href="${ctx}/mes/mesDevicePreventTask/info?id='+row.id+'" class="btnList" title="${text("查看详情")}"><i class="fa fa-fw fa-eye"></i></a>&nbsp;');

+ 5 - 1
src/main/resources/views/modules/mes/mesDeviceTimeList.html

@@ -79,7 +79,11 @@ $('#dataGrid').dataGrid({
 		// 		return "否";
 		// 	}
 		// }},
-		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:120, align:"center"},
+		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:120, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:125, align:"center"},
+		//{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
 		// {header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
 		// 	var actions = [];
 		// 	//<% if(hasPermi('mes:mesDeviceTime:edit')){ %>

+ 4 - 1
src/main/resources/views/modules/mes/mesDeviceUrgencyList.html

@@ -98,7 +98,10 @@ $('#dataGrid').dataGrid({
 		}},
 		{header:'${text("备注")}', name:'remark', index:'a.remark', width:150, align:"center"},
 		{header:'${text("维修时长(分)")}', name:'interval', index:'a.interval', width:150, align:"center"},
-		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:120, align:"center"},
+		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:120, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:125, align:"center"},
 		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
 			var actions = [];
 				actions.push('<a href="${ctx}/mes/mesDeviceUrgency/info?id='+row.id+'" class="btnList" title="${text("查看详情")}"><i class="fa fa-fw fa-eye"></i></a>&nbsp;');

+ 0 - 1
src/main/resources/views/modules/mes/mesDeviceUrgencyMyList.html

@@ -76,7 +76,6 @@ $('#dataGrid').dataGrid({
 		}},
 		{header:'${text("备注")}', name:'remark', index:'a.remark', width:150, align:"center"},
 		{header:'${text("维修时长(分)")}', name:'interval', index:'a.interval', width:150, align:"center"},
-		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
 		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
 			var actions = [];
 				actions.push('<a href="${ctx}/mes/mesDeviceUrgency/info?id='+row.id+'" class="btnList" title="${text("查看详情")}"><i class="fa fa-fw fa-eye"></i></a>&nbsp;');

+ 4 - 1
src/main/resources/views/modules/mes/mesDocumentCateList.html

@@ -60,7 +60,10 @@ $('#dataGrid').dataGrid({
 		{header:'${text("状态")}', name:'status', index:'a.status', width:150, align:"center", formatter: function(val, obj, row, act){
 			return js.getDictLabel(${@DictUtils.getDictListJson('sys_search_status')}, val, '${text("未知")}', true);
 		}},
-		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:120, align:"center"},
+		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:120, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:125, align:"center"},
 		{header:'${text("备注信息")}', name:'remarks', index:'a.remarks', width:150, align:"left"},
 		{header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){
 			var actions = [];

+ 4 - 1
src/main/resources/views/modules/mes/mesDocumentList.html

@@ -70,7 +70,10 @@ $('#dataGrid').dataGrid({
 		{header:'${text("状态")}', name:'status', index:'a.status', width:150, align:"center", formatter: function(val, obj, row, act){
 			return js.getDictLabel(${@DictUtils.getDictListJson('sys_search_status')}, val, '${text("未知")}', true);
 		}},
-		{header:'${text("修改时间")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:120, align:"center"},
+		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:120, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:125, align:"center"},
 		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
 			var actions = [];
 			//<% if(hasPermi('mes:mesDocument:edit')){ %>

+ 1 - 1
src/main/resources/views/modules/mes/mesLineList.html

@@ -61,7 +61,7 @@ $('#dataGrid').dataGrid({
 		{header:'${text("状态")}', name:'status', index:'a.status', width:150, align:"center", formatter: function(val, obj, row, act){
 			return js.getDictLabel(${@DictUtils.getDictListJson('sys_search_status')}, val, '${text("未知")}', true);
 		}},
-		{header:'${text("更新日期")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		//{header:'${text("更新日期")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
 		// {header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
 		// 	var actions = [];
 		// 	//<% if(hasPermi('mes:mesLine:edit')){ %>

+ 4 - 0
src/main/resources/views/modules/mes/mesLineProcessList.html

@@ -95,6 +95,10 @@ $('#dataGrid').dataGrid({
 				return js.getDictLabel(${@DictUtils.getDictListJson('sys_search_status')}, val, '${text("未知")}', true);
 			}},
 		{header:'${text("备注")}', name:'remark', index:'a.remark', width:150, align:"center"},
+		{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:120, align:"center"},
+		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:120, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:125, align:"center"},
 		// {header:'${text("设备启动")}', name:'stop', index:'a.stop', width:150, align:"center", formatter: function(val, obj, row, act){
 		// 		return js.getDictLabel(${@DictUtils.getDictListJson('mes_line_process_stop')}, val, '${text("允许")}', true);
 		// 	}},

+ 5 - 1
src/main/resources/views/modules/mes/mesMaterialKwList.html

@@ -49,7 +49,11 @@ $('#dataGrid').dataGrid({
 			return '<a href="${ctx}/mes/mesMaterialKw/form?id='+row.id+'" class="btnList" data-title="${text("编辑物料库位")}">'+(val||row.title)+'</a>';
 		}},
 		{header:'${text("所属仓库")}', name:'ckName', index:'b.ck_name', width:150, align:"center"},
-		{header:'${text("更新日期")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:120, align:"center"},
+		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:120, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:125, align:"center"},
+		//{header:'${text("更新日期")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
 		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
 			var actions = [];
 			//<% if(hasPermi('mes:mesMaterialKw:edit')){ %>

+ 5 - 1
src/main/resources/views/modules/mes/mesMaterialList.html

@@ -103,7 +103,11 @@ $('#dataGrid').dataGrid({
 		{header:'${text("状态")}', name:'status', index:'a.status', width:150, align:"center", formatter: function(val, obj, row, act){
 			return js.getDictLabel(${@DictUtils.getDictListJson('sys_search_status')}, val, '${text("未知")}', true);
 		}},
-		{header:'${text("更新日期")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:120, align:"center"},
+		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:120, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:125, align:"center"},
+		//{header:'${text("更新日期")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
 		{header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){
 			var actions = [];
 			//<% if(hasPermi('mes:mesMaterial:edit')){ %>

+ 3 - 1
src/main/resources/views/modules/mes/mesMaterialReportList.html

@@ -84,7 +84,9 @@ $('#dataGrid').dataGrid({
 		{header:'${text("备注")}', name:'remark', index:'a.remark', width:150, align:"center"},
 		{header:'${text("报检人")}', name:'createBy', index:'a.create_by', width:120, align:"center"},
 		{header:'${text("报检时间")}', name:'createDate', index:'a.create_date', width:150, align:"center"},
-		{header:'${text("更新日期")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:125, align:"center"},
+		//{header:'${text("更新日期")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
 		{header:'${text("操作")}', name:'actions', width:80, formatter: function(val, obj, row, act){
 			var actions = [];
 			//<% if(hasPermi('mes:mesMaterialReport:edit')){ %>

+ 5 - 1
src/main/resources/views/modules/mes/mesProcessProductList.html

@@ -53,7 +53,11 @@ $('#dataGrid').dataGrid({
 		{header:'${text("产线编号")}', name:'productCate', index:'a.product_cate', width:120, align:"center", frozen:true},
 		{header:'${text("工位号")}', name:'oprno', index:'a.oprno', width:120, align:"center"},
 		{header:'${text("工件码")}', name:'sn', index:'a.sn', width:250, align:"center"},
-		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:120, align:"center"},
+		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:120, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:125, align:"center"},
+		//{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
 		// {header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
 		// 	var actions = [];
 		// 	//<% if(hasPermi('mes:mesProcessProduct:edit')){ %>

+ 3 - 0
src/main/resources/views/modules/mes/mesProductCateList.html

@@ -63,6 +63,9 @@ $('#dataGrid').dataGrid({
 		{header:'${text("规格起始位数")}', name:'specStart', index:'a.spec_start', width:150, align:"center"},
 		{header:'${text("条码长度")}', name:'length', index:'a.length', width:150, align:"center"},
 		{header:'${text("入库数量")}', name:'nums', index:'a.nums', width:150, align:"center"},
+		{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:120, align:"center"},
+		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:120, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
 		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
 		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
 			var actions = [];

+ 6 - 2
src/main/resources/views/modules/mes/mesProductList.html

@@ -119,8 +119,12 @@ $('#dataGrid').dataGrid({
 		// {header:'${text("重量(kg)")}', name:'weight', index:'a.weight', width:150, align:"center"},
 		// {header:'${text("包装时间")}', name:'bindDate', index:'a.bind_date', width:150, align:"center"},
 		// {header:'${text("包装人")}', name:'bindBy', index:'a.bind_by', width:150, align:"center"},
-		{header:'${text("创建日期")}', name:'createDate', index:'a.create_date', width:150, align:"center" },
-		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:120, align:"center"},
+		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:120, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:125, align:"center"},
+		//{header:'${text("创建日期")}', name:'createDate', index:'a.create_date', width:150, align:"center" },
+		//{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
 		// {header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
 		// 	var actions = [];
 		// 	//<% if(hasPermi('mes:mesProduct:edit')){ %>

+ 5 - 1
src/main/resources/views/modules/mes/mesProductRecordList.html

@@ -128,7 +128,11 @@ $('#dataGrid').dataGrid({
 		{header:'${text("来源")}', name:'source', index:'a.source', width:150, align:"center", formatter: function(val, obj, row, act){
 				return js.getDictLabel(${@DictUtils.getDictListJson('mes_product_modify_source')}, val, '${text("未知")}', true);
 			}},
-		{header:'${text("更新日期")}', name:'updateDate', index:'a.update_date', width:160, align:"center",frozen:true },
+		{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:120, align:"center"},
+		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:120, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:125, align:"center"},
+		//{header:'${text("更新日期")}', name:'updateDate', index:'a.update_date', width:160, align:"center",frozen:true },
 		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
 			var actions = [];
 			//<% if(hasPermi('mes:mesProductRecord:edit')){ %>

+ 5 - 1
src/main/resources/views/modules/mes/mesRepairItemsList.html

@@ -87,7 +87,11 @@ $('#dataGrid').dataGrid({
 		{header:'${text("状态")}', name:'status', index:'a.status', width:150, align:"center", formatter: function(val, obj, row, act){
 				return js.getDictLabel(${@DictUtils.getDictListJson('sys_search_status')}, val, '${text("未知")}', true);
 			}},
-		{header:'${text("更新日期")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:120, align:"center"},
+		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:120, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:125, align:"center"},
+		//{header:'${text("更新日期")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
 		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
 			var actions = [];
 			//<% if(hasPermi('mes:mesRepairItems:edit')){ %>

+ 4 - 1
src/main/resources/views/modules/mes/mesShiftList.html

@@ -57,7 +57,10 @@ $('#dataGrid').dataGrid({
 		{header:'${text("状态")}', name:'status', index:'a.status', width:150, align:"center", formatter: function(val, obj, row, act){
 			return js.getDictLabel(${@DictUtils.getDictListJson('sys_search_status')}, val, '${text("未知")}', true);
 		}},
-		{header:'${text("更新日期")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:120, align:"center"},
+		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:120, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:125, align:"center"},
 		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
 			var actions = [];
 			//<% if(hasPermi('mes:mesShift:edit')){ %>

+ 4 - 0
src/main/resources/views/modules/mes/mesToolLifeList.html

@@ -62,6 +62,10 @@ $('#dataGrid').dataGrid({
 		{header:'${text("剩余寿命")}', name:'curLife', index:'a.cur_life', width:150, align:"center"},
 		{header:'${text("每次消耗寿命")}', name:'consumeLife', index:'a.consume_life', width:150, align:"center"},
 		{header:'${text("备注")}', name:'remark', index:'a.remark', width:150, align:"center"},
+		{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:120, align:"center"},
+		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:120, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:125, align:"center"},
 		{header:'${text("状态")}', name:'status', index:'a.status', width:150, align:"center", formatter: function(val, obj, row, act){
 			return js.getDictLabel(${@DictUtils.getDictListJson('sys_search_status')}, val, '${text("未知")}', true);
 		}},

+ 3 - 0
src/main/resources/views/modules/sys/user/empUserList.html

@@ -133,6 +133,9 @@
 			{header:'${text("电子邮箱")}', name:'email', index:'a.email', width:120, align:"center"},
 			{header:'${text("手机号码")}', name:'mobile', index:'a.mobile', width:120, align:"center"},
 			{header:'${text("办公电话")}', name:'phone', index:'a.phone', width:120, align:"center"},
+			{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:120, align:"center"},
+			{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:120, align:"center"},
+			{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
 			{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:125, align:"center", frozen:true},
 			{header:'${text("状态")}', name:'status', index:'a.status', width:60, align:"center", frozen:true, formatter: function(val, obj, row, act){
 					return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '未知', true);

+ 167 - 0
src/main/resources/views/modules/sys/user/officeList.html

@@ -0,0 +1,167 @@
+<% layout('/layouts/default.html', {title: '机构管理', libs: ['dataGrid']}){ %>
+<div class="main-content">
+	<div class="box box-main">
+		<div class="box-header">
+			<div class="box-title">
+				<i class="fa icon-grid"></i> ${text('机构管理')}
+			</div>
+			<div class="box-tools pull-right">
+				<a href="#" class="btn btn-default" id="btnSearch" title="${text('查询')}"><i class="fa fa-filter"></i> ${text('查询')}</a>
+				<a href="#" class="btn btn-default" id="btnRefreshTree" title="${text('刷新')}"><i class="fa fa-refresh"></i> ${text('刷新')}</a>
+				<a href="#" class="btn btn-default" id="btnExpandTreeNode" title="${text('展开一级')}"><i class="fa fa-angle-double-down"></i> ${text('展开')}</a>
+				<a href="#" class="btn btn-default" id="btnCollapseTreeNode" title="${text('折叠全部')}"><i class="fa fa-angle-double-up"></i> ${text('折叠')}</a>
+				<a href="#" class="btn btn-default" id="btnExport"><i class="glyphicon glyphicon-export"></i> ${text('导出')}</a>
+				<% if(hasPermi('sys:office:edit')){ %>
+					<a href="#" class="btn btn-default" id="btnImport"><i class="glyphicon glyphicon-import"></i> ${text('导入')}</a>
+					<a href="${ctx}/sys/office/form" class="btn btn-default btnTool" title="${text('新增机构')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
+				<% } %>
+				<a href="#" class="btn btn-default" id="btnSetting" title="${text('设置')}"><i class="fa fa-navicon"></i></a>
+			</div>
+		</div>
+		<div class="box-body">
+			<#form:form id="searchForm" model="${office}" action="${ctx}/sys/office/listData" method="post" class="form-inline hide"
+					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
+				<#form:hidden name="ctrlPermi" value="${ctrlPermi}"/>
+				<#form:hidden path="officeCode" class="isReset"/>
+				<div class="form-group">
+					<label class="control-label">${text('机构代码')}:</label>
+					<div class="control-inline">
+						<#form:input path="viewCode" maxlength="100" class="form-control width-90"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('机构名称')}:</label>
+					<div class="control-inline">
+						<#form:input path="officeName" maxlength="100" class="form-control width-90"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('机构全称')}:</label>
+					<div class="control-inline">
+						<#form:input path="fullName" maxlength="200" class="form-control width-90"/>
+					</div>
+				</div>
+				<!--<div class="form-group">
+					<label class="control-label">${text('机构类型')}:</label>
+					<div class="control-inline width-90">
+						<#form:select path="officeType" dictType="sys_office_type" blankOption="true" class="form-control"/>
+					</div>
+				</div>-->
+				<div class="form-group">
+					<label class="control-label">${text('状态')}:</label>
+					<div class="control-inline width-60">
+						<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
+					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
+				</div>
+			</#form:form>			
+			<table id="dataGrid"></table>
+		</div>
+	</div>
+</div>
+<% } %>
+<script>
+// 初始化DataGrid对象
+$('#dataGrid').dataGrid({
+	searchForm: $("#searchForm"),
+	columnModel: [
+		{header:'${text("机构名称")}', name:'officeName', index:'a.office_name', width:300, align:"left", frozen:true, formatter: function(val, obj, row, act){
+			return '( '+row.viewCode+' ) '+'<a href="${ctx}/sys/office/form?officeCode='+row.officeCode+'" class="btnList" data-title="${text("编辑机构")}">'+(val||row.id)+'</a>';
+		}},
+		{header:'${text("机构全称")}', name:'fullName', index:'a.full_name', width:200, align:"left"},
+		{header:'${text("排序号")}', name:'treeSort', index:'a.tree_sort', width:80, align:"center"},
+		{header:'${text("机构类型")}', name:'officeType', index:'a.office_type', width:100, align:"center", formatter: function(val, obj, row, act){
+			return js.getDictLabel(${@DictUtils.getDictListJson('sys_office_type')}, val, '${text("未知")}', true);
+		}},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'${text("备注信息")}', name:'remarks', index:'a.remarks', width:100, align:"left"},
+		{header:'${text("状态")}', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){
+			return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '${text("未知")}', true);
+		}},
+		{header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){
+			var actions = [];
+			//<% if(hasPermi('sys:office:edit')){ %>
+				actions.push('<a href="${ctx}/sys/office/form?officeCode='+row.officeCode+'" class="btnList" title="${text("编辑机构")}"><i class="fa fa-pencil"></i></a>&nbsp;');
+				if (row.status == Global.STATUS_NORMAL){
+					actions.push('<a href="${ctx}/sys/office/disable?officeCode='+row.officeCode+'" class="btnList" title="${text("停用机构")}" data-confirm="${text("确认要停用该机构吗?")}"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
+				} else if (row.status == Global.STATUS_DISABLE){
+					actions.push('<a href="${ctx}/sys/office/enable?officeCode='+row.officeCode+'" class="btnList" title="${text("启用机构")}" data-confirm="${text("确认要启用该机构吗?")}"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
+				}
+				actions.push('<a href="${ctx}/sys/office/delete?officeCode='+row.officeCode+'" class="btnList" title="${text("删除机构")}" data-confirm="${text("确认要删除该机构及所有子机构吗?")}" data-deltreenode="'+row.id+'"><i class="fa fa-trash-o"></i></a>&nbsp;');
+				actions.push('<a href="${ctx}/sys/office/form?parentCode='+row.id+'" class="btnList" title="${text("新增下级机构")}"><i class="fa fa-plus-square"></i></a>&nbsp;');
+			//<% } %>
+			return actions.join('');
+		}}
+	],
+	treeGrid: true,			// 启用树结构表格
+	defaultExpandLevel: 0,	// 默认展开的层次
+	expandNodeClearPostData: 'viewCode,officeName,fullName,officeType,', // 展开节点清理请求参数数据(一般设置查询条件的字段属性,否则在查询后,不能展开子节点数据)	// 加载成功后执行事件
+	ajaxSuccess: function(data){
+		if ($('#officeCode').val() != ''){
+			$('#officeCode').val('');
+			$('#btnExpandTreeNode').click();
+		}
+	}
+});
+$('#btnExport').click(function(){
+	js.ajaxSubmitForm($('#searchForm'), {
+		url:'${ctx}/sys/office/exportData',
+		downloadFile:true
+	});
+});
+$('#btnImport').click(function(){
+	js.layer.open({
+		type: 1,
+		area: ['400px'],
+		title: '${text("导入机构数据")}',
+		resize: false,
+		scrollbar: true,
+		content: js.template('importTpl'),
+		success: function(layero, index){
+			layero.find('input[type="checkbox"]').iCheck();
+		},
+		btn: ['<i class="fa fa-check"></i> ${text("导入")}',
+			'<i class="fa fa-remove"></i> ${text("关闭")}'],
+		btn1: function(index, layero){
+			var form = {
+				inputForm: layero.find('#inputForm'),
+				file: layero.find('#file').val()
+			};
+		    if (form.file == '' || (!js.endWith(form.file, '.xls') && !js.endWith(form.file, '.xlsx'))){
+		    	js.showMessage("${text('文件不正确,请选择后缀为“xls”或“xlsx”的文件。')}", null, 'warning');
+		        return false;
+		    }
+			js.ajaxSubmitForm(form.inputForm, function(data){
+				js.showMessage(data.message);
+				if(data.result == Global.TRUE){
+					js.layer.closeAll();
+				}
+				page();
+			}, "json");
+			return true;
+		}
+	});
+});
+</script>
+<script id="importTpl" type="text/template">//<!--
+<form id="inputForm" action="${ctx}/sys/office/importData" method="post" enctype="multipart/form-data"
+	class="form-horizontal mt20 mb10" style="overflow:auto;max-height:200px;">
+	<div class="row">
+		<div class="col-xs-12 col-xs-offset-1">
+			<input type="file" id="file" name="file" class="form-file"/>
+			<div class="mt10 pt5">
+				<#form:checkbox name="updateSupport" label="${text('是否更新已经存在的机构数据')}" class="form-control"
+					title="${text('如果机构编码已经存在,更新这条数据。')}"/> &nbsp;
+				<a href="${ctx}/sys/office/importTemplate" class="btn btn-default btn-xs"><i class="fa fa-file-excel-o"></i> ${text('下载模板')}</a>
+			</div>
+			<font color="red" class="pull-left mt10">
+				${text('提示:仅允许导入“xls”或“xlsx”格式文件!')}
+			</font>
+		</div>
+	</div>
+</form>
+//--></script>

+ 92 - 0
src/main/resources/views/modules/sys/user/postList.html

@@ -0,0 +1,92 @@
+<% layout('/layouts/default.html', {title: '岗位管理', libs: ['dataGrid']}){ %>
+<div class="main-content">
+	<div class="box box-main">
+		<div class="box-header">
+			<div class="box-title">
+				<i class="fa icon-trophy"></i> ${text('岗位管理')}
+			</div>
+			<div class="box-tools pull-right">
+				<a href="#" class="btn btn-default" id="btnSearch" title="${text('查询')}"><i class="fa fa-filter"></i> ${text('查询')}</a>
+				<% if(hasPermi('sys:post:edit')){ %>
+					<a href="${ctx}/sys/post/form" class="btn btn-default btnTool" title="${text('新增岗位')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
+				<% } %>
+				<a href="#" class="btn btn-default" id="btnSetting" title="${text('设置')}"><i class="fa fa-navicon"></i></a>
+			</div>
+		</div>
+		<div class="box-body">
+			<#form:form id="searchForm" model="${post}" action="${ctx}/sys/post/listData" method="post" class="form-inline hide"
+					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
+				<div class="form-group">
+					<label class="control-label">${text('岗位名称')}:</label>
+					<div class="control-inline">
+						<#form:input path="postName_like" maxlength="100" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('岗位代码')}:</label>
+					<div class="control-inline">
+						<#form:input path="viewCode" maxlength="64" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('岗位分类')}:</label>
+					<div class="control-inline width-90">
+						<#form:select path="postType" dictType="sys_post_type" blankOption="true" class="form-control"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('状态')}:</label>
+					<div class="control-inline width-60">
+						<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
+					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
+				</div>
+			</#form:form>			
+			<table id="dataGrid"></table>
+			<div id="dataGridPage"></div>
+		</div>
+	</div>
+</div>
+<% } %>
+<script>
+// 初始化DataGrid对象
+$('#dataGrid').dataGrid({
+	searchForm: $("#searchForm"),
+	columnModel: [
+		{header:'${text("岗位名称")}', name:'postName', index:'a.post_name', width:200, align:"center", frozen:true, formatter: function(val, obj, row, act){
+			return '<a href="${ctx}/sys/post/form?postCode='+row.postCode+'" class="btnList" data-title="${text("编辑岗位")}">'+(val||row.id)+'</a>';
+		}},
+		{header:'${text("岗位代码")}', name:'viewCode', index:'a.view_code', width:200, align:"center"},
+		{header:'${text("排序号")}', name:'postSort', index:'a.post_sort', width:80, align:"center"},
+		{header:'${text("岗位分类")}', name:'postType', index:'a.post_type', width:100, align:"center", formatter: function(val, obj, row, act){
+			return js.getDictLabel(${@DictUtils.getDictListJson('sys_post_type')}, val, '未知', true);
+		}},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:120, align:"center"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'${text("备注信息")}', name:'remarks', index:'a.remarks', width:200, align:"left"},
+		{header:'${text("状态")}', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){
+			return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '未知', true);
+		}},
+		{header:'${text("操作")}', name:'actions', width:130, formatter: function(val, obj, row, act){
+			var actions = [];
+			//<% if(hasPermi('sys:post:edit')){ %>
+				actions.push('<a href="${ctx}/sys/post/form?postCode='+row.postCode+'" class="btnList" title="${text("编辑岗位")}"><i class="fa fa-pencil"></i></a>&nbsp;');
+				if (row.status == Global.STATUS_NORMAL){
+					actions.push('<a href="${ctx}/sys/post/disable?postCode='+row.postCode+'" class="btnList" title="${text("停用岗位")}" data-confirm="${text("确认要停用该岗位吗?")}"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
+				} else if (row.status == Global.STATUS_DISABLE){
+					actions.push('<a href="${ctx}/sys/post/enable?postCode='+row.postCode+'" class="btnList" title="${text("启用岗位")}" data-confirm="${text("确认要启用该岗位吗?")}"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
+				}
+				actions.push('<a href="${ctx}/sys/post/delete?postCode='+row.postCode+'" class="btnList" title="${text("删除岗位")}" data-confirm="${text("确认要删除该岗位吗?")}"><i class="fa fa-trash-o"></i></a>&nbsp;');
+			//<% } %>
+			return actions.join('');
+		}}
+	],
+	// 加载成功后执行事件
+	ajaxSuccess: function(data){
+		
+	}
+});
+</script>