From a39f5672e958affc7ebdfe1c9fcc5b4ba1e7db50 Mon Sep 17 00:00:00 2001
From: 15004070936 <1097449274@qq.com>
Date: Fri, 13 Mar 2026 15:26:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8C=E3=80=81=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/sc/claTime/claTimeCalendar.vue |   8 +
 src/components/system/dept/deptSelect.vue     |   4 +
 src/views/school/room/index.vue               |  32 +++-
 .../school/salary/commission_plans/index.vue  | 168 ++++++++++++++----
 .../student/components/studentMemberCard.vue  |   8 +-
 src/views/school/sys/receipt/index.vue        |  15 +-
 src/views/system/dept/index.vue               |  13 +-
 src/views/system/role/index.vue               |  11 +-
 src/views/system/user/index.vue               |  30 ++--
 9 files changed, 218 insertions(+), 71 deletions(-)

diff --git a/src/components/sc/claTime/claTimeCalendar.vue b/src/components/sc/claTime/claTimeCalendar.vue
index d338860..207bdc6 100644
--- a/src/components/sc/claTime/claTimeCalendar.vue
+++ b/src/components/sc/claTime/claTimeCalendar.vue
@@ -326,6 +326,10 @@ export default {
               this.columnTitles = response.data.columnTitles
               this.claTimeContainer = response.data.claTimeContainer
             }
+          }else {
+            this.msgError(response.respMsg)
+            this.columnTitles=[]
+            this.claTimeContainer=[]
           }
         }).catch(() => {
           this.loading = false
@@ -345,6 +349,10 @@ export default {
               this.columnTitles = response.data.columnTitles
               this.claTimeContainer = response.data.claTimeContainer
             }
+          }else {
+            this.msgError(response.respMsg)
+            this.columnTitles=[]
+            this.claTimeContainer=[]
           }
         }).catch(() => {
           this.loading = false
diff --git a/src/components/system/dept/deptSelect.vue b/src/components/system/dept/deptSelect.vue
index 450c248..9e52495 100644
--- a/src/components/system/dept/deptSelect.vue
+++ b/src/components/system/dept/deptSelect.vue
@@ -56,6 +56,10 @@ export default {
   created() {
     this.campusList()
   },
+  activated() {
+    // 当组件被 keep-alive 缓存后激活时，重新获取数据
+    this.campusList()
+  },
   methods: {
     campusList() {
       campusList().then(response => {
diff --git a/src/views/school/room/index.vue b/src/views/school/room/index.vue
index d5618c8..81101fa 100644
--- a/src/views/school/room/index.vue
+++ b/src/views/school/room/index.vue
@@ -22,13 +22,13 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item>
+      <el-form-item style="float: right">
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8" >
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['sc:room:add']"
@@ -60,11 +60,32 @@
       </el-col>
     </el-row>
 
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+      border
+      :header-cell-style="{'text-align': 'center'}"
+      :cell-style="{'text-align': 'center'}"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column prop="deptName" label="所属校区" />
       <el-table-column prop="roomName" label="教室名" />
-      <el-table-column prop="venueFee" label="场地费/小时(元)" />
+      <el-table-column prop="venueFee" label="场地费" >
+        <template slot-scope="scope">
+          <el-tooltip effect="dark" placement="top">
+            <template slot="content">
+              <span style="color: #999; font-size: 12px;">
+                * 说明：场地费为xx元每小时，
+              <br>作用：在APP端店长角色查看周期内花费的场地费用时，提供计算依据，计算结果仅供参考；
+              <br>实际计算中，未满半小时，按0.5小时计算收费；已满半小时,按1小时计算收费；
+              <br>例如：教室使用40分钟，按1小时计算收费；使用70分钟，按1.5小时计算收费；
+              </span>
+            </template>
+            <span>{{ scope.row.venueFee }}元/小时</span>
+          </el-tooltip>
+        </template>
+      </el-table-column>
       <el-table-column prop="memo" label="备注" />
       <el-table-column width="150" label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -120,7 +141,8 @@
           </el-col>
         </el-row>
         <span style="color: #999; font-size: 12px;">
-          * 说明：场地费为xx元每小时；
+          * 说明：场地费为xx元每小时，
+        <br>作用：在APP端店长角色查看周期内花费的场地费用时，提供计算依据，计算结果仅供参考；
         <br>实际计算中，未满半小时，按0.5小时计算收费；已满半小时,按1小时计算收费；
         <br>例如：教室使用40分钟，按1小时计算收费；使用70分钟，按1.5小时计算收费；
         </span>
diff --git a/src/views/school/salary/commission_plans/index.vue b/src/views/school/salary/commission_plans/index.vue
index 4c6844e..c9d182d 100644
--- a/src/views/school/salary/commission_plans/index.vue
+++ b/src/views/school/salary/commission_plans/index.vue
@@ -2,21 +2,39 @@
   <div class="app-container">
     <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
       <el-form-item label="方案名称" prop="planName">
-        <el-input v-model="queryParams.planName" placeholder="请输入所属校区" />
+        <el-input v-model="queryParams.planName" placeholder="请输入方案名称" />
       </el-form-item>
       <el-form-item label="是否生效" prop="isActive">
-        <el-select v-model="queryParams.isActive" filterable placeholder="请选择">
+        <el-select v-model="queryParams.isActive" filterable placeholder="请选择" clearable>
           <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item>
+      <el-form-item style="float: right">
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+        <el-button type="success" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
       </el-form-item>
+      <el-row style="padding-bottom: 10px">
+         <span style="color: #999; font-size: 12px;">
+                * 说明：佣金方案为app端提成统计提供数据依据，计算结果仅供参考，
+                <br>* 计算方式：
+                    1.按成交订单使用的佣金方案分组，
+                    2.按照方案中的比例计算某一组的提成，
+                    3.所有分组的提成之和 = 最后应得提成，
+               <br>* 举例：
+                    课程顾问Amy本月成交了10单，其中有3单使用了佣金方案A，
+                    如果三单的销售额之和为12000元，大于方案A的第一阶梯阈值8000元，小于方案A的第二阶梯阈值15000元，
+                    那么这三单的提成=Amy这三单的销售额之和 ✖️ 方案A的第二阶梯比例8% = 12000✖️0.08 = 960元；
+              </span>
+      </el-row>
     </el-form>
 
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+      border
+      :cell-style="{ 'text-align': 'center' }"
+      :header-cell-style="{'text-align': 'center'}" >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column prop="planName" label="方案名称" />
       <el-table-column prop="tier1Threshold" label="第一阶梯阈值" />
@@ -26,8 +44,8 @@
       <el-table-column prop="tier3Threshold" label="第三阶梯阈值" />
       <el-table-column prop="tier3Rate" label="第三阶梯比例" />
       <el-table-column prop="tier4Rate" label="第四阶梯比例" />
-      <el-table-column prop="renewalRate" label="续费率" />
-      <el-table-column prop="referralRate" label="转介绍率" />
+<!--      <el-table-column prop="renewalRate" label="续费率" />-->
+<!--      <el-table-column prop="referralRate" label="转介绍率" />-->
       <el-table-column prop="isActive" :formatter="activeFormat" label="是否生效" />
       <el-table-column prop="effectiveDate" label="生效日期" />
       <el-table-column width="150" label="操作" align="center" class-name="small-padding fixed-width">
@@ -41,8 +59,8 @@
     <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList"/>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="770px">
-      <el-form ref="form" v-loading="loadingChange" :model="form" label-width="120px">
+    <el-dialog :title="title"  :visible.sync="open" width="770px">
+      <el-form ref="form" v-loading="loadingChange" :rules="rules" :model="form" label-width="120px">
         <el-row>
           <el-col :span="24">
             <el-form-item label="方案名称:" prop="planName">
@@ -56,7 +74,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="第一阶梯比例:" prop="tier1Rate">
-              <el-input v-model="form.tier1Rate" placeholder="第一阶梯比例(8%)" />
+              <el-input v-model="form.tier1Rate" placeholder="第一阶梯比例(0.06)" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -66,7 +84,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="第二阶梯比例:" prop="tier2Rate">
-              <el-input v-model="form.tier2Rate" placeholder="第二阶梯比例(8%)" />
+              <el-input v-model="form.tier2Rate" placeholder="第二阶梯比例(0.08)" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -76,39 +94,41 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="第三阶梯比例:" prop="tier3Rate">
-              <el-input v-model="form.tier3Rate" placeholder="第三阶梯比例(8%)" />
+              <el-input v-model="form.tier3Rate" placeholder="第三阶梯比例(0.10)" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="第四阶梯比例:" prop="tier4Rate">
-              <el-input v-model="form.tier4Rate" placeholder="第四阶梯比例(8%)" />
+              <el-input v-model="form.tier4Rate" placeholder="第四阶梯比例(0.12)" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="续费率:" prop="renewalRate">
-              <el-input v-model="form.renewalRate" placeholder="续费率(5%)" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="转介绍率:" prop="referralRate">
-              <el-input v-model="form.referralRate" placeholder="转介绍率(8-10%)" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="续费率:" prop="renewalRate">-->
+<!--              <el-input v-model="form.renewalRate" placeholder="续费率(5%)" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="转介绍率:" prop="referralRate">-->
+<!--              <el-input v-model="form.referralRate" placeholder="转介绍率(8-10%)" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+          <el-col :span="12"  >
             <el-form-item label="是否生效:" prop="isActive">
-              <el-select v-model="form.isActive" filterable placeholder="请选择">
+              <el-select v-model="form.isActive" filterable placeholder="请选择" :disabled="form.id!=undefined && form.isActive!='0'">
                 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="12" >
             <el-form-item label="生效日期:" prop="effectiveDate">
               <el-date-picker
                 v-model="form.effectiveDate"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
                 type="date"
-                placeholder="选择日期" />
+                placeholder="选择日期"
+                :disabled="form.id!=undefined && form.isActive!='0'"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -124,7 +144,8 @@
 <script>
 import { list, saveOrEdit, remove } from '@/api/school/salary/commissionPlans'
 export default {
-  name: 'Room',
+  name: 'commission_plans',
+
   data() {
     return {
       // 遮罩层
@@ -143,7 +164,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         planName:'',
-        isActive:1,
+        isActive:'',
       },
       // 表单参数
       form: {
@@ -163,13 +184,48 @@ export default {
       options:[
         {label:'生效',value:1},
         {label:'未生效',value:0},
-      ]
+      ],
+      rules: {
+        planName: [
+          { required: true, message: '方案名称不能为空', trigger: 'blur' }
+        ],
+        tier1Threshold: [
+          { required: true, message: '阈值不能为空', trigger: 'blur' },
+          {validator:this.positiveIntegerLessThanSix,trigger: 'blur'}
+        ],
+        tier1Rate:[
+          { required: true, message: '比例不能为空', trigger: 'blur' },
+          { validator:this.positiveDecimalWith2Digits, trigger: 'blur' }
+        ],
+        tier2Threshold:  [
+          { required: true, message: '阈值不能为空', trigger: 'blur' },
+          {validator:this.positiveIntegerLessThanSix,trigger: 'blur'}
+        ],
+        tier2Rate:[
+          { required: true, message: '比例不能为空', trigger: 'blur' },
+          { validator:this.positiveDecimalWith2Digits, trigger: 'blur' }
+        ],
+        tier3Threshold:  [
+          { required: true, message: '阈值不能为空', trigger: 'blur' },
+          {validator:this.positiveIntegerLessThanSix,trigger: 'blur'}
+        ],
+        tier3Rate:[
+          { required: true, message: '比例不能为空', trigger: 'blur' },
+          { validator:this.positiveDecimalWith2Digits, trigger: 'blur' }
+        ],
+        tier4Rate:[
+          { required: true, message: '比例不能为空', trigger: 'blur' },
+          { validator:this.positiveDecimalWith2Digits, trigger: 'blur' }
+        ],
+      },
+
     }
   },
   created() {
     this.getList()
   },
   methods: {
+
     getList() {
       this.loading = true
       list(this.queryParams).then(response => {
@@ -240,15 +296,22 @@ export default {
     /** 提交按钮 */
     submitForm: function() {
       this.loadingChange = true
-      saveOrEdit(this.form).then(response => {
-        this.loadingChange = false
-        this.msgSuccess(response.msg)
-        this.open = false
-        this.getList()
-      }).catch((response) => {
-        this.msgError(response.msg)
-        this.loadingChange = false
+      this.$refs['form'].validate(valid => {
+        if (!valid) {
+          this.loadingChange =false
+          return
+        }
+        saveOrEdit(this.form).then(response => {
+          this.loadingChange = false
+          this.msgSuccess(response.msg)
+          this.open = false
+          this.getList()
+        }).catch((response) => {
+          this.msgError(response.msg)
+          this.loadingChange = false
+        })
       })
+
     },
     /** 删除按钮操作 */
     handleDelete(row) {
@@ -266,6 +329,33 @@ export default {
           this.msgError(response.msg)
         }
       }).catch(function() {})
+    },
+    positiveIntegerLessThanSix(rule, value, callback) {
+      if (value === '' || value === null || value === undefined) {
+        callback(); // 空值由 required 处理
+        return;
+      }
+      const str = String(value);
+      if (!/^[1-9]\d{0,4}$/.test(str)) {
+        callback(new Error('必须为非零正整数且小于6位'));
+      } else {
+        callback();
+      }
+    },
+    positiveDecimalWith2Digits(rule, value, callback) {
+      const str = String(value);
+      if (!/^\d+(\.\d{1,2})?$/.test(str)) {
+        callback(new Error('必须为小于1的正数且最多两位小数'));
+      } else {
+        const num = parseFloat(value);
+        if (num <= 0) {
+          callback(new Error('数值必须大于0'));
+        } else if (num >= 1) {
+          callback(new Error('数值必须小于1'));
+        } else {
+          callback();
+        }
+      }
     }
   }
 }
diff --git a/src/views/school/student/components/studentMemberCard.vue b/src/views/school/student/components/studentMemberCard.vue
index ceef125..1b0ee5f 100644
--- a/src/views/school/student/components/studentMemberCard.vue
+++ b/src/views/school/student/components/studentMemberCard.vue
@@ -77,16 +77,16 @@
           <div v-else>
             <div v-if="scope.row.cardTypes.chargeType=='default'">
               默认<br>
-              <spa v-if="scope.row.chargeType=='count'">扣{{scope.row.cardTypes.defaultNum}}次 </spa>
-              <spa v-if="scope.row.chargeType=='total_fee'">扣{{scope.row.cardTypes.defaultFee}}元 </spa>
+              <span v-if="scope.row.chargeType=='count'">扣{{scope.row.cardTypes.defaultNum}}次 </span>
+              <span v-if="scope.row.chargeType=='total_fee'">扣{{scope.row.cardTypes.defaultFee}}元 </span>
             </div>
             <div v-if="scope.row.cardTypes.chargeType=='customize'">
               <div>
                 <ul>
                   <li v-for="item in scope.row.cardTypes.feeModeHourList" :key="item.courseTypeId">
                     {{ item.courseType }} -
-                    <spa v-if="scope.row.chargeType=='count'">扣{{item.cnt}}次 </spa>
-                    <spa v-if="scope.row.chargeType=='total_fee'">扣{{item.totalFee}}元 </spa>
+                    <span v-if="scope.row.chargeType=='count'">扣{{item.cnt}}次 </span>
+                    <span v-if="scope.row.chargeType=='total_fee'">扣{{item.totalFee}}元 </span>
                   </li>
                 </ul>
               </div>
diff --git a/src/views/school/sys/receipt/index.vue b/src/views/school/sys/receipt/index.vue
index 158b4ae..8ef97ee 100644
--- a/src/views/school/sys/receipt/index.vue
+++ b/src/views/school/sys/receipt/index.vue
@@ -10,13 +10,13 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item>
+      <el-form-item style="float: right">
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8" style="display: flex; align-items: center;">
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['sys:receipt:add']"
@@ -46,9 +46,18 @@
           @click="handleDelete"
         >删除</el-button>
       </el-col>
+      <span style="color: #999; font-size: 12px;" >
+        * 为学员办理入会时，作为收款账户标签使用；
+      </span>
     </el-row>
 
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+      border
+      :header-cell-style="{'text-align': 'center'}"
+      :cell-style="{'text-align': 'center'}">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column prop="accountName" label="账户名称" />
       <el-table-column prop="memo" label="备注" />
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index daf869c..3a5b4c7 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -19,7 +19,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item>
+      <el-form-item style="float: right">
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
@@ -45,16 +45,23 @@
           @click="toggleExpandAll"
         >展开/折叠</el-button>
       </el-col>
+      <span style="color: #999; font-size: 12px; ">
+        * 校区会作为门店展示，可创建教室、班级、排课，作为门店展示的内容可在左侧菜单【APP首页宣传】修改；<br>
+        *  部门仅内部管理使用，不会展示，无法创建教室、班级、排课；
+      </span>
+
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table
+      border
       v-if="refreshTable"
       v-loading="loading"
       :data="deptList"
       row-key="deptId"
       :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      :header-cell-style="{'text-align': 'center'}"
     >
       <el-table-column prop="deptName" label="部门/校区名称" width="260">
         <template slot-scope="scope">
@@ -62,8 +69,8 @@
           <span>{{ scope.row.deptName }}{{scope.row.parentId==0?'(总店)':''}}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
-      <el-table-column prop="status" label="状态" width="100">
+      <el-table-column prop="orderNum" align="center" label="排序" width="200"></el-table-column>
+      <el-table-column prop="status" align="center" label="状态" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
         </template>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 23c03b6..96f52af 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -45,7 +45,7 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item>
+      <el-form-item style="float: right">
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
@@ -88,7 +88,14 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="roleList"
+      @selection-change="handleSelectionChange"
+      border
+      :header-cell-style="{'text-align': 'center'}"
+      :cell-style="{'text-align': 'center'}"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="角色编号" prop="roleId" width="120" />
       <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 7c40147..0fad7fc 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -51,7 +51,7 @@
           <el-form-item label="状态" prop="status">
             <el-select
               v-model="queryParams.status"
-              placeholder="用户状态"
+              placeholder="员工状态"
               clearable
               style="width: 240px"
             >
@@ -86,11 +86,11 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" border :header-cell-style="{'text-align': 'center'}">
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
+          <el-table-column label="员工编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
           <el-table-column label="登录账号" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="员工昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
           <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
           <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
           <el-table-column prop="teacher"  align="center" label="教练角色" v-if="columns[5].visible" width="120">
@@ -165,8 +165,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="请输入用户昵称" maxlength="30" />
+            <el-form-item label="员工昵称" prop="nickName">
+              <el-input v-model="form.nickName" placeholder="请输入员工昵称" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -206,7 +206,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="用户性别">
+            <el-form-item label="员工性别">
               <el-select v-model="form.sex" placeholder="请选择性别">
                 <el-option
                   v-for="dict in dict.type.sys_user_sex"
@@ -252,7 +252,7 @@
           </el-col>
         </el-row>
         <span v-if="form.userId == undefined" style="color: #999; font-size: 12px;padding-top: 1px">
-          * 操作说明：本操作会自动关联（角色关联）相同手机号的app用户；<br>
+          * 操作说明：本操作会自动关联（同步角色）相同手机号的app用户；<br>
                  如果手机号未在app注册，本操作会自动注册一个新的app用户,<br>
                 登录账号默认为本手机号{{form.phonenumber}}，登录密码与本账号密码相同{{form.password}}；
         </span>
@@ -370,9 +370,9 @@ export default {
       },
       // 列信息
       columns: [
-        { key: 0, label: `用户编号`, visible: true },
+        { key: 0, label: `员工编号`, visible: true },
         { key: 1, label: `登录账号`, visible: true },
-        { key: 2, label: `用户昵称`, visible: true },
+        { key: 2, label: `员工昵称`, visible: true },
         { key: 3, label: `部门`, visible: true },
         { key: 4, label: `手机号码`, visible: true },
         { key: 5, label: `教练角色`, visible: true },
@@ -391,7 +391,7 @@ export default {
           }
         ],
         nickName: [
-          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+          { required: true, message: "员工昵称不能为空", trigger: "blur" }
         ],
         password: [
           { required: true, message: "用户密码不能为空", trigger: "blur" },
@@ -534,7 +534,7 @@ export default {
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
         this.open = true;
-        this.title = "添加用户";
+        this.title = "添加员工";
         this.form.password = this.initPassword;
       });
     },
@@ -550,7 +550,7 @@ export default {
         this.form.postIds = response.postIds;
         this.form.roleIds = response.roleIds;
         this.open = true;
-        this.title = "修改用户";
+        this.title = "修改员工";
         this.form.password = "";
       });
     },
@@ -602,7 +602,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const userIds = row.userId || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除员工编号为"' + userIds + '"的数据项？').then(function() {
         return delUser(userIds);
       }).then(() => {
         this.getList();
@@ -617,7 +617,7 @@ export default {
     },
     /** 导入按钮操作 */
     handleImport() {
-      this.upload.title = "用户导入";
+      this.upload.title = "员工导入";
       this.upload.open = true;
     },
     /** 下载模板操作 */