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

js/getService.js

@@ -4,7 +4,7 @@ var getService={
         var functionUrl = url;
         ServiceOperation.send(ServiceOperation.MethodGet, ServiceOperation.getFullUrl(functionUrl),"", false, function(data){
             if(!data.success){
-                DialogOperation.alertDialog(data.message); 
+                alert(data.message); 
             }else{
                 ret = data.result;
             }

js/service/material.js

@@ -573,54 +573,54 @@ var ServiceMaterial={
         return 90;
     },
     
-    // 近6个月质量目标合格率比较
+    // 近6个月质量目标合格率比较（品质管理看板）
     getLastSixMonthQualityTargetCompare: function () {
 
-        // return getService.methodGet("/fbsPuArrivalvouch/fbsArrivalVouchs/getLastSixMonthQualityTargetCompare");
+        return getService.methodGet("/fbsPuArrivalvouch/fbsArrivalVouchs/getLastSixMonthQualityTargetCompare");
 
-        const list = [];
+        // const list = [];
 
 
-        list.push({
-            month: "04",
-            target: 98,
-            real: 33
-        });
-        list.push({
-            month: "05",
-            target: 98,
-            real: 96
-        });
-        list.push({
-            month: "06",
-            target: 98,
-            real: 95
-        });
-        list.push({
-            month: "07",
-            target: 98,
-            real: 99
-        });
-        list.push({
-            month: "08",
-            target: 98,
-            real: 100
-        });
-        list.push({
-            month: "09",
-            target: 98,
-            real: 98
-        });
+        // list.push({
+        //     month: "04",
+        //     target: 98,
+        //     real: 33
+        // });
+        // list.push({
+        //     month: "05",
+        //     target: 98,
+        //     real: 96
+        // });
+        // list.push({
+        //     month: "06",
+        //     target: 98,
+        //     real: 95
+        // });
+        // list.push({
+        //     month: "07",
+        //     target: 98,
+        //     real: 99
+        // });
+        // list.push({
+        //     month: "08",
+        //     target: 98,
+        //     real: 100
+        // });
+        // list.push({
+        //     month: "09",
+        //     target: 98,
+        //     real: 98
+        // });
 
-        $.each(list, function (index, item) {
-            item.label = item.month;
-            item.label1 = "质量目标";
-            item.sum1 = item.target;
-            item.label2 = "合格率";
-            item.sum2 = item.real;
-        });
+        // $.each(list, function (index, item) {
+        //     item.label = item.month;
+        //     item.label1 = "质量目标";
+        //     item.sum1 = item.target;
+        //     item.label2 = "合格率";
+        //     item.sum2 = item.real;
+        // });
 
-        return list;
+        // return list;
 
     },
     // 当月供应商合格率

js/service/product.js

@@ -66,15 +66,15 @@ var ServiceProduct = {
     },
     // 月成品出货统计，根据成品维度
     getMonthSend: function () {
-        return getService.methodGet("/fbsRdrecord32/fbsRdrecords32/getMonthSend");
+        // return getService.methodGet("/fbsRdrecord32/fbsRdrecords32/getMonthSend");
 
-        // return {
-        //     "成品A": 20,
-        //     "成品B": 100,
-        //     "成品C": 80,
-        //     "成品D": 150,
-        //     "成品E": 200,
-        // };
+        return {
+            "成品A": 20,
+            "成品B": 100,
+            "成品C": 80,
+            "成品D": 150,
+            "成品E": 200,
+        };
     },
     // 月项目发货统计，根据项目维度
     getMonthSendByProject: function () {

pages/dashboard/warehouse.html

@@ -497,7 +497,7 @@
                     // 待入库
                     const waitinginMaterialList = ServiceMaterial.getWatingInList();
                     $.each(waitinginMaterialList,function(index,item){
-                        if (item.specs.length>6)
+                        if (item.specs!=undefined && item.specs!='undefined' && item.specs.length>6)
                             item.specs = item.specs.substr(0,6);
                             item.arriveDate = item.arriveDate.replace(/-/g,"");
                     });