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

public/static/UE/third-party/video-js/video.dev.js

@@ -1252,9 +1252,6 @@ vjs.getAbsoluteURL = function(url){
 vjs.log = function(){
   vjs.log.history = vjs.log.history || [];   // store logs to an array for reference
   vjs.log.history.push(arguments);
-  if(window.console){
-    window.console.log(Array.prototype.slice.call(arguments));
-  }
 };
 
 // Offset Left

src/components/relation/index.vue

@@ -337,11 +337,7 @@
                 var _stuff_height = _max_y - _min_y + 50
                 var _final_x = (this.graphSetting.viewSize.width - _stuff_width)/2 - _min_x
                 var _final_y = (this.graphSetting.viewSize.height - _stuff_height)/2 - _min_y
-                // if (window.SeeksGraphDebug) console.log('_min_x, _min_y, _stuff_width, _stuff_height:', _min_x, _min_y, _stuff_width, _stuff_height)
-                // var _final_x = -_min_x
-                // var _final_y = -_min_y
                 this.animateGoto(_final_x, _final_y, 500, () => {
-                  // this.graphSetting.checkedNodeId = thisNode.id
                   this.refreshNVAnalysisInfo()
                 })
               })
@@ -365,8 +361,6 @@
           } else {
             this.graphSetting.layouter = SeeksRGLayouters.createLayout(_defaultLayoutSetting, this.graphSetting)
           }
-        } else {
-          console.log('你需要设置layouts来指定当前图谱可以使用的布局器！')
         } 
         this.doLayout()
         callback(this)
@@ -788,8 +782,6 @@
           } else {
             this.graphSetting.layouter = SeeksRGLayouters.createLayout(_defaultLayoutSetting, this.graphSetting)
           }
-        } else {
-          console.log('你需要设置layouts来指定当前图谱可以使用的布局器！')
         } 
         var __root_id = jsonData['rootId']
         this.loadGraphJsonData(jsonData)
@@ -1056,7 +1048,7 @@
               this.graphSetting.canvasOffset.y = _origin_offset_y
               this.canvasBackgroundColor = 'transparent'
             } catch (e) {
-              console.log('[SEEKS Graph]Create and download image error:', e)
+             
             }
           })
         })

src/components/sale/offertransorder-form.vue

@@ -50,12 +50,19 @@
         </div>
       </div>
       <div class="text-subtitle2 text-weight-bold q-mb-md">
-        <span>课程信息</span>
+        <span>
+          <template v-if="obj.OfferType==1">
+            课程信息
+          </template>
+          <template v-else>
+            留学就业信息
+          </template>
+        </span>
       </div>
       <div class="q-mt-md">
         <q-table :pagination="pageInfo" no-data-label="暂无相关数据" flat
-          class="sticky-header-table sticky-right-column-table no-bottom-table" separator="none"
-          :data="chosenCourses" :columns="columns" row-key="name">
+          class="sticky-header-table sticky-right-column-table no-bottom-table" separator="none" :data="chosenCourses"
+          :columns="columns" row-key="name" :visible-columns="visibleColumns">
           <template v-slot:body-cell-DiscountRemark="props">
             <q-td :props="props" class="text-negative">
               <div v-for="(x, i) in props.value.split('^')" style="border-bottom:1px dotted #f5f6f7;">
@@ -66,6 +73,7 @@
           <!--设置课程-->
           <template v-slot:body-cell-ClassId="props">
             <q-td>
+              <template v-if="obj.OfferType==1">
                 <template v-if="props.row.ClassId>0">
                   {{props.row.ClassName}}
                 </template>
@@ -91,6 +99,7 @@
                     </q-banner>
                   </q-popup-proxy>
                 </i>
+              </template>
             </q-td>
           </template>
           <template v-slot:bottom>
@@ -106,7 +115,14 @@
             }}</span>
         </div>
         <div class="col  text-right">
-          <span>课程总价：</span>
+          <span>
+            <template v-if="obj.OfferType==1">
+              课程总价：
+            </template>
+            <template v-else>
+              留学就业总价：
+            </template>
+          </span>
           <span class="q-ml-xs text-weight-bold">￥{{
               model.TotalPrice ? model.TotalPrice.toFixed(2) : "0.00"
             }}</span>
@@ -206,6 +222,11 @@
             field: row => row.ClassId
           },
         ],
+        //表格可见列
+        visibleColumns: [
+          'CourseName', 'OriginalPrice', 'JoinNum', "DiscountPrice", "DiscountRemark", "ActualPrice",
+          "ClassId",
+        ], //可见列
         pageInfo: {
           pageIndex: 1,
           pageSize: 12,
@@ -219,7 +240,9 @@
 
     },
     created() {
-
+      if (this.obj && this.obj.OfferType != 1) {
+        this.visibleColumns.splice(this.visibleColumns.length - 1, 1);
+      }
     },
     mounted() {
       this.initObj();
@@ -230,7 +253,7 @@
         this.isShowClass = true;
         getClassDropDownList({
           CourseId: item.CourseId,
-          IsAddDefault:1,//添加默认选项
+          IsAddDefault: 1, //添加默认选项
         }).then(res => {
           item.ClassList = [];
           if (res.Code == 1) {
@@ -302,6 +325,7 @@
       transOfferToOrder() {
         var sMsg = {
           OfferId: this.model.Id,
+          OfferType:this.obj.OfferType,
           OfferDetails: this.model.OfferDetails
         };
         saveOfferToOrder(sMsg).then(res => {

src/components/sale/orderlist.vue

@@ -259,7 +259,7 @@
               <div class="col">
                 <div class="row" style="justify-content: space-between">
                   <span>收款单据：</span>
-                  <q-btn flat size="xs" icon="edit" v-if="isShowClass" style="font-weight:400;color: #02C499" label="修改"
+                  <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn" style="font-weight:400;color: #02C499" label="修改"
                     @click="chanceType(item,1)" />
                 </div>
                 <div class="row wrap">
@@ -272,7 +272,7 @@
                 </div>
                 <div class="row" style="justify-content: space-between">
                   <span>付款单据：</span>
-                  <q-btn flat size="xs" icon="edit" v-if="isShowClass" style="font-weight:400;color: #02C499" label="修改"
+                  <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn" style="font-weight:400;color: #02C499" label="修改"
                     @click="chanceType(item,2)" />
                 </div>
                 <div class="row wrap">
@@ -660,6 +660,7 @@
             this.AuthorityObj.isShowRenewClass = this.authObj.isShowRenewClass;
           }
         }
+        console.log(" this.AuthorityObj", this.AuthorityObj)
       },
       closeQuota() {
         this.isShowviewQuo = false;

src/components/sale/quotationstudy-form.vue

@@ -256,26 +256,23 @@
                 this.model.OfferDetails = tempObj.OfferDetails;
                 this.chosenProductList = tempObj.OfferDetails;
               }
-              console.log("this.model",this.model);
-              console.log("this.tempObj",tempObj);
-              console.log("this.chosenProductList",this.chosenProductList );
             }
           })
         } else {
           this.model = {
             Id: 0,
-            Name: "测试",
+            Name: "",
             OfferType: 2, //默认留学（2-留学，3-就业）
             EffectiveStart: "",
-            EffectiveEnd: "2021-04-04",
+            EffectiveEnd: "",
             CustomerType: 1,
             CustomerSource: 1,
             TotalOriginalPrice: 0.0,
             TotalPrice: 0.0,
             TotalDiscountPrice: 0.0,
-            CustomerInfo: "客户信息",
-            CustomerName: "客户姓名",
-            CustomerTel: "电话",
+            CustomerInfo: "",
+            CustomerName: "",
+            CustomerTel: "",
             OfferDetails: [],
             JoinNum: 1
           };

src/pages/course/course.vue

@@ -132,8 +132,8 @@
               @click="EditCourse(props.row, 1)" />
             <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="价格设置"
               @click="EditCourse(props.row, 2)" v-if="isHavePriceAction" />
-            <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400;" label="详情"
-              @click="goMycourse(props.row)" />
+            <!-- <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400;" label="详情"
+              @click="goMycourse(props.row)" /> -->
           </q-td>
         </template>
       </q-table>

src/pages/sale/courseoffer.vue

@@ -130,7 +130,7 @@
         <div class="col-3">
           <q-select filled stack-label use-input input-debounce="0" option-value="Id" clearable @input="resetSearch"
             option-label="EmployeeName" v-model="msg.CreateBy" :options="EmployeeList" label="员工" :dense="false"
-            emit-value map-options @filter="filterFn" >
+            emit-value map-options @filter="filterFn">
             <template v-slot:no-option>
               <q-item>
                 <q-item-section class="text-grey">
@@ -231,6 +231,12 @@
             field: "Name",
             align: "left"
           },
+          {
+            name: "OfferTypeName",
+            label: "类型",
+            field: "OfferTypeName",
+            align: "left"
+          },
           {
             name: "CustomerName",
             required: true,
@@ -313,7 +319,8 @@
     },
     computed: mapState({
       isHavePriceAction(state) {
-        if (state.user.userInfo&&state.user.userInfo.ActionMenuList&&state.user.userInfo.ActionMenuList.length>0) {
+        if (state.user.userInfo && state.user.userInfo.ActionMenuList && state.user.userInfo.ActionMenuList.length >
+          0) {
           let action = state.user.userInfo.ActionMenuList.find(x => {
             if (x.FunctionCode == "Edit_Offer_Price") {
               return x;
@@ -352,10 +359,6 @@
           if (res.Code == 1) {
             var jsonData = res.Data;
             if (jsonData && jsonData.length > 0) {
-            //   jsonData.unshift({
-            //     Id: 0,
-            //     EmployeeName: "请选择"
-            //   });
               this.AllemployeeList = JSON.parse(JSON.stringify(jsonData));
               this.EmployeeList = JSON.parse(JSON.stringify(jsonData));;
             }
@@ -366,8 +369,12 @@
       },
       //跳转到订单列表
       goOrderList(item) {
+        var url = "/sale/myOrder";
+        if (item.OfferType != 1) {
+          url = "/sale/studyOrder";
+        }
         this.$router.push({
-          path: "/sale/myOrder",
+          path: url,
           query: {
             OrderId: item
           }

src/pages/sale/myoffer.vue

@@ -400,8 +400,12 @@
       },
       //跳转到订单列表
       goOrderList(item) {
+        var url = "/sale/myOrder";
+        if (item.OfferType != 1) {
+          url = "/sale/studyOrder";
+        }
         this.$router.push({
-          path: "/sale/myOrder",
+          path: url,
           query: {
             OrderId: item
           }

src/pages/sale/studyOrder.vue

@@ -80,7 +80,7 @@
       </div>
     </div>
     <div class="page-content">
-      <orderlist :dataList="data.List" :isShowClass="false" :authObj="authObj" @success="refreshClassOrder" ref="orderL">
+      <orderlist :dataList="data.List"  :authObj="authObj" @success="refreshClassOrder" ref="orderL">
       </orderlist>
       <div class="row" style="justify-content: flex-end;padding: 5px 20px">
         <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"

src/pages/sale/studyjob.vue

@@ -267,7 +267,6 @@
     methods: {
       //显示下单弹窗
       showOrderForm(item) {
-        console.log("item",item)
         this.isShowOrderForm = true;
         this.studyObj = item;
       },

src/pages/studyAbroad/employment.vue

@@ -27,6 +27,10 @@
         </template>
         <template v-slot:body="props">
           <q-tr :props="props">
+            <q-td auto-width>
+              <q-btn size="sm" color="accent" round dense @click="props.row.expand = !props.row.expand"
+                :icon="props.row.expand ? 'remove' : 'add'" />
+            </q-td>
             <template v-for="col in props.cols">
               <q-td v-if="col.name == 'Name'" style="width:200px;">
                 {{col.value}}
@@ -56,7 +60,7 @@
                     <template v-if="x.PriceType==0">
                       {{ 100 - x.PriceMoney }}折
                     </template>
-                    <template>
+                    <template v-else>
                       {{x.PriceMoney}} 元
                     </template>
                     优惠
@@ -65,7 +69,7 @@
                     双人报名享<template v-if="x.PriceType==0">
                       {{ 100 - x.PriceMoney }}折
                     </template>
-                    <template>
+                    <template v-else>
                       {{x.PriceMoney}} 元
                     </template>
                     优惠
@@ -74,7 +78,7 @@
                     续费享<template v-if="x.PriceType==0">
                       {{ 100 - x.PriceMoney }}折
                     </template>
-                    <template>
+                    <template v-else>
                       {{x.PriceMoney}} 元
                     </template>
                     优惠
@@ -146,14 +150,35 @@
               <q-td v-else-if="col.name == 'Id'" style="width:200px;">
                 <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
                   @click="EditStudy(props.row)" />
-                <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="价格设置"
-                  @click="EditStudyPrice(props.row)" />
-                <q-btn v-if="props.row.SaleState==1||props.row.SaleState==4" flat size="xs" icon="edit" color="accent"
-                  style="font-weight:400" label="申请审核" @click="applyApply(props.row)" />
+                <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
+                  <q-list>
+                    <q-item clickable v-close-popup @click="EditStudyPrice(props.row)">
+                      <q-item-section>
+                        <q-item-label>价格设置</q-item-label>
+                      </q-item-section>
+                    </q-item>
+                    <q-item clickable v-close-popup v-if="props.row.SaleState==1||props.row.SaleState==4"
+                      @click="applyApply(props.row)">
+                      <q-item-section>
+                        <q-item-label>申请审核</q-item-label>
+                      </q-item-section>
+                    </q-item>
+                    <q-item clickable v-close-popup @click="GoToOrder(props.row)">
+                      <q-item-section>
+                        <q-item-label>订单中心</q-item-label>
+                      </q-item-section>
+                    </q-item>
+                    <q-item clickable v-close-popup @click="GoToPayment(props.row)">
+                      <q-item-section>
+                        <q-item-label>收支明细</q-item-label>
+                      </q-item-section>
+                    </q-item>
+                  </q-list>
+                </q-btn-dropdown>
               </q-td>
             </template>
           </q-tr>
-          <q-tr :props="props">
+          <q-tr v-show="props.row.expand" :props="props">
             <q-td colspan="100%" class="bg-grey-2">
               <div style="display:flex;">
                 <div style="flex-shrink:0">备注：</div>
@@ -214,6 +239,12 @@
         dataList: [],
         loading: true,
         columns: [{
+            name: 'Remark',
+            label: '备注',
+            field: 'Remark',
+            align: 'left'
+          },
+          {
             name: 'Name',
             label: '项目名称',
             field: 'Name',
@@ -281,7 +312,7 @@
         ],
         //表格可见列
         visibleColumns: [
-          'Name', 'SuggestPrice', 'SellPrice', "PreferentialList", "PreferentialListSellCommission",
+          'Remark', 'Name', 'SuggestPrice', 'SellPrice', "PreferentialList", "PreferentialListSellCommission",
           "PreferentialListB2BCommission",
           "EducationCommission", 'SaleStateName', 'Id', 'SupplierName',
         ], //可见列
@@ -331,6 +362,23 @@
       }
     },
     methods: {
+      //跳转到留学就业订单中心
+      GoToOrder(item) {
+        var tempStr = '/studyAbroad/studyemploymentorder?SourceId=' + item.Id;
+        this.$router.push({
+          path: tempStr
+        });
+      },
+      //跳转到收支明细
+      GoToPayment(item) {
+        this.$router.push({
+          path: '/studyAbroad/studypayment',
+          query: {
+            SourceId: item.Id,
+            blank: 'y'
+          }
+        })
+      },
       //显示详情
       ShowInfo(item) {
         this.studyObj = item;
@@ -352,7 +400,13 @@
         this.loading = true;
         queryStudyAbroadPage(this.msg).then(res => {
             this.loading = false;
-            this.dataList = res.Data.PageData;
+            var tempArray = res.Data.PageData;
+            if (tempArray && tempArray.length > 0) {
+              tempArray.forEach(item => {
+                item.expand = false;
+              })
+            }
+            this.dataList = tempArray;
             this.PageCount = res.Data.PageCount;
           })
           .catch(() => {

src/pages/studyAbroad/studyProAudit.vue

@@ -55,7 +55,7 @@
                 <template v-if="x.PriceType==0">
                   {{ 100 - x.PriceMoney }}折
                 </template>
-                <template>
+                <template v-else>
                   {{x.PriceMoney}} 元
                 </template>
                 优惠
@@ -64,7 +64,7 @@
                 双人报名享<template v-if="x.PriceType==0">
                   {{ 100 - x.PriceMoney }}折
                 </template>
-                <template>
+                <template v-else>
                   {{x.PriceMoney}} 元
                 </template>
                 优惠
@@ -73,7 +73,7 @@
                 续费享<template v-if="x.PriceType==0">
                   {{ 100 - x.PriceMoney }}折
                 </template>
-                <template>
+                <template v-else>
                   {{x.PriceMoney}} 元
                 </template>
                 优惠

src/pages/studyAbroad/studyabroad.vue

@@ -27,6 +27,10 @@
         </template>
         <template v-slot:body="props">
           <q-tr :props="props">
+            <q-td auto-width>
+              <q-btn size="sm" color="accent" round dense @click="props.row.expand = !props.row.expand"
+                :icon="props.row.expand ? 'remove' : 'add'" />
+            </q-td>
             <template v-for="col in props.cols">
               <q-td v-if="col.name == 'Name'" style="width:200px;">
                 {{col.value}}
@@ -56,7 +60,7 @@
                     <template v-if="x.PriceType==0">
                       {{ 100 - x.PriceMoney }}折
                     </template>
-                    <template>
+                    <template v-else>
                       {{x.PriceMoney}} 元
                     </template>
                     优惠
@@ -65,7 +69,7 @@
                     双人报名享<template v-if="x.PriceType==0">
                       {{ 100 - x.PriceMoney }}折
                     </template>
-                    <template>
+                    <template v-else>
                       {{x.PriceMoney}} 元
                     </template>
                     优惠
@@ -74,7 +78,7 @@
                     续费享<template v-if="x.PriceType==0">
                       {{ 100 - x.PriceMoney }}折
                     </template>
-                    <template>
+                    <template v-else>
                       {{x.PriceMoney}} 元
                     </template>
                     优惠
@@ -146,14 +150,35 @@
               <q-td v-else-if="col.name == 'Id'" style="width:200px;">
                 <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
                   @click="EditStudy(props.row)" />
-                <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="价格设置"
-                  @click="EditStudyPrice(props.row)" />
-                <q-btn v-if="props.row.SaleState==1||props.row.SaleState==4" flat size="xs" icon="edit" color="accent"
-                  style="font-weight:400" label="申请审核" @click="applyApply(props.row)" />
+                <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
+                  <q-list>
+                    <q-item clickable v-close-popup @click="EditStudyPrice(props.row)">
+                      <q-item-section>
+                        <q-item-label>价格设置</q-item-label>
+                      </q-item-section>
+                    </q-item>
+                    <q-item clickable v-close-popup v-if="props.row.SaleState==1||props.row.SaleState==4"
+                      @click="applyApply(props.row)">
+                      <q-item-section>
+                        <q-item-label>申请审核</q-item-label>
+                      </q-item-section>
+                    </q-item>
+                    <q-item clickable v-close-popup @click="GoToOrder(props.row)">
+                      <q-item-section>
+                        <q-item-label>订单中心</q-item-label>
+                      </q-item-section>
+                    </q-item>
+                    <q-item clickable v-close-popup @click="GoToPayment(props.row)">
+                      <q-item-section>
+                        <q-item-label>收支明细</q-item-label>
+                      </q-item-section>
+                    </q-item>
+                  </q-list>
+                </q-btn-dropdown>
               </q-td>
             </template>
           </q-tr>
-          <q-tr :props="props">
+          <q-tr v-show="props.row.expand" :props="props">
             <q-td colspan="100%" class="bg-grey-2">
               <div style="display:flex;">
                 <div style="flex-shrink:0">备注：</div>
@@ -215,6 +240,12 @@
         dataList: [],
         loading: true,
         columns: [{
+            name: 'Remark',
+            label: '备注',
+            field: 'Remark',
+            align: 'left'
+          },
+          {
             name: 'Name',
             label: '项目名称',
             field: 'Name',
@@ -282,7 +313,7 @@
         ],
         //表格可见列
         visibleColumns: [
-          'Name', 'SuggestPrice', 'SellPrice', "PreferentialList", "PreferentialListSellCommission",
+          'Remark', 'Name', 'SuggestPrice', 'SellPrice', "PreferentialList", "PreferentialListSellCommission",
           "PreferentialListB2BCommission",
           "EducationCommission", 'SaleStateName', 'Id', 'SupplierName',
         ], //可见列
@@ -332,6 +363,23 @@
       }
     },
     methods: {
+      //跳转到留学就业订单中心
+      GoToOrder(item) {
+        var tempStr = '/studyAbroad/studyemploymentorder?SourceId=' + item.Id;
+        this.$router.push({
+          path: tempStr
+        });
+      },
+      //跳转到收支明细
+      GoToPayment(item) {
+        this.$router.push({
+          path: '/studyAbroad/studypayment',
+          query: {
+            SourceId: item.Id,
+            blank: 'y'
+          }
+        })
+      },
       //显示详情
       ShowInfo(item) {
         this.studyObj = item;
@@ -353,7 +401,13 @@
         this.loading = true;
         queryStudyAbroadPage(this.msg).then(res => {
             this.loading = false;
-            this.dataList = res.Data.PageData;
+            var tempArray = res.Data.PageData;
+            if (tempArray && tempArray.length > 0) {
+              tempArray.forEach(item => {
+                item.expand = false;
+              })
+            }
+            this.dataList = tempArray;
             this.PageCount = res.Data.PageCount;
           })
           .catch(() => {

src/pages/studyAbroad/studyemploymentorder.vue

+<template>
+  <div class="page-body myOrder">
+    <div class="row col" style="height: 40px">
+      <div class="row col" style="justify-content: space-between;align-items: center;margin-bottom: 10px">
+        <div>
+          <template v-if="data&& data.ClassInfo">
+            {{data.ClassInfo.StudyName}}
+          </template>
+        </div>
+      </div>
+    </div>
+    <div class="page-content">
+      <orderlist :dataList="dataList" ref="orderL" :authObj="authObj" :cancelList="CancelList"
+        @success="refreshClassOrder"></orderlist>
+    </div>
+  </div>
+</template>
+<script>
+  import {
+    quertClassOrderList
+  } from '../../api/sale/sale';
+  import orderlist from '../../components/sale/orderlist'
+  export default {
+    components: {
+      orderlist
+    },
+    data() {
+      return {
+        data: {},
+        msg: {
+          SourceId: 0
+        },
+        //正常订单
+        dataList: [],
+        //取消订单
+        CancelList: [],
+        //权限判断
+        authObj: {
+          isShowName: false, //不显示班级名称
+          isShowEditSale: true, //显示修改销售按钮
+          isShowEducationRemark: true, //显示修改教务备注
+          isShowPrincipalRemark: true, //显示校长备注
+          isShowManagerRemark: true, //显示总经理备注
+          isShowCommissionEdit: true, //显示修改提成按钮
+          isShowRewardEdit: true, //显示修改额外提成按钮
+        }
+      }
+    },
+    created() {
+      if (this.$route.query.SourceId) {
+        this.msg.SourceId = this.$route.query.SourceId;
+      }
+      this.getList();
+    },
+    mounted() {
+
+    },
+    methods: {
+      //获取菜单分页列表
+      getList() {
+        this.loading = true;
+        quertClassOrderList(this.msg).then(res => {
+          this.data = res.Data;
+          if (this.data && this.data.OrderList && this.data.OrderList.NorList) {
+            this.dataList = this.data.OrderList.NorList;
+            let OrderIds = []
+            this.dataList.forEach(x => {
+              OrderIds.push(x.OrderId)
+            })
+            if (OrderIds.length > 0) {
+              OrderIds = OrderIds.join(',')
+              if (this.dataList.length > 0) {
+                this.$refs.orderL.getOrderFinanceList(OrderIds, 1)
+              }
+            }
+          }
+          if (this.data && this.data.OrderList && this.data.OrderList.CancelList) {
+            this.CancelList = this.data.OrderList.CancelList;
+            let OrderIds = []
+            this.CancelList.forEach(x => {
+              OrderIds.push(x.OrderId)
+            })
+            if (OrderIds.length > 0) {
+              OrderIds = OrderIds.join(',')
+              if (this.CancelList.length > 0) {
+                this.$refs.orderL.getOrderFinanceList(OrderIds, 2)
+              }
+            }
+          }
+          this.loading = false
+        }).catch(() => {
+          this.loading = false
+        })
+      },
+      //刷新页面
+      refreshClassOrder() {
+        this.getList();
+      }
+    }
+  }
+
+</script>
+<style>
+
+</style>

src/router/routes.js

@@ -127,7 +127,6 @@ const routes = [{
         component: () =>
           import("pages/course/classorder.vue")
       },
-
       {
         path: "/course/socialclass", //教学奖励-社会班设置
         component: () =>
@@ -552,6 +551,16 @@ const routes = [{
         component: () =>
           import("pages/studyAbroad/employment.vue")
       },
+      {
+        path: "/studyAbroad/studyemploymentorder", //留学就业订单中心
+        component: () =>
+          import("pages/studyAbroad/studyemploymentorder.vue")
+      },
+      {
+        path: "/studyAbroad/studypayment", //留学就业收支明细
+        component: () =>
+          import("pages/studyAbroad/studypayment.vue")
+      },
       {
         path: "/studyAbroad/supplier", //供应商
         component: () =>