From 9836c4acc9a442273bc2df8280bfa65e46cf9f04 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 18 May 2024 09:12:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/translationOrder/detail.vue | 9 ---------
 src/views/translationOrder/index.vue  | 4 ----
 2 files changed, 13 deletions(-)

diff --git a/src/views/translationOrder/detail.vue b/src/views/translationOrder/detail.vue
index 18bfa30..31ca734 100644
--- a/src/views/translationOrder/detail.vue
+++ b/src/views/translationOrder/detail.vue
@@ -4,12 +4,6 @@
       <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>
@@ -59,10 +53,7 @@
 
 <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 5013782..52b1906 100644
--- a/src/views/translationOrder/index.vue
+++ b/src/views/translationOrder/index.vue
@@ -133,11 +133,7 @@ const handleAdd = async () => {
 const handleDetail = async (data: any) => {
     console.log(data);
     router.push({
-<<<<<<< HEAD
-        path: 'detail',
-=======
         path: 'transDetail',
->>>>>>> 1f12492c0c5a598c6a3a40a6943f3335aff92557
         query: {
             id: data.id
         }