|
|
@@ -224,6 +224,15 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="商户号" prop="merchantId">
|
|
|
+ <el-input
|
|
|
+ v-model="queryParams.merchantId"
|
|
|
+ clearable
|
|
|
+ placeholder="请输入商户号"
|
|
|
+ size="small"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="代服账户" prop="erpAccount" v-if="SFDFopen">
|
|
|
<el-select v-model="queryParams.erpAccount" style="width: 215px" placeholder="ERP账户" clearable size="small">
|
|
|
<el-option
|
|
|
@@ -469,6 +478,11 @@
|
|
|
<el-table-column label="ERP电话" align="center" prop="erpPhone" width="120px" v-if="SFDFopen"/>
|
|
|
<el-table-column label="ERP账号" align="center" prop="erpAccount" width="120px" v-if="SFDFopen"/>
|
|
|
<el-table-column label="小程序名称" align="center" prop="miniProgramName"/>
|
|
|
+ <el-table-column label="商户号" align="center" prop="merchantId" width="140">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span>{{ scope.row.merchantId || '-' }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column align="center" label="手机号" prop="nickname" width="150px">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ scope.row.nickname }} </span>
|
|
|
@@ -1437,6 +1451,7 @@ export default {
|
|
|
isSysDel: null,
|
|
|
deptId: null,
|
|
|
productId:null,
|
|
|
+ merchantId: null,
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {
|
|
|
@@ -2458,6 +2473,7 @@ export default {
|
|
|
this.queryParams.sortField = null;
|
|
|
this.queryParams.sortOrder = null;
|
|
|
this.queryParams.productId=null;
|
|
|
+ this.queryParams.merchantId = null;
|
|
|
// 重置表格排序状态 - 关键代码
|
|
|
this.$nextTick(() => {
|
|
|
if (this.$refs.orderTable) {
|
