样式

src/views/PurchasingCenter/PurchaseContractSearch/index.vue

@@ -157,8 +157,6 @@
             {{ scope.row.审批时间 ? scope.row.审核时间 : '—' }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
-=======
         <el-table-column label="处理" align="center" min-width="130">
           <template slot-scope="scope">
             <el-tag v-if="Number(scope.row.是否未通过)===1&&Number(scope.row.不通过处理)===1" type="success" size="small">处理完成</el-tag>
@@ -166,7 +164,6 @@
             <span v-else>—</span>
           </template>
         </el-table-column>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-table-column label="采购员" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
@@ -205,11 +202,7 @@
 </template>
 
 <script>
-<<<<<<< HEAD
-import { initContract, initBuyer, searchTable1, searchTable2, deleteContract } from '@/api/PurchasingCenter/PurchaseContractSearch'
-=======
 import { initContract, initBuyer, searchTable1, searchTable2, deleteContract, handleDone } from '@/api/PurchasingCenter/PurchaseContractSearch'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 import QRCode from 'qrcode'
 import $ from 'jquery'
 // import { exportExcelMethod } from './exportExcel'
@@ -284,8 +277,6 @@ export default {
     this.searchTable1()
   },
   methods: {
-<<<<<<< HEAD
-=======
     // 处理完成
     done(row) {
       this.$confirm('确定处理完成?', '提示', {
@@ -306,7 +297,6 @@ export default {
         })
       })
     },
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     deleteContract(row) { // 删除合同
       this.$confirm('此操作将永久删除合同所有内容，确定删除?', '提示', {
         confirmButtonText: '确定',