合并代码

src/views/appeals/audit.vue

@@ -96,13 +96,8 @@
         </div>
     </div>
 </template>
-<<<<<<< HEAD
 <script setup>
-import { ref ,onMounted} from 'vue';
-=======
-<script lang="ts" setup name="AppealsAudit">
 import { ref } from 'vue';
->>>>>>> 1b0ae29fe93dcbbed527515619561514eaeff6fe
 // import audioPlayer from '../../components/audio/audioPlayer.vue';
 import qualityDetail from '../../components/quality/detail.vue';
 import qualityResult from '../../components/quality/result.vue';

src/views/appeals/index.vue

@@ -57,11 +57,7 @@ import { useRoute,  useRouter} from 'vue-router'
 
 
 export default defineComponent({
-<<<<<<< HEAD
-    name: 'Pending',
-=======
     name: 'AppealsPending',
->>>>>>> 1b0ae29fe93dcbbed527515619561514eaeff6fe
     components: {
         PageSearch,
         PageContent,

src/views/quality/index.vue

@@ -26,12 +26,8 @@
 			</template>
             <template #handlerSkot="scope">
 				<a style="color: #409eff; margin-right: 10px;" @click="openDetail(scope.row)">查看</a>
-<<<<<<< HEAD
-                <a style="color: #409eff" v-if="scope.row.status ===0 " @click="openAppeal(scope.row)">申诉</a>
-=======
                 <a v-if="scope.row.isQuality && scope.row.status !== 2" style="color: #409eff" @click="openAppeal(scope.row)">申诉</a>
                 <!-- <a v-if="scope.row.isQuality" style="color: #409eff" @click="openAppeal(scope.row)">详细</a> -->
->>>>>>> 1b0ae29fe93dcbbed527515619561514eaeff6fe
 			</template>
         </page-content>
         <page-modal :defaultInfo="defaultInfo" :title="'编辑'" ref="pageModalRef" :mainKey="'id'" pageName="/quality/qcresult"