学员学习调整

src/components/school/student/studentStudyAddForm.vue

@@ -5,16 +5,17 @@
       <template v-if="saveObj==2">
         <div class="row q-col-gutter-md">
           <q-input class="col-6" filled v-model="SaveMsg.StudyValue" dense label="时间"></q-input>
-          <q-input class="col-6" filled v-model="SaveMsg.Words" type="number" dense label="单词背诵"></q-input>
+          <q-input class="col-6" filled v-model="SaveMsg.Words" maxlength="180" dense label="单词背诵"></q-input>
         </div>
         <div class="q-mt-xs row q-col-gutter-md">
-          <q-input class="col-6" filled v-model="SaveMsg.Practice" type="number" dense label="练习题"></q-input>
-          <q-input class="col-6" filled v-model="SaveMsg.ReadingAloud" type="number" dense label="朗读/背诵"></q-input>
+          <q-input class="col-6" filled v-model="SaveMsg.Practice" maxlength="180" dense label="练习题"></q-input>
+          <q-input class="col-6" filled v-model="SaveMsg.ReadingAloud" maxlength="180" dense label="朗读/背诵"></q-input>
         </div>
         <div class="q-mt-xs row q-col-gutter-md">
-          <p>其他 <i class="el-icon-plus text-blue cursor-pointer" @click="SetStudentStudyOther"></i></p>
+          <q-input class="col-6" filled v-model="SaveMsg.Other" maxlength="180" dense label="其他"></q-input>
+          <!-- <p>其他 <i class="el-icon-plus text-blue cursor-pointer" @click="SetStudentStudyOther"></i></p> -->
         </div>
-        <template v-if='SaveMsg.Other&& SaveMsg.Other.length>0'>
+        <!-- <template v-if='SaveMsg.Other&& SaveMsg.Other.length>0'>
           <div class="q-mt-xs row q-col-gutter-md" v-for=" ( itemOther, indexOther ) in SaveMsg.Other "
             :key="indexOther">
             <q-input class="col-6" placeholder="请输入项目名称" filled v-model="itemOther.Name" autofocus :dense="true" />
@@ -23,7 +24,7 @@
             <i class="el-icon-delete text-blue cursor-pointer col-2" @click="DelStudentStudyOther(indexOther)"
               style="margin-top:11px;"></i>
           </div>
-        </template>
+        </template> -->
       </template>
       <template v-if="saveObj==3">
         <div class="q-mt-xs row q-col-gutter-md">
@@ -74,7 +75,7 @@
           Words: '',
           Practice: '',
           ReadingAloud: '',
-          Other: [],
+          Other: '',
           ChapterId: 0,
           StudyType: 0,
           Remarks: '到勤情况：\n课堂表现：\n作业情况：\n评价建议：',
@@ -104,15 +105,13 @@
         this.SaveMsg.GuestId = this.BaseInfo.GuestId;
         this.SaveMsg.OrderId = this.BaseInfo.OrderId;
         if (this.saveObj == 3) {
-          this.SaveMsg.Words = 0;
-          this.SaveMsg.Practice = 0;
-          this.SaveMsg.ReadingAloud = 0;
+          this.SaveMsg.Words = '';
+          this.SaveMsg.Practice = '';
+          this.SaveMsg.ReadingAloud = '';
           this.SaveMsg.ChapterId = 0;
           this.SaveMsg.Other = '';
-        }
-        else
-        {
-          this.SaveMsg.Remarks='';
+        } else {
+          this.SaveMsg.Remarks = '';
         }
         this.SaveMsg.StudyType = this.saveObj;
         SetStuStudyInfo(this.SaveMsg).then(res => {
@@ -143,10 +142,10 @@
         this.SaveMsg.ClassScrollType = 0;
         this.SaveMsg.OrderId = 0;
         this.SaveMsg.StudyID = 0;
-        this.SaveMsg.Words = 0;
-        this.SaveMsg.Practice = 0;
-        this.SaveMsg.ReadingAloud = 0;
-        this.SaveMsg.Other = [];
+        this.SaveMsg.Words = '';
+        this.SaveMsg.Practice = '';
+        this.SaveMsg.ReadingAloud = '';
+        this.SaveMsg.Other = '';
         this.SaveMsg.ChapterId = 0;
         this.SaveMsg.StudyType = 0;
         this.SaveMsg.Remarks = '到勤情况：\n课堂表现：\n作业情况：\n评价建议：';

src/components/school/student/studentStudylMonthlist.vue

@@ -242,9 +242,9 @@
         this.SaveMsg.GuestId = this.BaseInfo.GuestId;
         this.SaveMsg.OrderId = this.BaseInfo.OrderId;
         this.SaveMsg.StudyID = obj.StudyID;
-        this.SaveMsg.Practice = 0;
-        this.SaveMsg.ReadingAloud = 0;
-        this.SaveMsg.Words = 0;
+        this.SaveMsg.Practice = "";
+        this.SaveMsg.ReadingAloud = "";
+        this.SaveMsg.Words = "";
         this.SaveMsg.Other = '';
         this.SaveMsg.Remarks = obj.Remarks;
         this.SaveMsg.StudyValue = obj.ClassDate;
@@ -284,10 +284,10 @@
         this.SaveMsg.ClassScrollType = 0;
         this.SaveMsg.OrderId = 0;
         this.SaveMsg.StudyID = 0;
-        this.SaveMsg.Words = 0;
-        this.SaveMsg.Practice = 0;
-        this.SaveMsg.ReadingAloud = 0;
-        this.SaveMsg.Other = [];
+        this.SaveMsg.Words = "";
+        this.SaveMsg.Practice = "";
+        this.SaveMsg.ReadingAloud = "";
+        this.SaveMsg.Other = "";
         this.SaveMsg.ChapterId = 0;
         this.SaveMsg.StudyType = 0;
         this.SaveMsg.Remarks = '';

src/components/school/student/studentStudylist.vue

@@ -94,42 +94,24 @@
               <span v-else> {{ item.ClassDate }}</span>
             </td>
             <td>
-              <q-input v-if="Edit.index==index" placeholder="请输入单词分数" type="number" v-model="item.Words"
+              <q-input v-if="Edit.index==index" placeholder="请输入单词分数" maxlength="180" v-model="item.Words"
                 :dense="true" />
               <span v-else> {{ item.Words }}</span>
             </td>
             <td>
-              <q-input v-if="Edit.index==index" placeholder="请输入练习题分数" type="number" v-model="item.Practice"
+              <q-input v-if="Edit.index==index" placeholder="请输入练习题分数" maxlength="180" v-model="item.Practice"
                 :dense="true" />
               <span v-else> {{ item.Practice }}</span>
             </td>
             <td>
-              <q-input v-if="Edit.index==index" placeholder="请输入朗读/背诵分数" type="number" v-model="item.ReadingAloud"
+              <q-input v-if="Edit.index==index" placeholder="请输入朗读/背诵分数" maxlength="180" v-model="item.ReadingAloud"
                 :dense="true" />
               <span v-else> {{ item.ReadingAloud }}</span>
             </td>
             <td>
-              <div>
-                <i v-if="Edit.index==index" class="el-icon-plus text-blue cursor-pointer" style="margin-bottom:5px;"
-                  @click="SetStudentStudyOther(index)"></i>
-                <template v-if='item.Other&& item.Other.length>0'>
-                  <div v-for=" ( itemOther, indexOther ) in item.Other " :key="indexOther">
-                    <template v-if="Edit.index==index">
-                      <div class="row ">
-                        <q-input class="col-6" style="width:100px;" placeholder="请输入项目名称" v-model="itemOther.Name"
-                          :dense="true" />&nbsp;
-                        <q-input class="col-4" style="width:80px;" placeholder="请输入项目分数" v-model="itemOther.Score"
-                          type="number" :dense="true" />
-                        <i class="el-icon-delete text-blue cursor-pointer col-2"
-                          @click="DelStudentStudyOther(item,index,indexOther)" style="margin-top:11px;"></i>
-                      </div>
-                    </template>
-                    <p v-else>
-                      {{itemOther.Name}}：{{itemOther.Score}}
-                    </p>
-                  </div>
-                </template>
-              </div>
+              <q-input v-if="Edit.index==index" placeholder="请输入其他内容" maxlength="180" v-model="item.Other"
+                :dense="true" />
+              <span v-else> {{ item.Other }}</span>
             </td>
             <td>
               <div class="text-blue cursor-pointer">
@@ -222,10 +204,10 @@
           ClassScrollType: 0,
           OrderId: 0,
           StudyID: 0,
-          Words: 0,
-          Practice: 0,
-          ReadingAloud: 0,
-          Other: [],
+          Words: "",
+          Practice: "",
+          ReadingAloud: "",
+          Other: "",
           ChapterId: 0,
           StudyType: 0,
           Remarks: '',
@@ -334,10 +316,10 @@
           this.SaveMsg.ClassScrollType = 0,
           this.SaveMsg.OrderId = 0,
           this.SaveMsg.StudyID = 0,
-          this.SaveMsg.Words = 0,
-          this.SaveMsg.Practice = 0,
-          this.SaveMsg.ReadingAloud = 0,
-          this.SaveMsg.Other = [],
+          this.SaveMsg.Words = "",
+          this.SaveMsg.Practice = "",
+          this.SaveMsg.ReadingAloud = "",
+          this.SaveMsg.Other = "",
           this.SaveMsg.ChapterId = 0,
           this.SaveMsg.StudyType = 0,
           this.SaveMsg.Remarks = '',

src/components/school/student/stufollowlistNew.vue

@@ -76,7 +76,7 @@
           <th width="80">金额</th>
           <th style="min-width:250px;">基本情况</th>
           <th width="200">续费课程</th>
-          <th width="80">续费级别</th>
+          <!-- <th width="80">续费级别</th> -->
           <th width="80">续费金额</th>
           <th width="80">最新进度</th>
           <th width="90">负责人</th>
@@ -153,12 +153,12 @@
                 <span>{{sItem.CourseName}}</span>
               </div>
             </td>
-            <td>
+            <!-- <td>
               <div v-for="(sItem,sIndex) in item.RenewOrderList" style="border-bottom:1px dashed #d1d1d1;"
                 :key="sIndex+40000">
                 <span>{{ sItem.CourseRateName?sItem.CourseRateName:'-' }}</span>
               </div>
-            </td>
+            </td> -->
             <td>
               <div v-for="(sItem,sIndex) in item.RenewOrderList" style="border-bottom:1px dashed #d1d1d1;"
                 :key="sIndex+50000">