Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/school/manager/manager-form.vue

@@ -21,8 +21,8 @@
           <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.EmployeeName" ref="EmployeeName"
             class="col-6 q-pr-lg q-pb-lg" label="员工姓名" :rules="[val => !!val || '请填写员工姓名']" />
 
-          <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.IDCard" ref="IDCard"
-            class="col-6 q-pr-lg q-pb-lg" label="身份证号码" :rules="[val => !!val || '请填写身份证号码']" />
+          <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.IDCard"
+            class="col-6 q-pr-lg q-pb-lg" label="身份证号码"  />
 
           <q-select filled stack-label option-value="Id" option-label="Name" ref="ID" v-model="objOption.Sex"
             :options="SexList" label="性别" :dense="false" class="col-6 q-pr-lg q-pb-lg" emit-value map-options />

src/pages/financial/utils/commonUtils.js

@@ -347,8 +347,17 @@ var commonUtils = {
   //获取当前日期
   getCurrentDate() {
     var myDate = new Date();
+    var year = myDate.getFullYear();
+    var month = myDate.getMonth() + 1;
+    var day = myDate.getDate();
+    if (month >= 1 && month <= 9) {
+      month = "0" + month;
+    }
+    if (day >= 1 && day <= 9) {
+      day = "0" + day;
+    }
     //返回年月日
-    return myDate.getFullYear() + '-' + parseInt(myDate.getMonth() + 1) + "-" + myDate.getDate()
+    return year + '-' + month + "-" + day;
   },
   //格式化日期
   getFormatDate(dateStr) {

src/pages/stuMan/stuClassManage.vue

@@ -68,7 +68,8 @@
             label="学习课程" @clear="getClassList" maxlength="20" />
         </div>
         <div class="col-3">
-          <q-input v-model="msg.StartTime" mask="date" label="开班时间" standout="bg-primary text-white"  @update:model-value="()=>getClassList">
+          <q-input v-model="msg.StartTime" mask="date" label="开班时间" standout="bg-primary text-white"
+            @update:model-value="()=>getClassList">
             <template v-slot:append>
               <q-icon name="event" class="cursor-pointer">
                 <q-popup-proxy ref="qCStartTime" transition-show="scale" transition-hide="scale">
@@ -152,6 +153,7 @@
       if (this.$route.query && this.$route.query.ClassName) {
         this.msg.ClassName = decodeURI(this.$route.query.ClassName)
       }
+      this.msg.StartTime = this.$commonUtils.getCurrentDate();
       this.getClassStatus();
       this.getSchool();
       this.GetTeacherList();
@@ -161,10 +163,9 @@
       this.getClassList();
     },
     methods: {
-      changeDate()
-      {
-this.$refs.qCStartTime.hide();
-this.getClassList();
+      changeDate() {
+        this.$refs.qCStartTime.hide();
+        this.getClassList();
       },
       queryCourseSubject() {
         getCourseSubject({}).then(res => {