时间修改

src/main/resources/views/modules/mes/mesProductCcdList.html

@@ -112,7 +112,7 @@ $('#dataGrid').dataGrid({
 		{header:'${text("拍照区序号")}', name:'photoNum', index:'a.photo_num', width:120, align:"center"},
 		{header:'${text("测点编号")}', name:'testNum', index:'a.test_num', width:120, align:"center"},
 		{header:'${text("测点类型")}', name:'testCate', index:'a.test_cate', width:200, align:"center"},
-		{header:'${text("测试时间")}', name:'testDate', index:'a.test_date', width:150, align:"center"},
+		{header:'${text("时间")}', name:'testDate', index:'a.test_date', width:150, align:"center"},
 		{header:'${text("检测结果")}', name:'result', index:'a.result', width:150, align:"center"},
 		{header:'${text("人工复检")}', name:'recheck', index:'a.recheck', width:150, align:"center"},
 		// {header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){

src/main/resources/views/modules/mes/mesProductProdList.html

@@ -43,7 +43,7 @@
 					</div>
 				</div>
 			<div class="form-group">
-				<label class="control-label">${text('拉铆时间')}：</label>
+				<label class="control-label">${text('时间')}：</label>
 				<div class="control-inline">
 					<#form:input path="dateTime_gte" readonly="true" maxlength="20" class="form-control laydate width-datetime"
 					dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm" data-done="testTime_lte.click()"/>
@@ -97,7 +97,7 @@ $('#dataGrid').dataGrid({
 				return "NG";
 			}
 		}},
-		{header:'${text("拉铆时间")}', name:'dateTime', index:'a.date_time', width:150, align:"center"},
+		{header:'${text("时间")}', name:'dateTime', index:'a.date_time', width:150, align:"center"},
 		{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:'actions', width:120, formatter: function(val, obj, row, act){

src/main/resources/views/modules/mes/mesProductQmList.html

@@ -75,7 +75,7 @@ $('#dataGrid').dataGrid({
 		{header:'${text("工位号")}', name:'oprno', index:'a.oprno', width:100, align:"center"},
 		{header:'${text("名称")}', name:'title', index:'a.title', width:150, align:"center"},
 		{header:'${text("测试人员")}', name:'workNum', index:'a.work_num', width:150, align:"center"},
-		{header:'${text("测试时间")}', name:'testTime', index:'a.test_time', width:150, align:"center"},
+		{header:'${text("时间")}', name:'testTime', index:'a.test_time', width:150, align:"center"},
 		{header:'${text("测试压")}', name:'testPressure', index:'a.test_pressure', width:150, align:"center"},
 		{header:'${text("测试压单位")}', name:'testPressureUnit', index:'a.test_pressure_unit', width:150, align:"center"},
 		{header:'${text("泄露值")}', name:'leakVal', index:'a.leak_val', width:150, align:"center"},

src/main/resources/views/modules/mes/mesProductQmWhiteList.html

@@ -75,7 +75,7 @@ $('#dataGrid').dataGrid({
 		{header:'${text("工位号")}', name:'oprno', index:'a.oprno', width:100, align:"center"},
 		{header:'${text("名称")}', name:'title', index:'a.title', width:150, align:"center"},
 		{header:'${text("测试人员")}', name:'workNum', index:'a.work_num', width:150, align:"center"},
-		{header:'${text("测试时间")}', name:'testTime', index:'a.test_time', width:150, align:"center"},
+		{header:'${text("时间")}', name:'testTime', index:'a.test_time', width:150, align:"center"},
 		{header:'${text("测试压")}', name:'testPressure', index:'a.test_pressure', width:150, align:"center"},
 		{header:'${text("测试压单位")}', name:'testPressureUnit', index:'a.test_pressure_unit', width:150, align:"center"},
 		{header:'${text("泄露值")}', name:'leakVal', index:'a.leak_val', width:150, align:"center"},