Merge branch 'live-video-im' into 11/24SAAS

src/views/teacherManager/teacherOperation/components/salarySet.vue

@@ -280,7 +280,7 @@
               说明：老师是否结算课酬；
             </div>
           </el-form-item>
-          <el-form-item
+          <!-- <el-form-item
             label="生效日期"
             label-width="120px"
             prop="startDate"
@@ -298,7 +298,7 @@
             <div style="display: inline; color: red; padding-left: 10px">
               说明：本次调整只对生效日期之后（包含当天）且未结算的课程生效；
             </div>
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
 
         <!--  v-permission="pageType == 'create' ? {child: 'teacherDefaultMusicGroupSalary/batchUpset', parent: 'teacherAdd/batchUpset'} : {child: 'teacherDefaultMusicGroupSalary/batchUpset', parent: 'teacherUpdate/batchUpset'}" -->
@@ -441,7 +441,7 @@ export default {
       ruleList: [],
       vipList: [],
       updateForm: {
-        startDate: null,
+        // startDate: null,
         isSettlementSalary: 1
       },
       rules: {},
@@ -737,18 +737,18 @@ export default {
                 return;
               }
               teacherSalaryBatchUpset({
-                teacherDefaultMusicGroupSalaries: params,
-                startDate: updateForm.startDate
+                teacherDefaultMusicGroupSalaries: params
+                // startDate: updateForm.startDate
               }).then(res => {
                 if (res.code == 200) {
                   // 判断输入的值是否正确
                   vipGroupSalarySet({
-                    teacherDefaultVipGroupSalaries: this.vipTable,
-                    startDate: updateForm.startDate
+                    teacherDefaultVipGroupSalaries: this.vipTable
+                    // startDate: updateForm.startDate
                   }).then(res => {
                     if (res.code == 200) {
                       PracticeGroupSalaryUpdate({
-                        startDate: updateForm.startDate,
+                        // startDate: updateForm.startDate,
                         teacherDefaultPracticeGroupSalaries: this.accompanyTable
                       }).then(res => {
                         if (res.code == 200) {

src/views/teacherManager/teacherOperation/components/teacherOperation.vue

@@ -4,69 +4,70 @@
       <el-page-header @back="onCancel" :content="'老师' + (pageType == 'create' ? '新增' : '修改')"></el-page-header>
     </h2>-->
     <div class="infoWrap">
-      <div class="left">
-        <h4>基本信息</h4>
-        <el-form :model="topForm" :rules="rules" ref="form">
-          <el-row>
-            <el-col :span="12">
-              <el-form-item
-                label="姓名"
-                prop="realName"
-                :label-width="formLabelWidth"
-              >
-                <el-input v-model.trim="topForm.realName"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="姓名(备注)" :label-width="formLabelWidth">
-                <el-input v-model.trim="topForm.memo"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item
-                label="性别"
-                prop="gender"
-                :label-width="formLabelWidth"
-              >
-                <el-select v-model.trim="topForm.gender">
-                  <el-option label="男" :value="1"></el-option>
-                  <el-option label="女" :value="0"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="出生日期" :label-width="formLabelWidth">
-                <el-date-picker
-                  v-model.trim="topForm.birthdate"
-                  type="date"
-                  :picker-options="{
-                    firstDayOfWeek: 1
-                  }"
-                  value-format="yyyy-MM-dd"
-                  placeholder="出生日期"
-                ></el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item
-                label="入职日期"
-                prop="entryDate"
-                :label-width="formLabelWidth"
-              >
-                <el-date-picker
-                  v-model.trim="topForm.entryDate"
-                  type="date"
-                  :picker-options="pickerOptions2"
-                  value-format="yyyy-MM-dd"
-                  placeholder="入职日期"
-                ></el-date-picker>
-              </el-form-item>
-            </el-col>
-            <!--               <template #label>
+      <el-row :gutter="20">
+        <el-col :span="18" class="left">
+          <h4>基本信息</h4>
+          <el-form :model="topForm" :rules="rules" ref="form">
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label="姓名"
+                  prop="realName"
+                  :label-width="formLabelWidth"
+                >
+                  <el-input v-model.trim="topForm.realName"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="姓名(备注)" :label-width="formLabelWidth">
+                  <el-input v-model.trim="topForm.memo"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label="性别"
+                  prop="gender"
+                  :label-width="formLabelWidth"
+                >
+                  <el-select v-model.trim="topForm.gender">
+                    <el-option label="男" :value="1"></el-option>
+                    <el-option label="女" :value="0"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="出生日期" :label-width="formLabelWidth">
+                  <el-date-picker
+                    v-model.trim="topForm.birthdate"
+                    type="date"
+                    :picker-options="{
+                      firstDayOfWeek: 1
+                    }"
+                    value-format="yyyy-MM-dd"
+                    placeholder="出生日期"
+                  ></el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label="入职日期"
+                  prop="entryDate"
+                  :label-width="formLabelWidth"
+                >
+                  <el-date-picker
+                    v-model.trim="topForm.entryDate"
+                    type="date"
+                    :picker-options="pickerOptions2"
+                    value-format="yyyy-MM-dd"
+                    placeholder="入职日期"
+                  ></el-date-picker>
+                </el-form-item>
+              </el-col>
+              <!--               <template #label>
                   转正日期
                   <el-popover placement="top" width="280" trigger="hover">
 
@@ -103,295 +104,303 @@
                     </p>
                   </el-popover>
                 </template>-->
-            <el-col :span="12">
-              <el-form-item label="转正日期" :label-width="formLabelWidth">
-                <el-date-picker
-                  v-model="topForm.formalStaffDate"
-                  value-format="yyyy-MM-dd"
-                  type="date"
-                  placeholder="选择转正日期"
-                  :picker-options="pickerOptions"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-alert class="alert" :closable="false" type="info">
-              <template #title>
-                <div>
-                  <p style="font-weight:600">老师课酬结算规则：</p>
-                  <p>1.入职日期之前的课程，按老师课酬的100%结算</p>
-                  <p>
-                    2.入职日期当天及以后的课程，按老师课酬*试用期课酬折算值结算
-                  </p>
-                  <p>3.转正日期当天及以后的课程，按老师课酬的100%结算</p>
-                  <p>
-                    4.入职日期和转正日期设置为同一天，则日期当天及以后的课程按老师课酬的100%结算
-                  </p>
-                </div>
-              </template>
-            </el-alert>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item
-                :label="tenantIdBase == 28 ? '城市' : '所属分部'"
-                prop="organId"
-                :label-width="formLabelWidth"
-              >
-                <el-select
-                  v-model.trim="topForm.organId"
-                  filterable
-                  clearable
-                  :placeholder="tenantIdBase == 28 ? '城市' : '所属分部'"
-                  @change="switchOrgan"
+              <el-col :span="12">
+                <el-form-item label="转正日期" :label-width="formLabelWidth">
+                  <el-date-picker
+                    v-model="topForm.formalStaffDate"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="选择转正日期"
+                    :picker-options="pickerOptions"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-alert class="alert" :closable="false" type="info">
+                <template #title>
+                  <div>
+                    <p style="font-weight:600">老师课酬结算规则：</p>
+                    <p>1.入职日期之前的课程，按老师课酬的100%结算</p>
+                    <p>
+                      2.入职日期当天及以后的课程，按老师课酬*试用期课酬折算值结算
+                    </p>
+                    <p>3.转正日期当天及以后的课程，按老师课酬的100%结算</p>
+                    <p>
+                      4.入职日期和转正日期设置为同一天，则日期当天及以后的课程按老师课酬的100%结算
+                    </p>
+                  </div>
+                </template>
+              </el-alert>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  :label="tenantIdBase == 28 ? '城市' : '所属分部'"
+                  prop="organId"
+                  :label-width="formLabelWidth"
                 >
-                  <el-option
-                    v-for="item in branchList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="流动范围" :label-width="formLabelWidth">
-                <select-all
-                  v-model.trim="topForm.flowOrganRange"
-                  filterable
-                  clearable
-                  multiple
-                  placeholder="流动范围"
+                  <el-select
+                    v-model.trim="topForm.organId"
+                    filterable
+                    clearable
+                    :placeholder="tenantIdBase == 28 ? '城市' : '所属分部'"
+                    @change="switchOrgan"
+                  >
+                    <el-option
+                      v-for="item in branchList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="流动范围" :label-width="formLabelWidth">
+                  <select-all
+                    v-model.trim="topForm.flowOrganRange"
+                    filterable
+                    clearable
+                    multiple
+                    placeholder="流动范围"
+                  >
+                    <el-option
+                      v-for="item in branchList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value.toString()"
+                    ></el-option>
+                  </select-all>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label="员工状态"
+                  prop="isProbationPeriod"
+                  :label-width="formLabelWidth"
                 >
-                  <el-option
-                    v-for="item in branchList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value.toString()"
-                  ></el-option>
-                </select-all>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item
-                label="员工状态"
-                prop="isProbationPeriod"
-                :label-width="formLabelWidth"
-              >
-                <el-select
-                  v-model.trim="topForm.isProbationPeriod"
-                  clearable
-                  filterable
-                  placeholder="员工状态"
-                >
-                  <el-option
-                    v-for="item in ProbationPeriodList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="Number(item.value)"
-                  ></el-option>
-                  <!-- <el-option label="正式" :value="0"></el-option>
+                  <el-select
+                    v-model.trim="topForm.isProbationPeriod"
+                    clearable
+                    filterable
+                    placeholder="员工状态"
+                  >
+                    <el-option
+                      v-for="item in ProbationPeriodList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="Number(item.value)"
+                    ></el-option>
+                    <!-- <el-option label="正式" :value="0"></el-option>
                   <el-option label="试用" :value="1"></el-option>
                   <el-option label="实习" :value="3"></el-option> -->
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12" v-if="pageType == 'update'">
-              <el-form-item label="教学点" :label-width="formLabelWidth">
-                <el-input disabled v-model.trim="teacherSchools"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item
-                label="工作类型"
-                prop="jobNature"
-                :label-width="formLabelWidth"
-              >
-                <el-select
-                  v-model.trim="topForm.jobNature"
-                  placeholder="工作类型"
-                  clearable
-                  filterable
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" v-if="pageType == 'update'">
+                <el-form-item label="教学点" :label-width="formLabelWidth">
+                  <el-input disabled v-model.trim="teacherSchools"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label="工作类型"
+                  prop="jobNature"
+                  :label-width="formLabelWidth"
                 >
-                  <el-option
-                    v-for="item in jobNature"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
+                  <el-select
+                    v-model.trim="topForm.jobNature"
+                    placeholder="工作类型"
+                    clearable
+                    filterable
+                  >
+                    <el-option
+                      v-for="item in jobNature"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
 
-            <el-col :span="12" class="diSpan">
-              <el-tooltip placement="top" popper-class="mTooltip">
-                <div slot="content">
-                  「是」此老师可作为网管课老师；
-                  <br />「否」此老师不可作为网管课老师；
-                </div>
-                <!-- <img :src="imageIcon" class="micon el-tooltip" style="width:8px height:8px" alt /> -->
-                <i
-                  class="el-icon-question micon el-tooltip"
-                  style="font-size: 18px; color: #f56c6c"
-                ></i>
-              </el-tooltip>
+              <el-col :span="12" class="diSpan">
+                <el-tooltip placement="top" popper-class="mTooltip">
+                  <div slot="content">
+                    「是」此老师可作为网管课老师；
+                    <br />「否」此老师不可作为网管课老师；
+                  </div>
+                  <!-- <img :src="imageIcon" class="micon el-tooltip" style="width:8px height:8px" alt /> -->
+                  <i
+                    class="el-icon-question micon el-tooltip"
+                    style="font-size: 18px; color: #f56c6c"
+                  ></i>
+                </el-tooltip>
 
-              <el-form-item label="开放陪练" label-width="90px" class="course">
-                <el-select
-                  v-model.trim="topForm.isSupportExtraPracticeLesson"
-                  clearable
-                  filterable
-                  placeholder="开放陪练"
+                <el-form-item
+                  label="开放陪练"
+                  label-width="90px"
+                  class="course"
                 >
-                  <el-option label="是" :value="true"></el-option>
-                  <el-option label="否" :value="false"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="老师简介" :label-width="formLabelWidth">
-                <el-input
-                  type="textarea"
-                  v-model.trim="topForm.introduction"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="禁用云教练" label-width="90px" class="course">
-                <el-select
-                  v-model.trim="topForm.coursewareLimit"
-                  clearable
-                  filterable
-                  placeholder="开放陪练"
+                  <el-select
+                    v-model.trim="topForm.isSupportExtraPracticeLesson"
+                    clearable
+                    filterable
+                    placeholder="开放陪练"
+                  >
+                    <el-option label="是" :value="true"></el-option>
+                    <el-option label="否" :value="false"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="老师简介" :label-width="formLabelWidth">
+                  <el-input
+                    type="textarea"
+                    v-model.trim="topForm.introduction"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="禁用云教练"
+                  label-width="90px"
+                  class="course"
                 >
-                  <el-option label="是" :value="true"></el-option>
-                  <el-option label="否" :value="false"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <h4>资料学历</h4>
-          <el-row>
-            <el-col :span="12">
-              <!-- :rules="[{ required: true, message: '手机号不能为空',trigger: 'blur'},{pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号',trigger: 'blur' }]" -->
-              <el-form-item
-                label="手机号"
-                prop="phone"
-                :label-width="formLabelWidth"
-              >
-                <el-input v-model.trim.number="topForm.phone"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="毕业学校" :label-width="formLabelWidth">
-                <el-input v-model.trim="topForm.graduateSchool"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="电子邮箱" :label-width="formLabelWidth">
-                <el-input v-model.trim="topForm.email"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="最高学历" :label-width="formLabelWidth">
-                <!-- <el-input v-model.trim="topForm.educationBackground"></el-input> -->
-                <el-select
-                  v-model.trim="topForm.educationBackground"
-                  clearable
-                  filterable
-                  placeholder="最高学历"
+                  <el-select
+                    v-model.trim="topForm.coursewareLimit"
+                    clearable
+                    filterable
+                    placeholder="开放陪练"
+                  >
+                    <el-option label="是" :value="true"></el-option>
+                    <el-option label="否" :value="false"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <h4>资料学历</h4>
+            <el-row>
+              <el-col :span="12">
+                <!-- :rules="[{ required: true, message: '手机号不能为空',trigger: 'blur'},{pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号',trigger: 'blur' }]" -->
+                <el-form-item
+                  label="手机号"
+                  prop="phone"
+                  :label-width="formLabelWidth"
                 >
-                  <el-option label="初中" value="初中"></el-option>
-                  <el-option label="高中" value="高中"></el-option>
-                  <el-option label="大专" value="大专"></el-option>
-                  <el-option label="本科" value="本科"></el-option>
-                  <el-option label="硕士" value="硕士"></el-option>
-                  <el-option label="博士" value="博士"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item
-                label="专业技能"
-                :rules="[{ required: true }]"
-                :label-width="formLabelWidth"
-              >
-                <select-all
-                  :disabled="!topForm.organId"
-                  v-model="subjectIds"
-                  clearable
-                  placeholder="专业技能"
-                  multiple
+                  <el-input v-model.trim.number="topForm.phone"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="毕业学校" :label-width="formLabelWidth">
+                  <el-input v-model.trim="topForm.graduateSchool"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="电子邮箱" :label-width="formLabelWidth">
+                  <el-input v-model.trim="topForm.email"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="最高学历" :label-width="formLabelWidth">
+                  <!-- <el-input v-model.trim="topForm.educationBackground"></el-input> -->
+                  <el-select
+                    v-model.trim="topForm.educationBackground"
+                    clearable
+                    filterable
+                    placeholder="最高学历"
+                  >
+                    <el-option label="初中" value="初中"></el-option>
+                    <el-option label="高中" value="高中"></el-option>
+                    <el-option label="大专" value="大专"></el-option>
+                    <el-option label="本科" value="本科"></el-option>
+                    <el-option label="硕士" value="硕士"></el-option>
+                    <el-option label="博士" value="博士"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label="专业技能"
+                  :rules="[{ required: true }]"
+                  :label-width="formLabelWidth"
                 >
-                  <el-option
-                    v-for="item in subjectList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  ></el-option>
-                </select-all>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="职称" :label-width="formLabelWidth">
-                <el-input v-model.trim="topForm.technicalTitles"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="证件类型" :label-width="formLabelWidth">
-                <el-input v-model.trim="topForm.certificateType"></el-input>
-                <!-- <el-select v-model.trim="topForm.certificateType" placeholder="证件类型">
+                  <select-all
+                    :disabled="!topForm.organId"
+                    v-model="subjectIds"
+                    clearable
+                    placeholder="专业技能"
+                    multiple
+                  >
+                    <el-option
+                      v-for="item in subjectList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
+                    ></el-option>
+                  </select-all>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="职称" :label-width="formLabelWidth">
+                  <el-input v-model.trim="topForm.technicalTitles"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="证件类型" :label-width="formLabelWidth">
+                  <el-input v-model.trim="topForm.certificateType"></el-input>
+                  <!-- <el-select v-model.trim="topForm.certificateType" placeholder="证件类型">
                             <el-option label="身份证" value="身份证"></el-option>
                             <el-option label="护照" value="护照"></el-option>
                             <el-option label="港澳通行证" value="港澳通行证"></el-option>
                 </el-select>-->
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="证件号码" :label-width="formLabelWidth">
-                <el-input v-model.trim="topForm.certificateNum"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="离职日期" :label-width="formLabelWidth">
-                <el-date-picker
-                  v-model="topForm.demissionDate"
-                  value-format="yyyy-MM-dd"
-                  type="date"
-                  placeholder="选择离职日期"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label :label-width="formLabelWidth">
-                <!-- <el-input v-model.trim="topForm.certificateType"></el-input> -->
-                <el-checkbox
-                  v-model.trim="topForm.isSupportCourseScheduleRewardsRules"
-                  >是否适用阶梯奖励</el-checkbox
-                >
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <!-- <el-row>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="证件号码" :label-width="formLabelWidth">
+                  <el-input v-model.trim="topForm.certificateNum"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="离职日期" :label-width="formLabelWidth">
+                  <el-date-picker
+                    v-model="topForm.demissionDate"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="选择离职日期"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label :label-width="formLabelWidth">
+                  <!-- <el-input v-model.trim="topForm.certificateType"></el-input> -->
+                  <el-checkbox
+                    v-model.trim="topForm.isSupportCourseScheduleRewardsRules"
+                    >是否适用阶梯奖励</el-checkbox
+                  >
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <!-- <el-row>
             <el-col :span="24">
               <p style="color: red; line-height: 1.3; margin-bottom: 10px;">入职日期之前课酬按100%计算；<br />
                 入职日期当天及以后课酬按80%计算；<br />
@@ -399,28 +408,28 @@
                 若入职日期和转正日期设置为同一天，则日期当天及以后课酬按100%计算；</p>
             </el-col>
           </el-row> -->
-          <el-form-item>
-            <el-button @click="onSubmit('form')" type="primary"
-              >立即{{ pageType == "create" ? "创建" : "修改" }}</el-button
-            >
-            <el-button @click="onReSet('form')">重置</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-      <div class="right">
-        <div class="teacherIcon">
-          <image-cropper
-            ref="imgCropper"
-            :options="cropperOptions"
-            :imgSize="2"
-            showSize
-            :imageUrl="topForm.avatar ? topForm.avatar : avatar1"
-            @crop-upload-success="handleSuccess"
-          />
-          <!-- <img v-if="topForm.avatar" key="avatar" :src="topForm.avatar" alt />
+            <el-form-item>
+              <el-button @click="onSubmit('form')" type="primary"
+                >立即{{ pageType == "create" ? "创建" : "修改" }}</el-button
+              >
+              <el-button @click="onReSet('form')">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-col>
+        <el-col :span="6" class="right">
+          <div class="teacherIcon">
+            <image-cropper
+              ref="imgCropper"
+              :options="cropperOptions"
+              :imgSize="2"
+              showSize
+              :imageUrl="topForm.avatar ? topForm.avatar : avatar1"
+              @crop-upload-success="handleSuccess"
+            />
+            <!-- <img v-if="topForm.avatar" key="avatar" :src="topForm.avatar" alt />
           <img v-else key="avatar1" src="@/assets/images/base/woman.png" alt /> -->
-        </div>
-        <!-- <el-upload
+          </div>
+          <!-- <el-upload
           class="ivu-upload"
           :show-upload-list="false"
           :show-file-list="false"
@@ -432,8 +441,8 @@
           action="/api-web/uploadFile"
         >  -->
 
-        <!-- <el-button icon="ios-cloud-upload-outline" @click="$refs.imgCropper.$refs.upload.submit">修改头像</el-button> -->
-        <!--
+          <!-- <el-button icon="ios-cloud-upload-outline" @click="$refs.imgCropper.$refs.upload.submit">修改头像</el-button> -->
+          <!--
                v-if="pageType != 'create'"
             <el-button
             icon="ios-cloud-upload-outline"
@@ -444,13 +453,20 @@
             }"
             >新增头像</el-button
           > -->
-        <!-- </el-upload> -->
-        <p class="iconP">
-          推荐图片尺寸：200x200；
-          <br />支持的格式：jpg，jpeg，png，gif；
-          <br />*头像修改后，需要点击页面 <br />下方「立即修改」保存生效；
-        </p>
+          <!-- </el-upload> -->
+          <p class="iconP">
+            推荐图片尺寸：200x200；
+            <br />支持的格式：jpg，jpeg，png，gif；
+            <br />*头像修改后，需要点击页面 <br />下方「立即修改」保存生效；
+          </p>
+        </el-col>
+      </el-row>
+      <!-- <div class="left">
+        
       </div>
+      <div class="right">
+        
+      </div> -->
     </div>
   </div>
 </template>
@@ -898,21 +914,21 @@ export default {
 .infoWrap {
   margin-top: 20px;
 
-  display: flex;
-  flex-direction: row;
-  justify-content: flex-start;
+  // display: flex;
+  // flex-direction: row;
+  // justify-content: flex-start;
   .left {
-    max-width: 1000px;
-    width: 100%;
+    // max-width: 900px;
+    // width: 100%;
     h4 {
       margin-bottom: 20px;
     }
   }
   .right {
-    margin-left: 100px;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
+    // margin-left: 100px;
+    // display: flex;
+    // flex-direction: column;
+    // align-items: center;
     // .teacherIcon {
     //   width: 150px;
     //   height: 150px;
@@ -936,7 +952,7 @@ export default {
   }
   .alert {
     margin: 0 0 20px 120px;
-    width: 855px;
+    width: auto;
   }
 }
 </style>