diff --git a/src/api/eam/eam_object_list.js b/src/api/eam/eam_object_list.js
index 08b78c6..300372f 100644
--- a/src/api/eam/eam_object_list.js
+++ b/src/api/eam/eam_object_list.js
@@ -6,6 +6,9 @@ export const getEamObjectList = data => createAPI('pms/eamObject/getEamObjectLis
 export const getFileContentList = data => createAPI('sys/file/getSysFileByOrderRef2','post',data)
 /*查询设备的备件清单*/
 export const getDevicePartList = data => createAPI('pms/resourcespare/getResourceSpareListByResourceId','post',data)
+/*查询设备的核心备件清单*/
+export const getDeviceCorePartList = data => createAPI('pms/resourcespare/getDeviceCorePartList','post',data)
+
 /*查询设备的点检项目列表*/
 export const getCheckItemList = data => createAPI('pms/eamObject/getCheckItemList','post',data)
 /*查询设备的维保项目列表*/
diff --git a/src/views/modules/partspare/partspare-add-or-update.vue b/src/views/modules/partspare/partspare-add-or-update.vue
index 6a4faa4..97583c8 100644
--- a/src/views/modules/partspare/partspare-add-or-update.vue
+++ b/src/views/modules/partspare/partspare-add-or-update.vue
@@ -69,6 +69,12 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="是否核心备件">
+          <el-select v-model="dataForm.coreFlag">
+            <el-option value="Y" label="是"></el-option>
+            <el-option value="N" label="否"></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
       <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
@@ -91,7 +97,8 @@ export default {
       buList: [],
       visible: false,
       dataForm: {
-        active: "Y",
+        coreFlag: "Y",
+        active: "N",
         averagePrice: '',
         createdBy: '',
         estUseQty: 0,
@@ -183,6 +190,7 @@ export default {
               this.dataForm.spec = data.partSpare.spec
               this.dataForm.groupId = data.partSpare.groupId
               this.dataForm.buNo = data.partSpare.buNo
+              this.dataForm.coreFlag = data.partSpare.coreFlag
             }
           })
         }
diff --git a/src/views/modules/partspare/partspare.vue b/src/views/modules/partspare/partspare.vue
index 464cca2..c8f7691 100644
--- a/src/views/modules/partspare/partspare.vue
+++ b/src/views/modules/partspare/partspare.vue
@@ -24,6 +24,13 @@
               <el-option value="N" label="禁用"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="是否核心备件">
+            <el-select v-model="queryForm.coreFlag">
+              <el-option value="" label="全部"></el-option>
+              <el-option value="Y" label="是"></el-option>
+              <el-option value="N" label="否"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="仓库">
             <el-select v-model="queryForm.warehouseId">
               <el-option value="" label="全部"></el-option>
@@ -171,6 +178,7 @@ export default {
         spec: '',
         active: '',
         warehouseId: '',
+        coreFlag: '',
         buNo: '',
         limit: 1,
         page: '',
@@ -301,6 +309,24 @@ export default {
           fixed: '',
           columnWidth: 140,
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId:200101101,
+          serialNumber: '200101101TableCoreFlag',
+          tableId: "200101101Table",
+          tableName: "备品备件信息表",
+          columnProp: 'coreFlag',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '是否核心备件',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
         {
           userId: this.$store.state.user.name,
           functionId:200101101,
diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
index 92a037c..2784c5f 100644
--- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
@@ -450,7 +450,7 @@
         <el-form-item label="备件编码">
           <el-select v-model="coreComponentData.partNo" placeholder="请选择" clearable @change="componentChange" style="width: 200px">
             <el-option
-              v-for = "i in partSpareList"
+              v-for = "i in corePartSpareList"
               :key = "i.partNo"
               :label = "i.partNo+'-'+i.partDescription"
               :value = "i.partNo">
@@ -573,8 +573,9 @@
     getInventoryStockList, // 获取领用出库信息
     saveTrans, // 维修出库
     saveCoreComponent,
+
   } from "@/api/eam/eam.js"
-  import {downLoadObjectFile, getDevicePartList} from '@/api/eam/eam_object_list.js';
+  import {downLoadObjectFile, getDeviceCorePartList, getDevicePartList} from '@/api/eam/eam_object_list.js';
   import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
   import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
@@ -609,6 +610,7 @@
           title: '',
           orderNo: ''
         },
+        corePartSpareList:[],
         coreComponentData:{
           site:'',
           orderNo:'',
@@ -2358,8 +2360,22 @@
         this.authReach = !reachFlag
         this.authReport = !reportFlag
       },
+      getCorePartSpareList(){
+        let tempData = {
+          site: this.saveData.site,
+          objectID: this.saveData.objectID
+        }
+        getDeviceCorePartList(tempData).then(({data}) => {
+          // 区分请求成功和失败的状况
+          if (data && data.code === 200) {
+            this.corePartSpareList = data.rows
+          } else {
+            this.corePartSpareList = []
+          }
+        })
+      },
       coreComponentModal(){
-        this.getPartSpareList();
+        this.getCorePartSpareList();
         this.coreComponentData={
           site:this.saveData.site,
           buNo:this.saveData.buNo,
@@ -2397,7 +2413,7 @@
       },
       componentChange(value){
         if(value&&value!==''){
-          this.coreComponentData.partDescription=this.partSpareList.filter(item => item.partNo === value)[0].partDescription;
+          this.coreComponentData.partDescription=this.corePartSpareList.filter(item => item.partNo === value)[0].partDescription;
         }else {
           this.coreComponentData.partDescription=''
         }