diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index dae136a..89acb2f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -97,20 +97,17 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-<<<<<<< HEAD
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
         <el-button type="primary" @click="exportWord">
-=======
-        <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
->>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
+          <!-- <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord"> -->
           导出word
         </el-button>
-        <el-button  type="primary" @click="exportPdf">
+        <el-button type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button  type="primary" @click="print">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">