diff --git a/src/views/ss/suit/component/SuitTable.vue b/src/views/ss/suit/component/SuitTable.vue index 70553f3..5f19130 100644 --- a/src/views/ss/suit/component/SuitTable.vue +++ b/src/views/ss/suit/component/SuitTable.vue @@ -17,6 +17,14 @@ @keyup.enter.native="handleQuery" /> </el-form-item> + <el-form-item label="用户手机" prop="userMobile"> + <el-input + v-model="queryParams.userMobile" + placeholder="请输入用户手机号" + clearable + @keyup.enter.native="handleQuery" + /> + </el-form-item> <el-form-item label="套餐名称" prop="name"> <el-input v-model="queryParams.name" @@ -50,8 +58,8 @@ <el-table-column type="selection" width="55" align="center" /> <el-table-column label="套餐ID" align="center" prop="suitId" width="80"/> <el-table-column label="套餐名称" align="center" prop="name" width="100"/> - <el-table-column label="所属用户" align="center" prop="userName" width="100"> - <user-link slot-scope="d" :id="d.row.userId" :name="d.row.userName"/> + <el-table-column label="所属用户" align="center" prop="mobileOrUserName" width="100"> + <user-link slot-scope="d" :id="d.row.userId" :name="d.row.mobileOrUserName"/> </el-table-column> <el-table-column label="收费模式" align="center" prop="feeMode" width="100"> <dict-tag slot-scope="d" :value="d.row.feeMode" :options="dict.type.suit_fee_mode"/> diff --git a/src/views/system/smUser/index.vue b/src/views/system/smUser/index.vue index e410bb5..107fb85 100644 --- a/src/views/system/smUser/index.vue +++ b/src/views/system/smUser/index.vue @@ -111,6 +111,9 @@ <template v-else-if="column.key === 'phonenumber'"> <user-link :id="d.row.userId" :name="d.row.phonenumber"/> </template> + <template v-else-if="column.key === 'realOrUserName'"> + <user-link :id="d.row.userId" :name="d.row.realOrUserName"/> + </template> <template v-else-if="column.key === 'storeCount'"> {{d.row.storeCount | defaultValue}} 家 </template> @@ -308,8 +311,8 @@ export default { span: 12, columns: [ {key: 'userId', visible: false, label: 'ID', align: 'center', minWidth: "80", sortable: true, width: null}, - {key: 'phonenumber', visible: true, label: '手机', align: 'center', minWidth: null, sortable: true, width: "120"}, - {key: 'userName', visible: false, label: '名称', align: 'center', minWidth: null, sortable: false, width: null}, + {key: 'phonenumber', visible: true, label: '手机', align: 'center', minWidth: null, sortable: true, width: null}, + {key: 'realOrUserName', visible: true, label: '名称', align: 'center', minWidth: null, sortable: false, width: null}, {key: 'type', visible: true, label: '类型', align: 'center', minWidth: null, sortable: true, width: null}, {key: 'remark', visible: true, label: '备注', align: 'center', minWidth: null, sortable: false, overflow: true, width: null}, {key: 'status', visible: true, label: '状态', align: 'center', minWidth: null, sortable: true, width: null},