diff --git a/src/views/modules/partspare/coreSparePartsManagemen.vue b/src/views/modules/partspare/coreSparePartsManagemen.vue
index 26b14a9..a1509bc 100644
--- a/src/views/modules/partspare/coreSparePartsManagemen.vue
+++ b/src/views/modules/partspare/coreSparePartsManagemen.vue
@@ -21,9 +21,10 @@
         <el-input v-model="queryForm.batchNo" clearable style="width: 100px"></el-input>
       </el-form-item>
       <el-form-item label="汇总方式">
-        <el-select v-model="queryForm.groupType" @change="groupTypeChanged" style="width: 100px">
+        <el-select v-model="queryForm.groupType" @change="groupTypeChanged" style="width: 120px">
           <el-option value="0" label="当前核心备件"></el-option>
           <el-option value="1" label="未上机备件"></el-option>
+          <el-option value="2" label="备件上下机记录"></el-option>
         </el-select>
       </el-form-item>
 <!--      <el-form-item label="录入日期">-->
@@ -62,14 +63,14 @@
       @selection-change="handleSelectionChange"
       :row-style="controlRowStyle"
       style="width: 100%;">
+<!--      <el-table-column-->
+<!--        type="selection"-->
+<!--        header-align="center"-->
+<!--        align="center"-->
+<!--        width="50">-->
+<!--      </el-table-column>-->
       <el-table-column
-        type="selection"
-        header-align="center"
-        align="center"
-        width="50">
-      </el-table-column>
-      <el-table-column
-        v-for="(item,index) in arrayColumns" :key="index"
+        v-for="(item,index) in arrayColumns0" :key="index"
         :sortable="item.columnSortable"
         :prop="item.columnProp"
         :header-align="item.headerAlign"
@@ -94,7 +95,31 @@
       :row-style="controlRowStyle"
       style="width: 100%;">
       <el-table-column
-        v-for="(item,index) in arrayPart" :key="index"
+        v-for="(item,index) in arrayColumns1" :key="index"
+        :sortable="item.columnSortable"
+        :prop="item.columnProp"
+        :header-align="item.headerAlign"
+        :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align"
+        :fixed="item.fixed==''?false:item.fixed"
+        :min-width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <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>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-table
+      v-if="queryForm.groupType === '2'"
+      :data="dataList"
+      border
+      :height="height + 70"
+      v-loading="dataListLoading"
+      @selection-change="handleSelectionChange"
+      style="width: 100%;">
+      <el-table-column
+        v-for="(item,index) in arrayColumns2" :key="index"
         :sortable="item.columnSortable"
         :prop="item.columnProp"
         :header-align="item.headerAlign"
@@ -176,8 +201,8 @@ export default {
       addOrUpdateVisible: false,
       // 展示列集
       columnList: [],
-      // 料号汇总
-      arrayPart: [
+      // 汇总方式=‘未上机备件’
+      arrayColumns1: [
         // {
         //   userId: this.$store.state.user.name,
         //   functionId: 200101103,
@@ -336,8 +361,8 @@ export default {
           columnWidth: 140,
         }
       ],
-      // 料号_序号
-      arrayColumns: [
+      // 汇总方式=‘当前核心备件’
+      arrayColumns0: [
         {
           userId: this.$store.state.user.name,
           functionId: 200101103,
@@ -496,7 +521,154 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 140,
-        }]
+        }],
+      // 汇总方式=‘备件上下机记录’
+      arrayColumns2: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table1PartNo',
+          tableId: '200101103Table1',
+          tableName: '库存信息汇总表',
+          columnProp: 'partNo',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '配件编号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: true,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 140,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table1PartDescription',
+          tableId: '200101103Table1',
+          tableName: '库存信息汇总表',
+          columnProp: 'partDescription',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 140,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table1SerialNo',
+          tableId: '200101103Table1',
+          tableName: '库存信息汇总表',
+          columnProp: 'serialNo',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '序列号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 140,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table1OnOffStatus',
+          tableId: '200101103Table1',
+          tableName: '库存信息汇总表',
+          columnProp: 'onOffStatus',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '上下机状况',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 140,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table1CreatedDate',
+          tableId: '200101103Table1',
+          tableName: '库存信息汇总表',
+          columnProp: 'createdDate',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '更换时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 140,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table1TimeDiffMonths',
+          tableId: '200101103Table1',
+          tableName: '库存信息汇总表',
+          columnProp: 'timeDiffMonths',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '上机时长(月)',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 140,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table1FeedBackDesc',
+          tableId: '200101103Table1',
+          tableName: '库存信息汇总表',
+          columnProp: 'feedBackDesc',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '故障原因',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 140,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table1CreatedBy',
+          tableId: '200101103Table1',
+          tableName: '库存信息汇总表',
+          columnProp: 'createdBy',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '上机人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 140,
+        }
+      ]
     }
   },
   // watch: {