|
|
@@ -148,6 +148,7 @@
|
|
|
show-overflow
|
|
|
highlight-hover-row
|
|
|
:menu-config="{}"
|
|
|
+ :tooltip-config="tooltipConfig"
|
|
|
:sort-config="{remote:true}"
|
|
|
:export-config="{
|
|
|
remote: true,
|
|
|
@@ -203,7 +204,11 @@
|
|
|
<el-button @click="detail(scope.row)" :type="$dictUtils.getDictLabel('status_info', scope.row.type, '')" effect="dark" >{{$dictUtils.getDictLabel("status", scope.row.type, '未开始')}} </el-button>
|
|
|
</template>
|
|
|
</vxe-column>
|
|
|
-
|
|
|
+ <vxe-column min-width="100" title="付款状态" fixed="right" align="center" field="paymentStatus">
|
|
|
+ <template #default="scope">
|
|
|
+ <el-button :type="$dictUtils.getDictLabel('payment_status_info', scope.row.paymentStatus, '')" effect="dark" >{{$dictUtils.getDictLabel("payment_status", scope.row.paymentStatus, '未付款')}} </el-button>
|
|
|
+ </template>
|
|
|
+ </vxe-column>
|
|
|
<vxe-column title="操作" min-width="130px" fixed="right" align="center">
|
|
|
<template #default="scope">
|
|
|
<div v-if="isAdmin">
|
|
|
@@ -218,6 +223,9 @@
|
|
|
<el-button v-if="scope.row.type==='2' && checkIsAudit(scope.row)" text type="primary" @click="examine(scope.row)">审核</el-button>
|
|
|
<!-- 被驳回后当前申请人重新调整-->
|
|
|
<el-button v-if="scope.row.createId === $store.state.user.id&&scope.row.type === '4'" text type="primary" @click="adjust(scope.row)">驳回调整</el-button>
|
|
|
+<!-- 付款-->
|
|
|
+ <el-button v-if="hasPermission('cw:reimbursement:info:del') && scope.row.paymentStatus !== '1'" text type="primary" @click="payment(scope.row)">付款</el-button>
|
|
|
+ <el-button v-if="hasPermission('cw:reimbursement:info:del') && scope.row.paymentStatus === '1'" text type="primary" @click="rePayment(scope.row)">撤回付款</el-button>
|
|
|
</div>
|
|
|
</template>
|
|
|
</vxe-column>
|
|
|
@@ -299,6 +307,21 @@
|
|
|
isZjbry:false,
|
|
|
isSs:false,
|
|
|
isDgsbxBmzr:false,
|
|
|
+ tooltipConfig: {
|
|
|
+ showAll: true,
|
|
|
+ enterable: true,
|
|
|
+ contentMethod: ({ type, column, row, items, _columnIndex }) => {
|
|
|
+ const { field } = column
|
|
|
+ // 重写默认的提示内容
|
|
|
+ if (field === 'paymentStatus') {
|
|
|
+ if (row.paymentStatus === '1') {
|
|
|
+ return '付款时间:' + row.paymentTime;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // 其余的单元格使用默认行为
|
|
|
+ return null
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
reimbursementApprovalService: null,
|
|
|
@@ -632,6 +655,7 @@
|
|
|
'orders': this.tablePage.orders,
|
|
|
...this.searchForm
|
|
|
}).then((data) => {
|
|
|
+ console.log('list',data.records)
|
|
|
this.dataList = data.records
|
|
|
this.tablePage.total = data.total
|
|
|
this.loading = false
|
|
|
@@ -641,7 +665,7 @@
|
|
|
this.checkIsZj()
|
|
|
this.checkIsZjbry()
|
|
|
this.checkIsSs()
|
|
|
- processService.getByName('会计-报销审批(新)').then((data) => {
|
|
|
+ processService.getByName('会计-报销审批').then((data) => {
|
|
|
if (!this.commonJS.isEmpty(data.id)) {
|
|
|
this.processDefinitionId = data.id
|
|
|
this.procDefKey = data.key
|
|
|
@@ -898,6 +922,34 @@
|
|
|
console.log(user[0].name)
|
|
|
this.searchForm.reimBy=user[0].name
|
|
|
},
|
|
|
+ //付款
|
|
|
+ payment(row){
|
|
|
+ this.$confirm(`确定付款吗?`, '提示', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ type: 'warning'
|
|
|
+ }).then(() => {
|
|
|
+ let param = {paymentStatus: '1', id: row.id}
|
|
|
+ this.reimbursementApprovalService.updatePaymentStatus(param).then((data)=>{
|
|
|
+ this.$message.success(data)
|
|
|
+ this.refreshList()
|
|
|
+ })
|
|
|
+ })
|
|
|
+ },
|
|
|
+ //撤回付款
|
|
|
+ rePayment(row){
|
|
|
+ this.$confirm(`确定撤回付款吗?`, '提示', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ type: 'warning'
|
|
|
+ }).then(() => {
|
|
|
+ let param = {paymentStatus: '0', id: row.id}
|
|
|
+ this.reimbursementApprovalService.updatePaymentStatus(param).then((data)=>{
|
|
|
+ this.$message.success(data)
|
|
|
+ this.refreshList()
|
|
|
+ })
|
|
|
+ })
|
|
|
+ },
|
|
|
}
|
|
|
}
|
|
|
</script>
|
sangwenwei