From b5be19258f5fc579527d2629d0ba8affbdea6a8d Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Wed, 16 Jul 2025 16:15:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E5=A2=9E=E5=8A=A0=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E6=9F=A5=E8=AF=A2=EF=BC=8C=E6=9C=88=E5=BA=A6=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96=E7=B1=BB=E5=88=AB=E9=A1=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Yangwl <1726150332@qq.com>
---
 src/views/kanban/quality/kanban1.vue       | 29 +++++-----------------
 src/views/mes/monthProductionSut/index.vue | 24 +++++++++++++++---
 src/views/mes/reportWork/index.vue         |  5 ++++
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/views/kanban/quality/kanban1.vue b/src/views/kanban/quality/kanban1.vue
index 3437a80..2754b88 100644
--- a/src/views/kanban/quality/kanban1.vue
+++ b/src/views/kanban/quality/kanban1.vue
@@ -181,7 +181,7 @@
             </vue-seamless-scroll>
           </div>
           <div class="item-table item-table1" style="position: relative">
-            <div class="titlebox" style="margin-bottom: 14px; po">
+            <div class="titlebox" style="margin-bottom: 14px; ">
               <div class="titlename">不良类型占比</div>
               <el-date-picker
                 style="
@@ -321,16 +321,17 @@ export default {
     };
   },
   created() {
-    this.getDate();
+    // this.getDate();
   },
   destroyed() {
     clearInterval(this.time1);
     this.time1 = null;
   },
 
-  mounted() {
-    this.selectFactorylist();
+  async mounted() {
+    await this.selectFactorylist();
     this.gettime();
+    this.getDate();
   },
   methods: {
     /**获取默认查询时间段**/
@@ -376,7 +377,6 @@ export default {
         if (response.data) {
           _this.getLineList = response.data;
           _this.selectxt = _this.getLineList[0].parentName;
-
           //this.getDictData()
           this.getDeviceRefreshTime();
         }
@@ -385,7 +385,7 @@ export default {
     getDeviceRefreshTime() {
       const _this = this;
       getDeviceRefreshTime().then((response) => {
-        
+
         if (response.data) {
           // console.log(response.data)
           this.RefreshTime = response.data;
@@ -397,23 +397,6 @@ export default {
       });
     },
 
-    //        getDictData() {
-    //            const _this = this;
-    //            getDictData(
-    //                {
-    //                    dictType: 'static_dims',
-    //                }
-    //            ).then((response) => {
-    //                if (response) {
-    //                    // console.log(response)
-    //                    this.dictDatatype = response
-    //                    _this.selectxtclasses = _this.dictDatatype[1].ymdType;
-    //                    this.getDeviceRefreshTime()
-    //                    this.getdatalist()
-    //                   this.initChart1()
-    //                }
-    //            });
-    //        },
     noOkTimeChange(){
       this.ymdStart1 = moment(this.ymdArray1[0]).format("YYYY-MM-DD");
       this.ymdEnd1 = moment(this.ymdArray1[1]).format("YYYY-MM-DD");
diff --git a/src/views/mes/monthProductionSut/index.vue b/src/views/mes/monthProductionSut/index.vue
index ac36e05..67161f6 100644
--- a/src/views/mes/monthProductionSut/index.vue
+++ b/src/views/mes/monthProductionSut/index.vue
@@ -41,8 +41,11 @@
 
       <el-tab-pane label="当月产线品类汇总" >
         <el-button @click="exportExcel2">导出</el-button>
-        <el-table :data="tableDatas" id="exportTable2" border style="width: 100%" :header-cell-style="getHeaderCellStyle" :summary-method="getSummaries" show-summary>
-          <el-table-column prop="category" label="类别" fixed="left" width="150"></el-table-column>
+        <el-row>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="handleQuery"  :columns="columns"></right-toolbar>
+        </el-row>
+        <el-table :data="tableDatas"  id="exportTable2" border style="width: 100%" :header-cell-style="getHeaderCellStyle" :summary-method="getSummaries" show-summary>
+          <el-table-column prop="category" v-if="columns[0].visible" label="类别" fixed="left" width="150"></el-table-column>
           <el-table-column prop="total_monthly_summarys" label="当月汇总" fixed="left" width="150"></el-table-column>
           <el-table-column v-for="day in days" :key="day" :prop="day" :label="`${day.replace('day', '')}`" :width="150" align="center" :formatter="formatNullToZero">
           </el-table-column>
@@ -79,20 +82,32 @@ export default {
       legendData: [],
       seriesData: [],
       legendDatas: [],
-      seriesDatas: []
+      seriesDatas: [],
+      columns: [
+        { key: 0, label: `类别`, visible: false },
+      ],
     };
   },
-
   created() {
 
+  },
+  watch: {
+    'columns[0].visible'(newVal) {
+      this.$nextTick(() => {
+        this.$refs.table?.doLayout()
+      })
+    }
   },
   mounted() {
     // Set current month initially
     const currentMonth = new Date().toISOString().substr(0, 7);
     this.queryParams.monthValue = currentMonth;
     this.getList();
+
   },
+
   methods: {
+
     pad(number) {
       return number.toString().padStart(2, '0');
     },
@@ -375,6 +390,7 @@ export default {
 </script>
 
 <style scoped>
+
 .app-container {
   padding: 20px;
 }
diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index 76ff11e..68d14a5 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -10,6 +10,10 @@
 				<el-input v-model="queryParams.workorderCode" placeholder="请输入生产工单编码" clearable
 					@keyup.enter.native="handleQuery" />
 			</el-form-item>
+      <el-form-item label="批次" prop="batch">
+        <el-input v-model="queryParams.batch" placeholder="请输入批次" clearable
+                  @keyup.enter.native="handleQuery" />
+      </el-form-item>
 			<el-form-item label="产品编码" prop="productCode">
 				<el-input v-model="queryParams.productCode" placeholder="请输入产品编码" clearable
 					@keyup.enter.native="handleQuery" />
@@ -794,6 +798,7 @@ export default {
         productName: null,
         spec: null,
         unit: null,
+        batch:null,
         quantity: null,
         quantityFeedback: null,
         quantityQualified: null,