1

src/components/sale/myOrder-form.vue

@@ -473,6 +473,10 @@
           }
       },
       created(){
+          if(this.saveObj.tab){
+            this.tab = (this.saveObj.tab).toString();
+          }
+
           this.msg.OrderId = this.saveObj.OrderId;
           this.msg2.OrderId = this.saveObj.OrderId;
           this.msg3.SourceId = this.saveObj.OrderId;

src/components/sale/orderlist.vue

@@ -21,7 +21,7 @@
         <tr>
           <td :rowspan="3" style="text-align: left">
             <div style="font-size: 18px;color: #2961FE;margin-bottom: 20px;font-weight: bold"
-              @click="goOrderdetails(item)">{{item.OrderId}}</div>
+              @click="goOrderdetails(item,1)">{{item.OrderId}}</div>
             <div>{{item.EnterName}}</div>
             <div style="margin-top: 10px">{{item.CreateTime}}</div>
 
@@ -210,7 +210,7 @@
                   <div class="finance row" v-for="(x,j) in item.FinanceList" :index="j" :style="{
                       background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
                       color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
-                    <span>{{x.FrID}}</span>
+                    <span  style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span>
                   </div>
                 </div>
                 <div class="row" style="justify-content: space-between">
@@ -221,7 +221,7 @@
                   <div class="finance row" v-for="(x,j) in item.RefundFinanceList" :index="j" :style="{
                       background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
                       color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
-                    <span>{{x.FrID}}</span>
+                    <span  style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span>
                   </div>
                 </div>
               </div>
@@ -429,7 +429,7 @@
                   <div class="finance row" v-for="(x,j) in item.FinanceList" :index="j" :style="{
                       background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
                       color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
-                    <span>{{x.FrID}}</span>
+                    <span  style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span>
                   </div>
                 </div>
                 <div class="row" style="justify-content: space-between">
@@ -440,7 +440,7 @@
                   <div class="finance row" v-for="(x,j) in item.RefundFinanceList" :index="j" :style="{
                       background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
                       color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
-                    <span>{{x.FrID}}</span>
+                    <span  style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span>
                   </div>
                 </div>
               </div>
@@ -461,6 +461,8 @@
     <!--转交订单-->
     <transOrder-form v-if="isShowTransOrderForm" :save-obj="orderObj" @close="closeTransOrderForm"
       @success="refreshClassOrder"></transOrder-form>
+    <myOrder-form v-if="isShowmyorderForm" :save-obj="myorderObjOption" @close="closeMOSaveForm"></myOrder-form>
+
   </div>
 </template>
 
@@ -471,11 +473,13 @@
   import {
     cancelClassOrder, //取消订单
   } from '../../api/sale/sale'
+  import myOrderForm from '../../components/sale/myOrder-form'
   export default {
     components: {
       editorderForm,
       orderremarkForm,
-      transOrderForm
+      transOrderForm,
+      myOrderForm
     },
     props: {
       //正常订单
@@ -497,15 +501,25 @@
         orderObj: {}, //订单信息
         isShowCancel: false, //是否显示取消订单
         remarkType: 0, //备注类型
+        isShowmyorderForm:false,//显示详情
+        myorderObjOption:{},//详情的数据
       }
     },
     created() {
-
+      console.log(this.dataList)
     },
     mounted() {
 
     },
     methods: {
+      goOrderdetails(item,tab){
+        item.tab=tab
+        this.myorderObjOption= item;
+        this.isShowmyorderForm = true;
+      },
+      closeMOSaveForm(){
+        this.isShowmyorderForm = false;
+      },
       //订单转交
       transferOrder(item) {
         this.orderObj = item;
@@ -597,7 +611,6 @@
             'blank':'y',
             'orderObj':JSON.stringify(orderObj),
             'tradeWay':obj.tradeWay,
-
           }
         });
       },

src/pages/course/classorder.vue

@@ -71,14 +71,63 @@
           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(',')
+              this.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(',')
+              this.getOrderFinanceList(OrderIds,2)
+            }
           }
         }).catch(() => {
           this.loading = false
         })
       },
+      getOrderFinanceList(msg,type){
+        this.apipost('sellorder_post_GetOrderFinanceListForEdu',{OrderIds:msg},res=>{
+          if(res.data.resultCode===1){
+            this.loading = false;
+            let data = res.data.data;
+            if(type == 1){
+              this.dataList.forEach(x=>{
+                data.forEach(j=>{
+                  if(x.OrderId == j.OrderId){
+                    x.FinanceList = j.FinanceList
+                    x.RefundFinanceList = j.RefundFinanceList
+                  }
+                })
+              })
+            }else if(type ==2){
+              this.CancelList.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() {
         this.getList();

src/pages/financial/financalDocument/RecPayQuery.vue

@@ -965,6 +965,7 @@
           Remark: '', //备注查询
           Sort: '2',
           EmployeeId: '',
+          IsSellOrderForm:1
         },
         getCompanyMsg: { // 校区
           RB_Group_Id: '0',

src/pages/sale/japaneseTrain.vue

@@ -80,19 +80,16 @@
                             </div>
                           </div>
                           <div v-if="item.ClassStyle==3">
-                            <el-calendar v-model="elvalue" id="calendar" style="width: 454px;">
+                            <el-calendar v-model="elvalue" id="calendar" style="width: 500px;">
                               <!-- 这里使用的是 2.5 slot 语法，对于新项目请使用 2.6 slot 语法-->
                               <template slot="dateCell" slot-scope="{date, data}" class="row" style="height: 45px">
                                 <!--自定义内容-->
                                 <div class="calendar-day" >{{ data.day.split('-').slice(2).join('-') }}</div>
                                   <div v-for="x in item.ClassPlanList">
-                                    <div v-if="x.ClassDate == data.day" style="align-items: center;justify-content: center;margin-top: 10px" class="row">
+                                    <div v-if="x.ClassDate == data.day" style="align-items: center;justify-content: center;margin-top: 15px" class="row">
                                       <img src="../../assets/images/administration/gou.png" alt="" style="width: 16px;height: 12px" >
                                     </div>
-
                                   </div>
-
-
                               </template>
                             </el-calendar>
                           </div>
@@ -536,10 +533,8 @@
   .japaneseTrain .el-calendar{
     width: 454px;
   }
-  .japaneseTrain .el-calendar-table .el-calendar-day{
-    height: 0;
-  }
-  .japaneseTrain #calendar{
-    width: 454px;
+   .japaneseTrain .el-calendar-table .el-calendar-day{
+    height: 60px!important;
   }
+
 </style>

src/pages/sale/myOrder.vue

@@ -122,7 +122,7 @@
         <tbody v-for="(item,index) in data.List" :key="index">
           <tr>
             <td :rowspan="3" style="text-align: left">
-              <div style="font-size: 18px;color: #2961FE;margin-bottom: 20px;font-weight: bold;cursor: pointer;" @click="goOrderdetails(item)">{{item.OrderId}}</div>
+              <div style="font-size: 18px;color: #2961FE;margin-bottom: 20px;font-weight: bold;cursor: pointer;" @click="goOrderdetails(item,1)">{{item.OrderId}}</div>
               <div>{{item.EnterName}}</div>
               <div style="margin-top: 10px">{{item.CreateTime}}</div>
               <div style="margin-top: 30px;margin-bottom: 10px">班级</div>
@@ -303,7 +303,7 @@
                     <div class="finance row" v-for="(x,j) in item.FinanceList" :index="j" :style="{
                       background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
                       color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
-                      <span>{{x.FrID}}</span>
+                      <span style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span>
                     </div>
                   </div>
                   <div class="row" style="justify-content: space-between">
@@ -314,7 +314,7 @@
                     <div class="finance row" v-for="(x,j) in item.RefundFinanceList" :index="j" :style="{
                       background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
                       color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
-                      <span>{{x.FrID}}</span>
+                      <span style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span>
                     </div>
                   </div>
                 </div>
@@ -493,7 +493,8 @@
 
     },
     methods: {
-      goOrderdetails(item){
+      goOrderdetails(item,tab){
+        item.tab=tab
         this.myorderObjOption= item;
         this.isShowmyorderForm = true;
       },