Merge branch 'master' of http://139.196.39.194:9021/yuansh/FBS_VIEW

css/dashboard.css

@@ -2,6 +2,7 @@ body{
     background-color: #003d80;    
     color:#ffffff;
     font-size:14px;
+    font-family: "宋体";
 }
 .page-title{
     font-size:32px;

js/service/material.js

@@ -1071,9 +1071,9 @@ var ServiceMaterial={
             element.vendorName=element.cvencode;
             element.materialCode=element.cinvcode;
             element.materialName=element.cinvName;
-            element.arriveSum=element.iArrQTY;
-            element.checkSum=element.fchkquantity;
-            element.unpassSum=element.fchkinvalidqty;
+            element.arriveSum=element.fquantity;
+            element.checkSum=element.fdtquantity;
+            element.unpassSum=element.fdisquantity;
             element.checkDate=element.ddate;
             element.images=[
                         "/images/quality/13.png",