Commit 07a2c84e authored by 许珑标's avatar 许珑标

零工发薪记录增加数据来源字段

parent 634d59df
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
</el-form-item> </el-form-item>
<el-form-item label="业务名称" prop="batchPayName"> <el-form-item label="业务名称" prop="batchPayName">
<el-input v-model="queryParams.batchPayName" placeholder="请输入支付名称" clearable <el-input v-model="queryParams.batchPayName" placeholder="请输入支付名称" clearable
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="付款账户名" prop="payerAccName"> <el-form-item label="付款账户名" prop="payerAccName">
<el-input v-model="queryParams.payerAccName" placeholder="请输入付款账户名" clearable <el-input v-model="queryParams.payerAccName" placeholder="请输入付款账户名" clearable
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="支付状态" prop="payStatus"> <el-form-item label="支付状态" prop="payStatus">
<el-select v-model="queryParams.payStatus" placeholder="请选择支付状态" @change="handleQuery" clearable> <el-select v-model="queryParams.payStatus" placeholder="请选择支付状态" @change="handleQuery" clearable>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<el-form-item label="支付类型" prop="payTitle"> <el-form-item label="支付类型" prop="payTitle">
<el-select v-model="queryParams.payTitle" placeholder="请选择支付类型" @change="handleQuery" clearable> <el-select v-model="queryParams.payTitle" placeholder="请选择支付类型" @change="handleQuery" clearable>
<el-option v-for="dict in dict.type.pay_type_title" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.pay_type_title" :key="dict.value" :label="dict.label"
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['business:payOrder:export']">导出</el-button> v-hasPermi="['business:payOrder:export']">导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
...@@ -59,6 +59,13 @@ ...@@ -59,6 +59,13 @@
<dict-tag :options="dict.type.pay_status" :value="scope.row.payStatus" /> <dict-tag :options="dict.type.pay_status" :value="scope.row.payStatus" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="支付类型" align="center" prop="payTitle" />
<el-table-column label="数据来源" align="center" prop="dataSource" width="180">
<template slot-scope="scope">
<el-tag type="success" v-if="scope.row.dataSource && 2 === scope.row.dataSource">接口</el-tag>
<el-tag v-if="scope.row.dataSource && 1 === scope.row.dataSource">平台</el-tag>
</template>
</el-table-column>
<el-table-column label="详情预览" align="center"> <el-table-column label="详情预览" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<p style="margin: 0px;padding: 0px;">批次总笔数:{{ scope.row.totalCount }}</p> <p style="margin: 0px;padding: 0px;">批次总笔数:{{ scope.row.totalCount }}</p>
...@@ -76,20 +83,19 @@ ...@@ -76,20 +83,19 @@
<span>{{ parseTime(scope.row.transactionTime) }}</span> <span>{{ parseTime(scope.row.transactionTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="支付类型" align="center" prop="payTitle" /> <!-- <el-table-column label="支付备注" align="center" prop="payRemark" />-->
<el-table-column label="支付备注" align="center" prop="payRemark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.payStatus && scope.row.payStatus === 1" size="mini" type="text" icon="el-icon-money" @click="doPay(scope.row)">确认支付</el-button> <el-button v-if="scope.row.payStatus && scope.row.payStatus === 1" size="mini" type="text" icon="el-icon-money" @click="doPay(scope.row)">确认支付</el-button>
<el-button size="mini" type="text" icon="el-icon-s-order" @click="viewDetail(scope.row)">查看明细</el-button> <el-button size="mini" type="text" icon="el-icon-s-order" @click="viewDetail(scope.row)">查看明细</el-button>
<el-button v-if="scope.row.payStatus && scope.row.payStatus === 4 || scope.row.payStatus === 5" size="mini" <el-button v-if="scope.row.payStatus && scope.row.payStatus === 4 || scope.row.payStatus === 5" size="mini"
type="text" icon="el-icon-s-promotion" @click="doRepay(scope.row)">失败补发</el-button> type="text" icon="el-icon-s-promotion" @click="doRepay(scope.row)">失败补发</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" /> @pagination="getList" />
<el-dialog title="失败补发" :visible.sync="rePayPanel" width="90%" append-to-body class="dialogIp"> <el-dialog title="失败补发" :visible.sync="rePayPanel" width="90%" append-to-body class="dialogIp">
<RePay ref="rePay" :batch-info="rePayObj" @closeRePayPanel="closeRePayPanel" /> <RePay ref="rePay" :batch-info="rePayObj" @closeRePayPanel="closeRePayPanel" />
......
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