Merge branch 'master' of gitlab.gavelinfo.com:gavelinfo/kwell-mes

gavel/src/main/resources/templates/views/kmes/wosngz/wosngzinfo.html

@@ -154,14 +154,35 @@
                 {title: "规格型号", field: "wlxxGg", fieldType: "ftString",width:200},
                 {title: "数量", field: "zpsl", fieldType: "int"}
                 ];
-            $zpList.datagrid({
-                title:"详情",
-                columns:[new $.common.formatterCol($righColumnsZp)],
-                pagination:false
-            });
+			var $hgbz= [
+			    {title: "是否合格", field: "hgbz",width:180,align:"center",
+				formatter: function(value,row,index){
+				if (row.hzsl=="Y"){
+					return "合格";
+				} else {
+					return "不合格";
+				}
+			}
+			}
+			    ];
             HTTP.post("kmes/wosngz/getGphymx",{gpfkid:rowData.id},function (res) {
                 if(res.success){
-                    $zpList.datagrid("loadData",res.data.records||[])
+					if(res.data.total==0){
+						$zpList.datagrid({
+						    title:"详情",
+						    columns:[new $.common.formatterCol($hgbz)],
+						    pagination:false
+						});
+						$zpList.datagrid("loadData",[rowData])
+					}else{
+						$zpList.datagrid({
+						    title:"详情",
+						    columns:[new $.common.formatterCol($righColumnsZp)],
+						    pagination:false
+						});
+						 $zpList.datagrid("loadData",res.data.records||[])
+					}
+                   
                 }
             })
         }