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

js/content/mycharts.js

@@ -19,9 +19,9 @@ var ChartsService = {
         var option = {
             color: ['#37a2da'],
             grid:{
-                left:"5%",
-                right:"5%",
-                bottom:"15%",
+                left:"20%",
+                right:"10%",
+                bottom:"25%",
                 top:"10%"
             },
             xAxis: {
@@ -32,7 +32,9 @@ var ChartsService = {
                     textStyle: {
                         color: '#ffffff', //更改坐标轴文字颜色
                         fontSize: 14 //更改坐标轴文字大小
-                    }
+                    },
+                    interval:0,  
+                    rotate:30  
                 },
                 axisLine: {
                     lineStyle: {
@@ -112,9 +114,9 @@ var ChartsService = {
         var option = {
             color: ['#37a2da'],
             grid:{
-                left:"5%",
-                right:"5%",
-                bottom:"15%",
+                left:"20%",
+                right:"10%",
+                bottom:"25%",
                 top:"10%"
             },
             xAxis: {
@@ -125,7 +127,9 @@ var ChartsService = {
                     textStyle: {
                         color: '#ffffff', //更改坐标轴文字颜色
                         fontSize: 14 //更改坐标轴文字大小
-                    }
+                    },
+                    interval:0,  
+                    rotate:30
                 },
                 axisLine: {
                     lineStyle: {
@@ -208,9 +212,9 @@ var ChartsService = {
         var option = {
             color: ['#37a2da', '#ffd85c'],
             grid:{
-                left:"5%",
-                right:"5%",
-                bottom:"15%",
+                left:"20%",
+                right:"10%",
+                bottom:"25%",
                 top:"10%"
             },
             xAxis: {
@@ -221,7 +225,9 @@ var ChartsService = {
                     textStyle: {
                         color: '#ffffff', //更改坐标轴文字颜色
                         fontSize: 14 //更改坐标轴文字大小
-                    }
+                    },
+                    interval:0,  
+                    rotate:30  
                 },
                 axisLine: {
                     lineStyle: {
@@ -303,9 +309,9 @@ var ChartsService = {
         var option = {
             color: ['#37a2da'],
             grid:{
-                left:"5%",
-                right:"5%",
-                bottom:"15%",
+                left:"20%",
+                right:"10%",
+                bottom:"25%",
                 top:"10%"
             },
             xAxis: {
@@ -317,7 +323,9 @@ var ChartsService = {
                     textStyle: {
                         color: '#ffffff', //更改坐标轴文字颜色
                         fontSize: 14 //更改坐标轴文字大小
-                    }
+                    },
+                    interval:0,  
+                    rotate:30  
                 },
                 axisLine: {
                     lineStyle: {
@@ -492,9 +500,9 @@ var ChartsService = {
         var option = {
             color: ['#ff9f7f', '#ffd85c'],
             grid:{
-                left:"5%",
-                right:"5%",
-                bottom:"15%",
+                left:"20%",
+                right:"10%",
+                bottom:"25%",
                 top:"10%"
             },
             tooltip: {
@@ -525,7 +533,9 @@ var ChartsService = {
                     textStyle: {
                         color: '#ffffff', //更改坐标轴文字颜色
                         fontSize: 14 //更改坐标轴文字大小
-                    }
+                    },
+                    interval:0,  
+                    rotate:30  
                 },
                 axisLine: {
                     lineStyle: {

js/service/material.js

@@ -6,244 +6,244 @@
 var ServiceMaterial={
     // 待入库材料
     getWatingInList:function(){
-        // return getService.methodGet("/fbsPuArrivalvouch/fbsPuArrivalvouch/getWatingInList");
+        return getService.methodGet("/fbsPuArrivalvouch/fbsPuArrivalvouch/getWatingInList");
 
-        const materialList = [];
-        materialList.push({
-            vendorName:"A公司",
-            materialCode:"10001",
-            materialName:"物料A",
-            specs:"3*4",
-            arriveSum:"10",
-            arriveDate:"09月18日",
-            memo:""
-        });
-        materialList.push({
-            vendorName:"B公司",
-            materialCode:"10002",
-            materialName:"物料B",
-            specs:"3*4",
-            arriveSum:"20",
-            arriveDate:"09月18日",
-            memo:""
-        });
-        materialList.push({
-            vendorName:"C公司",
-            materialCode:"10003",
-            materialName:"物料C",
-            specs:"3*4",
-            arriveSum:"30",
-            arriveDate:"09月18日",
-            memo:""
-        });
-        materialList.push({
-            vendorName:"D公司",
-            materialCode:"10004",
-            materialName:"物料D",
-            specs:"3*4",
-            arriveSum:"40",
-            arriveDate:"09月18日",
-            memo:""
-        });
-        materialList.push({
-            vendorName:"E公司",
-            materialCode:"10005",
-            materialName:"物料E",
-            specs:"3*4",
-            arriveSum:"50",
-            arriveDate:"09月18日",
-            memo:""
-        });
-        materialList.push({
-            vendorName:"F公司",
-            materialCode:"10006",
-            materialName:"物料F",
-            specs:"3*4",
-            arriveSum:"60",
-            arriveDate:"09月18日",
-            memo:""
-        });
-        var i = 1;
-        $.each(materialList, function(index,item){
-            item.index = i++;
-        })
-        return materialList;
+        // const materialList = [];
+        // materialList.push({
+        //     vendorName:"A公司",
+        //     materialCode:"10001",
+        //     materialName:"物料A",
+        //     specs:"3*4",
+        //     arriveSum:"10",
+        //     arriveDate:"09月18日",
+        //     memo:""
+        // });
+        // materialList.push({
+        //     vendorName:"B公司",
+        //     materialCode:"10002",
+        //     materialName:"物料B",
+        //     specs:"3*4",
+        //     arriveSum:"20",
+        //     arriveDate:"09月18日",
+        //     memo:""
+        // });
+        // materialList.push({
+        //     vendorName:"C公司",
+        //     materialCode:"10003",
+        //     materialName:"物料C",
+        //     specs:"3*4",
+        //     arriveSum:"30",
+        //     arriveDate:"09月18日",
+        //     memo:""
+        // });
+        // materialList.push({
+        //     vendorName:"D公司",
+        //     materialCode:"10004",
+        //     materialName:"物料D",
+        //     specs:"3*4",
+        //     arriveSum:"40",
+        //     arriveDate:"09月18日",
+        //     memo:""
+        // });
+        // materialList.push({
+        //     vendorName:"E公司",
+        //     materialCode:"10005",
+        //     materialName:"物料E",
+        //     specs:"3*4",
+        //     arriveSum:"50",
+        //     arriveDate:"09月18日",
+        //     memo:""
+        // });
+        // materialList.push({
+        //     vendorName:"F公司",
+        //     materialCode:"10006",
+        //     materialName:"物料F",
+        //     specs:"3*4",
+        //     arriveSum:"60",
+        //     arriveDate:"09月18日",
+        //     memo:""
+        // });
+        // var i = 1;
+        // $.each(materialList, function(index,item){
+        //     item.index = i++;
+        // })
+        // return materialList;
     },
     // 已入库数量
     getInSum:function(){
-        // return getService.methodPost("/fbsPuArrivalvouch/fbsPuArrivalvouch/getInSum");
+        return getService.methodPost("/fbsPuArrivalvouch/fbsPuArrivalvouch/getInSum");
 
-        return 8;
+        // return 8;
     },
 
     // 待检材料
     getWatingCheckList:function(){
-        // return getService.methodGet("/fbsPuArrivalvouch/fbsPuArrivalvouch/getWatingCheckList");
+        return getService.methodGet("/fbsPuArrivalvouch/fbsPuArrivalvouch/getWatingCheckList");
 
-        const materialList = [];
-        materialList.push({
-            vendorName:"A公司",
-            materialCode:"10001",
-            materialName:"物料A",
-            specs:"3*4",
-            arriveSum:"10",
-            arriveDate:"09月18日"
-        });
-        materialList.push({
-            vendorName:"B公司",
-            materialCode:"10002",
-            materialName:"物料B",
-            specs:"3*4",
-            arriveSum:"20",
-            arriveDate:"09月18日"
-        });
-        materialList.push({
-            vendorName:"C公司",
-            materialCode:"10003",
-            materialName:"物料C",
-            specs:"3*4",
-            arriveSum:"30",
-            arriveDate:"09月18日"
-        });
-        materialList.push({
-            vendorName:"D公司",
-            materialCode:"10004",
-            materialName:"物料D",
-            specs:"3*4",
-            arriveSum:"40",
-            arriveDate:"09月18日"
-        });
-        materialList.push({
-            vendorName:"E公司",
-            materialCode:"10005",
-            materialName:"物料E",
-            specs:"3*4",
-            arriveSum:"50",
-            arriveDate:"09月18日"
-        });
-        materialList.push({
-            vendorName:"F公司",
-            materialCode:"10006",
-            materialName:"物料F",
-            specs:"3*4",
-            arriveSum:"60",
-            arriveDate:"09月18日"
-        });
-        return materialList;
+        // const materialList = [];
+        // materialList.push({
+        //     vendorName:"A公司",
+        //     materialCode:"10001",
+        //     materialName:"物料A",
+        //     specs:"3*4",
+        //     arriveSum:"10",
+        //     arriveDate:"09月18日"
+        // });
+        // materialList.push({
+        //     vendorName:"B公司",
+        //     materialCode:"10002",
+        //     materialName:"物料B",
+        //     specs:"3*4",
+        //     arriveSum:"20",
+        //     arriveDate:"09月18日"
+        // });
+        // materialList.push({
+        //     vendorName:"C公司",
+        //     materialCode:"10003",
+        //     materialName:"物料C",
+        //     specs:"3*4",
+        //     arriveSum:"30",
+        //     arriveDate:"09月18日"
+        // });
+        // materialList.push({
+        //     vendorName:"D公司",
+        //     materialCode:"10004",
+        //     materialName:"物料D",
+        //     specs:"3*4",
+        //     arriveSum:"40",
+        //     arriveDate:"09月18日"
+        // });
+        // materialList.push({
+        //     vendorName:"E公司",
+        //     materialCode:"10005",
+        //     materialName:"物料E",
+        //     specs:"3*4",
+        //     arriveSum:"50",
+        //     arriveDate:"09月18日"
+        // });
+        // materialList.push({
+        //     vendorName:"F公司",
+        //     materialCode:"10006",
+        //     materialName:"物料F",
+        //     specs:"3*4",
+        //     arriveSum:"60",
+        //     arriveDate:"09月18日"
+        // });
+        // return materialList;
     },
     // 已检数量
     getCheckSum:function(){
 
-        // return getService.methodPost("/fbsPuArrivalvouch/fbsPuArrivalvouch/getCheckSum");
+        return getService.methodPost("/fbsPuArrivalvouch/fbsPuArrivalvouch/getCheckSum");
 
-        return 10;
+        // return 10;
     },
     // 安全库存
     getStockList:function(){
-        // return getService.methodGet("/fbsInventory/fbsInventory/getStockList");
+        return getService.methodGet("/fbsInventory/fbsInventory/getStockList");
 
-        const materialList = [];
-        materialList.push({
-            materialCode:"10001",
-            materialName:"物料A",
-            specs:"3*4",
-            realStockSum:"10",
-            safeStockSum:"20"
-        });
-        materialList.push({
-            materialCode:"10002",
-            materialName:"物料B",
-            specs:"3*4",
-            realStockSum:"100",
-            safeStockSum:"80"
-        });
-        materialList.push({
-            materialCode:"10001",
-            materialName:"物料A",
-            specs:"3*4",
-            realStockSum:"10",
-            safeStockSum:"20"
-        });
-        materialList.push({
-            materialCode:"10002",
-            materialName:"物料B",
-            specs:"3*4",
-            realStockSum:"100",
-            safeStockSum:"80"
-        });materialList.push({
-            materialCode:"10001",
-            materialName:"物料A",
-            specs:"3*4",
-            realStockSum:"10",
-            safeStockSum:"20"
-        });
-        materialList.push({
-            materialCode:"10002",
-            materialName:"物料B",
-            specs:"3*4",
-            realStockSum:"100",
-            safeStockSum:"80"
-        });materialList.push({
-            materialCode:"10001",
-            materialName:"物料A",
-            specs:"3*4",
-            realStockSum:"10",
-            safeStockSum:"20"
-        });
-        materialList.push({
-            materialCode:"10002",
-            materialName:"物料B",
-            specs:"3*4",
-            realStockSum:"100",
-            safeStockSum:"80"
-        });materialList.push({
-            materialCode:"10001",
-            materialName:"物料A",
-            specs:"3*4",
-            realStockSum:"10",
-            safeStockSum:"20"
-        });
-        materialList.push({
-            materialCode:"10002",
-            materialName:"物料B",
-            specs:"3*4",
-            realStockSum:"100",
-            safeStockSum:"80"
-        });materialList.push({
-            materialCode:"10001",
-            materialName:"物料A",
-            specs:"3*4",
-            realStockSum:"10",
-            safeStockSum:"20"
-        });
-        materialList.push({
-            materialCode:"10002",
-            materialName:"物料B",
-            specs:"3*4",
-            realStockSum:"100",
-            safeStockSum:"80"
-        });materialList.push({
-            materialCode:"10001",
-            materialName:"物料A",
-            specs:"3*4",
-            realStockSum:"10",
-            safeStockSum:"20"
-        });
-        materialList.push({
-            materialCode:"10002",
-            materialName:"物料B",
-            specs:"3*4",
-            realStockSum:"100",
-            safeStockSum:"80"
-        });
-        materialList.push({
-            materialCode:"10001",
-            materialName:"物料A",
-            specs:"3*4",
-            realStockSum:"10",
-            safeStockSum:"20"
-        });
-        return materialList;
+        // const materialList = [];
+        // materialList.push({
+        //     materialCode:"10001",
+        //     materialName:"物料A",
+        //     specs:"3*4",
+        //     realStockSum:"10",
+        //     safeStockSum:"20"
+        // });
+        // materialList.push({
+        //     materialCode:"10002",
+        //     materialName:"物料B",
+        //     specs:"3*4",
+        //     realStockSum:"100",
+        //     safeStockSum:"80"
+        // });
+        // materialList.push({
+        //     materialCode:"10001",
+        //     materialName:"物料A",
+        //     specs:"3*4",
+        //     realStockSum:"10",
+        //     safeStockSum:"20"
+        // });
+        // materialList.push({
+        //     materialCode:"10002",
+        //     materialName:"物料B",
+        //     specs:"3*4",
+        //     realStockSum:"100",
+        //     safeStockSum:"80"
+        // });materialList.push({
+        //     materialCode:"10001",
+        //     materialName:"物料A",
+        //     specs:"3*4",
+        //     realStockSum:"10",
+        //     safeStockSum:"20"
+        // });
+        // materialList.push({
+        //     materialCode:"10002",
+        //     materialName:"物料B",
+        //     specs:"3*4",
+        //     realStockSum:"100",
+        //     safeStockSum:"80"
+        // });materialList.push({
+        //     materialCode:"10001",
+        //     materialName:"物料A",
+        //     specs:"3*4",
+        //     realStockSum:"10",
+        //     safeStockSum:"20"
+        // });
+        // materialList.push({
+        //     materialCode:"10002",
+        //     materialName:"物料B",
+        //     specs:"3*4",
+        //     realStockSum:"100",
+        //     safeStockSum:"80"
+        // });materialList.push({
+        //     materialCode:"10001",
+        //     materialName:"物料A",
+        //     specs:"3*4",
+        //     realStockSum:"10",
+        //     safeStockSum:"20"
+        // });
+        // materialList.push({
+        //     materialCode:"10002",
+        //     materialName:"物料B",
+        //     specs:"3*4",
+        //     realStockSum:"100",
+        //     safeStockSum:"80"
+        // });materialList.push({
+        //     materialCode:"10001",
+        //     materialName:"物料A",
+        //     specs:"3*4",
+        //     realStockSum:"10",
+        //     safeStockSum:"20"
+        // });
+        // materialList.push({
+        //     materialCode:"10002",
+        //     materialName:"物料B",
+        //     specs:"3*4",
+        //     realStockSum:"100",
+        //     safeStockSum:"80"
+        // });materialList.push({
+        //     materialCode:"10001",
+        //     materialName:"物料A",
+        //     specs:"3*4",
+        //     realStockSum:"10",
+        //     safeStockSum:"20"
+        // });
+        // materialList.push({
+        //     materialCode:"10002",
+        //     materialName:"物料B",
+        //     specs:"3*4",
+        //     realStockSum:"100",
+        //     safeStockSum:"80"
+        // });
+        // materialList.push({
+        //     materialCode:"10001",
+        //     materialName:"物料A",
+        //     specs:"3*4",
+        //     realStockSum:"10",
+        //     safeStockSum:"20"
+        // });
+        // return materialList;
 
     },
     // 工单备料
@@ -493,68 +493,68 @@ var ServiceMaterial={
     // 未来几天内到货计划
     getWillArriveList:function(days){
 
-        // return getService.methodGet("/fbsPuArrivalvouch/fbsArrivalVouchs/getWillArriveList");
+        return getService.methodGet("/fbsPuArrivalvouch/fbsArrivalVouchs/getWillArriveList");
 
-        const materialList = [];
-        materialList.push({
-            vendorName:"A公司",
-            materialCode:"10001",
-            materialName:"物料A",
-            specs:"3*4",
-            arriveSum:"10",
-            arriveDate:"09月18日",
-            memo:""
-        });
-        materialList.push({
-            vendorName:"B公司",
-            materialCode:"10002",
-            materialName:"物料B",
-            specs:"3*4",
-            arriveSum:"20",
-            arriveDate:"09月18日",
-            memo:""
-        });
-        materialList.push({
-            vendorName:"C公司",
-            materialCode:"10003",
-            materialName:"物料C",
-            specs:"3*4",
-            arriveSum:"30",
-            arriveDate:"09月18日",
-            memo:""
-        });
-        materialList.push({
-            vendorName:"D公司",
-            materialCode:"10004",
-            materialName:"物料D",
-            specs:"3*4",
-            arriveSum:"40",
-            arriveDate:"09月18日",
-            memo:""
-        });
-        materialList.push({
-            vendorName:"E公司",
-            materialCode:"10005",
-            materialName:"物料E",
-            specs:"3*4",
-            arriveSum:"50",
-            arriveDate:"09月18日",
-            memo:""
-        });
-        materialList.push({
-            vendorName:"F公司",
-            materialCode:"10006",
-            materialName:"物料F",
-            specs:"3*4",
-            arriveSum:"60",
-            arriveDate:"09月18日",
-            memo:""
-        });
-        var i = 1;
-        $.each(materialList, function(index,item){
-            item.index = i++;
-        })
-        return materialList;
+        // const materialList = [];
+        // materialList.push({
+        //     vendorName:"A公司",
+        //     materialCode:"10001",
+        //     materialName:"物料A",
+        //     specs:"3*4",
+        //     arriveSum:"10",
+        //     arriveDate:"09月18日",
+        //     memo:""
+        // });
+        // materialList.push({
+        //     vendorName:"B公司",
+        //     materialCode:"10002",
+        //     materialName:"物料B",
+        //     specs:"3*4",
+        //     arriveSum:"20",
+        //     arriveDate:"09月18日",
+        //     memo:""
+        // });
+        // materialList.push({
+        //     vendorName:"C公司",
+        //     materialCode:"10003",
+        //     materialName:"物料C",
+        //     specs:"3*4",
+        //     arriveSum:"30",
+        //     arriveDate:"09月18日",
+        //     memo:""
+        // });
+        // materialList.push({
+        //     vendorName:"D公司",
+        //     materialCode:"10004",
+        //     materialName:"物料D",
+        //     specs:"3*4",
+        //     arriveSum:"40",
+        //     arriveDate:"09月18日",
+        //     memo:""
+        // });
+        // materialList.push({
+        //     vendorName:"E公司",
+        //     materialCode:"10005",
+        //     materialName:"物料E",
+        //     specs:"3*4",
+        //     arriveSum:"50",
+        //     arriveDate:"09月18日",
+        //     memo:""
+        // });
+        // materialList.push({
+        //     vendorName:"F公司",
+        //     materialCode:"10006",
+        //     materialName:"物料F",
+        //     specs:"3*4",
+        //     arriveSum:"60",
+        //     arriveDate:"09月18日",
+        //     memo:""
+        // });
+        // var i = 1;
+        // $.each(materialList, function(index,item){
+        //     item.index = i++;
+        // })
+        // return materialList;
     },
     // 当天到货批数
     getTodayArriveSum:function(){

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 () {
@@ -90,17 +90,17 @@ var ServiceProduct = {
     },
     // 成品库存，物料维度
     getStockList: function () {
-        // return getService.methodGet("/fbsInventory/fbsInventory/getAllStockList");
+        return getService.methodGet("/fbsInventory/fbsInventory/getAllStockList");
 
-        return {
-            "成品A": 800,
-            "成品B": 900,
-            "成品C": 1000,
-            "成品D": 700,
-            "成品E": 600,
-            "成品F": 1100,
-            "成品G": 500
-        };
+        // return {
+        //     "成品A": 800,
+        //     "成品B": 900,
+        //     "成品C": 1000,
+        //     "成品D": 700,
+        //     "成品E": 600,
+        //     "成品F": 1100,
+        //     "成品G": 500
+        // };
 
     },
     // 根据产品分类获取质量异常数量
@@ -118,42 +118,42 @@ var ServiceProduct = {
     },
     // 某月产品良数量
     getMonthGood: function () {
-        const list = [];
-        list.push({
-            label: "产品A",
-            sum1: 48,
-            sum2: 50
-        });
-        list.push({
-            label: "产品B",
-            sum1: 80,
-            sum2: 90
-        });
-        list.push({
-            label: "产品C",
-            sum1: 47,
-            sum2: 50
-        });
-        list.push({
-            label: "产品D",
-            sum1: 40,
-            sum2: 50
-        });
-        list.push({
-            label: "产品E",
-            sum1: 42,
-            sum2: 50
-        });
-        list.push({
-            label: "产品F",
-            sum1: 44,
-            sum2: 50
-        });
-        list.push({
-            label: "产品G",
-            sum1: 45,
-            sum2: 50
-        });
+        // const list = [];
+        // list.push({
+        //     label: "产品A",
+        //     sum1: 48,
+        //     sum2: 50
+        // });
+        // list.push({
+        //     label: "产品B",
+        //     sum1: 80,
+        //     sum2: 90
+        // });
+        // list.push({
+        //     label: "产品C",
+        //     sum1: 47,
+        //     sum2: 50
+        // });
+        // list.push({
+        //     label: "产品D",
+        //     sum1: 40,
+        //     sum2: 50
+        // });
+        // list.push({
+        //     label: "产品E",
+        //     sum1: 42,
+        //     sum2: 50
+        // });
+        // list.push({
+        //     label: "产品F",
+        //     sum1: 44,
+        //     sum2: 50
+        // });
+        // list.push({
+        //     label: "产品G",
+        //     sum1: 45,
+        //     sum2: 50
+        // });
         // return list;
         return MethodGetService.methodGet("/fbsAbnormalWorkingHours/fbsAbnormalWorkingHours/getRejectsNumber");
     },
@@ -187,10 +187,10 @@ var ServiceProduct = {
     getProduceRate: function () {
         // const rate = 95;
         var rate=MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getProductionEfficiency");
-        return {
-            name: "生产效率",
-            value: rate
-        };
+        // return {
+        //     name: "生产效率",
+        //     value: rate
+        // };
 
     },
     // 日生产效率

pages/dashboard/warehouse.html

@@ -35,8 +35,6 @@
                 onclick="window.location.replace('/pages/dashboard/line.html');">产线看板</button>
             <button type="button" class="btn btn-warning"
                 onclick="window.location.replace('/pages/dashboard/quality.html');">品质看板</button>
-            <button type="button" class="btn btn-warning"
-                onclick="window.location.replace('/pages/dashboard/esop.html');">E-SOP</button>
         </div>
         <div class="col-lg-4 col-md-4">
         </div>
@@ -83,14 +81,19 @@
                     <div class="col-lg-1 col-md-1 center no-padding">到货数量</div>
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">到货日期</div>
                 </div>
-                <div class="row" v-for="material in waitingcheckMaterialList">
-                    <div class="col-lg-2 col-md-2 center no-padding">{{material.vendorName}}</div>
-                    <div class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
-                    <div class="col-lg-3 col-md-3 center no-padding">{{material.materialName}}</div>
-                    <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div>
-                    <div class="col-lg-1 col-md-1 center no-padding">{{material.arriveSum}}</div>
-                    <div class="col-lg-2 col-md-2 center no-padding">{{material.arriveDate}}</div>
+                <div class="row">
+                    <div class="col-lg-12 col-md-12" style="height: 160px;">
+                        <div class="row" v-for="material in waitingcheckMaterialList">
+                            <div class="col-lg-2 col-md-2 center no-padding">{{material.vendorName}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
+                            <div class="col-lg-3 col-md-3 center no-padding">{{material.materialName}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div>
+                            <div class="col-lg-1 col-md-1 center no-padding">{{material.arriveSum}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{material.arriveDate}}</div>
+                        </div>
+                    </div>
                 </div>
+
                 <div class="row">
                     <div class="col-lg-12 col-md-12 progress no-padding">
                         <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="60"
@@ -120,13 +123,17 @@
                     <div class="col-lg-1 col-md-1 center no-padding">到货数量</div>
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">到货日期</div>
                 </div>
-                <div class="row" v-for="material in waitinginMaterialList">
-                    <div class="col-lg-2 col-md-2 center no-padding">{{material.vendorName}}</div>
-                    <div class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
-                    <div class="col-lg-3 col-md-3 center no-padding">{{material.materialName}}</div>
-                    <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div>
-                    <div class="col-lg-1 col-md-1 center no-padding">{{material.arriveSum}}</div>
-                    <div class="col-lg-2 col-md-2 center no-padding">{{material.arriveDate}}</div>
+                <div class="row">
+                    <div class="col-lg-12 col-md-12" style="height: 160px;">
+                        <div class="row" v-for="material in waitinginMaterialList">
+                            <div class="col-lg-2 col-md-2 center no-padding">{{material.vendorName}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
+                            <div class="col-lg-3 col-md-3 center no-padding">{{material.materialName}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div>
+                            <div class="col-lg-1 col-md-1 center no-padding">{{material.arriveSum}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{material.arriveDate}}</div>
+                        </div>
+                    </div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-12 progress no-padding">
@@ -157,13 +164,17 @@
                     <div class="col-lg-1 col-md-1 center no-padding">发货数量</div>
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">发货日期</div>
                 </div>
-                <div class="row" v-for="product in waitingSendProductList">
-                    <div class="col-lg-2 col-md-2 center no-padding">{{product.warehouseName}}</div>
-                    <div class="col-lg-2 col-md-2 center no-padding">{{product.materialCode}}</div>
-                    <div class="col-lg-3 col-md-3 center no-padding">{{product.materialName}}</div>
-                    <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div>
-                    <div class="col-lg-1 col-md-1 center no-padding">{{product.sendSum}}</div>
-                    <div class="col-lg-2 col-md-2 center no-padding">{{product.planSendDate}}</div>
+                <div class="row">
+                    <div class="col-lg-12 col-md-12" style="height: 160px;">
+                        <div class="row" v-for="product in waitingSendProductList">
+                            <div class="col-lg-2 col-md-2 center no-padding">{{product.warehouseName}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{product.materialCode}}</div>
+                            <div class="col-lg-3 col-md-3 center no-padding">{{product.materialName}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div>
+                            <div class="col-lg-1 col-md-1 center no-padding">{{product.sendSum}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{product.planSendDate}}</div>
+                        </div>
+                    </div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-12 progress no-padding">
@@ -391,8 +402,8 @@
                 orderSheetMaterialPercent: 0,
                 orderSheetMaterialEnoughList: [],
                 orderSheetMaterialEnoughSum: 0,
-                orderSheetMaterialNotEnoughSum:0,
-                orderSheetMaterialNotEnoughList:[],
+                orderSheetMaterialNotEnoughSum: 0,
+                orderSheetMaterialNotEnoughList: [],
                 applyMaterialList: [],
                 applyCompleteSum: 0,
                 applyMaterialSum: 0,
@@ -432,21 +443,22 @@
                 },
                 // 轮播数据
                 scrollData: function () {
-                    for (var key in this.cacheDataObject){
+                    for (var key in this.cacheDataObject) {
                         const dataList = this.cacheDataObject[key].data;
                         const pagesize = this.cacheDataObject[key].pagesize;
-                        var pageindex = this.cacheDataObject[key].pageindex+1;
+                        var pageindex = this.cacheDataObject[key].pageindex + 1;
+
 
-                        
-                        if (dataList.length > pagesize){
-                            const pagesum = (dataList.length/pagesize).toFixed(0)*1+(dataList.length%pagesize>0?1:0);
+                        if (dataList.length > pagesize) {
+                            const pagesum = (dataList.length / pagesize).toFixed(0) * 1 + (dataList.length %
+                                pagesize > 0 ? 1 : 0);
                             if (pageindex >= pagesum)
                                 pageindex = 0;
                             this.cacheDataObject[key].pageindex = pageindex;
-                            const startIndex = pageindex*pagesize;
-                            const remainSum = dataList.length-startIndex;
-                            const recordSum = remainSum>=pagesize?pagesize:remainSum;
-                            this[key] = dataList.slice(startIndex, startIndex+pagesize);
+                            const startIndex = pageindex * pagesize;
+                            const remainSum = dataList.length - startIndex;
+                            const recordSum = remainSum >= pagesize ? pagesize : remainSum;
+                            this[key] = dataList.slice(startIndex, startIndex + pagesize);
                         }
                     }
 
@@ -467,7 +479,8 @@
                     const waitinginMaterialList = ServiceMaterial.getWatingInList();
                     this.waitinginMaterialSum = waitinginMaterialList.length;
                     this.inMaterialSum = ServiceMaterial.getInSum();
-                    const waitinginMaterialSumPercent = (this.waitinginMaterialSum / (this.waitinginMaterialSum +
+                    const waitinginMaterialSumPercent = (this.waitinginMaterialSum / (this
+                            .waitinginMaterialSum +
                             this.inMaterialSum) * 100)
                         .toFixed(0);
                     this.inMaterialSumPercent = (100 - waitinginMaterialSumPercent) + '%';
@@ -477,13 +490,14 @@
                         pagesize: 8,
                         pageindex: 0
                     }
-                    this.waitinginMaterialList = waitinginMaterialList.slice(0, this.cacheDataObject.waitinginMaterialList.pagesize);
+                    this.waitinginMaterialList = waitinginMaterialList.slice(0, this.cacheDataObject
+                        .waitinginMaterialList.pagesize);
                     // 收料待检
                     const waitingcheckMaterialList = ServiceMaterial.getWatingCheckList();
                     this.waitingcheckMaterialSum = waitingcheckMaterialList.length;
                     this.checkedMaterialSum = ServiceMaterial.getCheckSum();
                     const checkedMaterialSumPercent = (this.checkedMaterialSum / (this.checkedMaterialSum +
-                        this.waitingcheckMaterialSum) * 100)
+                            this.waitingcheckMaterialSum) * 100)
                         .toFixed(0);
                     this.waitingcheckMaterialSumPercent = (100 - checkedMaterialSumPercent) + '%';
                     this.checkedMaterialSumPercent = checkedMaterialSumPercent + '%';
@@ -492,13 +506,15 @@
                         pagesize: 8,
                         pageindex: 0
                     }
-                    this.waitingcheckMaterialList = waitingcheckMaterialList.slice(0, this.cacheDataObject.waitingcheckMaterialList.pagesize);
+                    this.waitingcheckMaterialList = waitingcheckMaterialList.slice(0, this.cacheDataObject
+                        .waitingcheckMaterialList.pagesize);
                     // 待入库
                     const waitingSendProductList = ServiceProduct.getWatingSendList();
                     this.waitingSendProductSum = waitingSendProductList.length;
                     this.sendProductSum = ServiceProduct.getSendSum();
-                    const waitingSendProductSumPercent = (this.waitingSendProductSum / (this.waitingSendProductSum +
-                        this.sendProductSum) * 100)
+                    const waitingSendProductSumPercent = (this.waitingSendProductSum / (this
+                            .waitingSendProductSum +
+                            this.sendProductSum) * 100)
                         .toFixed(0);
                     this.sendProductSumPercent = (100 - waitingSendProductSumPercent) + '%';
                     this.waitingSendProductSumPercent = waitingSendProductSumPercent + '%';
@@ -507,7 +523,8 @@
                         pagesize: 8,
                         pageindex: 0
                     }
-                    this.waitingSendProductList = waitingSendProductList.slice(0, this.cacheDataObject.waitingSendProductList.pagesize);
+                    this.waitingSendProductList = waitingSendProductList.slice(0, this.cacheDataObject
+                        .waitingSendProductList.pagesize);
                     // 库存
                     const materialStockList = ServiceMaterial.getStockList();
                     this.cacheDataObject.materialStockList = {
@@ -515,7 +532,8 @@
                         pagesize: 20,
                         pageindex: 0
                     }
-                    this.materialStockList = materialStockList.slice(0, this.cacheDataObject.materialStockList.pagesize);
+                    this.materialStockList = materialStockList.slice(0, this.cacheDataObject
+                        .materialStockList.pagesize);
                     /** 工单备料 **/
                     const orderSheetMaterialList = ServiceMaterial.getListByOrderSheet();
                     var orderSheetMaterialNeedSum = 0;
@@ -526,14 +544,16 @@
                         if (item.needSum * 1 > item.stockSum * 1)
                             orderSheetMaterialStockSum++;
                     });
-                    this.orderSheetMaterialPercent = ((orderSheetMaterialNeedSum - orderSheetMaterialStockSum) /
+                    this.orderSheetMaterialPercent = ((orderSheetMaterialNeedSum -
+                            orderSheetMaterialStockSum) /
                         orderSheetMaterialNeedSum * 100).toFixed("0");
                     this.cacheDataObject.orderSheetMaterialList = {
                         data: orderSheetMaterialList,
                         pagesize: 8,
                         pageindex: 0
                     }
-                    this.orderSheetMaterialList = orderSheetMaterialList.slice(0, this.cacheDataObject.orderSheetMaterialList.pagesize);
+                    this.orderSheetMaterialList = orderSheetMaterialList.slice(0, this.cacheDataObject
+                        .orderSheetMaterialList.pagesize);
                     /** 工单缺料 **/
                     const orderSheetMaterialNotEnoughList = ServiceMaterial.getListByOrderSheetNotEnough();
                     this.orderSheetMaterialNotEnoughSum = orderSheetMaterialNotEnoughList.length;
@@ -542,7 +562,8 @@
                         pagesize: 8,
                         pageindex: 0
                     }
-                    this.orderSheetMaterialNotEnoughList = orderSheetMaterialNotEnoughList.slice(0, this.cacheDataObject.orderSheetMaterialNotEnoughList.pagesize);
+                    this.orderSheetMaterialNotEnoughList = orderSheetMaterialNotEnoughList.slice(0, this
+                        .cacheDataObject.orderSheetMaterialNotEnoughList.pagesize);
                     /** 工单齐套 **/
                     const orderSheetMaterialEnoughList = ServiceMaterial.getListByOrderSheetEnough();
                     this.orderSheetMaterialEnoughSum = orderSheetMaterialEnoughList.length;
@@ -551,26 +572,28 @@
                         pagesize: 8,
                         pageindex: 0
                     }
-                    this.orderSheetMaterialEnoughList = orderSheetMaterialEnoughList.slice(0, this.cacheDataObject.orderSheetMaterialEnoughList.pagesize);
+                    this.orderSheetMaterialEnoughList = orderSheetMaterialEnoughList.slice(0, this
+                        .cacheDataObject.orderSheetMaterialEnoughList.pagesize);
                     /** 领料申请 **/
                     const applyMaterialList = ServiceMaterial.getApplyList();
                     this.applyCompleteSum = ServiceMaterial.getApplyCompleteSum();
                     this.applyMaterialSum = applyMaterialList.length;
                     const applyCompleteSumPercent = (this.applyCompleteSum / (this.applyCompleteSum +
                         this.applyMaterialSum) * 100).toFixed(0);
-                    this.applyMaterialSumPercent = (100 - applyCompleteSumPercent)+'%';
+                    this.applyMaterialSumPercent = (100 - applyCompleteSumPercent) + '%';
                     this.applyCompleteSumPercent = applyCompleteSumPercent + '%';
                     this.cacheDataObject.applyMaterialList = {
                         data: applyMaterialList,
                         pagesize: 8,
                         pageindex: 0
                     }
-                    this.applyMaterialList = applyMaterialList.slice(0, this.cacheDataObject.applyMaterialList.pagesize);
+                    this.applyMaterialList = applyMaterialList.slice(0, this.cacheDataObject
+                        .applyMaterialList.pagesize);
                 }
 
             },
             mounted() {
-                this.timer_long = setInterval(this.refreshData, 60000);                
+                this.timer_long = setInterval(this.refreshData, 60000);
                 this.refreshData();
 
             },