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

src/components/school/student/transfer-order/order-form.vue

@@ -696,18 +696,10 @@ export default {
     };
   },
   computed: {
-    // CourseCalculation(){
-    //   return this.courseInformationList.forEach(item=>{return item})
-    // }
+    
   },
   watch: {
-    // CourseCalculation:{
-    //   handler(val, oldVal) {
-    //     console.log(val,'====')
-    //     this.totalCourseFee()
-    //   },
-    //   deep: true, 
-    // },
+    
   },
   created() {
     if (this.saveObj && this.saveObj.CourseId) {
@@ -777,7 +769,7 @@ export default {
           //  NormalCommission:'',//正常返佣金额
           //  RenewCommission:"",// 预计返佣金额
           ScrollSchoolId: -1,
-          // UnitPrice:0
+          OrderType:1
       }
         if(item.CourseName){
           dataObj.CourseName = item.CourseName
@@ -1172,7 +1164,6 @@ export default {
       if(this.selectedCourseList.length>1){
         this.multipleAppointmentsFun()
       }else{
-        return
         this.singleAppointmentsFun()
       }
     },
@@ -1181,12 +1172,9 @@ export default {
       //插班验证课程和生效时间
       this.courseInformationList.forEach(item=>{
         item.StuIds = this.stuData.StuList.map(e => e.StuId).toString();
+        item.HelpEnterId = this.OrderMsg.HelpEnterId
         item.CustomerId = this.stuData.CustomerId;
       })
-      console.log(this.courseInformationList,'======')
-      // this.$emit("success");
-      // this.$emit("cancelloading"); //取消按钮的加载
-      // return
       let Msg = {
         OrderList: this.courseInformationList
       }

src/components/school/student/transfer-order/yueke.vue

@@ -41,7 +41,7 @@
         </div>
         <div class="col-4">
           <p class="yueke-title">已选：</p>
-          <p class="yueke-CourseName" v-for="(item,index) in selected">
+          <p class="yueke-CourseName" v-for="(item,index) in selection">
             <span>{{index+1}}、</span>
             {{item.CourseName}}
           </p>
@@ -53,7 +53,8 @@
     -->
     <q-table
       :pagination="msg"
-      
+      selection="multiple"
+      :selected.sync="selection"
       no-data-label="暂无相关数据"
       flat
       class="sticky-tow-column-table sticky-two-header-table"
@@ -63,11 +64,9 @@
       row-key="ClassId"
       @update:selected="emitSel"
       :selected-rows-label="getSelectedString"
-      selection="multiple"
-      :selected.sync="selected"
       table-class="table"
     >
-     <!-- <template v-slot:body-cell-CourseName="props">
+     <template v-slot:body-cell-CourseName="props">
         <q-td :props="props">
             {{ props.row.CourseName }}
         </q-td>
@@ -81,7 +80,7 @@
           :input="true"
           @input="changePage"
         />
-      </template> -->
+      </template>
     </q-table>
   </div>
 </template>
@@ -110,34 +109,34 @@ export default {
   },
   data() {
     return {
-      selected: [],
+      selection: [],
       columns: [
         {
           name: "CourseName",
-          required: true,
           label: "课程",
-          align: "left",
-          field: row => row.CourseName,
-          format: val => `${val}`,
-          sortable: true
+          field: "CourseName",
+          align: "left"
         },
         {
           name: "CourseSubjectName",
           required: true,
           label: "所属科目",
           align: "left",
-          field: row => row.CourseSubjectName,
-          format: val => `${val}`,
-          sortable: true
+          field: row => row.CourseSubjectName
         },
+        // {
+        //   name: "CateName",
+        //   required: true,
+        //   label: "系列",
+        //   align: "left",
+        //   field: row => row.CateName
+        // },
         {
           name: "SellPrice",
           required: true,
           label: "直客价",
           align: "left",
-          field: row => row.SellPrice.toFixed(2),
-          format: val => `${val}`,
-          sortable: true
+          field: row => row.SellPrice.toFixed(2)
         }
       ],
       // msg: {
@@ -180,7 +179,7 @@ export default {
     };
   },
   mounted() {
-    this.selected = this.select;
+    this.selection = this.select;
     this.getCourseList();
     this.queryCourseSubject();
     // this.getCategorytree();
@@ -188,9 +187,7 @@ export default {
   methods: {
     // 多选
     getSelectedString () {
-      return this.selected.length === 0 ? '' : `${this.selected.length} 
-      record${this.selected.length > 1 ? 's' : ''} 
-      selected of ${this.dataList.length}`
+      return this.selection.length === 0 ? '' : `${this.selection.length} record${this.selection.length > 1 ? 's' : ''} selected of ${this.dataList.length}`
     },
     emitSel(val) {
       this.$emit("select", val);