Skip to content

薪
薪瑞通-前端
Commit 998fd10b authored by 谢子梦's avatar 谢子梦
Browse files
Options

stage：文档问题修复

parent 9bd44f24
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 53 deletions
src/views/business/onlineTaskBatch/staff.vue
View file @ 998fd10b
......@@ -4,9 +4,7 @@
<el-descriptions title="" style="margin-top: 15px" :column="6">
<el-descriptions-item label="批次编号">{{ pageHeader.batchNo }}</el-descriptions-item>
<el-descriptions-item label="批次状态" :span="5">
<dict-tag
style="margin-top: -4px"
:options="dict.type.pay_status" :value="pageHeader.batchStatus" />
<dict-tag style="margin-top: -4px" :options="dict.type.pay_status" :value="pageHeader.batchStatus" />
</el-descriptions-item>
</el-descriptions>
......@@ -16,11 +14,8 @@
<div style="display: flex;align-items: center;justify-content: space-between;gap: 10px;">
<el-input v-model="queryParams.staffName" size="mini" @change="handleQuery" placeholder="输入姓名搜索" />
<el-select v-model="queryParams.payStatus" placeholder="请选择支付状态" @change="handleQuery" clearable>
<el-option v-for="dict in dict.type.pay_status"
v-if="dict.raw.remark !== 'noSearch'"
:key="dict.value"
:label="dict.label"
:value="dict.value" />
<el-option v-for="dict in dict.type.pay_status" v-show="dict.raw.remark !== 'noSearch'" :key="dict.value"
:label="dict.label" :value="dict.value" />
</el-select>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
......@@ -33,7 +28,7 @@
</el-col>
</el-row>
<el-table v-loading="loading" :data="taskStaffList">
<el-table-column label="员工姓名" align="center" prop="staffName" fixed="left"/>
<el-table-column label="员工姓名" align="center" prop="staffName" fixed="left" />
<el-table-column label="身份证号" align="center" prop="staffIdNo" />
<el-table-column label="手机号码" align="center" prop="staffMobile" />
<el-table-column label="收款账号" align="center" prop="staffAccNo">
......@@ -51,44 +46,27 @@
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-view"
<el-button size="mini" type="text" icon="el-icon-view"
v-if="scope.row.payStatus && (3 === scope.row.payStatus || 4 === scope.row.payStatus)"
@click="viewBizDetail(scope.row)"
v-hasPermi="['business:taskStaff:edit']"
>查看详情</el-button>
<el-button v-if="scope.row.payStatus && 3 === scope.row.payStatus"
size="mini" type="text"
icon="el-icon-s-check"
@click="voucherView(scope.row)"
>查看凭证</el-button>
<!-- <el-button v-if="pageHeader.batchNo && scope.row.batchPayNo !== pageHeader.batchNo"-->
<!-- size="mini" type="text"-->
<!-- icon="el-icon-c-scale-to-original"-->
<!-- @click="viewHistory(scope.row.id)"-->
<!-- >支付历史</el-button>-->
@click="viewBizDetail(scope.row)" v-hasPermi="['business:taskStaff:edit']">查看详情</el-button>
<el-button v-if="scope.row.payStatus && 3 === scope.row.payStatus" size="mini" type="text"
icon="el-icon-s-check" @click="voucherView(scope.row)">查看凭证</el-button>
<!-- <el-button v-if="pageHeader.batchNo && scope.row.batchPayNo !== pageHeader.batchNo"-->
<!-- size="mini" type="text"-->
<!-- icon="el-icon-c-scale-to-original"-->
<!-- @click="viewHistory(scope.row.id)"-->
<!-- >支付历史</el-button>-->
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<el-drawer
title="交易详情"
:visible.sync="drawer"
:with-header="false"
size="50%">
<el-drawer title="交易详情" :visible.sync="drawer" :with-header="false" size="50%">
<div style="padding: 20px">
<el-descriptions class="margin-top" title="交易明细" :column="2" border size="medium"
labelClassName="descriptionsItemLabel">
labelClassName="descriptionsItemLabel">
<el-descriptions-item label="收款人"> {{ biz.staffName }} </el-descriptions-item>
<el-descriptions-item label="收款账户"> {{ biz.staffAccNo }} </el-descriptions-item>
<el-descriptions-item label="流水编号"> {{ biz.bizPayNo }} </el-descriptions-item>
......@@ -113,11 +91,11 @@
<el-table-column label="收款账户" align="center">
<el-table-column label="户名" align="center" prop="payeeAccName" />
<el-table-column label="账户" align="center" prop="payeeAccNo" />
<el-table-column label="类型" align="center" prop="payeeAccType" >
<el-table-column label="类型" align="center" prop="payeeAccType">
<template slot-scope="scope">
<el-row>
<el-col :span="12">
<dict-tag :options="dict.type.payee_acc_type" :value="scope.row.payeeAccType"/>
<dict-tag :options="dict.type.payee_acc_type" :value="scope.row.payeeAccType" />
</el-col>
<el-col :span="12">
<el-tag v-if="scope.row.isPrivateAcc && scope.row.isPrivateAcc === 1">对私账户</el-tag>
......@@ -129,7 +107,7 @@
</el-table-column>
<el-table-column label="交易金额" align="center" prop="amount" />
<el-table-column label="手续费" align="center" prop="transFee" />
<el-table-column label="支付状态" align="center" prop="payStatus" >
<el-table-column label="支付状态" align="center" prop="payStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.pay_status" :value="scope.row.payStatus" />
</template>
......@@ -142,13 +120,9 @@
<el-table-column label="备注" align="center" prop="payRemark" />
</el-table>
<div style="text-align: right; margin-top: 10px">
<el-pagination id="viewHistory"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:page-sizes="[10, 20, 30, 40]"
:page-size="history.queryParams.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="history.total">
<el-pagination id="viewHistory" @size-change="handleSizeChange" @current-change="handleCurrentChange"
:page-sizes="[10, 20, 30, 40]" :page-size="history.queryParams.pageSize"
layout="total, sizes, prev, pager, next, jumper" :total="history.total">
</el-pagination>
</div>
<div slot="footer" class="dialog-footer">
......@@ -161,8 +135,8 @@
<script>
import { listTaskStaff } from "@/api/business/taskStaff";
import {getTaskBatch} from "@/api/business/taskBatch";
import {detailVoucherView, getDetailHistory} from "@/api/business/payOrder";
import { getTaskBatch } from "@/api/business/taskBatch";
import { detailVoucherView, getDetailHistory } from "@/api/business/payOrder";
export default {
name: "TaskStaff",
......@@ -262,7 +236,8 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.queryParams.staffName = ''
this.queryParams.payStatus = ''
this.handleQuery();
},
/** 导出按钮操作 */
......@@ -301,7 +276,7 @@ export default {
};
</script>
<style>
.descriptionsItemLabel{
.descriptionsItemLabel {
width: 100px;
}
</style>
src/views/business/onlineTaskInfo/payBatchSettlement.vue
View file @ 998fd10b
......@@ -336,6 +336,7 @@ export default {
created() {
if (this.$route.query.id) {
this.getBatchInfoFN(this.$route.query.id)
}
},
mounted() {
......@@ -597,6 +598,7 @@ export default {
this.pageInit(this.batchInfo.onlineTaskId)
this.params.onlineTaskBatchId = this.batchInfo.id
this.getList()
this.confirmPay()
}
})
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment