|
|
@@ -34,6 +34,7 @@
|
|
|
{{ scope.row.pname.join(' -> ') }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+
|
|
|
<el-table-column align="center" label="状态" class-name="status-col" width="80">
|
|
|
<template slot-scope="scope">
|
|
|
<el-tag :type="scope.row.status ? 'success' : 'danger'">{{
|
|
|
@@ -176,7 +177,12 @@
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="电子支付商户" prop="payWorkerCodeId">
|
|
|
<el-select v-model="mainForm.payWorkerCodeId" placeholder="请选择">
|
|
|
- <el-option v-for="item in PayConfigList" :key="item.value" :label="item.label" :value="item.value">
|
|
|
+ <el-option
|
|
|
+ v-for="item in PayConfigListDianzi"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value"
|
|
|
+ >
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
<div style="margin-left: 5px; color: #fd8005; width: calc(100% + 120px); margin-left: -90px">
|
|
|
@@ -489,6 +495,7 @@ export default {
|
|
|
data() {
|
|
|
return {
|
|
|
PayConfigList: [],
|
|
|
+ PayConfigListDianzi: [],
|
|
|
dataList: [], // 列表数据
|
|
|
dataList2: [], // 列表数据
|
|
|
listLoading: true, // 列表加载loading
|
|
|
@@ -782,6 +789,17 @@ export default {
|
|
|
}))
|
|
|
})
|
|
|
|
|
|
+ adminCompanyPayConfigList({
|
|
|
+ pageNum: 1,
|
|
|
+ pageSize: -1,
|
|
|
+ params: [{ param: 'a.attr', compare: 'like', value: '电子支付' }]
|
|
|
+ }).then(res => {
|
|
|
+ this.PayConfigListDianzi = res.data.records.map(item => ({
|
|
|
+ label: item.payMerchantName,
|
|
|
+ value: item.id
|
|
|
+ }))
|
|
|
+ })
|
|
|
+
|
|
|
this.cancelMainForm()
|
|
|
this.$nextTick(() => {
|
|
|
this.mainFormType = type
|
linwenxin