From 410dadef72028dbaea748b000a76be834b4bfb7d Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 16 Apr 2024 11:25:41 +0800
Subject: [PATCH] =?UTF-8?q?2024-04-16=20=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/eam/eamGroup.vue             |  2 +-
 src/views/modules/qc/FAIResultEntry.vue        |  2 +-
 src/views/modules/qc/IPQCResultEntry.vue       |  2 +-
 src/views/modules/qc/IQCResultEntry.vue        |  6 +++---
 .../reportWorkOrder/reportCheckOrder.vue       | 18 ++++++++++++++++++
 .../reportWorkOrder/reportMaintenanceOrder.vue | 18 ++++++++++++++++++
 6 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/eam/eamGroup.vue b/src/views/modules/eam/eamGroup.vue
index 5bcf694..c43abf9 100644
--- a/src/views/modules/eam/eamGroup.vue
+++ b/src/views/modules/eam/eamGroup.vue
@@ -461,7 +461,7 @@
         this.searchData.limit = -1
         this.searchData.page = 1
         await eamGroupSearch(this.searchData).then(({data}) => {
-          this.exportList= data.page.list
+          this.exportList = data.page.list
         })
         return this.exportList
       },
diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index 9286774..782b5b1 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -89,7 +89,7 @@
         <el-button v-if="!authCheck" type="primary" @click="submitResult">审核</el-button>
         <el-button v-if="!authDelete" type="primary" @click="deleteModal">删除</el-button>
         <download-excel
-          :fields="fields"
+          :fields="fields()"
           :data="exportData"
           type="xls"
           :name="exportName"
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index a394dab..0cc0f47 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -94,7 +94,7 @@
         <el-button v-if="!authCheck" type="primary" @click="submitResult">审核</el-button>
         <el-button v-if="!authDelete" type="primary" @click="deleteModal">删除</el-button>
         <download-excel
-          :fields="fields"
+          :fields="fields()"
           :data="exportData"
           type="xls"
           :name="exportName"
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index 35d7854..cb80145 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -86,7 +86,7 @@
         <el-button v-if="!authDelete" type="primary" @click="deleteModal">删除</el-button>
         <el-button v-if="!authOverLoad" type="primary" @click="overLoadModal">任务重载</el-button>
         <download-excel
-          :fields="fields"
+          :fields="fields()"
           :data="exportData"
           type="xls"
           :name="exportName"
@@ -2100,7 +2100,7 @@
         this.searchData.limit = -1
         this.searchData.page = 1
         await qcIQCInspectionSearch(this.searchData).then(({data}) => {
-          this.exportList= data.page.list
+          this.exportList = data.page.list
         })
         return this.exportList
       },
@@ -2109,7 +2109,7 @@
 
       finishDownload() {},
 
-      fields() {
+      fields () {
         let json = "{"
         this.columnList1.forEach((item, index) => {
           if (index == this.columnList1.length - 1) {
diff --git a/src/views/modules/reportWorkOrder/reportCheckOrder.vue b/src/views/modules/reportWorkOrder/reportCheckOrder.vue
index cf07b0c..91b1599 100644
--- a/src/views/modules/reportWorkOrder/reportCheckOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportCheckOrder.vue
@@ -556,6 +556,24 @@
             fixed: '',
             columnWidth: 80,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101002005,
+            serialNumber: '101002005Table1ObjectDesc',
+            tableId: "101002005Table1",
+            tableName: "点检执行表",
+            columnProp: 'objectDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '设备名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 101002005,
diff --git a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
index eb85f47..8f2b6a7 100644
--- a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
@@ -627,6 +627,24 @@
             fixed: '',
             columnWidth: 80,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101003005,
+            serialNumber: '101003005Table1ObjectDesc',
+            tableId: "101003005Table1",
+            tableName: "维保执行表",
+            columnProp: 'objectDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '设备名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 101003005,