Merge branch '03/03Lebao' into online

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

@@ -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 = " ";

vue.config.js

@@ -20,8 +20,9 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.38:8000' //邹璇
 // let target = 'http://192.168.3.57:8000' //勇哥
-// let target = 'http://dev.dayaedu.com' // 测试服
-let target = 'http://47.114.176.40:8000' //开发环境
+let target = 'http://dev.dayaedu.com' // 测试服
+// let target = 'http://47.114.176.40:8000' //开发环境
+// let target = 'https://test.dayaedu.com' //开发环境
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {