diff --git a/src/views/modules/eamReport/eamCheckRecord.vue b/src/views/modules/eamReport/eamCheckRecord.vue
index 0588d38..e634ce2 100644
--- a/src/views/modules/eamReport/eamCheckRecord.vue
+++ b/src/views/modules/eamReport/eamCheckRecord.vue
@@ -2,7 +2,7 @@
   <div class="mod-config">
     <el-form :inline="true" label-position="top" :model="searchData">
       <el-form-item :label="'BU'">
-        <el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 130px">
+        <el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 80px">
           <el-option
             v-for = "i in userBuList"
             :key = "i.buNo"
@@ -18,13 +18,21 @@
         <el-input v-model="searchData.orderNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'设备编码'">
-        <el-input v-model="searchData.objectID" clearable style="width: 120px"></el-input>
+        <el-input v-model="searchData.objectID" clearable style="width: 100px"></el-input>
       </el-form-item>
       <el-form-item :label="'计划执行人员'">
         <el-input v-model="searchData.planOperatorName" clearable style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item :label="'点检项目编码'">
+        <el-input v-model="searchData.itemNo" clearable style="width: 100px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'点检项目名称'">
+        <el-input v-model="searchData.itemDesc" clearable style="width: 200px"></el-input>
+      </el-form-item>
+    </el-form>
+    <el-form :inline="true" label-position="top" :model="searchData">
       <el-form-item :label="'状态'">
-        <el-select filterable v-model="searchData.status" style="width: 130px">
+        <el-select filterable v-model="searchData.status" style="width: 80px">
           <el-option label="全部" value=""></el-option>
           <el-option label="未开工" value="未开工"></el-option>
           <el-option label="待审核" value="待审核"></el-option>
@@ -32,14 +40,6 @@
           <el-option label="已取消" value="已取消"></el-option>
         </el-select>
       </el-form-item>
-    </el-form>
-    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
-      <el-form-item :label="'点检项目编码'">
-        <el-input v-model="searchData.itemNo" clearable style="width: 120px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'点检项目名称'">
-        <el-input v-model="searchData.itemDesc" clearable style="width: 120px"></el-input>
-      </el-form-item>
       <el-form-item :label="'计划执行日期'">
         <el-date-picker
           style="width: 120px"
@@ -116,9 +116,9 @@
       <el-table-column
         prop="checkResult"
         header-align="center"
-        align="center"
+        align="left"
         label="点检结论"
-        width="80">
+        width="70">
         <template slot-scope="scope">
           <div :style="{ color: scope.row.checkResult === '合格' ? 'green' : scope.row.checkResult === '不合格' ? 'red' : ''}">
             {{ scope.row.checkResult }}
@@ -248,7 +248,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100,
+          columnWidth: 60,
         },
         {
           userId: this.$store.state.user.name,
@@ -258,7 +258,7 @@ export default {
           tableName: "点检工单表",
           columnProp: 'planID',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '计划编码',
           columnHidden: false,
           columnImage: false,
@@ -276,7 +276,7 @@ export default {
           tableName: "点检工单表",
           columnProp: 'planDesc',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '计划描述',
           columnHidden: false,
           columnImage: false,
@@ -284,7 +284,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120,
+          columnWidth: 200,
         },
         {
           userId: this.$store.state.user.name,
@@ -294,7 +294,7 @@ export default {
           tableName: "点检工单表",
           columnProp: 'orderNo',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '工单编码',
           columnHidden: false,
           columnImage: false,
@@ -312,7 +312,7 @@ export default {
           tableName: "点检工单表",
           columnProp: 'propertiesCode',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '模板编码',
           columnHidden: false,
           columnImage: false,
@@ -330,7 +330,7 @@ export default {
           tableName: "点检工单表",
           columnProp: 'codeDesc',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '模板名称',
           columnHidden: false,
           columnImage: false,
@@ -348,7 +348,7 @@ export default {
           tableName: "点检工单表",
           columnProp: 'objectID',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '设备编码',
           columnHidden: false,
           columnImage: false,
@@ -366,7 +366,7 @@ export default {
           tableName: "点检工单表",
           columnProp: 'objectDesc',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '设备名称',
           columnHidden: false,
           columnImage: false,
@@ -374,7 +374,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 80,
+          columnWidth: 120,
         },
         {
           userId: this.$store.state.user.name,
@@ -402,7 +402,7 @@ export default {
           tableName: "点检工单表",
           columnProp: 'planOperatorName',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '计划执行人员',
           columnHidden: false,
           columnImage: false,
@@ -420,7 +420,7 @@ export default {
           tableName: "点检工单表",
           columnProp: 'actualOperatorName',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '实际执行人员',
           columnHidden: false,
           columnImage: false,
@@ -428,7 +428,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100,
+          columnWidth: 120,
         },
         {
           userId: this.$store.state.user.name,
@@ -438,7 +438,7 @@ export default {
           tableName: "点检工单表",
           columnProp: 'checkerName',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '审核人员',
           columnHidden: false,
           columnImage: false,
@@ -528,7 +528,7 @@ export default {
           tableName: "点检工单表",
           columnProp: 'remark',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '执行结果备注',
           columnHidden: false,
           columnImage: false,
@@ -536,7 +536,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120,
+          columnWidth: 200,
         },
         {
           userId: this.$store.state.user.name,
@@ -546,7 +546,7 @@ export default {
           tableName: "点检项目表",
           columnProp: 'itemNo',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '点检项目编码',
           columnHidden: false,
           columnImage: false,
@@ -564,7 +564,7 @@ export default {
           tableName: "点检项目表",
           columnProp: 'itemDesc',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '点检项目名称',
           columnHidden: false,
           columnImage: false,
@@ -572,7 +572,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 90,
+          columnWidth: 120,
         },
         {
           userId: this.$store.state.user.name,
@@ -582,7 +582,7 @@ export default {
           tableName: "点检项目表",
           columnProp: 'itemRemark',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '点检方法说明',
           columnHidden: false,
           columnImage: false,
@@ -590,7 +590,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120,
+          columnWidth: 200,
         },
         {
           userId: this.$store.state.user.name,
diff --git a/src/views/modules/eamReport/eamDefectRecord.vue b/src/views/modules/eamReport/eamDefectRecord.vue
index be45338..355f53f 100644
--- a/src/views/modules/eamReport/eamDefectRecord.vue
+++ b/src/views/modules/eamReport/eamDefectRecord.vue
@@ -1,15 +1,8 @@
 <template>
   <div class="mod-config">
-
- <!--    <div>-->
-<!--        <span @click="favoriteFunction()">-->
-<!--         <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>-->
-<!--        </span>-->
-<!--    </div>-->
-
-    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+    <el-form :inline="true" label-position="top" :model="searchData">
       <el-form-item :label="'BU'">
-        <el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 130px">
+        <el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 80px">
           <el-option
             v-for = "i in userBuList"
             :key = "i.buNo"
@@ -25,13 +18,21 @@
         <el-input v-model="searchData.orderNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'设备编码'">
-        <el-input v-model="searchData.objectID" clearable style="width: 120px"></el-input>
+        <el-input v-model="searchData.objectID" clearable style="width: 100px"></el-input>
       </el-form-item>
       <el-form-item :label="'计划执行人员'">
         <el-input v-model="searchData.planOperatorName" clearable style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item :label="'维修项目编码'">
+        <el-input v-model="searchData.itemNo" clearable style="width: 100px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'维修项目名称'">
+        <el-input v-model="searchData.itemDesc" clearable style="width: 200px"></el-input>
+      </el-form-item>
+    </el-form>
+    <el-form :inline="true" label-position="top" :model="searchData">
       <el-form-item :label="'状态'">
-        <el-select filterable v-model="searchData.status" style="width: 130px">
+        <el-select filterable v-model="searchData.status" style="width: 80px">
           <el-option label="全部" value=""></el-option>
           <el-option label="未开工" value="未开工"></el-option>
           <el-option label="待审核" value="待审核"></el-option>
@@ -39,14 +40,6 @@
           <el-option label="已取消" value="已取消"></el-option>
         </el-select>
       </el-form-item>
-    </el-form>
-    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
-      <el-form-item :label="'维修项目编码'">
-        <el-input v-model="searchData.itemNo" clearable style="width: 120px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'维修项目名称'">
-        <el-input v-model="searchData.itemDesc" clearable style="width: 120px"></el-input>
-      </el-form-item>
       <el-form-item :label="'计划执行日期'">
         <el-date-picker
           style="width: 120px"
@@ -123,9 +116,9 @@
       <el-table-column
         prop="urgency"
         header-align="center"
-        align="center"
+        align="left"
         label="紧急程度"
-        width="90">
+        width="70">
       </el-table-column>
       <el-table-column
         prop="result"
@@ -221,7 +214,7 @@ export default {
         objectID: '',
         planOperator: '',
         buDesc: '',
-        functionType: 'A',
+        functionType: 'C',
         status: '',
         startDate: new Date(),
         endDate: '',
@@ -256,7 +249,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 80,
+          columnWidth: 60,
         },
         {
           userId: this.$store.state.user.name,
@@ -284,7 +277,7 @@ export default {
           tableName: "维修工单表",
           columnProp: 'orderNo',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '工单编码',
           columnHidden: false,
           columnImage: false,
@@ -302,7 +295,7 @@ export default {
           tableName: "维修工单表",
           columnProp: 'planID',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '反馈单号',
           columnHidden: false,
           columnImage: false,
@@ -320,7 +313,7 @@ export default {
           tableName: "维修工单表",
           columnProp: 'feedBackDesc',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '反馈描述',
           columnHidden: false,
           columnImage: false,
@@ -328,7 +321,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100,
+          columnWidth: 200,
         },
         {
           userId: this.$store.state.user.name,
@@ -338,7 +331,7 @@ export default {
           tableName: "维修工单表",
           columnProp: 'defectID',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '故障编码',
           columnHidden: false,
           columnImage: false,
@@ -356,7 +349,7 @@ export default {
           tableName: "维修工单表",
           columnProp: 'defectDesc',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '故障名称',
           columnHidden: false,
           columnImage: false,
@@ -364,7 +357,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 80,
+          columnWidth: 120,
         },
         {
           userId: this.$store.state.user.name,
@@ -374,7 +367,7 @@ export default {
           tableName: "维修工单表",
           columnProp: 'objectID',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '设备编码',
           columnHidden: false,
           columnImage: false,
@@ -392,7 +385,7 @@ export default {
           tableName: "维修工单表",
           columnProp: 'objectDesc',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '设备名称',
           columnHidden: false,
           columnImage: false,
@@ -410,7 +403,7 @@ export default {
           tableName: "维修工单表",
           columnProp: 'resourceDesc',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '机台名称',
           columnHidden: false,
           columnImage: false,
@@ -428,7 +421,7 @@ export default {
           tableName: "维修工单表",
           columnProp: 'departmentName',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '设备部门',
           columnHidden: false,
           columnImage: false,
@@ -446,7 +439,7 @@ export default {
           tableName: "维修工单表",
           columnProp: 'createBy',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '报修人员名称',
           columnHidden: false,
           columnImage: false,
@@ -454,7 +447,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 80,
+          columnWidth: 100,
         },
         {
           userId: this.$store.state.user.name,
@@ -482,7 +475,7 @@ export default {
           tableName: "维修工单表",
           columnProp: 'planOperatorName',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '计划执行人员',
           columnHidden: false,
           columnImage: false,
@@ -500,7 +493,7 @@ export default {
           tableName: "维修工单表",
           columnProp: 'actualOperatorName',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '实际执行人员',
           columnHidden: false,
           columnImage: false,
@@ -626,7 +619,7 @@ export default {
           tableName: "维修工单表",
           columnProp: 'remark',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '工单备注',
           columnHidden: false,
           columnImage: false,
@@ -634,7 +627,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120,
+          columnWidth: 200,
         },
         {
           userId: this.$store.state.user.name,
@@ -644,7 +637,7 @@ export default {
           tableName: "维修工单表",
           columnProp: 'difficultyLevel',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '难度等级',
           columnHidden: false,
           columnImage: false,
@@ -662,7 +655,7 @@ export default {
           tableName: "维修工单表",
           columnProp: 'difficultyRemark',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '难度备注',
           columnHidden: false,
           columnImage: false,
@@ -688,7 +681,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100,
+          columnWidth: 80,
         },
         {
           userId: this.$store.state.user.name,
@@ -698,7 +691,7 @@ export default {
           tableName: "维修项目表",
           columnProp: 'itemNo',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '维修项目编码',
           columnHidden: false,
           columnImage: false,
@@ -716,7 +709,7 @@ export default {
           tableName: "维修项目表",
           columnProp: 'itemDesc',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '维修项目名称',
           columnHidden: false,
           columnImage: false,
@@ -724,7 +717,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 90,
+          columnWidth: 120,
         },
         {
           userId: this.$store.state.user.name,
@@ -734,7 +727,7 @@ export default {
           tableName: "维修项目表",
           columnProp: 'itemRemark',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '维修方法说明',
           columnHidden: false,
           columnImage: false,
diff --git a/src/views/modules/eamReport/eamMaintenanceRecord.vue b/src/views/modules/eamReport/eamMaintenanceRecord.vue
index 0e68d87..66e9669 100644
--- a/src/views/modules/eamReport/eamMaintenanceRecord.vue
+++ b/src/views/modules/eamReport/eamMaintenanceRecord.vue
@@ -1,15 +1,8 @@
 <template>
   <div class="mod-config">
-
- <!--    <div>-->
-<!--        <span @click="favoriteFunction()">-->
-<!--         <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>-->
-<!--        </span>-->
-<!--    </div>-->
-
-    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+    <el-form :inline="true" label-position="top" :model="searchData">
       <el-form-item :label="'BU'">
-        <el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 130px">
+        <el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 80px">
           <el-option
             v-for = "i in userBuList"
             :key = "i.buNo"
@@ -25,13 +18,21 @@
         <el-input v-model="searchData.orderNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'设备编码'">
-        <el-input v-model="searchData.objectID" clearable style="width: 120px"></el-input>
+        <el-input v-model="searchData.objectID" clearable style="width: 100px"></el-input>
       </el-form-item>
       <el-form-item :label="'计划执行人员'">
         <el-input v-model="searchData.planOperatorName" clearable style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item :label="'维保项目编码'">
+        <el-input v-model="searchData.itemNo" clearable style="width: 100px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'维保项目名称'">
+        <el-input v-model="searchData.itemDesc" clearable style="width: 200px"></el-input>
+      </el-form-item>
+    </el-form>
+    <el-form :inline="true" label-position="top" :model="searchData">
       <el-form-item :label="'状态'">
-        <el-select filterable v-model="searchData.status" style="width: 130px">
+        <el-select filterable v-model="searchData.status" style="width: 80px">
           <el-option label="全部" value=""></el-option>
           <el-option label="未开工" value="未开工"></el-option>
           <el-option label="待审核" value="待审核"></el-option>
@@ -39,14 +40,6 @@
           <el-option label="已取消" value="已取消"></el-option>
         </el-select>
       </el-form-item>
-    </el-form>
-    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
-      <el-form-item :label="'维保项目编码'">
-        <el-input v-model="searchData.itemNo" clearable style="width: 120px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'维保项目名称'">
-        <el-input v-model="searchData.itemDesc" clearable style="width: 120px"></el-input>
-      </el-form-item>
       <el-form-item :label="'计划执行日期'">
         <el-date-picker
           style="width: 120px"
@@ -123,9 +116,9 @@
       <el-table-column
         prop="checkResult"
         header-align="center"
-        align="center"
+        align="left"
         label="维保结论"
-        width="80">
+        width="70">
         <template slot-scope="scope">
           <div :style="{ color: scope.row.checkResult === '合格' ? 'green' : scope.row.checkResult === '不合格' ? 'red' : ''}">
             {{ scope.row.checkResult }}
@@ -247,7 +240,7 @@ export default {
           tableName: "维保工单表",
           columnProp: 'buDesc',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: 'BU',
           columnHidden: false,
           columnImage: false,
@@ -255,7 +248,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100,
+          columnWidth: 60,
         },
         {
           userId: this.$store.state.user.name,
@@ -265,7 +258,7 @@ export default {
           tableName: "维保工单表",
           columnProp: 'disposalMeasures',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '异常原因',
           columnHidden: false,
           columnImage: false,
@@ -283,7 +276,7 @@ export default {
           tableName: "维保工单表",
           columnProp: 'planID',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '计划编码',
           columnHidden: false,
           columnImage: false,
@@ -301,7 +294,7 @@ export default {
           tableName: "维保工单表",
           columnProp: 'orderNo',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '工单编码',
           columnHidden: false,
           columnImage: false,
@@ -319,7 +312,7 @@ export default {
           tableName: "维保工单表",
           columnProp: 'propertiesCode',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '模板编码',
           columnHidden: false,
           columnImage: false,
@@ -337,7 +330,7 @@ export default {
           tableName: "维保工单表",
           columnProp: 'codeDesc',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '模板名称',
           columnHidden: false,
           columnImage: false,
@@ -355,7 +348,7 @@ export default {
           tableName: "维保工单表",
           columnProp: 'objectID',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '设备编码',
           columnHidden: false,
           columnImage: false,
@@ -373,7 +366,7 @@ export default {
           tableName: "维保工单表",
           columnProp: 'objectDesc',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '设备名称',
           columnHidden: false,
           columnImage: false,
@@ -391,7 +384,7 @@ export default {
           tableName: "维保工单表",
           columnProp: 'status',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '状态',
           columnHidden: false,
           columnImage: false,
@@ -409,7 +402,7 @@ export default {
           tableName: "维保工单表",
           columnProp: 'planOperatorName',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '计划执行人员',
           columnHidden: false,
           columnImage: false,
@@ -427,7 +420,7 @@ export default {
           tableName: "维保工单表",
           columnProp: 'actualOperatorName',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '实际执行人员',
           columnHidden: false,
           columnImage: false,
@@ -445,7 +438,7 @@ export default {
           tableName: "维保工单表",
           columnProp: 'operator',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '协同人员',
           columnHidden: false,
           columnImage: false,
@@ -463,7 +456,7 @@ export default {
           tableName: "维保工单表",
           columnProp: 'checkerName',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '审核人员',
           columnHidden: false,
           columnImage: false,
@@ -553,7 +546,7 @@ export default {
           tableName: "维保工单表",
           columnProp: 'remark',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '工单备注',
           columnHidden: false,
           columnImage: false,
@@ -561,7 +554,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120,
+          columnWidth: 200,
         },
         {
           userId: this.$store.state.user.name,
@@ -571,7 +564,7 @@ export default {
           tableName: "维保工单表",
           columnProp: 'itemNo',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '维保项目编码',
           columnHidden: false,
           columnImage: false,
@@ -589,7 +582,7 @@ export default {
           tableName: "维保工单表",
           columnProp: 'itemDesc',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '维保项目名称',
           columnHidden: false,
           columnImage: false,
@@ -597,7 +590,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 90,
+          columnWidth: 120,
         },
         {
           userId: this.$store.state.user.name,
@@ -607,7 +600,7 @@ export default {
           tableName: "维保工单表",
           columnProp: 'itemRemark',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '维保方法说明',
           columnHidden: false,
           columnImage: false,
@@ -615,7 +608,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120,
+          columnWidth: 200,
         },
         {
           userId: this.$store.state.user.name,
diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue
index 014bcc6..0863a0e 100644
--- a/src/views/modules/part/bomManagement.vue
+++ b/src/views/modules/part/bomManagement.vue
@@ -1558,7 +1558,7 @@ export default {
           serialNumber: '601002Table1CreateBy',
           tableId: '601002Table1',
           tableName: 'BOM信息表',
-          columnProp: 'createBy',
+          columnProp: 'createByDesc',
           headerAlign: 'center',
           align: 'center',
           columnLabel: '创建人',
@@ -1594,7 +1594,7 @@ export default {
           serialNumber: '601002Table1UpdateBy',
           tableId: '601002Table1',
           tableName: 'BOM信息表',
-          columnProp: 'updateBy',
+          columnProp: 'updateByDesc',
           headerAlign: 'center',
           align: 'center',
           columnLabel: '更新人',
diff --git a/src/views/modules/part/bomSearch3.vue b/src/views/modules/part/bomSearch3.vue
index 0c5f850..fb230c9 100644
--- a/src/views/modules/part/bomSearch3.vue
+++ b/src/views/modules/part/bomSearch3.vue
@@ -403,7 +403,7 @@ export default {
           serialNumber: '601002002Table1CreateBy',
           tableId: '601002002Table1',
           tableName: 'BOMHeader表',
-          columnProp: 'createBy',
+          columnProp: 'createByDesc',
           headerAlign: 'center',
           align: 'center',
           columnLabel: '创建人',
@@ -439,7 +439,7 @@ export default {
           serialNumber: '601002002Table1UpdateBy',
           tableId: '601002002Table1',
           tableName: 'BOMHeader表',
-          columnProp: 'updateBy',
+          columnProp: 'updateByDesc',
           headerAlign: 'center',
           align: 'center',
           columnLabel: '更新人',
diff --git a/src/views/modules/part/partProductGroupInformation.vue b/src/views/modules/part/partProductGroupInformation.vue
index 81b1cb9..c75a5ff 100644
--- a/src/views/modules/part/partProductGroupInformation.vue
+++ b/src/views/modules/part/partProductGroupInformation.vue
@@ -68,16 +68,13 @@
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <div v-if="item.columnProp !== 'active'">
-            <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
-            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
-          </div>
-          <div v-else>
-            <span v-if="!item.columnHidden">
-              <span v-if="scope.row.active === 'Y'">是</span>
-              <span v-if="scope.row.active === 'N'">否</span>
+          <span v-if="!item.columnHidden">
+            <span v-if="columnsProp.includes(item.columnProp)">{{ scope.row[`${item.columnProp}Desc`] }}</span>
+            <span v-else>
+              {{ scope.row[item.columnProp] }}
             </span>
-          </div>
+          </span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
       <el-table-column
@@ -494,6 +491,7 @@ export default {
   },
   data () {
     return {
+      columnsProp:['createBy', 'active', 'updateBy'],
       isVisible1: false,
       // 导出
       exportData: [],
diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue
index d3f8ace..6c9d5e5 100644
--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@@ -1117,7 +1117,7 @@ export default {
           serialNumber: '104003Table1CreateBy',
           tableId: '104003Table1',
           tableName: 'Routing信息表',
-          columnProp: 'createBy',
+          columnProp: 'createByDesc',
           headerAlign: 'center',
           align: 'center',
           columnLabel: '创建人',
@@ -1153,7 +1153,7 @@ export default {
           serialNumber: '104003Table1UpdateBy',
           tableId: '104003Table1',
           tableName: 'Routing信息表',
-          columnProp: 'updateBy',
+          columnProp: 'updateByDesc',
           headerAlign: 'center',
           align: 'center',
           columnLabel: '更新人',