添加运营助理岗位

ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysCommisionController.java

@@ -116,35 +116,31 @@ public class SysCommisionController extends BaseController {
         startPage();
         List<SysCommision> list = sysCommisionService.selectSysCommisionDetail(sysCommision);
         for (SysCommision detail : list) {
+            detail.setRate(0F);
             SysCommision tmpQueryCom = new SysCommision();
             tmpQueryCom.setUserId(detail.getUserId());
             List<SysCommision> tmpComList = sysCommisionService.selectSysCommisionList(tmpQueryCom);
 
-            boolean comHit = false;
             for (int i = 0; i < tmpComList.size(); i++) {
                 SysCommision com = tmpComList.get(i);
                 float dAmount = detail.getAmount().floatValue();
                 float cAmount = com.getAmount().floatValue();
+                detail.setRate(com.getRate());
                 if (dAmount < cAmount && i == 0) {
-                    comHit = false;
+                    // 第一条规则
                     break;
                 } else if (i == tmpComList.size() - 1 && dAmount > cAmount) {
-                    comHit = true;
+                    // 最后一条规则
-                    detail.setRate(com.getRate());
                     break;
                 } else if (dAmount >= cAmount && dAmount < tmpComList.get(i + 1).getAmount().floatValue()) {
-                    comHit = true;
+                    // 中间规则
-                    detail.setRate(com.getRate());
+                    break;
                 }
             }
-            if (!comHit) {
+
-                detail.setRate(0F);
+            float amount = detail.getAmount().floatValue();
-                detail.setCommision(BigDecimal.ZERO);
+            amount = amount * detail.getRate() / 100F;
-            } else {
+            detail.setCommision(new BigDecimal(amount));
-                float amount = detail.getAmount().floatValue();
-                amount = amount * detail.getRate() / 100F;
-                detail.setCommision(new BigDecimal(amount));
-            }
         }
         return getDataTable(list);
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java

@@ -69,6 +69,8 @@ public class SysOrderController extends BaseController {
                     order.setPlanner(user.getNickName());
                 } else if (user.getUserId().equals(order.getPlannerAssisId())) {
                     order.setPlannerAssis(user.getNickName());
+                } else if (user.getUserId().equals(order.getOperatorAssisId())) {
+                    order.setOperatorAssis(user.getNickName());
                 }
             }
         }
@@ -102,6 +104,8 @@ public class SysOrderController extends BaseController {
                     order.setPlanner(user.getNickName());
                 } else if (user.getUserId().equals(order.getPlannerAssisId())) {
                     order.setPlannerAssis(user.getNickName());
+                } else if (user.getUserId().equals(order.getOperatorAssisId())) {
+                    order.setOperatorAssis(user.getNickName());
                 }
             }
         }

ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysOrder.java

@@ -2,6 +2,7 @@ package com.ruoyi.custom.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -14,105 +15,178 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author wonder
  * @date 2020-09-24
  */
-public class SysOrder extends BaseEntity
+public class SysOrder extends BaseEntity {
-{
     private static final long serialVersionUID = 1L;
 
-    /** 编号 */
+    /**
+     * 编号
+     */
     @Excel(name = "编号")
     private Long orderId;
 
-    /** 客户姓名 */
+    /**
+     * 客户姓名
+     */
     @Excel(name = "客户姓名")
     private String customer;
 
-    /** 电话 */
+    /**
+     * 电话
+     */
     @Excel(name = "电话")
     private String phone;
 
-    /** 金额 */
+    /**
+     * 金额
+     */
     @Excel(name = "金额")
     private BigDecimal amount;
 
-    /** 收款方式 */
+    /**
+     * 收款方式
+     */
     private Long payTypeId;
 
-    /** 收款方式 */
+    /**
+     * 收款方式
+     */
     @Excel(name = "收款方式")
     private String payType;
 
-    /** 售前 */
+    /**
+     * 售前
+     */
     private Long preSaleId;
 
-    /** 售前 */
+    /**
+     * 售前
+     */
     @Excel(name = "售前")
     private String preSale;
 
-    /** 售后 */
+    /**
+     * 售后
+     */
     private Long afterSaleId;
 
-    /** 售后 */
+    /**
+     * 售后
+     */
     @Excel(name = "售后")
     private String afterSale;
 
-    /** 营养师 */
+    /**
+     * 营养师
+     */
     private Long nutritionistId;
 
-    /** 营养师 */
+    /**
+     * 营养师
+     */
     @Excel(name = "营养师")
     private String nutritionist;
 
-    /** 助理营养师 */
+    /**
+     * 助理营养师
+     */
     private Long nutriAssisId;
 
-    /** 助理营养师 */
+    /**
+     * 助理营养师
+     */
     @Excel(name = "助理营养师")
     private String nutriAssis;
 
-    /** 账号 */
+    /**
+     * 账号
+     */
     private Long accountId;
 
-    /** 账号 */
+    /**
+     * 账号
+     */
     @Excel(name = "账号")
     private String account;
 
-    /** 策划 */
+    /**
+     * 策划
+     */
     private Long plannerId;
 
-    /** 策划 */
+    /**
+     * 策划
+     */
     @Excel(name = "策划")
     private String planner;
 
-    /** 策划助理 */
+    /**
+     * 策划助理
+     */
     private Long plannerAssisId;
 
-    /** 策划助理 */
+    /**
+     * 策划助理
+     */
     @Excel(name = "策划助理")
     private String plannerAssis;
 
-    /** 运营 */
+    /**
+     * 运营
+     */
     private Long operatorId;
 
-    /** 运营 */
+    /**
+     * 运营
+     */
     @Excel(name = "运营")
     private String operator;
 
-    /** 推荐人 */
+    /**
+     * 运营助理
+     */
+    private Long operatorAssisId;
+
+    @Excel(name = "运营助理")
+    private String operatorAssis;
+
+    /**
+     * 推荐人
+     */
     @Excel(name = "推荐人")
     private String recommender;
 
-    /** 服务月数 */
+    /**
+     * 服务月数
+     */
     @Excel(name = "服务月数")
     private String serveMonth;
 
     @Excel(name = "审核状态", dictType = "cus_review_status")
     private String reviewStatus;
 
-    /** 成交日期 */
+    /**
+     * 成交日期
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "成交日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date orderTime;
 
+    public void setOperatorAssis(String operatorAssis) {
+        this.operatorAssis = operatorAssis;
+    }
+
+    public void setOperatorAssisId(Long operatorAssisId) {
+        this.operatorAssisId = operatorAssisId;
+    }
+
+    public Long getOperatorAssisId() {
+        return operatorAssisId;
+    }
+
+    public String getOperatorAssis() {
+        return operatorAssis;
+    }
+
     public String getReviewStatus() {
         return reviewStatus;
     }
@@ -129,226 +203,201 @@ public class SysOrder extends BaseEntity
         return serveMonth;
     }
 
-    public void setOrderId(Long orderId)
+    public void setOrderId(Long orderId) {
-    {
         this.orderId = orderId;
     }
 
-    public Long getOrderId()
+    public Long getOrderId() {
-    {
         return orderId;
     }
-    public void setCustomer(String customer)
+
-    {
+    public void setCustomer(String customer) {
         this.customer = customer;
     }
 
-    public String getCustomer()
+    public String getCustomer() {
-    {
         return customer;
     }
-    public void setPhone(String phone)
+
-    {
+    public void setPhone(String phone) {
         this.phone = phone;
     }
 
-    public String getPhone()
+    public String getPhone() {
-    {
         return phone;
     }
-    public void setAmount(BigDecimal amount)
+
-    {
+    public void setAmount(BigDecimal amount) {
         this.amount = amount;
     }
 
-    public BigDecimal getAmount()
+    public BigDecimal getAmount() {
-    {
         return amount;
     }
-    public void setPayTypeId(Long payTypeId)
+
-    {
+    public void setPayTypeId(Long payTypeId) {
         this.payTypeId = payTypeId;
     }
 
-    public Long getPayTypeId()
+    public Long getPayTypeId() {
-    {
         return payTypeId;
     }
-    public void setPayType(String payType)
+
-    {
+    public void setPayType(String payType) {
         this.payType = payType;
     }
 
-    public String getPayType()
+    public String getPayType() {
-    {
         return payType;
     }
-    public void setPreSaleId(Long preSaleId)
+
-    {
+    public void setPreSaleId(Long preSaleId) {
         this.preSaleId = preSaleId;
     }
 
-    public Long getPreSaleId()
+    public Long getPreSaleId() {
-    {
         return preSaleId;
     }
-    public void setPreSale(String preSale)
+
-    {
+    public void setPreSale(String preSale) {
         this.preSale = preSale;
     }
 
-    public String getPreSale()
+    public String getPreSale() {
-    {
         return preSale;
     }
-    public void setAfterSaleId(Long afterSaleId)
+
-    {
+    public void setAfterSaleId(Long afterSaleId) {
         this.afterSaleId = afterSaleId;
     }
 
-    public Long getAfterSaleId()
+    public Long getAfterSaleId() {
-    {
         return afterSaleId;
     }
-    public void setAfterSale(String afterSale)
+
-    {
+    public void setAfterSale(String afterSale) {
         this.afterSale = afterSale;
     }
 
-    public String getAfterSale()
+    public String getAfterSale() {
-    {
         return afterSale;
     }
-    public void setNutritionistId(Long nutritionistId)
+
-    {
+    public void setNutritionistId(Long nutritionistId) {
         this.nutritionistId = nutritionistId;
     }
 
-    public Long getNutritionistId()
+    public Long getNutritionistId() {
-    {
         return nutritionistId;
     }
-    public void setNutritionist(String nutritionist)
+
-    {
+    public void setNutritionist(String nutritionist) {
         this.nutritionist = nutritionist;
     }
 
-    public String getNutritionist()
+    public String getNutritionist() {
-    {
         return nutritionist;
     }
-    public void setNutriAssisId(Long nutriAssisId)
+
-    {
+    public void setNutriAssisId(Long nutriAssisId) {
         this.nutriAssisId = nutriAssisId;
     }
 
-    public Long getNutriAssisId()
+    public Long getNutriAssisId() {
-    {
         return nutriAssisId;
     }
-    public void setNutriAssis(String nutriAssis)
+
-    {
+    public void setNutriAssis(String nutriAssis) {
         this.nutriAssis = nutriAssis;
     }
 
-    public String getNutriAssis()
+    public String getNutriAssis() {
-    {
         return nutriAssis;
     }
-    public void setAccountId(Long accountId)
+
-    {
+    public void setAccountId(Long accountId) {
         this.accountId = accountId;
     }
 
-    public Long getAccountId()
+    public Long getAccountId() {
-    {
         return accountId;
     }
-    public void setAccount(String account)
+
-    {
+    public void setAccount(String account) {
         this.account = account;
     }
 
-    public String getAccount()
+    public String getAccount() {
-    {
         return account;
     }
-    public void setPlannerId(Long plannerId)
+
-    {
+    public void setPlannerId(Long plannerId) {
         this.plannerId = plannerId;
     }
 
-    public Long getPlannerId()
+    public Long getPlannerId() {
-    {
         return plannerId;
     }
-    public void setPlanner(String planner)
+
-    {
+    public void setPlanner(String planner) {
         this.planner = planner;
     }
 
-    public String getPlanner()
+    public String getPlanner() {
-    {
         return planner;
     }
-    public void setPlannerAssisId(Long plannerAssisId)
+
-    {
+    public void setPlannerAssisId(Long plannerAssisId) {
         this.plannerAssisId = plannerAssisId;
     }
 
-    public Long getPlannerAssisId()
+    public Long getPlannerAssisId() {
-    {
         return plannerAssisId;
     }
-    public void setPlannerAssis(String plannerAssis)
+
-    {
+    public void setPlannerAssis(String plannerAssis) {
         this.plannerAssis = plannerAssis;
     }
 
-    public String getPlannerAssis()
+    public String getPlannerAssis() {
-    {
         return plannerAssis;
     }
-    public void setOperatorId(Long operatorId)
+
-    {
+    public void setOperatorId(Long operatorId) {
         this.operatorId = operatorId;
     }
 
-    public Long getOperatorId()
+    public Long getOperatorId() {
-    {
         return operatorId;
     }
-    public void setOperator(String operator)
+
-    {
+    public void setOperator(String operator) {
         this.operator = operator;
     }
 
-    public String getOperator()
+    public String getOperator() {
-    {
         return operator;
     }
-    public void setRecommender(String recommender)
+
-    {
+    public void setRecommender(String recommender) {
         this.recommender = recommender;
     }
 
-    public String getRecommender()
+    public String getRecommender() {
-    {
         return recommender;
     }
-    public void setOrderTime(Date orderTime)
+
-    {
+    public void setOrderTime(Date orderTime) {
         this.orderTime = orderTime;
     }
 
-    public Date getOrderTime()
+    public Date getOrderTime() {
-    {
         return orderTime;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("orderId", getOrderId())
                 .append("customer", getCustomer())
                 .append("phone", getPhone())
@@ -376,6 +425,8 @@ public class SysOrder extends BaseEntity
                 .append("plannerAssis", getPlannerAssis())
                 .append("operatorId", getOperatorId())
                 .append("operator", getOperator())
+                .append("operatorAssisId", getOperatorAssisId())
+                .append("operatorAssis", getOperatorAssis())
                 .append("recommender", getRecommender())
                 .append("orderTime", getOrderTime())
                 .append("serveMonth", getServeMonth())

ruoyi-custom/src/main/resources/mapper/custom/SysOrderMapper.xml

@@ -25,6 +25,7 @@
         <result property="plannerId" column="planner_id"/>
         <result property="plannerAssisId" column="planner_assis_id"/>
         <result property="operatorId" column="operator_id"/>
+        <result property="operatorAssisId" column="operator_assis_id"/>
         <result property="recommender" column="recommender"/>
         <result property="orderTime" column="order_time"/>
         <result property="serveMonth" column="serve_month"/>
@@ -32,7 +33,7 @@
     </resultMap>
 
     <sql id="selectSysOrderVo">
-        select o.order_id, o.review_status, o.customer, o.phone, o.amount, o.serve_month, o.pay_type_id, pay.dict_label as pay_type, o.pre_sale_id, o.create_by, o.create_time, o.after_sale_id, o.update_by, o.update_time, o.nutritionist_id, o.remark, o.nutri_assis_id, o.account_id, acc.dict_label as account, o.planner_id, o.planner_assis_id, o.operator_id, o.recommender, o.order_time from sys_order o
+        select o.order_id, o.review_status, o.customer, o.phone, o.amount, o.serve_month, o.pay_type_id, pay.dict_label as pay_type, o.pre_sale_id, o.create_by, o.create_time, o.after_sale_id, o.update_by, o.update_time, o.nutritionist_id, o.remark, o.nutri_assis_id, o.account_id, acc.dict_label as account, o.planner_id, o.planner_assis_id, o.operator_id, o.operator_assis_id, o.recommender, o.order_time from sys_order o
         LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'cus_pay_type') AS pay ON pay.dict_value = o.pay_type_id
         LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'cus_account') AS acc ON acc.dict_value = o.account_id
     </sql>
@@ -52,6 +53,7 @@
             <if test="plannerId != null ">and planner_id = #{plannerId}</if>
             <if test="plannerAssisId != null ">and planner_assis_id = #{plannerAssisId}</if>
             <if test="operatorId != null ">and operator_id = #{operatorId}</if>
+            <if test="operatorAssisId != null ">and operator_assis_id = #{operatorAssisId}</if>
             <if test="recommender != null  and recommender != ''">and recommender = #{recommender}</if>
             <if test="beginTime != null and beginTime != ''">and date_format(order_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')</if>
             <if test="endTime != null and endTime != ''">and date_format(order_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')</if>
@@ -87,6 +89,7 @@
             <if test="plannerId != null">planner_id,</if>
             <if test="plannerAssisId != null">planner_assis_id,</if>
             <if test="operatorId != null">operator_id,</if>
+            <if test="operatorAssisId != null">operator_assis_id,</if>
             <if test="recommender != null">recommender,</if>
             <if test="orderTime != null">order_time,</if>
             <if test="serveMonth != null">serve_month,</if>
@@ -111,6 +114,7 @@
             <if test="plannerId != null">#{plannerId},</if>
             <if test="plannerAssisId != null">#{plannerAssisId},</if>
             <if test="operatorId != null">#{operatorId},</if>
+            <if test="operatorAssisId != null">#{operatorAssisId},</if>
             <if test="recommender != null">#{recommender},</if>
             <if test="orderTime != null">#{orderTime},</if>
             <if test="serveMonth != null">#{serveMonth},</if>
@@ -138,6 +142,7 @@
             <if test="plannerId != null">planner_id = #{plannerId},</if>
             <if test="plannerAssisId != null">planner_assis_id = #{plannerAssisId},</if>
             <if test="operatorId != null">operator_id = #{operatorId},</if>
+            <if test="operatorAssisId != null">operator_assis_id = #{operatorAssisId},</if>
             <if test="recommender != null">recommender = #{recommender},</if>
             <if test="orderTime != null">order_time = #{orderTime},</if>
             <if test="serveMonth != null">serve_month = #{serveMonth},</if>

ruoyi-ui/src/views/custom/order/index.vue

@@ -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,

ruoyi-ui/src/views/system/user/index.vue

@@ -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-form-item label="手机号码" prop="phonenumber">-->
-            <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable size="small"
+<!--            <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable size="small"-->
-                      style="width: 240px" @keyup.enter.native="handleQuery"/>
+<!--                      style="width: 240px" @keyup.enter.native="handleQuery"/>-->
-          </el-form-item>
+<!--          </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="userName" :show-overflow-tooltip="true"/>
-          <el-table-column label="用户昵称" align="center" prop="nickName" :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-form-item label="用户名称" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入用户昵称"/>
+              <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-form-item v-if="form.userId == undefined" label="用户账号" prop="userName">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11"/>
+              <el-input v-model="form.userName" placeholder="请输入用户账号"/>
-            </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>
           </el-col>
           <el-col :span="12">
@@ -332,14 +332,14 @@
               trigger: ["blur", "change"],
             },
           ],
-          phonenumber: [
+          // phonenumber: [
-            {required: true, message: "手机号码不能为空", trigger: "blur"},
+          //   {required: true, message: "手机号码不能为空", trigger: "blur"},
-            {
+          //   {
-              pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+          //     pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-              message: "请输入正确的手机号码",
+          //     message: "请输入正确的手机号码",
-              trigger: "blur",
+          //     trigger: "blur",
-            },
+          //   },
-          ],
+          // ],
         },
       };
     },