修改Bug

dist/static/css/chunk-c8e43c82.2b45befe.css → dist/static/css/chunk-25e49980.2c556a48.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-65c64585]{font-size:14px}.btnList[data-v-65c64585]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-65c64585]{margin-right:15px}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-66d6bcbe]{font-size:14px}.btnList[data-v-66d6bcbe]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-66d6bcbe]{margin-right:15px}

src/views/categroyManager/insideSetting/gradientSet.vue

@@ -216,7 +216,7 @@ export default {
             form.errorText = '最大值不能为空'
             return
         } else if(parseInt(lastDate.max) <= parseInt(lastDate.min)) {
-            form.errorText = '最小值不能小于或等于上一个梯度的最大值'
+            form.errorText = '最大值应大于该梯度的最小值'
             return
         }
 

src/views/categroyManager/insideSetting/staffManager.vue

@@ -111,6 +111,16 @@ import pagination from '@/components/Pagination/index'
 import { queryEmployByOrganId, employeeOperate, getUserRole, employeeAdd, employeeUpdate } from '@/api/systemManage'
 import { branchQueryPage } from '@/api/specialSetting'
 import store from '@/store'
+import { isvalidPhone } from '@/utils/validate'
+let validPhone = (rule, value,callback)=>{
+    if (!value){
+        callback(new Error('请输入电话号码'))
+    }else  if (!isvalidPhone(value)){
+        callback(new Error('请输入正确的11位手机号码'))
+    }else {
+        callback()
+    }
+}
 export default {
   components: { pagination },
   name: 'adminManager',
@@ -146,7 +156,7 @@ export default {
       rules: {
         realName: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
         gender: [{required: true, message: '请选择性别', trigger: 'change'}],
-        phone: [{ type: 'number', required: true, message: '手机号输入有误', trigger: 'blur'}],
+        phone: [{ type: 'number', required: true, validator: validPhone, trigger: 'blur'}],
         roleIds: [{type: 'array', required: true, message: '请选择分类', trigger: 'change'}],
         organIdLists: [{type: 'array', required: true, message: '请选择所属部门', trigger: 'change'}],
         jobNature: [{required: true, message: '请选择工作类型', trigger: 'change'}],

src/views/teacherManager/teacherDetail/components/settlement.vue

@@ -12,6 +12,7 @@
       <el-form-item>
         <el-date-picker
           v-model="courseDate"
+          style="width: 400px;"
           type="daterange"
           value-format="yyyy-MM-dd"
           @change="searchCourseDate"
@@ -27,7 +28,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.signInStatus" placeholder="上课类型">
+        <el-select v-model="searchForm.signInStatus" placeholder="考勤状态">
           <el-option v-for="(item, index) in attendance" :key="index" 
             :label="item.label" :value="item.value"></el-option>
         </el-select>

src/views/teacherManager/teacherDetail/components/teacherInfo.vue

@@ -146,7 +146,7 @@ export default {
           tempData.teacherSchools = this.joinArray(tempData.teacherSchools) // 教学点
           tempData.entryDate = this.formatTimer(tempData.entryDate)
           tempData.jobNature = this.jobNature(tempData.jobNature)
-          tempData.birthdate = this.jobNature(tempData.birthdate)
+          tempData.birthdate = this.formatTimer(tempData.birthdate)
           tempData.gender = tempData.birthdate ? '女' : '男'
           this.topForm = res.data
         }

src/views/teacherManager/teacherDetail/index.vue

@@ -1,6 +1,9 @@
 <template>
   <div class='m-container'>
-    <h2>{{ teacherName }}</h2>
+    <h2>
+      <el-page-header @back="onCancel" 
+      :content="teacherName"></el-page-header>
+    </h2>
     <div class="m-core">
       <!-- navMenu -->
       <el-tabs v-model="activeName"
@@ -68,6 +71,9 @@ export default {
     handleClick (val, event) {
       this.activeName = val.name
       this.activeStatus[val.name] = true
+    },
+    onCancel() {
+      this.$router.push('/business/teacherList')
     }
   }
 }