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

src/components/teacher/changeClassForm.vue

@@ -292,7 +292,7 @@
                 </tbody>
               </table>
             </template>
-            <div class="row wrap" style="margin-top:30px;">
+            <div class="row wrap" style="margin-top:30px;display:none;">
               <div class="col-6">
                 <q-input filled stack-label maxlength="6" v-model="msg.AllChangePlanItem.ClassHours" :dense="false"
                   class="col-6 q-pr-lg q-pb-lg" label="学习课时"
@@ -842,11 +842,12 @@
       },
       addTime(plan) {
         let obj = {
+          ClassTimeId: 0,
           EndTime: "",
           StartTime: "",
           TimeHour: 0
         }
-        plan.TimeList.push(plan)
+        plan.TimeList.push(obj)
       },
       changeClass(val) {
         this.currentClass = this.classList.find(x => {

src/pages/course/lessonPreparation.vue

@@ -145,7 +145,7 @@
 }
 
 .preSecond {
-    font-size: 36px;
+    font-size: 18px;
     color: #000000;
     position: relative;
     margin: 20px 0;
@@ -155,13 +155,13 @@
     position: absolute;
     content: '';
     display: inline-block;
-    width: 120px;
-    height: 14px;
+    width: 75px;
+    height: 5px;
     background: #3FC4FF;
     position: absolute;
     left: 0;
-    top: 34px;
-    opacity: 0.8;
+    top: 18px;
+    opacity: 0.6;
 }
 
 .prePare_Content {

src/pages/teacher/changeClassManager.vue

@@ -57,6 +57,28 @@
             <span class="ReceipTypeName">{{props.row.ReceiptTypeName}}</span>
           </q-td>
         </template>
+        <template v-slot:body-cell-ApplyReason="props">
+          <q-td :props="props">
+            <div class="bill_Rearsons">
+              <template v-if="props.row.ReceiptType==1">
+                <span>
+                  {{props.row.DataObj.Remarks}}
+                  <q-tooltip :offset="[0, 10]">
+                    {{props.row.DataObj.Remarks}}
+                  </q-tooltip>
+                </span>
+              </template>
+              <template v-if="props.row.ReceiptType==2">
+                <span>
+                  {{props.row.DataObj.ApplyReason}}
+                  <q-tooltip :offset="[0, 10]">
+                    {{props.row.DataObj.ApplyReason}}
+                  </q-tooltip>
+                </span>
+              </template>
+            </div>
+          </q-td>
+        </template>
         <template v-slot:bottom>
           <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
             :input="true" @input="changePage" />
@@ -149,6 +171,12 @@
             field: 'CreateTime',
             align: 'left'
           },
+          {
+            name: 'ApplyReason',
+            label: '退课原因',
+            field: 'ApplyReason',
+            align: 'left'
+          },
           {
             name: 'optioned',
             label: '操作',

src/pages/user/billquery.vue

@@ -20,7 +20,12 @@
     width: 400px;
     min-height: 150px;
   }
-
+  .bill_Rearsons{
+    width:250px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis
+  }
 </style>
 <template>
   <div class="page-body">
@@ -49,13 +54,35 @@
       </div>
     </div>
     <div class="page-content">
-      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table"
+      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table sticky-right-column-table"
         separator="none" :data="data" :columns="columns" row-key="name">
         <template v-slot:body-cell-ReceiptTypeName="props">
           <q-td :props="props">
             <span class="ReceipTypeName">{{props.row.ReceiptTypeName}}</span>
           </q-td>
         </template>
+        <template v-slot:body-cell-ApplyReason="props">
+          <q-td :props="props">
+            <div class="bill_Rearsons">
+              <template v-if="props.row.ReceiptType==1">
+                <span>
+                  {{props.row.DataObj.Remarks}}
+                  <q-tooltip :offset="[0, 10]">
+                    {{props.row.DataObj.Remarks}}
+                  </q-tooltip>
+                </span>
+              </template>
+              <template v-if="props.row.ReceiptType==2">
+                <span>
+                  {{props.row.DataObj.ApplyReason}}
+                  <q-tooltip :offset="[0, 10]">
+                    {{props.row.DataObj.ApplyReason}}
+                  </q-tooltip>
+                </span>
+              </template>
+            </div>
+          </q-td>
+        </template>
         <template v-slot:body-cell-AuditObj="props">
           <q-td :props="props">
             <template v-if="props.row.AuditObj&&props.row.AuditObj.AuditNode">
@@ -187,6 +214,12 @@
             field: 'CreateTime',
             align: 'left'
           },
+          {
+            name: 'ApplyReason',
+            label: '退课原因',
+            field: 'ApplyReason',
+            align: 'left'
+          },
           {
             name: 'optioned',
             label: '操作',