|
@@ -60,9 +60,7 @@
|
|
|
<el-date-picker
|
|
|
v-model.trim="topForm.entryDate"
|
|
|
type="date"
|
|
|
- :picker-options="{
|
|
|
- firstDayOfWeek: 1,
|
|
|
- }"
|
|
|
+ :picker-options="pickerOptions2"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
placeholder="入职日期"
|
|
|
></el-date-picker>
|
|
@@ -286,10 +284,11 @@
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="转正日期" :label-width="formLabelWidth">
|
|
|
<el-date-picker
|
|
|
- v-model="topForm.formalStaffDate"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
+ v-model="topForm.formalStaffDate"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
type="date"
|
|
|
placeholder="选择转正日期"
|
|
|
+ :picker-options="pickerOptions"
|
|
|
>
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
@@ -379,6 +378,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'
|
|
|
let validPhone = (rule, value, callback) => {
|
|
|
if (!value) {
|
|
|
callback(new Error("请输入电话号码"));
|
|
@@ -392,6 +392,7 @@ let validPhone = (rule, value, callback) => {
|
|
|
export default {
|
|
|
name: "teacherOperation",
|
|
|
data() {
|
|
|
+ const that = this
|
|
|
return {
|
|
|
headers: {
|
|
|
Authorization: getToken(),
|
|
@@ -458,6 +459,20 @@ export default {
|
|
|
],
|
|
|
isAvatar: null,
|
|
|
},
|
|
|
+ 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;
|
|
|
+ }
|
|
|
+ },
|
|
|
+ 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;
|
|
|
+ }
|
|
|
+ }
|
|
|
};
|
|
|
},
|
|
|
created() {},
|
|
@@ -543,6 +558,14 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
+ // pickerOptions() {
|
|
|
+ // return {
|
|
|
+ // disabledDate(time) {
|
|
|
+ // let date = new Date(this.topForm.entryDate)
|
|
|
+ // return time.getTime() > date.now();
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // },
|
|
|
joinArray(value, type) {
|
|
|
if (!type) {
|
|
|
type = " ";
|