From cc625b98a8f8c8288be670d51e9393ed42545dec Mon Sep 17 00:00:00 2001
From: zhouhy <zhouhy3@mesnac.com>
Date: Fri, 10 May 2024 15:53:01 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=8F=91=E6=B3=A1=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E3=80=81=E8=BF=94=E4=BF=AE=E7=8E=87=E3=80=81=E7=84=8A=E6=BC=8F?=
 =?UTF-8?q?=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/boxTraceabilityReport/index.vue    | 38 ++++++++++++++--
 src/views/report/repairRateReport/index.vue   | 10 ++++-
 src/views/report/weldLeakRate/index.vue       | 43 +++++++++++++++++--
 3 files changed, 82 insertions(+), 9 deletions(-)

diff --git a/src/views/report/boxTraceabilityReport/index.vue b/src/views/report/boxTraceabilityReport/index.vue
index 43ce0d7..f43ff0b 100644
--- a/src/views/report/boxTraceabilityReport/index.vue
+++ b/src/views/report/boxTraceabilityReport/index.vue
@@ -139,11 +139,41 @@
           </el-table-column>
           <el-table-column label="箱体型号" align="center" prop="MATERIAL_MODEL" width="150">
           </el-table-column>
-          <el-table-column label="最后扫描点" align="center" prop="SCAN_SPOT" width="150">
-          </el-table-column>
-          <el-table-column label="报废记录" align="center" prop="SCRAP_FLAG" width="150">
-          </el-table-column>
+          <el-table-column label="条码打印" align="center"  prop="code1000" width="150"></el-table-column>
+          <el-table-column label="前/后板自动成型" align="center"  prop="code1001" width="150"></el-table-column>
+          <el-table-column label="胆、壳组装" align="center"  prop="code1002" width="150"></el-table-column>
+          <el-table-column label="泡前库" align="center"  prop="code1004" width="150"></el-table-column>
+          <el-table-column label="箱体发泡" align="center"  prop="code1005" width="150"></el-table-column>
+          <el-table-column label="泡后库" align="center"  prop="code1006" width="150"></el-table-column>
+          <el-table-column label="灌注" align="center"  prop="code1007" width="150"></el-table-column>
+          <el-table-column label="MES/SN绑定" align="center"  prop="code1008" width="150"></el-table-column>
+          <el-table-column label="成品下线扫描" align="center"  prop="code1009" width="150"></el-table-column>
+          <el-table-column label="成品库分垛" align="center"  prop="code1010" width="150"></el-table-column>
+          <el-table-column label="泡后出库" align="center"  prop="code1011" width="150"></el-table-column>
+          <el-table-column label="箱门匹配" align="center"  prop="code1012" width="150"></el-table-column>
+          <el-table-column label="门体发泡" align="center"  prop="code1020" width="150"></el-table-column>
+          <el-table-column label="箱体发泡" align="center"  prop="code1105" width="150"></el-table-column>
+          <el-table-column label="成品下线扫描" align="center"  prop="code1109" width="150"></el-table-column>
+          <el-table-column label="内胆预装检漏" align="center"  prop="code2001" width="150"></el-table-column>
+          <el-table-column label="箱体发泡检验02" align="center"  prop="code2002" width="150"></el-table-column>
+          <el-table-column label="箱体发泡检验01" align="center"  prop="code2003" width="150"></el-table-column>
+          <el-table-column label="电检检验" align="center"  prop="code2005" width="150"></el-table-column>
+          <el-table-column label="低压检漏" align="center"  prop="code2006" width="150"></el-table-column>
+          <el-table-column label="高压检漏" align="center"  prop="code2007" width="150"></el-table-column>
+          <el-table-column label="测温检验01" align="center"  prop="code2008" width="150"></el-table-column>
+          <el-table-column label="测温检验02" align="center"  prop="code2009" width="150"></el-table-column>
+          <el-table-column label="终检01" align="center"  prop="code2010" width="150"></el-table-column>
+          <el-table-column label="终检02" align="center"  prop="code2011" width="150"></el-table-column>
+          <el-table-column label="终检03" align="center"  prop="code2012" width="150"></el-table-column>
+          <el-table-column label="OQC抽检工位" align="center"  prop="code2013" width="150"></el-table-column>
+          <el-table-column label="性能抽检工位" align="center"  prop="code2014" width="150"></el-table-column>
+          <el-table-column label="总装(灌注)质检" align="center"  prop="code2015" width="150"></el-table-column>
+          <el-table-column label="包装箱检验" align="center"  prop="code2016" width="150"></el-table-column>
+          <el-table-column label="门体检验" align="center"  prop="code2020" width="150"></el-table-column>
+
+<!--          <el-table-column label="报废时间" align="center" prop="scan_TIME" width="150"></el-table-column>-->
         </el-table>
+
         <pagination
           v-show="detailTotal>0"
           :total="detailTotal"
diff --git a/src/views/report/repairRateReport/index.vue b/src/views/report/repairRateReport/index.vue
index 8f73d58..12fc0ab 100644
--- a/src/views/report/repairRateReport/index.vue
+++ b/src/views/report/repairRateReport/index.vue
@@ -21,6 +21,13 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="月/周" >
+        <el-select v-model="queryParams.month" clearable placeholder="请选择">
+          <el-option label="日" value="1"></el-option>
+          <el-option label="周" value="2"></el-option>
+          <el-option label="月" value="3"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="起止日期">
         <el-date-picker
           v-model="daterangeBeginTime"
@@ -156,7 +163,8 @@ export default {
         ORDER_CODE: null,
         MATERIAL_CODE: null,
         MATERIAL_NAME: null,
-        BEGIN_DATE: null
+        BEGIN_DATE: null,
+        month:"1"
       },
       // 表单参数
       form: {},
diff --git a/src/views/report/weldLeakRate/index.vue b/src/views/report/weldLeakRate/index.vue
index 1a7a8c2..1f4ee0e 100644
--- a/src/views/report/weldLeakRate/index.vue
+++ b/src/views/report/weldLeakRate/index.vue
@@ -8,6 +8,12 @@
           placeholder="选择年">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="月/周" >
+      <el-select v-model="form.month" clearable placeholder="请选择">
+          <el-option label="月" value="1"></el-option>
+          <el-option label="周" value="0"></el-option>
+      </el-select>
+      </el-form-item>
       <!--      <el-form-item label="周期" prop="period">-->
       <!--        <el-select v-model="form.period" placeholder="选择周期">-->
       <!--          <el-option :label="i.label" :value="i.value" v-for="i in option"></el-option>-->
@@ -23,11 +29,13 @@
       :data="tableData"
       style="width: 100%">
       <el-table-column
+        v-if="week111||month111"
         prop="productLineName"
         label="产线"
         width="150">
       </el-table-column>
       <el-table-column
+        v-if="week111"
         v-for="i in 52"
         :label="'第'+(i)+'周'"
         width="120">
@@ -37,6 +45,17 @@
           }}%
         </template>
       </el-table-column>
+      <el-table-column
+        v-if="month111"
+        v-for="i in 12"
+        :label="'第'+(i)+'月'"
+        width="120">
+        <template slot-scope="scope">
+          {{
+            ((tableData.find(v => v.productLineName === scope.row.productLineName).children.find(r => r.WEEK_NUMBER === i) || {}).REPAIR_RATE) || '0'
+          }}%
+        </template>
+      </el-table-column>
     </el-table>
 
     <pagination
@@ -64,11 +83,14 @@ export default {
   },
   data() {
     return {
+      month111:false,
+      week111:false,
       total: 0,
       form: {
         year: new Date().getFullYear().toString(),
         pageNum: 1,
-        pageSize: 10
+        pageSize: 10,
+        month:"0",
       },
       option: [
         {
@@ -93,8 +115,20 @@ export default {
   ,
   methods: {
     getList() {
-      weldLeakRateList({year: this.form.year,}).then(response => {
+      weldLeakRateList({year: this.form.year,month:this.form.month},
+      ).then(response => {
         this.total = response?.total || 0
+        var length = response.data.length;
+        var yname = "";
+        if (length == 12){
+            yname = "月"
+          this.month111=true;
+            this.week111 = false;
+        }else {
+          this.week111 = true;
+          this.month111 = false;
+          yname="周"
+        }
         //分页查询
         let productLineArr = [...new Set(response.data.map(v => v.PRODUCT_LINE_NAME))]
         let data = productLineArr.map(v => {
@@ -109,7 +143,7 @@ export default {
           tooltip: {
             trigger: "axis",
             formatter: (v)=>{
-              console.log(v)
+              // console.log(v)
               return v[0].axisValueLabel+'<br />'+v.map(e=>{
                 return `
               ${e.marker}${e.seriesName} : ${e.data}%\n
@@ -128,7 +162,7 @@ export default {
           },
           xAxis: {
             type: "category",
-            data: Array(52).fill('').map((v, k) => '第' + (k + 1) + '周'),
+            data: Array(length).fill('').map((v, k) => '第' + (k + 1) + yname),
             axisLine: {
               lineStyle: {
                 color: "#999",
@@ -172,6 +206,7 @@ export default {
               },
               itemStyle: {
                 normal: {
+                    label:{show:true},
                   // color: "#F58080",
                   borderWidth: 10,
                   // borderColor: "#F58080",