lex-xin 4 лет назад
Родитель
Сommit
121924e6aa

+ 10 - 0
src/views/teacherManager/teacherDetail/components/teacherInfo.vue

@@ -170,6 +170,13 @@
           </el-row>
              <el-row>
             <el-col :span="12">
+              <el-form-item label="转证日期"
+                            :label-width="formLabelWidth">
+                <el-input disabled
+                          v-model.trim="topForm.formalStaffDate"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
               <el-form-item label="离职日期"
                             :label-width="formLabelWidth">
                 <el-input disabled
@@ -234,6 +241,9 @@ export default {
           if(this.topForm.demissionDate){
              this.topForm.demissionDate = dayjs(this.topForm.demissionDate).format('YYYY-MM-DD')
           }
+          if(this.topForm.formalStaffDate) {
+            this.topForm.formalStaffDate = dayjs(this.topForm.formalStaffDate).format('YYYY-MM-DD')
+          }
 
         }
       })

+ 7 - 0
src/views/teacherManager/teacherList.vue

@@ -219,6 +219,13 @@
               }}</el-button>
             </template>
           </el-table-column>
+             <el-table-column align="center" label="转证日期">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.formalStaffDate | dayjsFormat}}
+              </div>
+            </template>
+          </el-table-column>
              <el-table-column align="center" label="离职日期">
             <template slot-scope="scope">
               <div>

+ 17 - 0
src/views/teacherManager/teacherOperation/components/teacherOperation.vue

@@ -282,6 +282,17 @@
           </el-row>
           <el-row>
             <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="选择转证日期"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
               <el-form-item label="离职日期" :label-width="formLabelWidth">
                 <el-date-picker
                    v-model="topForm.demissionDate"
@@ -292,6 +303,8 @@
                 </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> -->
@@ -404,6 +417,7 @@ export default {
         email: null,
         educationBackground: null,
         demissionDate:null,
+        formalStaffDate: null,
         isProbationPeriod: null,
         technicalTitles: null,
         certificateType: null,
@@ -500,6 +514,7 @@ export default {
               email: result.email,
               educationBackground: result.educationBackground,
               demissionDate:result.demissionDate,
+              formalStaffDate: result.formalStaffDate,
               technicalTitles: result.technicalTitles,
               certificateType: result.certificateType,
               certificateNum: result.certificateNum,
@@ -610,6 +625,8 @@ export default {
         graduateSchool: null,
         email: null,
         educationBackground: null,
+        demissionDate: null,
+        formalStaffDate: null,
         subjectIds: [],
         technicalTitles: null,
         certificateType: null,