Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

添加运营助理岗位

Browse Source
This commit is contained in:
huangdeliang
2020-10-08 21:02:25 +08:00
parent c17f078f7b
commit 5522e23de2
6 changed files with 266 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
ruoyi-ui/src/views/custom/order/index.vue
View File

@ -121,6 +121,17 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="运营助理" prop="operatorAssisId">
<el-select v-model="queryParams.operatorAssisId" placeholder="请选择运营助理"
clearable size="small">
<el-option v-for="dict in operatorAssisIdOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="审核状态" prop="reviewStatus">
<el-select v-model="queryParams.reviewStatus" placeholder="请选择审核状态"
@ -218,6 +229,7 @@
<el-table-column label="策划" align="center" prop="planner" width="120"/>
<el-table-column label="策划助理" align="center" prop="plannerAssis" width="120"/>
<el-table-column label="运营" align="center" prop="operator" width="120"/>
<el-table-column label="运营助理" align="center" prop="operatorAssis" width="120"/>
<el-table-column label="推荐人" align="center" prop="recommender" width="120"/>
<el-table-column label="备注" align="center" prop="remark" width="120"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
@ -389,6 +401,23 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="运营助理" prop="operatorAssisId">
<el-select v-model="form.operatorAssisId" placeholder="请选择运营">
<el-option
v-for="dict in operatorAssisIdOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="推荐人" prop="recommender">
<el-input v-model="form.recommender" placeholder="请输入推荐人"/>
</el-form-item>
</el-col>
<el-col :span="12" v-hasPermi="['custom:order:review']">
<el-form-item label="审核状态" prop="reviewStatus">
<el-select v-model="form.reviewStatus" placeholder="请选择审核状态">
@ -401,11 +430,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col>
<el-form-item label="推荐人" prop="recommender">
<el-input v-model="form.recommender" placeholder="请输入推荐人"/>
</el-form-item>
</el-col>
<el-col>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
@ -474,6 +498,8 @@
plannerAssisIdOptions: [],
// 运营字典
operatorIdOptions: [],
//
operatorAssisIdOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
@ -490,6 +516,7 @@
plannerId: null,
plannerAssisId: null,
operatorId: null,
operatorAssisId: null,
recommender: null,
reviewStatus: null,
},
@ -562,6 +589,7 @@
this.plannerIdOptions = options['planner'] || [];
this.plannerAssisIdOptions = options['planner_assis'] || [];
this.operatorIdOptions = options['operator'] || [];
this.operatorAssisIdOptions = options['operator_assis'] || [];
})
this.getDicts("cus_pay_type").then(response => {
this.payTypeIdOptions = response.data;
@ -621,6 +649,10 @@
operatorIdFormat(row, column) {
return this.selectDictLabel(this.operatorIdOptions, row.operatorId);
},
// 运营助理字典翻译
operatorAssisIdFormat(row, column) {
return this.selectDictLabel(this.operatorAssisIdOptions, row.operatorAssisId);
},
// 取消按钮
cancel() {
this.open = false;
@ -632,6 +664,7 @@
const defaultServeMonth = this.serveMonthOption.find(opt => opt.remark === 'default');
const defaultAccount = this.accountIdOptions.find(opt => opt.remark === 'default');
const defaultOperator = this.operatorIdOptions.find(opt => opt.remark === 'default');
const defaultOperatorAssis = this.operatorAssisIdOptions.find(opt => opt.remark === 'default');
const defaultPresale = this.preSaleIdOptions.find(opt => opt.remark === 'default');
const defaultAftersale = this.afterSaleIdOptions.find(opt => opt.remark === 'default');
const defaultNutritionist = this.nutritionistIdOptions.find(opt => opt.remark === 'default');
@ -657,6 +690,7 @@
plannerId: defaultPlanner ? parseInt(defaultPlanner.dictValue) : null,
plannerAssisId: defaultPlannerAssis ? parseInt(defaultPlannerAssis.dictValue) : null,
operatorId: defaultOperator ? parseInt(defaultOperator.dictValue) : null,
operatorAssisId: defaultOperatorAssis ? parseInt(defaultOperatorAssis.dictValue) : null,
recommender: null,
orderTime: null,
serveMonth: defaultServeMonth ? parseInt(defaultServeMonth.dictValue) : 1,

64
ruoyi-ui/src/views/system/user/index.vue
View File

@ -15,14 +15,14 @@
<!--用户数据-->
<el-col :span="20" :xs="24">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="用户名称" prop="userName">
<el-form-item label="用户账号" prop="userName">
<el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable size="small" style="width: 240px"
@keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="手机号码" prop="phonenumber">
<el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable size="small"
style="width: 240px" @keyup.enter.native="handleQuery"/>
</el-form-item>
<!-- <el-form-item label="手机号码" prop="phonenumber">-->
<!-- <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable size="small"-->
<!-- style="width: 240px" @keyup.enter.native="handleQuery"/>-->
<!-- </el-form-item>-->
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="用户状态" clearable size="small" style="width: 240px">
<el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel"
@ -68,10 +68,10 @@
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="50" align="center" />-->
<el-table-column label="用户编号" align="center" prop="userId"/>
<el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true"/>
<el-table-column label="用户昵称" align="center" prop="nickName" :show-overflow-tooltip="true"/>
<el-table-column label="用户账号" align="center" prop="userName" :show-overflow-tooltip="true"/>
<el-table-column label="用户名称" align="center" prop="nickName" :show-overflow-tooltip="true"/>
<el-table-column label="岗位" align="center" prop="postName" :show-overflow-tooltip="true"/>
<el-table-column label="手机号码" align="center" prop="phonenumber" width="120"/>
<!-- <el-table-column label="手机号码" align="center" prop="phonenumber" width="120"/>-->
<el-table-column label="状态" align="center">
<template slot-scope="scope">
<el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
@ -108,8 +108,8 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
<el-form-item label="用户昵称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入用户昵称"/>
<el-form-item label="用户名称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入用户名称"/>
</el-form-item>
</el-col>
<el-col :span="12">
@ -118,22 +118,22 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="手机号码" prop="phonenumber">-->
<!-- <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="邮箱" prop="email">-->
<!-- <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row>
<el-col :span="12">
<el-form-item label="手机号码" prop="phonenumber">
<el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
<el-input v-model="form.userName" placeholder="请输入用户名称"/>
<el-form-item v-if="form.userId == undefined" label="用户账号" prop="userName">
<el-input v-model="form.userName" placeholder="请输入用户账号"/>
</el-form-item>
</el-col>
<el-col :span="12">
@ -332,14 +332,14 @@
trigger: ["blur", "change"],
},
],
phonenumber: [
{required: true, message: "手机号码不能为空", trigger: "blur"},
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: "请输入正确的手机号码",
trigger: "blur",
},
],
// phonenumber: [
// {required: true, message: "手机号码不能为空", trigger: "blur"},
// {
// pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
// message: "请输入正确的手机号码",
// trigger: "blur",
// },
// ],
},
};
},