页面修改

src/components/sale/orderlist.vue

@@ -163,7 +163,6 @@
               <template v-else>
                 <span class="redstyle">{{item.PreferPrice.toFixed(2)}}</span>
               </template>
-
             </td>
             <td style="border:none;width:7%">
               <template v-if="item.Income>=0">
@@ -225,13 +224,14 @@
               </template>
               <template v-if="comefrom==1">
                 <q-btn flat size="xs" color="accent" style="font-weight:400" label="关联老师"
-                @click="gettanchuteacher(item)" >
-                <q-popup-proxy >
+                  @click="gettanchuteacher(item)">
+                  <q-popup-proxy>
                     <q-banner v-if="isShowteacher">
                       <div class="calenderDialog">
                         <div style="margin:10px 0 15px 0;">请选择关联教师</div>
                         <q-select standout="bg-primary text-white" option-value="Id" option-label="EmployeeName"
-                        v-model="teacherMsg.HelpEnterId" :options="TeacherList" emit-value map-options label="请选择关联教师" />
+                          v-model="teacherMsg.HelpEnterId" :options="TeacherList" emit-value map-options
+                          label="请选择关联教师" />
                         <q-card-actions align="right" class="bg-white" style="margin-top:20px;">
                           <q-btn label="取消" flat color="grey-10" size="sm" @click="isShowteacher=false"
                             style="font-weight:400 !important" />
@@ -329,11 +329,17 @@
                       <q-item-label @click="transferClass(item,1)">转班</q-item-label>
                     </q-item-section>
                   </q-item>
-                  <q-item clickable v-close-popup v-if="AuthorityObj.isShowSeparater" style="display:none">
+                  <q-item clickable v-close-popup v-if="AuthorityObj.isShowSeparater">
                     <q-item-section>
                       <q-item-label @click="transferClass(item,2)">分拆</q-item-label>
                     </q-item-section>
                   </q-item>
+                  <q-item clickable v-close-popup
+                    v-if="AuthorityObj.isShowSeparater&&item.JoinType==5&&item.IsBackClass==0">
+                    <q-item-section>
+                      <q-item-label @click="backSourceClass(item)">回归原班</q-item-label>
+                    </q-item-section>
+                  </q-item>
                 </q-list>
               </q-btn-dropdown>
             </td>
@@ -844,8 +850,8 @@
       @success="refreshOrder"></continueclass-form>
 
     <!-- 转班申请 -->
-    <transferclass-form v-if="isShowTransferClass" :save-obj="orderObj" :ChangeType="ChangeType" @close="closeTransferClassForm"
-      @success="refreshOrder"></transferclass-form>
+    <transferclass-form v-if="isShowTransferClass" :save-obj="orderObj" :ChangeType="ChangeType"
+      @close="closeTransferClassForm" @success="refreshOrder"></transferclass-form>
 
     <!-- 查看报价单 -->
     <viewquotation-form v-if="isShowviewQuo" :rId="offerId" :isShowCancle="1" @close="closeQuota"
@@ -874,8 +880,9 @@
   import eduinfoForm from '../sale/eduinfo-form'
 
   import {
-    setOrderHelpEnterId,//老师关联
+    setOrderHelpEnterId, //老师关联
     cancelClassOrder, //取消订单
+    regressSourceClass, //拆分订单回到原班
   } from '../../api/sale/sale'
 
   import {
@@ -932,7 +939,7 @@
         default: 0
       },
       //因为今天订单 取消了一些操作
-      comefrom:{//来自 1是来自 学管今日订单
+      comefrom: { //来自 1是来自 学管今日订单
         type: Number,
         default: 0
       }
@@ -976,7 +983,7 @@
           isShowContract: true, //是否显示合同
           isShowEdit: true, //是否显示修改订单按钮
           isShowTransClassOrder: false, //是否显示转班按钮
-          isShowSeparater:false //是否显示分拆
+          isShowSeparater: false //是否显示分拆
         },
 
         isShowEduForm: false, //是否显示新增修改合同弹窗
@@ -989,16 +996,19 @@
         newModityOrderType: 0,
         isChaBan: 0, //是否插班(0-正常报入，1-插班报入)
         isShowTransferClass: false, //是否显示转班
-        ChangeType:1, //1-转班 2-分拆
-        isShowteacher:false,//关联教师显示
-        teacherMsg:{OrderId:0,HelpEnterId:'',},//关联老师参数
-        TeacherList:[],//下拉老师
+        ChangeType: 1, //1-转班 2-分拆
+        isShowteacher: false, //关联教师显示
+        teacherMsg: {
+          OrderId: 0,
+          HelpEnterId: '',
+        }, //关联老师参数
+        TeacherList: [], //下拉老师
       }
     },
     created() {
       this.initAuth();
       this.Employee();
-      this.GetTeacherList()//获取老师数据
+      this.GetTeacherList() //获取老师数据
       var localStorageData = window.localStorage["loginUserInfo"];
       let ActionMenuList = JSON.parse(localStorageData).data.ActionMenuList
       if (ActionMenuList && ActionMenuList.length > 0) {
@@ -1084,11 +1094,45 @@
           if (this.authObj.isShowTransClassOrder != null && this.authObj.isShowTransClassOrder) {
             this.AuthorityObj.isShowTransClassOrder = this.authObj.isShowTransClassOrder;
           }
-          if (this.authObj.isShowSeparater !=null && this.authObj.isShowSeparater){
+          if (this.authObj.isShowSeparater != null && this.authObj.isShowSeparater) {
             this.AuthorityObj.isShowSeparater = this.authObj.isShowSeparater;
           }
         }
       },
+      //回归原班
+      backSourceClass(item) {
+        var backMsg = {
+          OrderId: item.OrderId
+        };
+        var that = this;
+        this.$q.dialog({
+          title: "回归原班",
+          message: "你正在进行订单回归原班级操作，是否确认执行",
+          persistent: true,
+          cancel: {
+            label: "取消",
+            flat: true
+          },
+          ok: {
+            label: "确认执行",
+            flat: true,
+            focus: true
+          }
+        }).onOk(() => {
+          regressSourceClass(backMsg).then(res => {
+            if (res.Code == 1) {
+               that.$q.notify({
+                icon: 'iconfont icon-chenggong',
+                color: 'accent',
+                timeout: 2000,
+                message: '操作成功',
+                position: 'top'
+              })
+              that.refreshOrder();
+            }
+          })
+        });
+      },
       //关闭报价单
       closeQuota() {
         this.isShowviewQuo = false;
@@ -1137,20 +1181,17 @@
         this.orderObj = {};
         this.isShowContinueClass = false;
       },
-
       //转班
-      transferClass(item,type) {
+      transferClass(item, type) {
         this.orderObj = item;
         this.ChangeType = type;
         this.isShowTransferClass = true;
       },
-
       //关闭转班
       closeTransferClassForm() {
         this.orderObj = {};
         this.isShowTransferClass = false;
       },
-
       //获取员工列表
       Employee() {
         var qMsg = {
@@ -1404,7 +1445,6 @@
       refreshPage() {
         this.refreshOrder();
       },
-
       //领取合同
       takeContract(item) {
         let msg = {
@@ -1468,7 +1508,7 @@
       //获取教师下拉
       GetTeacherList() {
         var qMsg = {
-          AccountTypeStr:2
+          AccountTypeStr: 2
         }
         queryEmployee(qMsg).then(res => {
           if (res.Code == 1) {
@@ -1476,14 +1516,13 @@
           }
         })
       },
-        gettanchuteacher(item){
+      gettanchuteacher(item) {
         this.isShowteacher = true
         this.teacherMsg.OrderId = item.OrderId;
-          this.teacherMsg.HelpEnterId = item.HelpEnterId>0?item.HelpEnterId:'';
-          
+        this.teacherMsg.HelpEnterId = item.HelpEnterId > 0 ? item.HelpEnterId : '';
       },
-        setCheckStatus(){
-          if( this.teacherMsg.HelpEnterId==0 ||  this.teacherMsg.HelpEnterId==''){
+      setCheckStatus() {
+        if (this.teacherMsg.HelpEnterId == 0 || this.teacherMsg.HelpEnterId == '') {
           this.$q.notify({
             icon: 'close',
             color: 'accent',
@@ -1495,7 +1534,6 @@
         }
         setOrderHelpEnterId(this.teacherMsg).then(res => {
           if (res.Code == 1) {
-                
             this.$q.notify({
               icon: 'iconfont icon-chenggong',
               color: 'accent',
@@ -1506,17 +1544,13 @@
             //调用父页面成功方法
             this.isShowteacher = false
             this.$emit('success');
-                
           }
         })
-
       }
-
     }
   }
 
 </script>
-
 <style>
   li {
     list-style-type: none;