jack
/
7uppay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

部分界面样式调整

master
yangchangfa 11 months ago
parent
47c2f0ac8c
commit
f4fb709c44
8 changed files with 123 additions and 113 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      src/views/pay/payAgentUser/payDaiShouOrderContry.vue
  2. 28
      src/views/pay/payAgentUser/payDaiShouOrderStore.vue
  3. 16
      src/views/pay/payOrder/orderReport.vue
  4. 58
      src/views/pay/payOrder/payDaiFuWater.vue
  5. 41
      src/views/pay/payOrder/payMoneyWater.vue
  6. 36
      src/views/pay/payOrder/payOrderWater.vue
  7. 37
      src/views/pay/payOrder/paySettleWater.vue
  8. 4
      src/views/pay/payType/payTypeChannelManage.vue

16
src/views/pay/payAgentUser/payDaiShouOrderContry.vue
View File

@ -16,32 +16,32 @@
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px" <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px"
class="flex form" style="padding:0 20px"> class="flex form" style="padding:0 20px">
<el-form-item label="交易时间"> <el-form-item label="交易时间">
<el-date-picker v-model="dateRange" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss" <el-date-picker v-model="dateRange" size="small" style="width: 340px; height: 32px;" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
:unlink-panels="true" :default-time="['00:00:00', '23:59:59']" :unlink-panels="true" :default-time="['00:00:00', '23:59:59']"
:picker-options="pickerOptions"></el-date-picker> :picker-options="pickerOptions"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="商户名称" prop="storeName"> <el-form-item label="商户名称" prop="storeName">
<el-input size="medium" v-model="queryParams.storeName" placeholder="请输入商户名称" <el-input size="small" v-model="queryParams.storeName" placeholder="请输入商户名称"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item> </el-form-item>
<el-form-item label="支付渠道" prop="channelType"> <el-form-item label="支付渠道" prop="channelType">
<el-select v-model="queryParams.channelType" placeholder="请选择支付渠道" clearable size="medium"> <el-select v-model="queryParams.channelType" placeholder="请选择支付渠道" clearable size="small">
<el-option v-for="(item, i) in userLevType" :key="i" :label="item.channelName" <el-option v-for="(item, i) in userLevType" :key="i" :label="item.channelName"
:value="item.payChannel"></el-option> :value="item.payChannel"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="支付类型" prop="payType"> <el-form-item label="支付类型" prop="payType">
<el-select v-model="queryParams.payType" placeholder="请选择支付类型" clearable size="medium"> <el-select v-model="queryParams.payType" placeholder="请选择支付类型" clearable size="small">
<el-option v-for="(item, i) in sortLevType" :key="i" :label="item.typeName" <el-option v-for="(item, i) in sortLevType" :key="i" :label="item.typeName"
:value="item.payType"></el-option> :value="item.payType"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="" size="small" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table stripe v-loading="loading" :data="infoList"> <el-table stripe v-loading="loading" :data="infoList">
@ -88,7 +88,7 @@
</div> </div>
</template> </template>
<script> <script>
import { common_api, payAgentUser } from "@/api/form"; import { common_api, payAgentUser } from "@/api/form";
@ -364,4 +364,4 @@ export default {
} }
}, },
}; };
</script> </script>

28
src/views/pay/payAgentUser/payDaiShouOrderStore.vue
View File

@ -16,47 +16,47 @@
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px" <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px"
class="flex form" style="padding:0 20px"> class="flex form" style="padding:0 20px">
<el-form-item label="交易时间"> <el-form-item label="交易时间">
<el-date-picker v-model="dateRange" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss" <el-date-picker v-model="dateRange" size="small" style="width: 340px; height: 32px;" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
:unlink-panels="true" :default-time="['00:00:00', '23:59:59']" :unlink-panels="true" :default-time="['00:00:00', '23:59:59']"
:picker-options="pickerOptions"></el-date-picker> :picker-options="pickerOptions"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="商户名称" prop="storeName"> <el-form-item label="商户名称" prop="storeName">
<el-input size="medium" v-model="queryParams.storeName" placeholder="请输入商户名称" <el-input size="small" v-model="queryParams.storeName" placeholder="请输入商户名称"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item> </el-form-item>
<el-form-item label="账户编号" prop="accountNo"> <el-form-item label="账户编号" prop="accountNo">
<el-input size="medium" v-model="queryParams.accountNo" placeholder="请输入账户编号" <el-input size="small" v-model="queryParams.accountNo" placeholder="请输入账户编号"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item> </el-form-item>
<el-form-item label="国家编号" prop="nationCode"> <el-form-item label="国家编号" prop="nationCode">
<el-input size="medium" v-model="queryParams.nationCode" placeholder="请输入国家编号" <el-input size="small" v-model="queryParams.nationCode" placeholder="请输入国家编号"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="" size="small" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table stripe v-loading="loading" :data="infoList"> <el-table stripe v-loading="loading" :data="infoList">
<el-table-column label="商户名称" align="center" prop="storeName" /> <el-table-column label="商户名称" align="left" prop="storeName" />
<el-table-column label="账户编号" align="center" prop="accountNo" /> <el-table-column label="账户编号" align="left" prop="accountNo" />
<el-table-column label="支付类型名称" align="left" prop="typeName" />
<el-table-column label="国家编号" align="left" prop="nationCode" />
<el-table-column label="成功订单数" align="center" prop="successOrderCount" /> <el-table-column label="成功订单数" align="center" prop="successOrderCount" />
<el-table-column label="订单成功金额" align="center" prop="payAmt" /> <el-table-column label="订单成功金额" align="center" prop="payAmt" />
<el-table-column label="订单总金额" align="center" prop="tranAmt" /> <el-table-column label="订单总金额" align="center" prop="tranAmt" />
<el-table-column label="总订单数" align="center" prop="orderCount" /> <el-table-column label="总订单数" align="center" prop="orderCount" />
<el-table-column label="成功率" align="center" prop="successRate"> <el-table-column label="成功率" align="center" prop="successRate">
<template slot-scope="scope"> <template slot-scope="scope">
{{ NumberMul(scope.row.successRate,100) }}% {{ NumberMul(scope.row.successRate,100) }}%
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="支付类型名称" align="center" prop="typeName" />
<el-table-column label="国家编号" align="center" prop="nationCode" />
<!-- <el-table-column <!-- <el-table-column
label="操作" label="操作"
align="center" align="center"
@ -89,7 +89,7 @@
</div> </div>
</template> </template>
<script> <script>
import { common_api, payAgentUser } from "@/api/form"; import { common_api, payAgentUser } from "@/api/form";
@ -355,4 +355,4 @@ export default {
} }
}, },
}; };
</script> </script>

16
src/views/pay/payOrder/orderReport.vue
View File

@ -15,7 +15,7 @@
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px" <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px"
class="flex form" style="padding:0 20px"> class="flex form" style="padding:0 20px">
<el-form-item label="交易时间"> <el-form-item label="交易时间">
<my-date-picker @change="onDateRangeChange" ref="child" /> <my-date-picker @change="onDateRangeChange" ref="child" style="height: 32px;"/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="商户名称" prop="storeName"> <!-- <el-form-item label="商户名称" prop="storeName">
<el-input size="medium" v-model="queryParams.storeName" placeholder="请输入商户名称" @keyup.enter.native="handleQuery" <el-input size="medium" v-model="queryParams.storeName" placeholder="请输入商户名称" @keyup.enter.native="handleQuery"
@ -23,7 +23,7 @@
</el-form-item> --> </el-form-item> -->
<el-form-item label="商户名称" prop="storeName"> <el-form-item label="商户名称" prop="storeName">
<el-select v-model="queryParams.storeName" placeholder="请选择商户名称" clearable size="medium"> <el-select v-model="queryParams.storeName" placeholder="请选择商户名称" clearable size="small">
<el-option v-for="(item, i) in storeNameType" :key="i" :label="item.storeName" <el-option v-for="(item, i) in storeNameType" :key="i" :label="item.storeName"
:value="item.storeName"></el-option> :value="item.storeName"></el-option>
</el-select> </el-select>
@ -34,19 +34,19 @@
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item> --> </el-form-item> -->
<el-form-item label="支付渠道" prop="channelType"> <el-form-item label="支付渠道" prop="channelType">
<el-select v-model="queryParams.channelType" placeholder="请选择支付渠道" clearable size="medium"> <el-select v-model="queryParams.channelType" placeholder="请选择支付渠道" clearable size="small">
<el-option v-for="(item, i) in userLevType" :key="i" :label="item.channelName" <el-option v-for="(item, i) in userLevType" :key="i" :label="item.channelName"
:value="item.payChannel"></el-option> :value="item.payChannel"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="支付类型" prop="payType"> <el-form-item label="支付类型" prop="payType">
<el-select v-model="queryParams.payType" placeholder="请选择支付类型" clearable size="medium"> <el-select v-model="queryParams.payType" placeholder="请选择支付类型" clearable size="small">
<el-option v-for="(item, i) in sortLevType" :key="i" :label="item.typeName" :value="item.payType"></el-option> <el-option v-for="(item, i) in sortLevType" :key="i" :label="item.typeName" :value="item.payType"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="medium" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -203,7 +203,7 @@ export default {
} }
this.queryParams.beginTime = this.systemDate + ' ' + '00' + ':' + '00' + ':' + '00' this.queryParams.beginTime = this.systemDate + ' ' + '00' + ':' + '00' + ':' + '00'
this.queryParams.endTime = this.systemDate+ ' ' + '23' + ':' + '59' + ':' + '59' this.queryParams.endTime = this.systemDate+ ' ' + '23' + ':' + '59' + ':' + '59'
this.$forceUpdate() this.$forceUpdate()
}, },
init() { init() {
common_api.payChannelAll().then((response) => { common_api.payChannelAll().then((response) => {
@ -223,7 +223,7 @@ export default {
this.data = response.data; this.data = response.data;
this.loading = false; this.loading = false;
}); });
}, },
/** 查询订单周期变化 */ /** 查询订单周期变化 */
onDateRangeChange(value) { onDateRangeChange(value) {

58
src/views/pay/payOrder/payDaiFuWater.vue
View File

@ -14,57 +14,57 @@
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="96px" <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="96px"
class="flex form" style="padding:0 20px"> class="flex form" style="padding:0 20px">
<el-form-item label="商户订单号" prop="outTradeNo"> <el-form-item label="商户订单号" prop="outTradeNo">
<el-input size="medium" v-model="queryParams.outTradeNo" placeholder="请输入商户订单号" <el-input size="small" v-model="queryParams.outTradeNo" placeholder="请输入商户订单号"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item> </el-form-item>
<el-form-item label="平台订单号" prop="noOrder"> <el-form-item label="平台订单号" prop="noOrder">
<el-input size="medium" v-model="queryParams.noOrder" placeholder="请输入平台订单号" <el-input size="small" v-model="queryParams.noOrder" placeholder="请输入平台订单号"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item> </el-form-item>
<el-form-item label="商户名称" prop="storeName"> <el-form-item label="商户名称" prop="storeName">
<el-input size="medium" v-model="queryParams.storeName" placeholder="请输入商户名称" <el-input size="small" v-model="queryParams.storeName" placeholder="请输入商户名称"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item> </el-form-item>
<el-form-item label="银行卡号" prop="acctId"> <el-form-item label="银行卡号" prop="acctId">
<el-input size="medium" v-model="queryParams.acctId" placeholder="请输入银行卡号" <el-input size="small" v-model="queryParams.acctId" placeholder="请输入银行卡号"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item> </el-form-item>
<el-form-item label="代付状态" prop="orderStatus"> <el-form-item label="代付状态" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" placeholder="请选择代付状态" size="medium"> <el-select v-model="queryParams.orderStatus" placeholder="请选择代付状态" size="small">
<el-option v-for="dict in dict.type.payment_status" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.payment_status" :key="dict.value" :label="dict.label"
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="出金渠道" prop="outChannel"> <el-form-item label="出金渠道" prop="outChannel">
<el-select v-model="queryParams.outChannel" placeholder="请选择出金渠道" clearable size="medium"> <el-select v-model="queryParams.outChannel" placeholder="请选择出金渠道" clearable size="small">
<el-option v-for="(item, i) in userLevType" :key="i" :label="item.channelName" <el-option v-for="(item, i) in userLevType" :key="i" :label="item.channelName"
:value="item.payChannel"></el-option> :value="item.payChannel"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否发起代付" prop="isPayment"> <el-form-item label="是否发起代付" prop="isPayment">
<el-select v-model="queryParams.isPayment" placeholder="请选择是否发起代付" size="medium"> <el-select v-model="queryParams.isPayment" placeholder="请选择是否发起代付" size="small">
<el-option v-for="dict in dict.type.yes_no" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.yes_no" :key="dict.value" :label="dict.label"
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="订单来源" prop="sourceType"> <el-form-item label="订单来源" prop="sourceType">
<el-select v-model="queryParams.sourceType" placeholder="请选择订单来源" size="medium"> <el-select v-model="queryParams.sourceType" placeholder="请选择订单来源" size="small">
<el-option v-for="dict in dict.type.source_type" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.source_type" :key="dict.value" :label="dict.label"
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker v-model="dateRange[0]" size="small" style="width: 340px" <el-date-picker v-model="dateRange[0]" size="small" style="width: 340px; height: 32px;"
value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期"
end-placeholder="结束日期" :unlink-panels="true" :default-time="['00:00:00', '23:59:59']" end-placeholder="结束日期" :unlink-panels="true" :default-time="['00:00:00', '23:59:59']"
:picker-options="pickerOptions"></el-date-picker> :picker-options="pickerOptions"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="更新时间"> <el-form-item label="更新时间">
<el-date-picker v-model="dateRange[1]" size="small" style="width: 340px" <el-date-picker v-model="dateRange[1]" size="small" style="width: 340px; height: 32px"
value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期"
end-placeholder="结束日期" :unlink-panels="true" :default-time="['00:00:00', '23:59:59']" end-placeholder="结束日期" :unlink-panels="true" :default-time="['00:00:00', '23:59:59']"
:picker-options="pickerOptions"></el-date-picker> :picker-options="pickerOptions"></el-date-picker>
@ -74,13 +74,13 @@
<el-form-item> <el-form-item>
<div class="searchTop flexBet" style="align-items: center;"> <div class="searchTop flexBet" style="align-items: center;">
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="" size="small" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</el-row> </el-row>
<el-row :gutter="10" class="mb8" style="margin-left:20px"> <el-row :gutter="10" class="mb8" style="margin-left:20px">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleExport" <el-button type="primary" plain icon="" size="small" style="height: 32px;" @click="handleExport"
v-hasPermi="['record:platform_payment_export']">导出</el-button> v-hasPermi="['record:platform_payment_export']">导出</el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5"> <!-- <el-col :span="1.5">
@ -102,26 +102,23 @@
<el-table stripe v-loading="loading" :data="infoList" :row-class-name="tableRowClassName"> <el-table stripe v-loading="loading" :data="infoList" :row-class-name="tableRowClassName">
<!-- <el-table-column type="selection" width="55" align="center" :selectable="selectable" @selection-change="handleSelectionChange" /> --> <!-- <el-table-column type="selection" width="55" align="center" :selectable="selectable" @selection-change="handleSelectionChange" /> -->
<el-table-column :label="'商户订单号\n平台订单号'" align="center" prop="storeNo" min-width="150"> <el-table-column :label="'商户订单号\n平台订单号'" align="left" prop="storeNo" min-width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.outTradeNo }}<br /> {{ scope.row.outTradeNo }}<br />
{{ scope.row.noOrder }} {{ scope.row.noOrder }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="'开户名'" align="center" prop="storeNo" min-width="80">
<template slot-scope="scope">
{{ scope.row.acctName }}
</template>
</el-table-column>
<el-table-column :label="'银行名称'" align="center" prop="storeNo" min-width="100"> <el-table-column :label="'银行名称'" align="left" prop="storeNo" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.bankName }} {{ scope.row.bankName }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="'银行卡号'" align="center" prop="storeNo" min-width="120">
<el-table-column :label="'开户名\n银行卡号'" align="left" prop="storeNo" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.acctId }}<br /> {{ scope.row.acctName }}<br />
{{ scope.row.acctId }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="'代付金额\n代付手续费'" align="center" prop="storeNo"> <el-table-column :label="'代付金额\n代付手续费'" align="center" prop="storeNo">
@ -142,7 +139,7 @@
{{ scope.row.outChannelName }} {{ scope.row.outChannelName }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="'商户名称\n创建时间'" align="center" prop="storeNo" min-width="120"> <el-table-column :label="'商户名称\n创建时间'" align="left" prop="storeNo" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.storeName }}<br /> {{ scope.row.storeName }}<br />
{{ scope.row.createTime }} {{ scope.row.createTime }}
@ -155,9 +152,9 @@
</el-table-column> </el-table-column>
<el-table-column :label="'订单信息'" align="center" prop="orderMsg" min-width="100" /> <el-table-column :label="'订单信息'" align="left" prop="orderMsg" min-width="100" show-overflow-tooltip/>
<el-table-column :label="'备注'" align="center" prop="memo" min-width="100" /> <el-table-column :label="'备注'" align="left" prop="memo" min-width="100" />
<el-table-column :label="'更新时间'" align="center" prop="storeNo" min-width="120"> <el-table-column :label="'更新时间'" align="center" prop="storeNo" min-width="120">
@ -313,7 +310,7 @@
<el-form-item label="回调地址"> <el-form-item label="回调地址">
{{ detailInfoList.notifyUrl }} {{ detailInfoList.notifyUrl }}
</el-form-item> </el-form-item>
<el-form-item label="订单描述"> <el-form-item label="订单信息">
{{ detailInfoList.orderMsg }} {{ detailInfoList.orderMsg }}
</el-form-item> </el-form-item>
<el-form-item label="交易状态"> <el-form-item label="交易状态">
@ -365,7 +362,7 @@
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { common_api, platform_payment_list, payOrder } from "@/api/form"; import { common_api, platform_payment_list, payOrder } from "@/api/form";
@ -598,7 +595,7 @@ export default {
this.$forceUpdate() this.$forceUpdate()
}, },
selectable(row, rowIndex) { selectable(row, rowIndex) {
//索引是从0开始，条件1是指只有第2行数据不被禁用 //索引是从0开始，条件1是指只有第2行数据不被禁用
if (row.orderStatus == 'processreview') { if (row.orderStatus == 'processreview') {
return true; //不禁用 return true; //不禁用
} else { } else {
@ -772,6 +769,9 @@ export default {
}; };
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
::v-deep .el-form-item {
margin-bottom: 16px;
}
::v-deep .el-table tbody tr:hover>td { ::v-deep .el-table tbody tr:hover>td {
background-color: rgba(0, 0, 0, 0) !important background-color: rgba(0, 0, 0, 0) !important
} }
@ -800,4 +800,4 @@ export default {
::v-deep .el-dialog:not(.is-fullscreen) { ::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 20vh !important; margin-top: 20vh !important;
} }
</style> </style>

41
src/views/pay/payOrder/payMoneyWater.vue
View File

@ -21,41 +21,41 @@
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px" <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px"
class="flex form" style="padding:0 20px"> class="flex form" style="padding:0 20px">
<el-form-item label="商户名称" prop="storeName"> <el-form-item label="商户名称" prop="storeName">
<el-input size="medium" v-model="queryParams.storeName" placeholder="请输入商户名称" <el-input size="small" v-model="queryParams.storeName" placeholder="请输入商户名称"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item> </el-form-item>
<el-form-item label="业务单号" prop="witNo"> <el-form-item label="业务单号" prop="witNo">
<el-input size="medium" v-model="queryParams.witNo" placeholder="请输入业务单号" <el-input size="small" v-model="queryParams.witNo" placeholder="请输入业务单号"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item> </el-form-item>
<el-form-item label="账户编号" prop="accountNo"> <el-form-item label="账户编号" prop="accountNo">
<el-input size="medium" v-model="queryParams.accountNo" placeholder="请输入账户编号" <el-input size="small" v-model="queryParams.accountNo" placeholder="请输入账户编号"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item> </el-form-item>
<el-form-item label="类型" prop="isIncome"> <el-form-item label="类型" prop="isIncome">
<el-select v-model="queryParams.isIncome" placeholder="请选择类型" size="medium"> <el-select v-model="queryParams.isIncome" placeholder="请选择类型" size="small">
<el-option v-for="dict in typeCon" :key="dict.value" :label="dict.label" :value="dict.value" /> <el-option v-for="dict in typeCon" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="业务类型" prop="witType"> <el-form-item label="业务类型" prop="witType">
<el-select v-model="queryParams.witType" placeholder="请选择业务类型" size="medium"> <el-select v-model="queryParams.witType" placeholder="请选择业务类型" size="small">
<el-option v-for="dict in dict.type.capital_type" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.capital_type" :key="dict.value" :label="dict.label"
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="用户类型" prop="userType"> <el-form-item label="用户类型" prop="userType">
<el-select v-model="queryParams.userType" placeholder="请选择用户类型" size="medium"> <el-select v-model="queryParams.userType" placeholder="请选择用户类型" size="small">
<el-option v-for="dict in userCon" :key="dict.value" :label="dict.label" :value="dict.value" /> <el-option v-for="dict in userCon" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="交易时间"> <el-form-item label="交易时间">
<el-date-picker v-model="dateRange" size="small" style="width: 340px" <el-date-picker v-model="dateRange" size="small" style="width: 340px; height: 32px;"
value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期"
end-placeholder="结束日期" :unlink-panels="true" end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></el-date-picker> :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></el-date-picker>
@ -63,13 +63,13 @@
<el-form-item> <el-form-item>
<div class="searchTop flexBet" style="align-items: center;"> <div class="searchTop flexBet" style="align-items: center;">
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="" size="small" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</el-row> </el-row>
<el-row :gutter="10" class="mb8" style="margin-left:20px"> <el-row :gutter="10" class="mb8" style="margin-left:20px">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleExport" <el-button type="primary" plain icon="" size="small" @click="handleExport" style="height: 32px;"
v-hasPermi="['order:rechargeRecord:export']">导出</el-button> v-hasPermi="['order:rechargeRecord:export']">导出</el-button>
</el-col> </el-col>
</el-row> </el-row>
@ -77,14 +77,14 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table stripe v-loading="loading" :data="infoList" @selection-change="handleSelectionChange"> <el-table stripe v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
<el-table-column :label="'业务单号'" align="center" prop="witNo" min-width="180" /> <el-table-column :label="'业务单号'" align="left" prop="witNo" min-width="180" />
<el-table-column :label="'账户名称'" align="center" prop="storeNo" min-width="150"> <el-table-column :label="'账户名称'" align="left" prop="storeNo" min-width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.userType == 'agent' ? scope.row.name : scope.row.storeName }} {{ scope.row.userType == 'agent' ? scope.row.name : scope.row.storeName }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="'账号编号'" align="center" prop="accountNo" min-width="150" /> <el-table-column :label="'账号编号'" align="left" prop="accountNo" min-width="150" />
<el-table-column label="用户类型" align="center" prop="userType" min-width="120"> <el-table-column label="用户类型" align="center" prop="userType" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="scope.row.userType == 'store' <el-tag :type="scope.row.userType == 'store'
@ -123,11 +123,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="'备注'" align="center" prop="remarks" min-width="150"/> <el-table-column :label="'备注'" align="left" prop="remarks" min-width="150"/>
<el-table-column label="添加日期" align="center" prop="createTime" width="180" /> <el-table-column label="添加日期" align="left" prop="createTime" width="180" />
<el-table-column label="修改日期" align="center" prop="updateTime" width="180" /> <el-table-column label="修改日期" align="left" prop="updateTime" width="180" />
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" /> :limit.sync="queryParams.pageSize" @pagination="getList" />
@ -148,7 +148,7 @@
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { common_api, capitalDtlList } from "@/api/form"; import { common_api, capitalDtlList } from "@/api/form";
@ -370,7 +370,7 @@ export default {
this.sortLevType = response.data this.sortLevType = response.data
}); });
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.storeId) this.ids = selection.map(item => item.storeId)
@ -463,6 +463,9 @@ export default {
}; };
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
::v-deep .el-form-item {
margin-bottom: 16px;
}
::v-deep .el-dialog__body { ::v-deep .el-dialog__body {
padding: 20px 20px; padding: 20px 20px;
} }
@ -483,4 +486,4 @@ export default {
::v-deep .el-dialog:not(.is-fullscreen) { ::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 33vh !important; margin-top: 33vh !important;
} }
</style> </style>

36
src/views/pay/payOrder/payOrderWater.vue
View File

@ -13,11 +13,11 @@
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px" <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px"
class="flex form" style="padding:0 20px"> class="flex form" style="padding:0 20px">
<el-form-item label="商户订单号" prop="outTradeNo"> <el-form-item label="商户订单号" prop="outTradeNo">
<el-input size="medium" v-model="queryParams.outTradeNo" placeholder="请输入商户订单号" <el-input size="small" v-model="queryParams.outTradeNo" placeholder="请输入商户订单号"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item> </el-form-item>
<el-form-item label="平台订单号" prop="orderNo"> <el-form-item label="平台订单号" prop="orderNo">
<el-input size="medium" v-model="queryParams.orderNo" placeholder="请输入平台订单号" <el-input size="small" v-model="queryParams.orderNo" placeholder="请输入平台订单号"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item> </el-form-item>
<!-- <el-form-item label="渠道订单号" prop="transactionId"> <!-- <el-form-item label="渠道订单号" prop="transactionId">
@ -33,11 +33,11 @@
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item> --> </el-form-item> -->
<el-form-item label="商户名称" prop="storeName"> <el-form-item label="商户名称" prop="storeName">
<el-input size="medium" v-model="queryParams.storeName" placeholder="请输入商户名称" <el-input size="small" v-model="queryParams.storeName" placeholder="请输入商户名称"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item> </el-form-item>
<el-form-item label="付款人" prop="userKey"> <el-form-item label="付款人" prop="userKey">
<el-input size="medium" v-model="queryParams.userKey" placeholder="请输入付款人" <el-input size="small" v-model="queryParams.userKey" placeholder="请输入付款人"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item> </el-form-item>
@ -47,27 +47,27 @@
</el-form-item> --> </el-form-item> -->
<el-form-item label="订单状态" prop="orderStatus"> <el-form-item label="订单状态" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" size="medium"> <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" size="small">
<el-option v-for="dict in dict.type.pay_status" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.pay_status" :key="dict.value" :label="dict.label"
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="结算状态" prop="storeSettle"> <el-form-item label="结算状态" prop="storeSettle">
<el-select v-model="queryParams.storeSettle" placeholder="请选择结算状态" size="medium"> <el-select v-model="queryParams.storeSettle" placeholder="请选择结算状态" size="small">
<el-option v-for="dict in dict.type.settle_status" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.settle_status" :key="dict.value" :label="dict.label"
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="支付渠道" prop="channelType"> <el-form-item label="支付渠道" prop="channelType">
<el-select v-model="queryParams.channelType" placeholder="请选择支付渠道" clearable size="medium"> <el-select v-model="queryParams.channelType" placeholder="请选择支付渠道" clearable size="small">
<el-option v-for="(item, i) in userLevType" :key="i" :label="item.channelName" <el-option v-for="(item, i) in userLevType" :key="i" :label="item.channelName"
:value="item.payChannel"></el-option> :value="item.payChannel"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="支付类型" prop="payType"> <el-form-item label="支付类型" prop="payType">
<el-select v-model="queryParams.payType" placeholder="请选择支付类型" clearable size="medium"> <el-select v-model="queryParams.payType" placeholder="请选择支付类型" clearable size="small">
<el-option v-for="(item, i) in sortLevType" :key="i" :label="item.typeName" <el-option v-for="(item, i) in sortLevType" :key="i" :label="item.typeName"
:value="item.payType"></el-option> :value="item.payType"></el-option>
</el-select> </el-select>
@ -79,14 +79,14 @@
</el-form-item> --> </el-form-item> -->
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker v-model="dateRange[0]" size="small" style="width: 340px" <el-date-picker v-model="dateRange[0]" size="small" style="width: 340px; height: 32px;"
value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期"
end-placeholder="结束日期" :unlink-panels="true" :default-time="['00:00:00', '23:59:59']" end-placeholder="结束日期" :unlink-panels="true" :default-time="['00:00:00', '23:59:59']"
:picker-options="pickerOptions"></el-date-picker> :picker-options="pickerOptions"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="支付时间"> <el-form-item label="支付时间">
<el-date-picker v-model="dateRange[1]" size="small" style="width: 340px" <el-date-picker v-model="dateRange[1]" size="small" style="width: 340px; height: 32px;"
value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期"
end-placeholder="结束日期" :unlink-panels="true" :default-time="['00:00:00', '23:59:59']" end-placeholder="结束日期" :unlink-panels="true" :default-time="['00:00:00', '23:59:59']"
:picker-options="pickerOptions"></el-date-picker> :picker-options="pickerOptions"></el-date-picker>
@ -96,17 +96,17 @@
<el-form-item> <el-form-item>
<div class="searchTop flexBet" style="align-items: center;"> <div class="searchTop flexBet" style="align-items: center;">
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="" size="small" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</el-row> </el-row>
<el-row :gutter="10" class="mb8" style="margin-left:20px"> <el-row :gutter="10" class="mb8" style="margin-left:20px">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleExport" <el-button type="primary" plain icon="" size="small" @click="handleExport" style="height: 32px;"
v-hasPermi="['order:rechargeRecord:export']">导出</el-button> v-hasPermi="['order:rechargeRecord:export']">导出</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleSay" :disabled="single" <el-button type="primary" plain icon="" size="small" @click="handleSay" :disabled="single" style="height: 32px;"
v-hasPermi="['order:rechargeRecord:reissueNotice']">补发通知</el-button> v-hasPermi="['order:rechargeRecord:reissueNotice']">补发通知</el-button>
</el-col> </el-col>
</el-row> </el-row>
@ -483,7 +483,7 @@
</div> </div>
</template> </template>
<script> <script>
import { common_api, payOrder } from "@/api/form"; import { common_api, payOrder } from "@/api/form";
@ -871,6 +871,9 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped>
::v-deep .el-form-item {
margin-bottom: 16px;
}
::v-deep .el-dialog:not(.is-fullscreen) { ::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 10vh !important; margin-top: 10vh !important;
} }
@ -882,4 +885,5 @@ export default {
::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell { ::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell {
background: none !important; background: none !important;
} }
</style>
</style>

37
src/views/pay/payOrder/paySettleWater.vue
View File

@ -13,41 +13,41 @@
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px" <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px"
class="flex form" style="padding:0 20px"> class="flex form" style="padding:0 20px">
<el-form-item label="平台订单号" prop="orderNo"> <el-form-item label="平台订单号" prop="orderNo">
<el-input size="medium" v-model="queryParams.orderNo" placeholder="请输入平台订单号" <el-input size="small" v-model="queryParams.orderNo" placeholder="请输入平台订单号"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item> </el-form-item>
<el-form-item label="商户名称" prop="storeName"> <el-form-item label="商户名称" prop="storeName">
<el-input size="medium" v-model="queryParams.storeName" placeholder="请输入商户名称" <el-input size="small" v-model="queryParams.storeName" placeholder="请输入商户名称"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item> </el-form-item>
<el-form-item label="商户编号" prop="storeNo"> <el-form-item label="商户编号" prop="storeNo">
<el-input size="medium" v-model="queryParams.storeNo" placeholder="请输入商户编号" <el-input size="small" v-model="queryParams.storeNo" placeholder="请输入商户编号"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item> </el-form-item>
<el-form-item label="结算状态" prop="settleCode"> <el-form-item label="结算状态" prop="settleCode">
<el-select v-model="queryParams.settleCode" placeholder="请选择结算状态" size="medium"> <el-select v-model="queryParams.settleCode" placeholder="请选择结算状态" size="small">
<el-option v-for="dict in dict.type.settle_status" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.settle_status" :key="dict.value" :label="dict.label"
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="交易时间"> <el-form-item label="交易时间">
<el-date-picker v-model="dateRange" size="small" style="width: 340px" <el-date-picker v-model="dateRange" size="small" style="width: 340px; height: 32px;"
value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期"
end-placeholder="结束日期" :unlink-panels="true" end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></el-date-picker> :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="" size="small" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table stripe v-loading="loading" :data="infoList" @selection-change="handleSelectionChange"> <el-table stripe v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
<el-table-column :label="'订单号'" align="center" prop="orderNo" min-width="180" /> <el-table-column :label="'订单号'" align="left" prop="orderNo" min-width="180" />
<el-table-column :label="'商户名称'" align="center" prop="storeName" min-width="120" /> <el-table-column :label="'商户名称'" align="left" prop="storeName" min-width="120" />
<el-table-column :label="'商户编号'" align="center" prop="storeNo" min-width="150" /> <el-table-column :label="'商户编号'" align="left" prop="storeNo" min-width="150" />
<el-table-column :label="'支付类型'" align="center" prop="typeName" min-width="150" /> <el-table-column :label="'支付类型'" align="center" prop="typeName" min-width="150" />
<el-table-column :label="'渠道类型'" align="center" prop="channelName" min-width="150" /> <el-table-column :label="'渠道类型'" align="center" prop="channelName" min-width="150" />
<el-table-column :label="'待结算金额'" align="center" prop="settleAmt" /> <el-table-column :label="'待结算金额'" align="center" prop="settleAmt" />
@ -60,9 +60,9 @@
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="执行时间" align="center" prop="settleTime" width="180" /> <el-table-column label="执行时间" align="left" prop="settleTime" width="180" />
<el-table-column label="充值时间" align="center" prop="rechargeTime" width="180" /> <el-table-column label="充值时间" align="left" prop="rechargeTime" width="180" />
<el-table-column label="添加日期" align="center" prop="addTime" width="180" /> <el-table-column label="添加日期" align="left" prop="addTime" width="180" />
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" /> :limit.sync="queryParams.pageSize" @pagination="getList" />
@ -83,7 +83,7 @@
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { common_api, paySettleWater } from "@/api/form"; import { common_api, paySettleWater } from "@/api/form";
@ -378,6 +378,9 @@ export default {
}; };
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
::v-deep .el-form-item {
margin-bottom: 16px;
}
::v-deep .el-dialog__body { ::v-deep .el-dialog__body {
padding: 20px 20px; padding: 20px 20px;
} }
@ -398,4 +401,4 @@ export default {
::v-deep .el-dialog:not(.is-fullscreen) { ::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 33vh !important; margin-top: 33vh !important;
} }
</style> </style>

4
src/views/pay/payType/payTypeChannelManage.vue
View File

@ -169,8 +169,8 @@
<el-input v-model="form.poundageAmt" placeholder="请输入手续费金额" size="small" <el-input v-model="form.poundageAmt" placeholder="请输入手续费金额" size="small"
oninput="value=value.replace(/[^\d.]/g,'').replace(/^\./g, '').replace(/\.{2,}/g, '').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').match(/^\d*(\.?\d{0,4})/g)[0] || null" /> oninput="value=value.replace(/[^\d.]/g,'').replace(/^\./g, '').replace(/\.{2,}/g, '').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').match(/^\d*(\.?\d{0,4})/g)[0] || null" />
</el-form-item> </el-form-item>
<el-form-item label="手续费率" prop="poundageRate"> <el-form-item label="手续费费率" prop="poundageRate">
<el-input v-model="form.poundageRate" placeholder="请输入手续费率" size="small" style="width: 202px;" <el-input v-model="form.poundageRate" placeholder="请输入手续费费率" size="small" style="width: 202px;"
oninput="value=value.replace(/[^\d.]/g,'').replace(/^\./g, '').replace(/\.{2,}/g, '').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').match(/^\d*(\.?\d{0,4})/g)[0] || null" /> oninput="value=value.replace(/[^\d.]/g,'').replace(/^\./g, '').replace(/\.{2,}/g, '').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').match(/^\d*(\.?\d{0,4})/g)[0] || null" />
<span style="color:red;"> <span style="color:red;">
（示例：1%填0.01） （示例：1%填0.01）

Write Preview
Loading…
Cancel
Save