修改显示

src/views/studentManager/modals/addMusic.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form :model="musicForm" label-width="100px" ref="form">
+    <el-form :model="musicForm" label-width="110px" ref="form">
       <el-form-item
         label="乐器分类"
         prop="goodsCategoryId"
@@ -67,9 +67,9 @@
         </el-select>
       </el-form-item>
       <el-form-item
-        label="乐保有效期"
+        label="乐保结束日期"
         :rules="[
-          { required: true, message: '请选择乐保有效期', trigger: 'blur' },
+          { required: true, message: '请选择乐保结束日期', trigger: 'blur' },
         ]"
         v-if="musicForm.status == 1"
         prop="date"
@@ -77,13 +77,12 @@
         <el-date-picker
           style="width: 400px"
           v-model="musicForm.date"
-          :clearable="false"
-          type="datetimerange"
+          clearable
+          type="datetime"
           value-format="yyyy-MM-dd HH:mm:ss"
-          range-separator="至"
-          :picker-options="{ firstDayOfWeek: 1 }"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
+          default-time="23:59:59"
+          :picker-options="pickerOptions"
+          placeholder="乐保结束日期"
         >
         </el-date-picker>
       </el-form-item>
@@ -104,7 +103,14 @@ export default {
         goodsId: "",
         goodsCategoryId: "",
         status: "",
-        date: [],
+        date: null,
+      },
+      pickerOptions: {
+        firstDayOfWeek: 1,
+        disabledDate(time) {
+          let times = dayjs(dayjs().format('YYYY-MM-DD')).valueOf()
+          return times > time.getTime();
+        },
       },
       typeList: this.categoryList,
       musicList: [],
@@ -122,11 +128,8 @@ export default {
       musicForm.goodsId = operationData.goodsId
       musicForm.goodsName = operationData.goodsName
       musicForm.status = operationData.status + ''
-      if(operationData.startTime && operationData.endTime) {
-        musicForm.date = [(operationData.startTime), (operationData.endTime)]
-      } else {
-        musicForm.date = []
-      }
+      musicForm.date = operationData.endTime || null
+
 
       musicForm.id = operationData.id
     }
@@ -147,11 +150,23 @@ export default {
       this.$refs.form.validate(async (res) => {
         if (res) {
           try {
-            const { date, ...rest } = this.musicForm;
+            const { date, status, ...rest } = this.musicForm;
             let obj = {
               ...rest,
-              ...getTimes(date, ["startTime", "endTime"], 'YYYY-MM-DD HH:mm:ss'),
+              status
             };
+            // 是否有乐保
+            if(status == 1) {
+              if(this.operationData && this.operationData.startTime) {
+                obj.startTime = this.operationData.startTime
+              } else {
+                obj.startTime = dayjs().format('YYYY-MM-DD HH:mm') + ':00'
+              }
+              obj.endTime = date
+            } else {
+              obj.startTime = ''
+              obj.endTime = ''
+            }
             if(this.operationStatus == 'create') {
               const res = await addStudentInstrument(obj);
               this.$message.success('添加成功')

src/views/teamDetail/components/studentList.vue

@@ -1393,6 +1393,7 @@ export default {
               this.maskForm.parentName = res.data.parentsName;
               this.maskForm.course = res.data.currentClass;
               this.maskForm.startClass = res.data.currentGrade;
+              this.maskForm.currentGradeNum = (res.data.currentGradeNum) + '';
               this.maskForm.phone = val;
               this.maskForm.timer = res.data.birthdate;
             }