|
|
@@ -127,11 +127,7 @@
|
|
|
<span v-else>已开票</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
-<<<<<<< HEAD
|
|
|
<el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="500">
|
|
|
-=======
|
|
|
- <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="450">
|
|
|
->>>>>>> 8b8a6ad600972213308e628164112ce037ce8786
|
|
|
<template scope="scope">
|
|
|
<span v-hasPermission="`acquisitionManagement.acquisitionPay.add`">
|
|
|
<el-button v-if="
|
|
|
@@ -451,7 +447,6 @@
|
|
|
})
|
|
|
},
|
|
|
methods: {
|
|
|
-<<<<<<< HEAD
|
|
|
imgshow(){
|
|
|
this.deleteshow=false
|
|
|
console.log(11111)
|
|
|
@@ -460,10 +455,7 @@
|
|
|
this.dialogImageUrl = file.url;
|
|
|
this.dialogVisible = true;
|
|
|
},
|
|
|
- previewPayOrder(val){debugger
|
|
|
-=======
|
|
|
previewPayOrder(val){
|
|
|
->>>>>>> 8b8a6ad600972213308e628164112ce037ce8786
|
|
|
this.paymentReceipt = val.paymentScreenshot
|
|
|
this.isPreviewPayOrder = true
|
|
|
console.log(val.paymentScreenshot)
|
