From f96210b3774d895a546f4f9bb875e315911072c6 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Wed, 20 Mar 2024 10:34:35 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E5=85=A5=E5=BA=93=E8=BF=94?=
 =?UTF-8?q?=E4=BF=AE=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base/orderInfo/index.vue                  |  2 +-
 src/views/board/scanDown/index.vue                  | 13 +++++++------
 src/views/production/planInfo/index.vue             |  2 +-
 .../report/productTraceabilityReport/index.vue      |  5 ++++-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/views/base/orderInfo/index.vue b/src/views/base/orderInfo/index.vue
index 169838d..53d1492 100644
--- a/src/views/base/orderInfo/index.vue
+++ b/src/views/base/orderInfo/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="工作中心" prop="workCenterCode" >
-        <el-select v-model="queryParams.workCenterCode" placeholder="请选择工作中心" >
+        <el-select v-model="queryParams.workCenterCode" placeholder="请选择工作中心" clearable>
           <el-option
             v-for="item in productLineList"
             :key="item.workCenterCode"
diff --git a/src/views/board/scanDown/index.vue b/src/views/board/scanDown/index.vue
index 2560493..d06b5c5 100644
--- a/src/views/board/scanDown/index.vue
+++ b/src/views/board/scanDown/index.vue
@@ -16,7 +16,7 @@
       }};&nbsp;达成率：{{ ((finishedProductOutput.sj / finishedProductOutput.mb) * 100).toFixed(2) }}% </span>
     <span style="position: absolute;top: 54.3%;left: 19%;color: #fff;font-size: 0.9vw">目标：{{ finalInspection.mb }} &nbsp;&nbsp;&nbsp;实际：{{
         finalInspection.sj
-      }}% &nbsp;&nbsp;&nbsp;累计不良数：{{ finalInspection.bls }}</span>
+      }} &nbsp;&nbsp;&nbsp;累计不良数：{{ finalInspection.bls }}</span>
     <span style="position: absolute;top: 54.3%;left: 66.7%;color: #CFD2D0;font-size: 0.9vw">合计：{{ zhddhj }}</span>
 
     <div class="scrollTable">
@@ -486,7 +486,7 @@ export default {
                   name: '目标',
                   type: 'line',
                   yAxisIndex: 1,
-                  data: e.map(val => 3),
+                  data: e.map(val => 10),
                   itemStyle: {
                     normal: {
                       color: '#0DB99D',
@@ -789,8 +789,8 @@ export default {
           f: (e) => {
             this.finalInspection = {
               mb: e?.[0]?.COLUMN_A || '',
-              sj: e?.[0]?.COLUMN_C || '',
-              bls: e?.[0]?.COLUMN_B || '',
+              sj: e?.[0]?.COLUMN_B || '',
+              bls: e?.[0]?.COLUMN_C || '',
             }
           }
         },
@@ -882,7 +882,8 @@ export default {
                   itemStyle: {
                     normal: {
                       color: function (val) {
-                        if (e[val.dataIndex].Y_VALUE_TWO < 3) {
+                        console.log(e[val.dataIndex].Y_VALUE_TWO)
+                        if (e[val.dataIndex].Y_VALUE_TWO < 10) {
                           return '#30e391'
                         } else {
                           return '#FE70A6'
@@ -916,7 +917,7 @@ export default {
                   name: '目标',
                   type: 'line',
                   yAxisIndex: 1,
-                  data: e.map(val => 3),
+                  data: e.map(val => 10),
                   itemStyle: {
                     normal: {
                       color: '#0DB99D',
diff --git a/src/views/production/planInfo/index.vue b/src/views/production/planInfo/index.vue
index 261d094..3cac80a 100644
--- a/src/views/production/planInfo/index.vue
+++ b/src/views/production/planInfo/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="产线" prop="productLineCode">
-        <el-select v-model="queryParams.productLineCode" placeholder="请选择产线">
+        <el-select v-model="queryParams.productLineCode" placeholder="请选择产线" clearable>
           <el-option
             v-for="item in productLineList"
             :key="item.productLineCode"
diff --git a/src/views/report/productTraceabilityReport/index.vue b/src/views/report/productTraceabilityReport/index.vue
index 0eb9937..df110c0 100644
--- a/src/views/report/productTraceabilityReport/index.vue
+++ b/src/views/report/productTraceabilityReport/index.vue
@@ -300,7 +300,10 @@ export default {
     /** 查看明细 */
     handleOrderDetails(row) {
       // this.$tab.openPage("SAP订单信息","/order/orderInfo" , {ORDER_CODE: row.ORDER_CODE})
-      console.log(row)
+      if (row.BOX_CODE == null){
+        this.$modal.msgError('该产品无MES条码！')
+        return;
+      }
       this.form.BOX_CODE= row.BOX_CODE
       this.form.ORDER_CODE= row.ORDER_CODE
       productTraceabilityDetailList({ BOX_CODE: row.BOX_CODE }).then(response => {