Merge branch 'master' of http://121.36.46.135:3000/mes-ljz/mescloud

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

@@ -229,7 +229,7 @@ $("#inputForm").validate({
 var vm = new Vue({
 	el: '#app',
 	data: {
-		sn:"",
+		sn:"${mesMaterialCheckRecord.sn!}",
 		is_show:false,
 		msg:"",
 		materialTitle:"",
@@ -415,6 +415,8 @@ var vm = new Vue({
 					that.materialId=res.data.info.id;
 					that.faDate=res.data.faDate || snFields.faDate;
 					that.faNums=res.data.faNums || snFields.faNums;
+					that.hgQty=that.faNums;
+					that.bhgQty=0;
 					that.options=res.data.mitList;
 
 					for (let o in that.options){
@@ -465,6 +467,8 @@ var vm = new Vue({
 								 that.materialId=res.data.info.id;
 								 that.faDate=res.data.faDate || snFields.faDate;
 								 that.faNums=res.data.faNums || snFields.faNums;
+								 that.hgQty=that.faNums;
+								 that.bhgQty=0;
 								 that.options=res.data.mitList;
 								 that.formatData();
 							 }

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

@@ -94,12 +94,15 @@ $('#dataGrid').dataGrid({
 		{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:'actions', width:80, formatter: function(val, obj, row, act){
+		{header:'${text("操作")}', name:'actions', width:110, formatter: function(val, obj, row, act){
 			var actions = [];
 			//<% if(hasPermi('mes:mesMaterialReport:edit')){ %>
 				actions.push('<a href="${ctx}/mes/mesMaterialReport/form?id='+row.id+'" class="btnList" title="${text("编辑来料报检")}"><i class="fa fa-pencil"></i></a>&nbsp;');
 				actions.push('<a href="${ctx}/mes/mesMaterialReport/delete?id='+row.id+'" class="btnList" title="${text("删除来料报检")}" data-confirm="${text("确认要删除该来料报检吗？")}"><i class="fa fa-trash-o"></i></a>&nbsp;');
 			//<% } %>
+			//<% if(hasPermi('mes:mesMaterialCheckRecord:view')){ %>
+				actions.push('<a href="${ctx}/mes/mesMaterialCheckRecord/form?sn='+encodeURIComponent(row.sn||'')+'" class="btnList" title="${text("来料检查")}"><i class="fa fa-check-square-o"></i></a>&nbsp;');
+			//<% } %>
 			return actions.join('');
 		}}
 	],