Merge branch 'master' into test

src/views/bpm/vis-page/productionSchedule.vue

@@ -57,7 +57,7 @@
           <div class="box-echarts">
             <div class="box-echarts-top">
               <span class="box-top-name">月度产量统计</span>
-              <span class="box-top-unit">(KG)</span>
+              <!-- <span class="box-top-unit">(KG)</span> -->
             </div>
             <div class="monthly_output">
               <div v-if="isFlag" id="monthly_output" ref="monthly_output"></div>
@@ -67,7 +67,7 @@
 
         <div class="box-footer-right">
           <div class="box-echarts-top">
-            <span class="box-top-name">生产工单进度看板</span>
+            <span class="box-top-name">生产工单进度</span>
           </div>
           <dv-scroll-board
             v-if="isFlag"
@@ -533,7 +533,7 @@ taskName 当前工序	*/
               for (let i in item) {
                 let div = '';
                 if (i === 'serialNo') {
-                  div = `<div class="white" style="font-size: 0.8rem;">${item[i]}</div>`;
+                  div = `<div class="white" style="font-size: 0.8rem;">${item[i] || '无'}</div>`;
                   list[0] = div;
                 }
                 if (i === 'code') {