diff --git a/src/views/translationOrder/detail.vue b/src/views/translationOrder/detail.vue
index bd8fb03..18bfa30 100644
--- a/src/views/translationOrder/detail.vue
+++ b/src/views/translationOrder/detail.vue
@@ -4,6 +4,12 @@
       <el-tabs v-model="activeName" class="demo-tabs" @tab-change="tabChange">
         <el-tab-pane label="概况" name="detail">
           <el-descriptions class="margin-top" :column="4" border>
+<<<<<<< HEAD
+            <!-- <template #extra>
+              <el-button type="primary">Operation</el-button>
+            </template> -->
+=======
+>>>>>>> 1f12492c0c5a598c6a3a40a6943f3335aff92557
             <el-descriptions-item :span="4" label="单据编号">
               {{ form.number }}
             </el-descriptions-item>
@@ -53,6 +59,10 @@
 
 <script lang="ts" setup name="opurchaseclassDetail">
 import { usePaging } from "@/hooks/usePaging";
+<<<<<<< HEAD
+import { useDictData } from "@/hooks/useDictOptions";
+=======
+>>>>>>> 1f12492c0c5a598c6a3a40a6943f3335aff92557
 import {
   apiOpurchaseclassLists,
   apiOpurchaseclassDelete,
diff --git a/src/views/translationOrder/index.vue b/src/views/translationOrder/index.vue
index 52b1906..5013782 100644
--- a/src/views/translationOrder/index.vue
+++ b/src/views/translationOrder/index.vue
@@ -133,7 +133,11 @@ const handleAdd = async () => {
 const handleDetail = async (data: any) => {
     console.log(data);
     router.push({
+<<<<<<< HEAD
+        path: 'detail',
+=======
         path: 'transDetail',
+>>>>>>> 1f12492c0c5a598c6a3a40a6943f3335aff92557
         query: {
             id: data.id
         }