1

src/api/sale/sale.js

@@ -226,4 +226,16 @@ export function SetBackClassApply(data) {
       method: 'post',
       data
     })
-  }
+  }
\ No newline at end of file
+
+/**
+ *  点击获取订单详情
+ *
+ */
+export function getClassOrderForDetail(data) {
+  return request({
+    url: '/order/GetClassOrderForDetail',
+    method: 'post',
+    data
+  })
+}

src/components/sale/editOrder-form.vue

@@ -161,6 +161,11 @@
           return this.OrderMsg.Class_Price;
         }
       },
+      getSortFun(order, sortBy){
+        var ordAlpah = (order == 'asc') ? '>' : '<';
+        var sortFun = new Function('a', 'b', 'return a.' + sortBy + ordAlpah + 'b.' + sortBy + '?1:-1');
+        return sortFun;
+      },
       //修改订单
       saveOrderInfo() {
         this.OrderMsg.PreferPrice = this.OrderMsg.GuestNum * this.OrderMsg.Unit_Price

src/components/sale/myOrder-form.vue

@@ -7,28 +7,28 @@
         </div>
         <div class="drawerTop-t">
           <span style="font-size: 16px;color: #000000;font-weight: bold">订单编号</span>
-          <span style="font-size: 12px;color: #666666">{{saveObj.OrderId}}</span>
+          <span style="font-size: 12px;color: #666666">{{Detail.OrderId}}</span>
         </div>
         <div style="background: rgba(2, 196, 153, 0.2);border-radius: 4px;text-align: center;padding: 2px 13px;margin-left: 30px">
-          <span style="color: #02C499">{{saveObj.OrderStateName}}</span>
+          <span style="color: #02C499">{{Detail.OrderStateName}}</span>
         </div>
       </div>
       <div style="padding:20px 15px;" class="row wrap q-col-gutter-md">
         <div class="col-6 row">
           <span class="two-left">关联销售：</span>
-          <span class="two-r">{{saveObj.EnterName}}</span>
+          <span class="two-r">{{Detail.EnterName}}</span>
         </div>
         <div class="col-6 row">
           <span  class="two-left">创建时间：</span>
-          <span class="two-r">{{saveObj.CreateTime}}</span>
+          <span class="two-r">{{Detail.CreateTime}}</span>
         </div>
         <div class="col-6 row">
           <span class="two-left">应收总额：</span>
-          <span class="two-r">{{saveObj.PreferPrice.toFixed(2)}}</span>
+          <span class="two-r">{{Detail.PreferPrice.toFixed(2)}}</span>
         </div>
         <div class="col-6 row">
           <span  class="two-left">待收金额：</span>
-          <span class="two-r">{{saveObj.DueInMoney.toFixed(2)}}</span>
+          <span class="two-r">{{Detail.DueInMoney.toFixed(2)}}</span>
         </div>
       </div>
       <div style="padding: 20px;">
@@ -51,39 +51,39 @@
           <div style="padding:20px 15px;" class="row wrap q-col-gutter-md">
             <div class="col-6 row">
               <span class="two-left">人数：</span>
-              <span class="two-r">{{saveObj.GuestNum}}</span>
+              <span class="two-r">{{Detail.GuestNum}}</span>
             </div>
             <div class="col-6 row">
               <span  class="two-left">班级信息：</span>
-              <span class="two-r">{{saveObj.ClassName}}</span>
+              <span class="two-r">{{Detail.ClassName}}</span>
             </div>
             <div class="col-6 row">
               <span class="two-left">单价：</span>
-              <span class="two-r">{{saveObj.Class_Price.toFixed(2)}}</span>
+              <span class="two-r">{{Detail.Class_Price.toFixed(2)}}</span>
             </div>
             <div class="col-6 row">
               <span  class="two-left">成交单价：</span>
-              <span class="two-r" style="color: #3FC4FF">{{saveObj.Unit_Price.toFixed(2)}}</span>
+              <span class="two-r" style="color: #3FC4FF">{{Detail.Unit_Price.toFixed(2)}}</span>
             </div>
             <div class="col-6 row">
               <span class="two-left">应收金额：</span>
-              <span class="two-r">{{saveObj.PreferPrice.toFixed(2)}}</span>
+              <span class="two-r">{{Detail.PreferPrice.toFixed(2)}}</span>
             </div>
             <div class="col-6 row">
               <span  class="two-left">实收金额：</span>
-              <span class="two-r">{{saveObj.Income.toFixed(2)}}</span>
+              <span class="two-r">{{Detail.Income.toFixed(2)}}</span>
             </div>
             <div class="col-6 row">
               <span class="two-left">优惠金额：</span>
-              <span class="two-r">{{saveObj.DiscountMoney.toFixed(2)}}</span>
+              <span class="two-r">{{Detail.DiscountMoney.toFixed(2)}}</span>
             </div>
             <div class="col-6 row">
               <span  class="two-left">退款总额：</span>
-              <span class="two-r">{{saveObj.Refund.toFixed(2)}}</span>
+              <span class="two-r">{{Detail.Refund.toFixed(2)}}</span>
             </div>
             <div class="col-6 row">
               <span  class="two-left">待收总额：</span>
-              <span class="two-r" style="color:#2961FE;">{{saveObj.DueInMoney.toFixed(2)}}</span>
+              <span class="two-r" style="color:#2961FE;">{{Detail.DueInMoney.toFixed(2)}}</span>
             </div>
           </div>
         </div>
@@ -315,6 +315,7 @@
     getOrderGuestPageList,
     getClassOrderRemarkList,//获取备注列表
     getClassOrderLogList,//获取订单操作日志列表
+    getClassOrderForDetail
   } from '../../api/sale/sale'
     export default {
         name: "myOrder-form",
@@ -473,7 +474,8 @@
             dataListP:[],
             floading:false,
             LogLoading:false,
-            GetFinancLogList:[]
+            GetFinancLogList:[],
+            Detail:{},
           }
       },
       created(){
@@ -485,6 +487,7 @@
           this.msg2.OrderId = this.saveObj.OrderId;
           this.msg3.SourceId = this.saveObj.OrderId;
           this.msg.ClassId = this.saveObj.ClassId;
+          this.getOrderInfo()
         this.getRolelist()
         this.getRemarkList()
         this.OrderLogList()
@@ -505,6 +508,15 @@
             }
           },null)
         },
+        getOrderInfo(){
+
+          getClassOrderForDetail({OrderId:this.saveObj.OrderId}).then(res => {
+            this.Detail = res.Data
+
+          }).catch(() => {
+
+          })
+        },
         closeSaveForm(){
           this.$emit('close')
           this.dialog = false
@@ -565,8 +577,8 @@
         },
         getfinanciaALLPageList(Type){
           this.floading= true
-          this.financiaMsg.TCID = this.saveObj.ClassId
-          this.financiaMsg.OrderID = this.saveObj.OrderId
+          this.financiaMsg.TCID = this.Detail.ClassId
+          this.financiaMsg.OrderID = this.Detail.OrderId
           this.financiaMsg.Type = Type
           this.apipost('Financial_post_GetALLPageList',this.financiaMsg,res=>{
             if(res.data.resultCode===1){

src/components/sale/orderlist.vue

@@ -20,7 +20,7 @@
       <tbody v-for="(item,index) in dataList" :key="index">
         <tr>
           <td :rowspan="3" style="text-align: left">
-            <div style="font-size: 18px;color: #2961FE;margin-bottom: 20px;font-weight: bold"
+            <div style="font-size: 18px;color: #2961FE;margin-bottom: 20px;font-weight: bold;text-decoration: underline;cursor: pointer"
               @click="goOrderdetails(item,1)">{{item.OrderId}}</div>
             <div>{{item.EnterName}}</div>
             <div style="margin-top: 10px">{{item.CreateTime}}</div>

src/pages/course/achievements.vue

@@ -60,7 +60,7 @@
           <div style="margin-left: 20px">
             <div class="List-title">{{item.TeacherName}}</div>
             <div class="row d-div"><span class="d2-n">原有课时费</span>{{item.BaseHourFee}}元</div>
-            <div class="row d-div" style="color:#F28C1D;"><span class="d2-n">课时费奖励</span>{{item.UnitPrice}}元</div>
+            <div class="row d-div" style="color:#F28C1D;"><span class="d2-n">课时费奖励</span>{{item.AddHourFee}}元</div>
             <div class="row d-div"><span class="d2-n">带班人数</span>{{item.BaseStuNum}} <span style="color:#F28C1D;" v-if="item.AddStuNum>0">{{'+'+item.AddStuNum}}</span> </div>
           </div>
 
@@ -136,27 +136,44 @@
                 <div style="margin-top:20px;" class="achievements-proxy">
                   <table class="socialTable">
                     <tr>
-                      <td style="width:100px;" v-if="item.KSList&&item.KSList.length>0" :rowspan="item.KSList.length+2">平均上课率</td>
-                      <td :colspan="item.KSFullRate.length+2">满班率</td>
+                      <th :colspan="item.KSFullRate.length+3">
+                        社会课时费调账规则
+                      </th>
                     </tr>
                     <tr>
-                      <td></td>
-                      <td v-for="(x,j) in item.KSFullRate"  style="width:100px;">
-                        <div class="Classdel_Div">{{x.StartValue}}%-{{x.EndValue}}%</div>
-                      </td>
+                      <td style="width:100px;" v-if="item.KSList&&item.KSList.length>0" :rowspan="(item.KSList.length*2)+3">平均上课率</td>
+                      <td :colspan="item.KSFullRate.length+3">满班率</td>
                     </tr>
-                    <tr v-for="(x,j) in item.KSList">
-                      <td  style="width:100px;">
-                        <div class="div_RowList">
-                          {{x.StartValue}}<span v-if="x.StartValue>=0">%</span><span
-                          v-if="x.StartValue>=0&&x.EndValue>=0">-</span>{{x.EndValue}}<span
-                          v-if="x.EndValue>=0">%</span>
-                        </div>
-                      </td>
-                      <td v-for="(subItem,subIndex) in x.FullClassList">
-                        {{subItem.ClassMoney}}
+                    <tr>
+                      <td colspan="2"></td>
+                      <td v-for="(x,j) in item.KSFullRate" >
+                        <div class="Classdel_Div">{{x.StartValue}}%-{{x.EndValue}}%</div>
                       </td>
                     </tr>
+                    <template v-for="(x,j) in item.KSList">
+                      <tr>
+                        <td @click="getDataItem(x,index)" rowspan="2" style="width:150px;">
+                          <div class="div_RowList">
+                            {{x.StartValue}}<span v-if="x.StartValue>=0">%</span><span
+                            v-if="x.StartValue>=0&&x.EndValue>=0">-</span>{{x.EndValue}}<span
+                            v-if="x.EndValue>=0">%</span>
+                          </div>
+                        </td>
+                        <td style="width:150px;">奖励课时费</td>
+                        <td v-for="(subItem,subIndex) in x.FullClassList" style="width:100px;">
+                          {{subItem.ClassMoney}}
+
+                        </td>
+
+                      </tr>
+                      <tr>
+                        <td>增加带班人数</td>
+                        <td v-for="(subItem,subIndex) in x.FullClassList" style="width:100px;">
+                          {{subItem.PeopelNum}}
+                        </td>
+
+                      </tr>
+                    </template>
                   </table>
                 </div>
               </q-banner>
@@ -353,6 +370,7 @@
           }, res => {
             if (res.data.resultCode == 1) {
               this.coinGetList = res.data.data;
+              this.FinanceMsg.CurrencyId = this.coinGetList[0].ID
             }
           }, err => {})
         },

src/pages/course/classHourReward.vue

@@ -275,6 +275,7 @@
           }, res => {
             if (res.data.resultCode == 1) {
               this.coinGetList = res.data.data;
+              this.FinanceMsg.CurrencyId = this.coinGetList[0].ID
             }
           }, err => {})
         },

src/pages/sale/myOrder.vue

@@ -80,7 +80,7 @@
         <span>{{data.Statistics.ExtraRewardMoney}}</span>
       </div>
     </div>
-    <div class="row col">
+    <div class="row col" style="justify-content: flex-end">
       <div class="row tis">
         <div class="tis-k" style="background: #2961FE"></div>
         <span>已打单</span>
@@ -109,7 +109,6 @@
           class="full-width justify-end" color="primary" :input="true"
         >
         </q-pagination>
-
       </div>
     </div>
 
@@ -156,7 +155,7 @@
         msg: {
           pageIndex: 1,
           pageSize: 8,
-          OrderId:0,//订单号
+          OrderId:'',//订单号
           GuestName:'',//客人名称
           ClassName: '', //班级名称
           CouseId:0,//课程id
@@ -247,8 +246,12 @@
           this.msg.OPStartTime = '';
           this.msg.OPEndTime = '';
         }
+        let msg = JSON.parse(JSON.stringify(this.msg));
+        if(msg.OrderId==''|| msg.OrderId==null){
+          msg.OrderId=0
+        }
         this.loading = true;
-        getMyOrderPageList(this.msg).then(res => {
+        getMyOrderPageList(msg).then(res => {
 
           this.data = res.Data.PageData;
 
@@ -258,32 +261,17 @@
           })
           OrderIds = OrderIds.join(',')
           // this.getOrderFinanceList(OrderIds)
-          this.$refs.orderL.getOrderFinanceList(OrderIds,1)
+          if( this.data.List.length>0){
+            this.$refs.orderL.getOrderFinanceList(OrderIds,1)
+
+          }
 
           this.pageCount = res.Data.PageCount;
         }).catch(() => {
           this.loading = false
         })
       },
-      getOrderFinanceList(msg){
-        this.apipost('sellorder_post_GetOrderFinanceListForEdu',{OrderIds:msg},res=>{
-          if(res.data.resultCode===1){
-            this.loading = false;
-            let data = res.data.data;
-            this.data.List.forEach(x=>{
-              data.forEach(j=>{
-                if(x.OrderId == j.OrderId){
-                  x.FinanceList = j.FinanceList
-                  x.RefundFinanceList = j.RefundFinanceList
-                }
-              })
-            })
-          }else{
-            this.loading = false;
-            this.$message.error(res.data.message);
-          }
-        },err=>{})
-      },
+
 
       //刷新页面
       refreshClassOrder() {

src/pages/sale/studentList.vue

@@ -83,7 +83,7 @@
     getGuestBasicsEnumList,//日语基础枚举
     getGuestEducationEnumList,//学历枚举
     getGuestLearningGoalsEnumList,//获取学习目的 枚举
-    getOrderFormEnumList,//来自
+    getOrderSourceEnumList,//来自
     setOrderGuestInfo,//保存
     delOrderGuestInfo,//删除
   } from '../../api/sale/sale'
@@ -234,7 +234,7 @@
         })
       },
       getOrderForm(){
-        getOrderFormEnumList({}).then(res => {
+        getOrderSourceEnumList({}).then(res => {
           if(res.Code==1){
             this.OFList = res.Data
             this.addMsg.GuestSource = this.OFList[0].Id