|
|
@@ -57,23 +57,6 @@
|
|
|
prop="entryDate"
|
|
|
:label-width="formLabelWidth"
|
|
|
>
|
|
|
- <template #label>
|
|
|
- 入职日期
|
|
|
- <el-popover
|
|
|
- placement="top"
|
|
|
- width="280"
|
|
|
- trigger="hover">
|
|
|
- <!-- <el-button slot="reference"></el-button> -->
|
|
|
- <i slot="reference"
|
|
|
- class="el-icon-warning-outline"
|
|
|
- style="font-size: 14px; "
|
|
|
- />
|
|
|
- <p style="color: red; line-height: 1.3; margin-bottom: 10px;">入职日期之前课酬按100%计算；<br />
|
|
|
- 入职日期当天及以后课酬按80%计算；<br />
|
|
|
- 转正日期当天及以后课酬按100%计算；<br />
|
|
|
- 若入职日期和转正日期设置为同一天，则日期当天及以后课酬按100%计算；</p>
|
|
|
- </el-popover>
|
|
|
- </template>
|
|
|
<el-date-picker
|
|
|
v-model.trim="topForm.entryDate"
|
|
|
type="date"
|
|
|
@@ -83,28 +66,73 @@
|
|
|
></el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <!-- <template #label>
|
|
|
+ 转正日期
|
|
|
+ <el-popover placement="top" width="280" trigger="hover">
|
|
|
+
|
|
|
+ <i
|
|
|
+ slot="reference"
|
|
|
+ class="el-icon-warning-outline"
|
|
|
+ style="font-size: 14px"
|
|
|
+ />
|
|
|
+ <p
|
|
|
+ style="color: red; line-height: 1.3; margin-bottom: 10px"
|
|
|
+ >
|
|
|
+ 入职日期之前课酬按100%计算；<br />
|
|
|
+ 入职日期当天及以后课酬按80%计算；<br />
|
|
|
+ 转正日期当天及以后课酬按100%计算；<br />
|
|
|
+ 若入职日期和转正日期设置为同一天，则日期当天及以后课酬按100%计算；
|
|
|
+ </p>
|
|
|
+ </el-popover>
|
|
|
+ </template> <template #label>
|
|
|
+ 入职日期
|
|
|
+ <el-popover placement="top" width="280" trigger="hover">
|
|
|
+
|
|
|
+ <i
|
|
|
+ slot="reference"
|
|
|
+ class="el-icon-warning-outline"
|
|
|
+ style="font-size: 14px"
|
|
|
+ />
|
|
|
+ <p
|
|
|
+ style="color: red; line-height: 1.3; margin-bottom: 10px"
|
|
|
+ >
|
|
|
+ 入职日期之前课酬按100%计算；<br />
|
|
|
+ 入职日期当天及以后课酬按80%计算；<br />
|
|
|
+ 转正日期当天及以后课酬按100%计算；<br />
|
|
|
+ 若入职日期和转正日期设置为同一天，则日期当天及以后课酬按100%计算；
|
|
|
+ </p>
|
|
|
+ </el-popover>
|
|
|
+ </template>-->
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item
|
|
|
- label="工作类型"
|
|
|
- prop="jobNature"
|
|
|
- :label-width="formLabelWidth"
|
|
|
- >
|
|
|
- <el-select
|
|
|
- v-model.trim="topForm.jobNature"
|
|
|
- placeholder="工作类型"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
+ <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-option
|
|
|
- v-for="item in jobNature"
|
|
|
- :key="item.value"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
+ </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
|
|
|
@@ -160,7 +188,12 @@
|
|
|
filterable
|
|
|
placeholder="员工状态"
|
|
|
>
|
|
|
- <el-option v-for="item in ProbationPeriodList" :key="item.value" :label="item.label" :value="Number(item.value)"></el-option>
|
|
|
+ <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> -->
|
|
|
@@ -175,13 +208,27 @@
|
|
|
</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
|
|
|
+ label="工作类型"
|
|
|
+ prop="jobNature"
|
|
|
+ :label-width="formLabelWidth"
|
|
|
+ >
|
|
|
+ <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">
|
|
|
@@ -208,6 +255,16 @@
|
|
|
</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-row>
|
|
|
<h4>资料学历</h4>
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
@@ -299,39 +356,10 @@
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="转正日期" :label-width="formLabelWidth">
|
|
|
- <template #label>
|
|
|
- 转正日期
|
|
|
- <el-popover
|
|
|
- placement="top"
|
|
|
- width="280"
|
|
|
- trigger="hover">
|
|
|
- <!-- <el-button slot="reference"></el-button> -->
|
|
|
- <i slot="reference"
|
|
|
- class="el-icon-warning-outline"
|
|
|
- style="font-size: 14px; "
|
|
|
- />
|
|
|
- <p style="color: red; line-height: 1.3; margin-bottom: 10px;">入职日期之前课酬按100%计算；<br />
|
|
|
- 入职日期当天及以后课酬按80%计算；<br />
|
|
|
- 转正日期当天及以后课酬按100%计算；<br />
|
|
|
- 若入职日期和转正日期设置为同一天，则日期当天及以后课酬按100%计算；</p>
|
|
|
- </el-popover>
|
|
|
- </template>
|
|
|
- <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-col :span="12">
|
|
|
<el-form-item label="离职日期" :label-width="formLabelWidth">
|
|
|
<el-date-picker
|
|
|
- v-model="topForm.demissionDate"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
+ v-model="topForm.demissionDate"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
type="date"
|
|
|
placeholder="选择离职日期"
|
|
|
>
|
|
|
@@ -382,10 +410,7 @@
|
|
|
multiple
|
|
|
action="/api-web/uploadFile"
|
|
|
>
|
|
|
- <el-button
|
|
|
- icon="ios-cloud-upload-outline"
|
|
|
- >修改头像</el-button
|
|
|
- >
|
|
|
+ <el-button icon="ios-cloud-upload-outline">修改头像</el-button>
|
|
|
<!--
|
|
|
v-if="pageType != 'create'"
|
|
|
<el-button
|
|
|
@@ -417,7 +442,7 @@ import store from "@/store";
|
|
|
import { permission } from "@/utils/directivePage";
|
|
|
import { jobNature, ProbationPeriodList } from "@/utils/searchArray";
|
|
|
import { isvalidPhone } from "@/utils/validate";
|
|
|
-import dayjs from 'dayjs'
|
|
|
+import dayjs from "dayjs";
|
|
|
let validPhone = (rule, value, callback) => {
|
|
|
if (!value) {
|
|
|
callback(new Error("请输入电话号码"));
|
|
|
@@ -431,7 +456,7 @@ let validPhone = (rule, value, callback) => {
|
|
|
export default {
|
|
|
name: "teacherOperation",
|
|
|
data() {
|
|
|
- const that = this
|
|
|
+ const that = this;
|
|
|
return {
|
|
|
headers: {
|
|
|
Authorization: getToken(),
|
|
|
@@ -459,7 +484,7 @@ export default {
|
|
|
graduateSchool: null,
|
|
|
email: null,
|
|
|
educationBackground: null,
|
|
|
- demissionDate:null,
|
|
|
+ demissionDate: null,
|
|
|
formalStaffDate: null,
|
|
|
isProbationPeriod: null,
|
|
|
technicalTitles: null,
|
|
|
@@ -501,17 +526,26 @@ export default {
|
|
|
pickerOptions2: {
|
|
|
firstDayOfWeek: 1,
|
|
|
disabledDate(time) {
|
|
|
- let date = new Date(dayjs(that.topForm.formalStaffDate).format('YYYY-MM-DD') + ' 00:00:00')
|
|
|
- return that.topForm.formalStaffDate ? time.getTime() > date.getTime() : false;
|
|
|
- }
|
|
|
+ let date = new Date(
|
|
|
+ dayjs(that.topForm.formalStaffDate).format("YYYY-MM-DD") +
|
|
|
+ " 00:00:00"
|
|
|
+ );
|
|
|
+ return that.topForm.formalStaffDate
|
|
|
+ ? time.getTime() > date.getTime()
|
|
|
+ : false;
|
|
|
+ },
|
|
|
},
|
|
|
pickerOptions: {
|
|
|
firstDayOfWeek: 1,
|
|
|
disabledDate(time) {
|
|
|
- let date = new Date(dayjs(that.topForm.entryDate).format('YYYY-MM-DD') + ' 00:00:00')
|
|
|
- return that.topForm.entryDate ? date.getTime() > time.getTime() : false;
|
|
|
- }
|
|
|
- }
|
|
|
+ let date = new Date(
|
|
|
+ dayjs(that.topForm.entryDate).format("YYYY-MM-DD") + " 00:00:00"
|
|
|
+ );
|
|
|
+ return that.topForm.entryDate
|
|
|
+ ? date.getTime() > time.getTime()
|
|
|
+ : false;
|
|
|
+ },
|
|
|
+ },
|
|
|
};
|
|
|
},
|
|
|
created() {},
|
|
|
@@ -570,7 +604,7 @@ export default {
|
|
|
graduateSchool: result.graduateSchool,
|
|
|
email: result.email,
|
|
|
educationBackground: result.educationBackground,
|
|
|
- demissionDate:result.demissionDate,
|
|
|
+ demissionDate: result.demissionDate,
|
|
|
formalStaffDate: result.formalStaffDate,
|
|
|
technicalTitles: result.technicalTitles,
|
|
|
certificateType: result.certificateType,
|
|
|
@@ -636,7 +670,7 @@ export default {
|
|
|
teacherUpdate(this.topForm).then((res) => {
|
|
|
if (res.code == 200) {
|
|
|
// this.$emit('onTeacher')
|
|
|
- this.$store.dispatch('delVisitedViews', this.$route)
|
|
|
+ this.$store.dispatch("delVisitedViews", this.$route);
|
|
|
this.$router.push({
|
|
|
path: "/teacherManager/teacherList",
|
|
|
query: { rules: this.Frules, search: this.Fsearch },
|
|
|
@@ -654,7 +688,7 @@ export default {
|
|
|
if (permission("/teacherAdd/salarySeting")) {
|
|
|
this.$emit("onTeacher", res.data);
|
|
|
} else {
|
|
|
- this.$store.dispatch('delVisitedViews', this.$route)
|
|
|
+ this.$store.dispatch("delVisitedViews", this.$route);
|
|
|
this.$router.push({
|
|
|
path: "/teacherManager/teacherList",
|
|
|
query: { rules: this.Frules, search: this.Fsearch },
|
|
|
@@ -666,15 +700,15 @@ export default {
|
|
|
}
|
|
|
} else {
|
|
|
this.$nextTick(() => {
|
|
|
- let isError = document.getElementsByClassName('is-error')
|
|
|
+ let isError = document.getElementsByClassName("is-error");
|
|
|
isError[0].scrollIntoView({
|
|
|
// 滚动到指定节点
|
|
|
// 值有start,center,end，nearest，当前显示在视图区域中间
|
|
|
- block: 'center',
|
|
|
+ block: "center",
|
|
|
// 值有auto、instant,smooth，缓动动画（当前是慢速的）
|
|
|
- behavior: 'smooth',
|
|
|
- })
|
|
|
- })
|
|
|
+ behavior: "smooth",
|
|
|
+ });
|
|
|
+ });
|
|
|
return false;
|
|
|
}
|
|
|
});
|
|
|
@@ -709,13 +743,13 @@ export default {
|
|
|
certificateType: null,
|
|
|
certificateNum: null,
|
|
|
jobType: "ADVISER",
|
|
|
- memo: null
|
|
|
+ memo: null,
|
|
|
};
|
|
|
- this.subjectIds = []
|
|
|
+ this.subjectIds = [];
|
|
|
this.$refs[formName].resetFields();
|
|
|
},
|
|
|
onCancel() {
|
|
|
- this.$store.dispatch('delVisitedViews', this.$route)
|
|
|
+ this.$store.dispatch("delVisitedViews", this.$route);
|
|
|
this.$router.push({
|
|
|
path: "/teacherManager/teacherList",
|
|
|
query: { rules: this.Frules, search: this.Fsearch },
|
|
|
@@ -842,5 +876,9 @@ export default {
|
|
|
width: 260px;
|
|
|
text-align: center;
|
|
|
}
|
|
|
+ .alert {
|
|
|
+ margin: 0 0 20px 120px;
|
|
|
+ width: 855px;
|
|
|
+ }
|
|
|
}
|
|
|
</style>
|
mo