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

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

@@ -36,7 +36,8 @@
         var tabIndex={
             "ZP":0,
             "JY":1,
-            "WX":2
+            "WX":2,
+			"JG":3,
         };
 
         var columns = [
@@ -80,6 +81,7 @@
            if(rowData.bzgxGxlx){
                var index=tabIndex[rowData.bzgxGxlx];
                $tab.tabs("select",index);
+			   console.log(index)
                if(index==0){
                    $zpContainer.html("");
                    $zpContainer.append("<div id=\"zpList\" style=\"width: 100%;height: 100%\"></div>");
@@ -136,6 +138,36 @@
                    $wxListContainer.append(element);
                    wx(rowData)
                }
+			   else if(index==3){
+			      $("#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("不合格")
+			      }
+			   }
            }
        }
 
@@ -190,6 +222,7 @@
                 }
             })
         }
+		/*加工反馈*/
         /*检验反馈*/
         function jy(rowData) {
             var $zpList=$("#jyList");var $topList=$("#jybhgList");