产线

js/service/person.js

@@ -78,10 +78,11 @@ var ServicePerson={
     // 人员日出勤率,考勤人数，总人数
     getDayAttendance:function(){
         
-        return {
-            "考勤人数":48,
-            "未考勤人数":2
-        };
+        // return {
+        //     "考勤人数":48,
+        //     "未考勤人数":2
+        // };
+        return MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getAttendanceOfTheDay");
     },
     // 班组装人员信息
     getWorkPersonList:function(){

js/service/produce-task.js

@@ -220,61 +220,78 @@ var ServiceProduceTask = {
     },
     // 获取到现在为止在进行订单或者项目
     getDoingListByOrder: function () {
-        const taskList = [];
-        taskList.push({
-            materialName: "节能灯",
-            specs: "HID 200W with Osram",
-            planSum: 30,
-            completeSum: 15,
-            projectName:"",
-            orderCode:"O0001",
-            planCompleteDate:"2020-10-1"
-        });
-        taskList.push({
-            materialName: "节能灯",
-            specs: "HID 100W with Osram",
-            planSum: 40,
-            completeSum: 10,
-            projectName:"希望小学工程",
-            orderCode:"",
-            planCompleteDate:"2020-10-20"
-        });
-        taskList.push({
-            materialName: "节能灯",
-            specs: "HID 500W",
-            planSum: 50,
-            completeSum: 40,
-            projectName:"",
-            orderCode:"O0002",
-            planCompleteDate:"2020-10-20"
-        });
-        taskList.push({
-            materialName: "节能灯",
-            specs: "HID 13W",
-            planSum: 50,
-            completeSum: 30,
-            projectName:"市政工程",
-            orderCode:"",
-            planCompleteDate:"2020-10-20"
-        });
-        taskList.push({
-            materialName: "节能灯",
-            specs: "HID 100W with Osram",
-            planSum: 40,
-            completeSum: 20,
-            projectName:"",
-            orderCode:"O0003",
-            planCompleteDate:"2020-10-20"
-        });
-        taskList.push({
-            materialName: "节能灯",
-            specs: "HID 100W with Osram",
-            planSum: 40,
-            completeSum: 10,
-            projectName:"希望小学工程",
-            orderCode:"",
-            planCompleteDate:"2020-10-20"
-        });
+        // const taskList = [];
+        // taskList.push({
+        //     materialName: "节能灯",
+        //     specs: "HID 200W with Osram",
+        //     planSum: 30,
+        //     completeSum: 15,
+        //     projectName:"",
+        //     orderCode:"O0001",
+        //     planCompleteDate:"2020-10-1"
+        // });
+        // taskList.push({
+        //     materialName: "节能灯",
+        //     specs: "HID 100W with Osram",
+        //     planSum: 40,
+        //     completeSum: 10,
+        //     projectName:"希望小学工程",
+        //     orderCode:"",
+        //     planCompleteDate:"2020-10-20"
+        // });
+        // taskList.push({
+        //     materialName: "节能灯",
+        //     specs: "HID 500W",
+        //     planSum: 50,
+        //     completeSum: 40,
+        //     projectName:"",
+        //     orderCode:"O0002",
+        //     planCompleteDate:"2020-10-20"
+        // });
+        // taskList.push({
+        //     materialName: "节能灯",
+        //     specs: "HID 13W",
+        //     planSum: 50,
+        //     completeSum: 30,
+        //     projectName:"市政工程",
+        //     orderCode:"",
+        //     planCompleteDate:"2020-10-20"
+        // });
+        // taskList.push({
+        //     materialName: "节能灯",
+        //     specs: "HID 100W with Osram",
+        //     planSum: 40,
+        //     completeSum: 20,
+        //     projectName:"",
+        //     orderCode:"O0003",
+        //     planCompleteDate:"2020-10-20"
+        // });
+        // taskList.push({
+        //     materialName: "节能灯",
+        //     specs: "HID 100W with Osram",
+        //     planSum: 40,
+        //     completeSum: 10,
+        //     projectName:"希望小学工程",
+        //     orderCode:"",
+        //     planCompleteDate:"2020-10-20"
+        // });
+
+        let taskList=MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getDoingListByOrder");
+        taskList.forEach(element => {
+            element.materialName=element.product;
+            element.specs=element.cinvstd;
+            element.planSum=element.numberOfTasks;
+            if(element.qualifiedNumber){
+                element.completeSum=element.qualifiedNumber;
+            }else{
+                element.completeSum=0
+            }
+           
+            element.projectName=element.productionOrderNumberName;
+            element.orderCode=element.productionOrderNumberName;
+            element.planCompleteDate=element.endDate;
+        });
+        console.log(taskList)
         $.each(taskList, function (index, item) {
             item.incompleteSum = item.planSum - item.completeSum;
             if (item.incompleteSum < 0)
@@ -283,7 +300,11 @@ var ServiceProduceTask = {
             item.incompletePercent = (100 - item.completePercent) + "%";
             item.completePercent = item.completePercent + "%";
             const dateNow = DateOperation.formatDate(new Date(), "YYYY-mm-dd");
-            item.bgcss = DateOperation.subtraction(item.planCompleteDate, dateNow, "s")>0?"task-block-timeout":"task-block-normal";
+            if(item.planCompleteDate){
+                item.bgcss = DateOperation.subtraction(item.planCompleteDate, dateNow, "s")>0?"task-block-timeout":"task-block-normal";
+            }else{
+                item.bgcss="task-block-timeout";
+            }
             item.displayName = item.projectName == "" ? item.orderCode : item.projectName;
         });
         return taskList;