合并

src/views/sb/info/modules/DetailC.vue

@@ -55,53 +55,28 @@
               </a-button>
             </a-col>
             <a-col :span="10">
-<<<<<<< HEAD
-              <a-button shape="round" type="primary" block>
-                配件记录
-=======
               <a-button shape="round" @click="handleCheckFinish()" block>
                 保养记录
->>>>>>> 771e778e064235dd496ade6ed93af1283d7743cd
               </a-button>
             </a-col>
             <a-col :span="10">
               <a-button shape="round" block>
-<<<<<<< HEAD
-
-                配件记录
-=======
                 历史故障
->>>>>>> 771e778e064235dd496ade6ed93af1283d7743cd
               </a-button>
             </a-col>
             <a-col :span="10">
               <a-button shape="round" block>
-<<<<<<< HEAD
-
-                配件记录
-=======
                 历史费用
->>>>>>> 771e778e064235dd496ade6ed93af1283d7743cd
               </a-button>
             </a-col>
             <a-col :span="10">
               <a-button shape="round" block>
-<<<<<<< HEAD
-
-                配件记录
-=======
                 状态变更记录
->>>>>>> 771e778e064235dd496ade6ed93af1283d7743cd
               </a-button>
             </a-col>
             <a-col :span="10">
               <a-button shape="round" block>
-<<<<<<< HEAD
-
-                配件记录
-=======
                 停机记录
->>>>>>> 771e778e064235dd496ade6ed93af1283d7743cd
               </a-button>
             </a-col>
           </a-row>
@@ -275,11 +250,7 @@ import { queryNumPartInfo } from '@/api/part/info'
 import { queryNumModelbom } from '@/api/sb/modelbom'
 import { queryChildNumSbInfo } from '@/api/sb/info'
 import SparePartUsedSelectTable from '@/views/sqarepartmanage/sparepartused/modules/SparePartUsedSelectTable'
-<<<<<<< HEAD
-import SbOilPageTable from '@/views/sb/oil/modules/SbOilPageTable'
-=======
 // import SbOilPageTable from '@/views/sb/oil/modules/SbOilPageTable'
->>>>>>> 771e778e064235dd496ade6ed93af1283d7743cd
 import SbRunFillPageTable from '@/views/sb/run-fill/modules/SbRunFillPageTable'
 import SbInspectionFillPageTable from '@/views/sb/inspection-fill/modules/SbInspectionFillPageTable'
 import DetailSbBom from '@/views/sb/modelbom/modules/DetailSbBom'
@@ -301,11 +272,7 @@ export default {
     RepairApplicationFormTable,
     CheckJobTable,
     SparePartUsedSelectTable,
-<<<<<<< HEAD
-    SbOilPageTable,
-=======
     // SbOilPageTable,
->>>>>>> 771e778e064235dd496ade6ed93af1283d7743cd
     SbRunFillPageTable,
     SbInspectionFillPageTable,
     DetailSbBom,
@@ -454,26 +421,6 @@ export default {
       this.$viewer = viewer
     },
     handleViewBom (record) {
-<<<<<<< HEAD
-      this.visible = false
-      const modal = this.$refs.detailSbBomModal
-      modal.base(this.model)
-    },
-    handleViewChildSbInfo () {
-      this.visible = false
-      const modal = this.$refs.detailSbInfoModal
-      modal.base(this.model)
-    },
-    handleViewCheck (record) {
-      this.visible = false
-      const modal = this.$refs.detailSbCheckModal
-      modal.base(this.model)
-    },
-    handleViewCheckJob (record) {
-      this.visible = false
-      const modal = this.$refs.detailSbCheckJobModal
-      modal.base(this.model)
-=======
       // this.visible = false
       // const modal = this.$refs.detailSbBomModal
       // modal.base(this.model)
@@ -507,7 +454,6 @@ export default {
     handleCheckFinish () {
       const routeUrl = this.$router.resolve({ path: '/check/polling-job/finish', query: { id: this.model.id } })
       window.open(routeUrl.href, '_blank')
->>>>>>> 771e778e064235dd496ade6ed93af1283d7743cd
     },
     handleMeasure (record) {
       this.visible = false
@@ -595,15 +541,10 @@ export default {
       this.fetchNum()
     },
     partInfoListView () {
-<<<<<<< HEAD
-      const modal = this.$refs.partInfoList
-      modal.base({ sbId: this.model.id }, { sbId: this.model.id })
-=======
       // const modal = this.$refs.partInfoList
       // modal.base({ sbId: this.model.id }, { sbId: this.model.id })
       const routeUrl = this.$router.resolve({ path: '/part/info', query: { id: this.model.id } })
       window.open(routeUrl.href, '_blank')
->>>>>>> 771e778e064235dd496ade6ed93af1283d7743cd
     },
     checkJobTableWaitDoListView () {
       const modal = this.$refs.checkJobTableWaitDo