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

gavel/src/main/resources/templates/views/kmes/gpcs/index.html

@@ -105,6 +105,11 @@
 					{
 						that.wosncode=that.xlh
 						let msg=res.message||"查询WOSNID:"+that.wosncode+"成功"
+						if(res.data.records.hgbz=="N"){
+							that.isok="NG"
+						}else{
+							that.isok="OK"
+						}
 						csfk_wrz(that,msg)	
 					}else if(res.data.records.sntype=="OKBZ"){
 						that.isok="OK"

gavel/src/main/resources/templates/views/kmes/gphy/zpindex.html

@@ -77,7 +77,7 @@
 			$txtScgd.iTextbox();
 			$txtWosnid.iTextbox();
 			var options = {
-				url: 'kmes/gpcs',
+				url: 'kmes/gpfk',
 				noRequest: true,
 				columns: [[
 					{title: "产品条码", field: "wosnid", fieldType: "ftString",width:160},

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

@@ -38,6 +38,7 @@
             "JY":1,
             "WX":2,
 			"JG":3,
+			"CS":4
         };
 
         var columns = [
@@ -168,6 +169,36 @@
 			      					   $("#ishgs").text("不合格")
 			      }
 			   }
+			   else if(index==4){
+			      $("#zpListContainer").html("");
+			      $("#zpListContainer").append("      <div style=\"width: 70%;display: inline-block;height: 100%\">" +
+			          "                                    <div style=\"width: 0%;height: 100%\" id=\"jyList\"></div>" +
+			          "                                </div>" +
+			          "                                <div style=\"width: 100%;float:right;height: 100%;\">" +
+			          "                                    <div style=\"width: 100%;height: 0%\" id=\"jybhgList\"></div>" +
+			          // "                                    <div style=\"width: 100%;height: 100%;border: 1px solid #D3D3D3;position: relative\" >" +
+			          "                                        <div class=\"\" style=\"width: 50%;height: 50%;border: 1px solid #D3D3D3;;display: inline-block;position: absolute;  top:50%;left:50%;transform:translate(-50%,-50%);\">" +
+			          "                                                <label  style=\"text-align: left;font-weight: 700;\">反馈结果</label>" +
+			          "                                                <div id=\"ishgs\" class=\"mx-dataTable hb-text\" style=\"margin-top: 60px;bottom: 0;border: none;text-align: center\">" +
+			          "                                                    合格" +
+			          "                                                </div>" +
+			          "                                        <div>" +
+			          // "                                    </div>" +
+			          "                                        </div>" +
+			          "                                        <div class=\"\" style=\"width: 50%;height: 100%;float: right;position: relative\">" +
+			          "                                                <label style=\"text-align: left;font-weight: 700;\">备注</label>" +
+			          "                                            <div class=\"mx-dataTable bz-text\" style=\"margin-top: 60px;bottom: 0;border: none;text-align: center\">" +
+			          "                                            </div>" +
+			          "                                            <div>" +
+			          "                                            </div>" +
+			          "                                        </div>" +
+			          "                                    </div>" +
+			          "                                </div>");
+			   					console.log(rowData)
+			      if(rowData.hgbz=="N"){
+			      					   $("#ishgs").text("不合格")
+			      }
+			   }
            }
        }