页面修改

src/components/course/classstu-form.vue

@@ -33,11 +33,9 @@
               <div style="margin:10px 0 15px 0;">邀请新学员</div>
             </div>
             <div class="drop_NameDown">
-              <!-- <q-select dense standout="bg-primary text-white" v-model="checkedStudent" :options="InvitationList"
-              @filter="filterCourseFn" use-input option-value="StuId" option-label="StuName" label="选择学员" /> -->
-              <q-select filled stack-label use-input input-debounce="0"
-                option-value="StuId" option-label="StuName" v-model="checkedStudent"
-                :options="InvitationList" label="选择学员" :dense="false" emit-value map-options @filter="filterFn">
+              <q-select filled stack-label use-input input-debounce="0" option-value="StuId" option-label="StuName"
+                v-model="checkedStudent" :options="InvitationList" label="选择学员" :dense="false" emit-value map-options
+                @filter="filterFn">
                 <template v-slot:no-option>
                   <q-item>
                     <q-item-section class="text-grey">
@@ -55,15 +53,27 @@
         </q-popup-proxy>
       </q-btn>
     </div>
-    <q-table :loading="loading" no-data-label="暂无相关数据" style="margin-bottom:80px;" flat selection="multiple" :selected.sync="selectedStudent"
-      class="sticky-column-table" separator="none" title="学员信息" :data="studentList" :pagination="initialPagination" :columns="columns"
-      row-key="Id" hide-bottom>
+    <q-table :loading="loading" no-data-label="暂无相关数据" style="margin-bottom:80px;" flat selection="multiple"
+      :selected.sync="selectedStudent" class="sticky-column-table" separator="none" title="学员信息" :data="studentList"
+      :pagination="initialPagination" :columns="columns" row-key="Id" hide-bottom>
       <template v-slot:body-cell-IsRenew="props">
         <q-td auto-width :props="props">
           <span style="color:red;" v-if="props.row.IsRenew==0">否</span>
           <span style="color:green;" v-if="props.row.IsRenew==1">是</span>
         </q-td>
       </template>
+      <template v-slot:body-cell-StuType="props">
+        <q-td auto-width :props="props">
+          <span v-if="props.row.IsChaBan==0">正常报入</span>
+          <span style="color:red;" v-if="props.row.IsChaBan==1">
+            插班报入
+            <q-tooltip   :offset="[10, 10]">
+              开始课时:{{props.row.StartClassHours}}<br />
+              {{props.row.CourseName}}
+            </q-tooltip>
+          </span>
+        </q-td>
+      </template>
     </q-table>
   </div>
 </template>
@@ -111,6 +121,12 @@
             field: 'ClassHours',
             align: 'left',
           },
+          {
+            name: 'StuType',
+            label: '学生类型',
+            field: 'StuType',
+            align: 'left',
+          },
           {
             name: 'CreateTimeStr',
             label: '加入时间',
@@ -239,7 +255,7 @@
       },
       //获取学员下拉信息
       getStudentList() {
-        var qMsg={
+        var qMsg = {
           SchoolId: this.setingObj.School_Id
         };
         GetStudentList({}).then(res => {
@@ -263,9 +279,9 @@
           return;
         } else {
           let checkedStuObj = {};
-          this.InvitationList.forEach(x=>{
-            if(x.StuId==this.checkedStudent){
-              checkedStuObj=x;
+          this.InvitationList.forEach(x => {
+            if (x.StuId == this.checkedStudent) {
+              checkedStuObj = x;
             }
           })
           this.invitationMsg.ClassId = this.setingObj.ClassId;

src/components/sale/editOrder-form.vue

@@ -31,6 +31,11 @@
           <q-input filled stack-label :dense="false" v-model="OrderMsg.StartClassHours" :disable="modityOrderType==2"
             @keyup.native="checkInteger(OrderMsg,'StartClassHours')" ref="StartClassHours" @input="countPrice"
             class="col-12" label="起始课时" :rules="[val => !!val || '请填起始课时']" />
+          <q-input filled stack-label :dense="false" v-model="OrderMsg.EffectTime" :disable="modityOrderType==2"
+            ref="EffectTime" @input="countPrice" class="col-12" label="生效时间" :rules="[val => !!val || '请填生效时间']" />
+          <q-select filled option-value="UpOrderId" :disable="modityOrderType==2" option-label="CourseName"
+            ref="UpOrderId" v-model="OrderMsg.UpOrderId" :options="CourseList" emit-value map-options class="q-pb-lg"
+            label="前置订单" @input="changePrice" />
         </template>
         <template v-if="modityOrderType==1">
           <q-input filled stack-label :dense="false" v-model="OrderMsg.Unit_Price"
@@ -147,6 +152,8 @@
           IsChaBan: 0, //是否插班报入(1-是)
           CourseId: '', //课程编号
           StartClassHours: 0, //已上课时
+          EffectTime: '', //生效时间
+          UpOrderId: 0, //前置订单编号
         },
         IsShowUpPrice: false, //是否显示高于定价
         UnitPrice: 0,
@@ -268,6 +275,8 @@
               this.OrderMsg.CourseId = tempData.CourseId;
               this.OrderMsg.StartClassHours = tempData.StartClassHours;
               this.OrderMsg.IsChaBan = tempData.IsChaBan;
+              this.OrderMsg.EffectTime=tempData.EffectTime;
+              this.OrderMsg.UpOrderId=tempData.UpOrderId;
               this.UnitPrice = this.OrderMsg.Unit_Price;
               this.IsShowEditOrder = true;
             }
@@ -285,6 +294,8 @@
           this.OrderMsg.CourseId = '';
           this.OrderMsg.StartClassHours = 0;
           this.OrderMsg.IsChaBan = this.isChaBan;
+                  this.OrderMsg.EffectTime="";
+              this.OrderMsg.UpOrderId=0;
           this.OrderMsg.OrderType = this.orderType;
           if (this.OrderMsg.OrderType == 2) {
             this.OrderMsg.OrderNature = 1;

src/components/sale/orderlist.vue

@@ -93,7 +93,7 @@
               <template v-if="item.OrderType==1">
                 <div v-if="item.CourseName">课程名称:{{item.CourseName}}</div>
                 <div v-if="item.IsChaBan==1" style="color:red;">
-                  插班报入  插班开始课时:{{item.StartClassHours}}
+                  插班  开始课时:{{item.StartClassHours}}
                 </div>
               </template>
               <div style="margin-top:10px;" v-if="item.OfferId>0">