新增修改订单调整

src/components/sale/orderlist.vue

@@ -991,8 +991,7 @@
                 </div>
               </td>
               <td style="border:none;" v-if="AuthorityObj.isShowEdit && viewType == 0">
-                <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400;display:none;" label="编辑"
-                  @click="editOrder(item)" />
+ 
                 <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;display:none;">
                   <q-list>
                     <q-item clickable v-close-popup>
@@ -1917,10 +1916,7 @@
         this.IsRefund = 0
         var newUrlPath = "/financial/financalDocument/ChoiceAddFinancialDocuments";
         this.OpenNewUrl(newUrlPath, query);
-        // this.$router.push({
-        //   path: newUrlPath,
-        //   query
-        // });
+ 
       },
       chanceType_lx(obj) {
         //留学的时 成本制单

src/components/school/student/abroad-form.vue

@@ -23,12 +23,14 @@
                   </div>
                 </div>
               </div>
-              <abroadlist :dataList="dataList" :loading="loading" @select="selectCourse" :select="defaultCourse"></abroadlist>
+              <abroadlist :dataList="dataList" :loading="loading" @select="selectCourse" :select="defaultCourse">
+              </abroadlist>
               <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="PageCount"
                 :input="true" @input="changePage" />
             </q-step>
             <q-step :name="2" title="确认" icon="settings" :done="step > 2">
-              <studyForm ref="orderForm" :save-obj="saveObj" :select="selectedArr" @success="$emit('close')" @cancelloading='cancelloading'></studyForm>
+              <studyForm ref="orderForm" :save-obj="saveObj" :select="selectedArr" @success="$emit('close')"
+                @cancelloading='cancelloading'></studyForm>
             </q-step>
           </q-stepper>
         </q-card-section>
@@ -44,14 +46,9 @@
 </template>
 
 <script>
-  import {
-    queryCourseDropdownList,
-    getCourseSubject
-  } from "../../../api/course/index";
   import {
     queryStudyAbroadPage
   } from '../../../api/studyabroad/index'
-
   import abroadlist from "./transfer-order/abroadlist";
   import studyForm from "./transfer-order/study-form";
   export default {
@@ -84,7 +81,7 @@
         dataList: [],
         defaultCourse: [],
         saveObj: {}, //所选数据
-        loading:false,
+        loading: false,
         studyList: [{
           Id: 1,
           Name: '留学'
@@ -93,11 +90,11 @@
           Name: '就业'
         }],
         PageCount: 0,
-        selectedArr:[]
+        selectedArr: []
       };
     },
     mounted() {
-      if(this.select){
+      if (this.select) {
         this.selectedArr = this.select;
       }
       this.getList();
@@ -121,13 +118,13 @@
       },
       // 选择课程
       selectCourse(val) {
-        if(val&&val.length>0){
-            this.saveObj = val[0];
-            this.defaultCourse = val;
-            this.saveObj.OrderCourseList =[];
-            this.saveObj.OrderCourseList.push(JSON.parse(JSON.stringify(this.saveObj)));
-            this.saveObj.TextbookFee=0;
-            this.saveObj.CoursewareFee=0;
+        if (val && val.length > 0) {
+          this.saveObj = val[0];
+          this.defaultCourse = val;
+          this.saveObj.OrderCourseList = [];
+          this.saveObj.OrderCourseList.push(JSON.parse(JSON.stringify(this.saveObj)));
+          this.saveObj.TextbookFee = 0;
+          this.saveObj.CoursewareFee = 0;
         }
       },
       next() {
@@ -146,11 +143,11 @@
         this.getList();
       },
       saveOrderForm() {
-        this.loading1 = true
+        this.loading1 = true;
         this.$refs.orderForm.saveOrderInfo();
       },
       cancelloading() {
-        this.loading1 = false
+        this.loading1 = false;
       },
     }
   };

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

@@ -22,7 +22,6 @@
                         v-model="courseMsg.School_Id" :options="schoolList" emit-value map-options label="关联校区"
                         clearable />
                     </div>
-
                     <div class="col-3">
                       <q-input @change="resetSearch" clearable filled v-model="courseMsg.ClassNo" label="班号"
                         @clear="resetSearch" maxlength="20" />
@@ -74,8 +73,7 @@
             </q-step>
             <q-step :name="3" title="确认" icon="settings" :done="step > 3">
               <orderForm ref="orderForm" :mode="mode" :schoolList="schoolList" :save-obj="saveObj" :stuData="stuData"
-                :modityOrderType="1" :selectedCourseList="selectedCourseList" @success="$emit('close')"
-                @cancelloading="cancelloading"></orderForm>
+                @success="$emit('close')" @cancelloading="cancelloading"></orderForm>
             </q-step>
           </q-stepper>
         </q-card-section>
@@ -100,11 +98,9 @@
   } from "../../../api/sale/sale";
   import {
     getSchoolDropdown, //获取校区列表
- 
   } from "../../../api/school/index";
   import {
     queryCourseDropdownList,
- 
   } from "../../../api/course/index";
   import Mode from "./transfer-order/tickMode";
   import Course from "./transfer-order/courselist";
@@ -188,7 +184,7 @@
         myClassList: [],
         allClassList: [],
         loading1: false, //防止多次点击
-        mode: 1,
+        mode: 1, //1-班课，2-常规约课，3-vip 1对1
         selectedCourseList: [], //多选课程
       };
     },

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

@@ -24,7 +24,6 @@
         </div>
       </div>
     </div>
-
     <q-table :pagination="msg" :selection="mode==2?'multiple':'single'" :selected.sync="selection"
       no-data-label="暂无相关数据" flat class="sticky-tow-column-table sticky-two-header-table" separator="none"
       :data="dataList" :columns="columns" row-key="ClassId" @update:selected="emitSel"
@@ -50,15 +49,14 @@
   } from "../../../../api/sale/sale";
 
   export default {
-    components: {
-    },
+    components: {},
     props: {
       select: {
         type: Array,
         default: () => []
       },
       mode: {
-        type: Number, //1:约课，2：班课,3-Vip
+        type: Number, //1-班课,2-常规约课,3-Vip 1对1课程
         default: 1
       },
     },
@@ -173,7 +171,6 @@
       }
     }
   };
-
 </script>
 <style>
   .table {
@@ -220,5 +217,4 @@
   .yueke-CourseName span {
     color: #2961fe;
   }
-
-</style>
+</style>
\ No newline at end of file

src/pages/sale/myOrder.vue

@@ -131,7 +131,6 @@
     queryCourseDropdownList,
     getCourseSubject
   } from '../../api/course/index'
-  import myOrderForm from '../../components/sale/myOrder-form'
   import classinfoForm from '../../components/course/classinfo-form';
   import orderlist from '../../components/sale/orderlist'
   export default {
@@ -139,7 +138,6 @@
       title: "我的语培订单"
     },
     components: {
-      myOrderForm,
       classinfoForm,
       orderlist
     },

src/pages/studyAbroad/subscribe.vue

@@ -246,7 +246,7 @@
       </q-calendar>
     </div>
     <SubscribeForm v-model="showForm" :editType="editType" :dateObj="dateObj" :saveObj="saveObj" :auth="auth"
-      :teacherList="TeacherList2" @success="successHandle" />
+      :teacherList="TeacherList" @success="successHandle" />
   </div>
 </template>
 
@@ -386,7 +386,6 @@
           "brown",
         ],
         legendList: [],
-        TeacherList2: [],
         events: [],
         dateObj: {},
         saveObj: {},
@@ -499,7 +498,6 @@
       getTeacherList() {
         getTeacherDropDownList({
           LeaveStatus: 1,
-          
         }).then(res => {
           if (res.Code == 1) {
             this.TeacherList = JSON.parse(JSON.stringify(res.Data));
@@ -508,11 +506,6 @@
               TId: 0
             };
             this.TeacherList.unshift(obj);
-            this.TeacherList2 = JSON.parse(JSON.stringify(res.Data));
-            this.TeacherList2.unshift({
-              TeacherName: "请选择",
-              TId: 0
-            });
             this.legendList = JSON.parse(JSON.stringify(res.Data));
             this.legendList.forEach((item, index) => {
               item.bg = this.colorList[index];