1

src/components/sale/orderlist.vue

 <template>
-  <div>
+  <div class="classorder">
     <table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0" style="">
       <tr>
         <th width="12%">单号</th>
@@ -24,8 +24,7 @@
               @click="goOrderdetails(item)">{{item.OrderId}}</div>
             <div>{{item.EnterName}}</div>
             <div style="margin-top: 10px">{{item.CreateTime}}</div>
-            <div style="margin-top: 30px;margin-bottom: 10px">班级</div>
-            <div style="font-weight: bold;color:#2961FE;">{{item.ClassName}}</div>
+
           </td>
           <td style="border:none">{{item.GuestNum}}人</td>
           <td style="border:none">{{item.Class_Price.toFixed(2)}}</td>
@@ -202,7 +201,29 @@
                 </div>
               </div>
               <div class="col">
-                <div>收款单据：</div>
+                <div class="row" style="justify-content: space-between">
+                  <span>收款单据：</span>
+                  <q-btn flat size="xs" icon="edit"  style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,1)"/>
+                </div>
+
+                <div class="row wrap" >
+                  <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>
+                  </div>
+                </div>
+                <div class="row" style="justify-content: space-between">
+                  <span>付款单据：</span>
+                  <q-btn flat size="xs" icon="edit"  style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,2)"/>
+                </div>
+                <div class="row wrap" >
+                  <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>
+                  </div>
+                </div>
               </div>
             </div>
           </td>
@@ -223,8 +244,6 @@
               @click="goOrderdetails(item)">{{item.OrderId}}</div>
             <div>{{item.EnterName}}</div>
             <div style="margin-top: 10px">{{item.CreateTime}}</div>
-            <div style="margin-top: 30px;margin-bottom: 10px">班级</div>
-            <div style="font-weight: bold;color:#2961FE;">{{item.ClassName}}</div>
           </td>
           <td style="border:none">{{item.GuestNum}}人</td>
           <td style="border:none">{{item.Class_Price.toFixed(2)}}</td>
@@ -401,7 +420,29 @@
                 </div>
               </div>
               <div class="col">
-                <div>收款单据：</div>
+                <div class="row" style="justify-content: space-between">
+                  <span>收款单据：</span>
+                  <q-btn flat size="xs" icon="edit"  style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,1)"/>
+                </div>
+
+                <div class="row wrap" >
+                  <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>
+                  </div>
+                </div>
+                <div class="row" style="justify-content: space-between">
+                  <span>付款单据：</span>
+                  <q-btn flat size="xs" icon="edit"  style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,2)"/>
+                </div>
+                <div class="row wrap" >
+                  <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>
+                  </div>
+                </div>
               </div>
             </div>
           </td>
@@ -537,6 +578,185 @@
 
         });
       },
+      chanceType(obj,type){
+        let TCIDARR=[]
+        TCIDARR.push(obj.ClassId)
+        let orderObj = {
+          OrderID:obj.OrderId,
+          OrderSource:17,
+          Obj: {},
+          SourceID:0,
+          TCIDList: TCIDARR
+        }
+        this.$router.push({
+          path: '/financial/financalDocument/ChoiceAddFinancialDocuments',
+          query:{
+            "Type":type,
+            "companyID":this.getLocalStorage().School_Id,
+            "path": "",
+            'blank':'y',
+            'orderObj':JSON.stringify(orderObj),
+            'tradeWay':obj.tradeWay,
+
+          }
+        });
+      },
     }
   }
-</script>
+</script>
\ No newline at end of file
+<style >
+  li{
+    list-style-type:none ;
+  }
+  .classorder ul{padding: 0px}
+  .classorder .price-popup{border-radius: 4px;}
+  .classorder .el-range-editor .el-range-input {
+    background: none;
+  }
+  .classorder .el-range-editor.el-input__inner {
+    background-color: transparent;
+  }
+  .classorder .q-mb-md{
+    margin-bottom: 0;
+  }
+  .classorder .stics{padding:10px 20px;background: #DDDEE0;border-radius: 4px;font-size: 14px;color: #000000;font-weight: bold}
+  .classorder .stics .stics-name{color: #2D2D2D;font-weight: 600;margin-right: 10px}
+  .classorder .tis {margin:10px 0;align-items: center}
+  .classorder .tis .tis-k{width: 10px;height: 10px;margin-right: 8px}
+  .classorder .tis span{font-size: 14px;color: #2D2D2D;font-weight: 600;margin-right: 20px}
+  .classorder table {
+    padding: 10px 0 ;
+    width: 100%;
+    background-color: #ededed;
+    border-collapse: collapse;
+    border: 1px solid #d2d2d2;
+    font-size: 12px;
+  }
+  .classorder table th {
+    background-color: #ededed;
+    height: 34px;
+    text-indent: 15px;
+  }
+
+  .classorder table td {
+    background-color: #ffffff;
+    padding: 9px 15px;
+    color: #333333;
+    border: 1px solid rgba(138, 138, 138, 0.09);
+    text-align: center;
+
+  }
+
+  .classorder table ._color_666 {
+    color: #666666;
+  }
+
+  .classorder table tr._color_666 th {
+    padding: 9px 15px;
+  }
+
+  .classorder table th {
+    background-color: #ededed;
+    height: 34px;
+    text-indent: 15px;
+  }
+
+  .classorder table td {
+    background-color: #ffffff;
+    padding: 9px 15px;
+    color: #333333;
+    /*border: 1px solid #d2d2d2;*/
+  }
+
+  .classorder table ._color_666 {
+    color: #666666;
+  }
+
+  .classorder table tr._color_666 th {
+    padding: 9px 15px;
+  }
+  .classorder .enrollTotalSearchTable {
+    width: 100%;
+    font-size: 14px;
+    color: #333;
+    border-bottom: 1px solid #cccccc;
+    border-right: 1px solid #cccccc;
+    border-collapse: collapse;
+  }
+  .classorder .enrollTotalSearchTable tr {
+    /* border-bottom: 2px solid #333; */
+  }
+
+  .classorder .enrollTotalSearchTable tr th {
+    background: #bdbdbd;
+    height: 30px;
+    font-size: 12px;
+    text-align: center;
+    border-top: 1px solid #cccccc;
+    border-left: 1px solid #cccccc;
+  }
+
+  .classorder .enrollTotalSearchTable tr {
+    background: #fff;
+    text-align: left;
+  }
+
+  .classorder .enrollTotalSearchTable tbody tr:last-child {
+    border-bottom: 2px solid #333;
+  }
+
+  .classorder .enrollTotalSearchTable tr:first-child td:first-child {
+    border-bottom: 2px solid #333;
+  }
+
+  .classorder .enrollTotalSearchTable tr td {
+    height: 66px;
+    padding: 10px;
+    /*border-top: 1px solid #cccccc;*/
+    /*border-left: 1px solid #cccccc;*/
+  }
+
+  .classorder .enrollTotalSearchTable tr td>img {
+    width: 32px;
+    height: 32px;
+    border-radius: 16px;
+    vertical-align: middle;
+    margin-right: 5px;
+  }
+
+  .classorder .enrollTotalSearchTable tr td p {
+    line-height: 20px;
+  }
+  .classorder .remarks{
+    font-size: 14px;
+    color: #2D2D2D;
+  }
+  .classorder .remarks-b{
+    width: 100%;
+    height: 94px;
+    background: #F0F5FB;
+    margin-top: 20px;
+    padding: 15px;
+    font-size: 12px;
+    color: #999999;
+    position: relative;
+    overflow: hidden;
+    display:-webkit-box;
+    line-height: 20px;
+    -webkit-line-clamp:4;
+    -webkit-box-orient:vertical ;
+  }
+  .classorder .remarks-b-b{
+    text-align: right;position: absolute;right: 0px;bottom: 0px
+  }
+  .classorder .on-left{
+    margin-right: 5px;
+  }
+  .classorder .finance{
+    padding: 1px 10px;
+    align-items: center;
+    justify-content: center;
+    border-radius: 4px;
+    margin: 5px 3px 3px 0;
+  }
+</style>

src/pages/sale/japaneseTrain.vue

@@ -72,6 +72,30 @@
                               <img src="../../assets/images/administration/gou.png" alt="" style="width: 16px;height: 12px" v-if="j.select==true">
                             </span>
                           </div>
+                          <div v-if="item.ClassStyle==2" class="row wrap" style="width: 454px;">
+                            <div v-for="(j,k) in item.month" style="width: 45.4px;height: 30px;line-height: 30px;text-align: center;font-size: 12px;color: #2D2D2D;margin-top: 10px;!important">
+                              <div :style="{'width': '45.4px','height': '30px',background:j.select==true?'rgba(41, 97, 254, 0.2)':'#FFF'}">
+                                {{j.name}}
+                              </div>
+                            </div>
+                          </div>
+                          <div v-if="item.ClassStyle==3">
+                            <el-calendar v-model="elvalue" id="calendar" style="width: 454px;">
+                              <!-- 这里使用的是 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">
+                                      <img src="../../assets/images/administration/gou.png" alt="" style="width: 16px;height: 12px" >
+                                    </div>
+
+                                  </div>
+
+
+                              </template>
+                            </el-calendar>
+                          </div>
                           <div style="color:#2D2D2D;font-size: 14px;font-weight: bold;">课程安排</div>
                           <div style="width: 454px;height: 40px;background: #EEEEEF;font-size: 12px;color: #2D2D2D;font-weight: 600;margin-top: 20px;display: flex;align-items: center">
                             <div style="width: 50%;padding-left: 20px">
@@ -236,6 +260,7 @@
         SourceEnumList:[],
         ClassList: [], //关联课程下拉数据
         TeacherList: [], //关联教师下拉数据
+        elvalue:new Date(),
       }
     },
     created() {
@@ -351,8 +376,25 @@
                 })
               })
               x.weeks = weekList
+            }else if(x.ClassStyle==2){
+              let data = [];
+              for(let i = 0;i<31;i++){
+                let obj ={
+                  name:i+1,
+                  select:false
+                };
+                x.ClassPlanList.forEach(j=>{
+                  if(j.WeekDay == i+1){
+                    obj.select=true
+                  }
+                })
+                data.push(obj)
+
+              }
+              x.month = data;
 
             }
+
           })
 
         }).catch(() => {
@@ -482,4 +524,22 @@
   .japaneseTrain .q-mb-md{
     margin-bottom: 0;
   }
+  .japaneseTrain .month-item{
+    display: inline-block;
+    width: 45.5px;
+    height: 45.4px;
+    line-height: 45.4px;
+    text-align: center;
+    font-size: 12px;
+    color: #2D2D2D;
+  }
+  .japaneseTrain .el-calendar{
+    width: 454px;
+  }
+  .japaneseTrain .el-calendar-table .el-calendar-day{
+    height: 0;
+  }
+  .japaneseTrain #calendar{
+    width: 454px;
+  }
 </style>

src/pages/sale/myOrder.vue

@@ -122,11 +122,11 @@
         <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" @click="goOrderdetails(item)">{{item.OrderId}}</div>
+              <div style="font-size: 18px;color: #2961FE;margin-bottom: 20px;font-weight: bold;cursor: pointer;" @click="goOrderdetails(item)">{{item.OrderId}}</div>
               <div>{{item.EnterName}}</div>
               <div style="margin-top: 10px">{{item.CreateTime}}</div>
               <div style="margin-top: 30px;margin-bottom: 10px">班级</div>
-              <div style="font-weight: bold;color:#2961FE;">{{item.ClassName}}</div>
+              <div style="font-weight: bold;color:#2961FE;cursor: pointer;" @click="getClassInfo(item)">{{item.ClassName}}</div>
             </td>
             <td style="border:none">{{item.GuestNum}}人</td>
             <td style="border:none">{{item.Class_Price.toFixed(2)}}</td>
@@ -298,18 +298,25 @@
                     <span>收款单据：</span>
                     <q-btn flat size="xs" icon="edit"  style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,1)"/>
                   </div>
-                  <div class="row wrap">
-                    <div class="finance row" style="background: rgba(41, 97, 254, 0.2);color: #2961FE">
-                      <span>124</span>
-                    </div>
-                    <div class="finance row" style="background: rgba(41, 97, 254, 0.2);color: #2961FE">
-                      <span>124</span>
+
+                  <div class="row wrap" >
+                    <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>
                     </div>
                   </div>
                   <div class="row" style="justify-content: space-between">
                     <span>付款单据：</span>
                     <q-btn flat size="xs" icon="edit"  style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,2)"/>
                   </div>
+                  <div class="row wrap" >
+                    <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>
+                    </div>
+                  </div>
                 </div>
               </div>
             </td>
@@ -398,6 +405,8 @@
   </div>
 </q-dialog>
 <myOrder-form v-if="isShowmyorderForm" :save-obj="myorderObjOption" @close="closeMOSaveForm"></myOrder-form>
+<classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" @close="closeClass" @success="refreshClass"></classinfo-form>
+
 </div>
 </template>
 <script>
@@ -418,10 +427,13 @@
     queryCourseDropdownList,
   } from '../../api/course/index'
   import myOrderForm from '../../components/sale/myOrder-form'
+  import classinfoForm from '../../components/course/classinfo-form';
+
   export default {
 
     components: {
-      myOrderForm
+      myOrderForm,
+      classinfoForm
     },
     data() {
       return {
@@ -466,7 +478,9 @@
         UPrice:false,
         UnitPrice:0,//用于可以输入单价的验证
         isShowmyorderForm:false,
-        myorderObjOption:{}
+        myorderObjOption:{},
+        classObjOption: null,
+        isShowClassInfo: false, //是否显示课程信息
       }
     },
     created() {
@@ -571,15 +585,15 @@
         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=>{
-              res.data.data.forEach(j=>{
+              data.forEach(j=>{
                 if(x.OrderId == j.OrderId){
                   x.FinanceList = j.FinanceList
                   x.RefundFinanceList = j.RefundFinanceList
                 }
               })
             })
-            console.log()
           }else{
             this.loading = false;
             this.$message.error(res.data.message);
@@ -807,9 +821,9 @@
         TCIDARR.push(obj.ClassId)
         let orderObj = {
           OrderID:obj.OrderId,
-          OrderSource:8,
+          OrderSource:17,
           Obj: {},
-          SourceID:17,
+          SourceID:0,
           TCIDList: TCIDARR
         }
         this.$router.push({
@@ -824,7 +838,19 @@
 
           }
         });
-      }
+      },
+      getClassInfo(obj) {//打开班级详情组件
+        this.classObjOption = obj;
+        this.isShowClassInfo = true;
+      },
+      //关闭班级信息弹窗
+      closeClass() {
+        this.isShowClassInfo = false
+      },
+      //刷新
+      refreshClass() {
+
+      },
 
     }
   }
@@ -983,6 +1009,6 @@
     align-items: center;
     justify-content: center;
     border-radius: 4px;
-    margin-right: 5px;
+    margin: 5px 3px 3px 0;
   }
 </style>