Browse Source

柯赛看板调整,车间看板当日生产计划,根据类型不同字不同颜色

xiaost 8 months ago
parent
commit
c84b3440f8
2 changed files with 34 additions and 18 deletions
  1. 2 2
      src/components/warehousechart/up1Chart/chart.vue
  2. 32 16
      src/views/prodline/bottom1.vue

+ 2 - 2
src/components/warehousechart/up1Chart/chart.vue

@@ -51,7 +51,7 @@ export default {
           series: [
             {
               type: "pie",
-              radius: '40%',
+              radius: '36%',
               center: ['50%', '20%'],
               data: newData.data1,
               label: {
@@ -63,7 +63,7 @@ export default {
             },
             {
               type: "pie",
-              radius: '40%',
+              radius: '36%',
               center: ["50%", "68%"],
               data: newData.data2,
               label: {

+ 32 - 16
src/views/prodline/bottom1.vue

@@ -21,17 +21,18 @@ export default {
   data() {
     return {
       config: {
-        header: ['线别','销售工单', '产品名称', '订单数', '备料状态', '计划完成数量','完成数量','完成进度', '提醒事项','异常事项'],
+        header: ['线别','销售工单', '产品名称', '订单数', '备料状态', '计划完成数量','完成数量','完成进度', '提醒事项','类型','异常事项'],
         data: [],
         rowNum: 9, //表格行数
         headerHeight: 35,
         headerBGC: 'rgba(15,19,37,0.1)', //表头
         oddRowBGC: 'rgba(15,19,37,0.1)', //奇数行
         evenRowBGC: 'rgba(23,28,51,0.1)', //偶数行
-        columnWidth: [130,190, 180, 120, 140, 180, 180, 180,  260,250],
-        align: ['center','left','left','left','left','center','center','center','center','center','center','center']
+        columnWidth: [130,190, 180, 120, 140, 180, 180, 120,210,120,200],
+        align: ['center','left','left','left','left','center','center','center','center','center','center','center','center']
       },
       timing: null,
+      isActive:true,
     }
   },
   mounted() {
@@ -62,20 +63,35 @@ export default {
                 for (let index = 0; index < dataList.length; index++) {
                   const element = dataList[index];
                   let item = new Array();
-                  item.push("<span  class='colorGrass fs-xxl'>" + element.v_licode + "</span>");
-                  item.push("<span  class='colorGrass fs-xxl'>" + element.v_sacode + "</span>");
-                  item.push("<span  class='colorGrass fs-xxl'>" + element.v_jitype + "</span>");
-                  item.push("<span  class='colorGrass fs-xxl'>" + element.v_qty + "</span>");
-                  if (element.v_blstatus == '未领料') {  //98%
-                    item.push("<span  class='colorRemind fs-xxl'>" + element.v_blstatus + "</span>");
-                  } else {
-                    item.push("<span  class='colorGrass fs-xxl'>" + element.v_blstatus + "</span>");
+                  if(null !=element.v_remark1 && ""!= element.v_remark1){
+                    item.push("<span  class='colorRed fs-xxl'>" + element.v_licode + "</span>");
+                    item.push("<span  class='colorRed fs-xxl'>" + element.v_sacode + "</span>");
+                    item.push("<span  class='colorRed fs-xxl'>" + element.v_jitype + "</span>");
+                    item.push("<span  class='colorRed fs-xxl'>" + element.v_qty + "</span>");
+                    item.push("<span  class='colorRed fs-xxl'>" + element.v_blstatus + "</span>");
+                    item.push("<span  class='colorRed fs-xxl'>" + element.v_planoutqty + "</span>");
+                    item.push("<span  class='colorRed fs-xxl'>" + element.v_madeqty + "</span>");
+                    item.push("<span  class='colorRed fs-xxl'>" + element.v_madejd + "</span>");
+                    item.push("<span  class='colorRed fs-xxl'>" + element.v_remark + "</span>");
+                    item.push("<span  class='colorRed fs-xxl'>" + element.v_remark1 + "</span>");
+                    item.push("<span  class='colorRed fs-xxl'>" + element.v_yc + "</span>");
+                  }else{
+                    item.push("<span  class='colorGrass fs-xxl'>" + element.v_licode + "</span>");
+                    item.push("<span  class='colorGrass fs-xxl'>" + element.v_sacode + "</span>");
+                    item.push("<span  class='colorGrass fs-xxl'>" + element.v_jitype + "</span>");
+                    item.push("<span  class='colorGrass fs-xxl'>" + element.v_qty + "</span>");
+                    if (element.v_blstatus == '未领料') {  //98%
+                      item.push("<span  class='colorRemind fs-xxl'>" + element.v_blstatus + "</span>");
+                    } else {
+                      item.push("<span  class='colorGrass fs-xxl'>" + element.v_blstatus + "</span>");
+                    }
+                    item.push("<span  class='colorGrass fs-xxl'>" + element.v_planoutqty + "</span>");
+                    item.push("<span  class='colorGrass fs-xxl'>" + element.v_madeqty + "</span>");
+                    item.push("<span  class='colorGrass fs-xxl'>" + element.v_madejd + "</span>");
+                    item.push("<span  class='colorRemind fs-xxl'>" + element.v_remark + "</span>");
+                    item.push("<span  class='colorGrass fs-xxl'>" + element.v_remark1 + "</span>");
+                    item.push("<span  class='colorRemind fs-xxl'>" + element.v_yc + "</span>");
                   }
-                  item.push("<span  class='colorGrass fs-xxl'>" + element.v_planoutqty + "</span>");
-                  item.push("<span  class='colorGrass fs-xxl'>" + element.v_madeqty + "</span>");
-                  item.push("<span  class='colorGrass fs-xxl'>" + element.v_madejd + "</span>");
-                  item.push("<span  class='colorRemind fs-xxl'>" + element.v_remark + "</span>");
-                  item.push("<span  class='colorRemind fs-xxl'>" + element.v_yc + "</span>");
                   resultList.push(item);
                 }
                 const scrollBoard = this.$refs['scroll-board'];