1

src/pages/financial/orderCompleteStatistics.vue

@@ -46,6 +46,9 @@
   .color-black{
       color:black !important;
   }
+  .border-b{
+    border-bottom: 1px solid #333;
+  }
 
 </style>
 <template>
@@ -131,13 +134,6 @@
       <p class="easyUpdateTime" v-if="UpdateStaus==1">正在更新,更新开始时间 {{UpdateStartTime}}</p>
       <p class="easyUpdateTime" v-if="UpdateStaus==2">上次更新时间 {{UpdateStartTime}}<br />每日8点、12点、19点、22点数据更新~</p> -->
     </div>
-    <!-- <div style="margin-bottom:25px;" v-loading='loading'>
-      <v-table is-horizontal-resize column-width-drag :show-vertical-border="true" rowKeyFieldName="rowkey" style="width:100%" :columns="columns"
-        :table-data="DataList" :filter-method="filterMethod"  :column-cell-class-name="columnCellClass"
-        @on-custom-comp="customCompFunc" @sort-change="sortChange" :row-click="rowClick" :row-dblclick="rowDbClick" :cell-span-option="cellSpanOption"  >
-      </v-table>
-    </div> -->
-   
     <div style="width:100%; overflow-x:auto">
       <table :boeder="1" class="singeRowTable orderCompleteStatistics" style="width:3000px;border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
       <tr>
@@ -188,36 +184,36 @@
           <td>{{item.CourseName}}</td>
           <td>{{item.ClassName}}</td>
           <td>{{item.StudentName}}</td>
-          <td>{{item.EmployeeName}}</td>
+          <td>{{item.CreateByName}}</td>
           <td>{{item.TotalClassHours}}</td>
           <td>{{item.TotalUnitPrice}}</td>
           <td>{{item.TotalCourseFee}}</td>
           <td>{{item.TotalBookFee}}</td><!--教材费-->
           <td>{{item.TotalClassFee}}</td><!--课件费-->
-          <td>{{item.TotalClassFee}}</td><!--优惠金额-->
+          <td>{{item.TotalDiscountMoney}}</td><!--优惠金额-------------------------->
           <td>{{item.TotalMoney}}</td><!--合同总金额-->
            <!-- -收款信息（实收金额-- -->
           <td>
-           <div v-for="subitem in item.IncomeList" :key="item.id">
+           <div v-for="subitem in item.IncomeList" class="border-b">
              {{ subitem.TradeDate }}
            </div>
           </td><!--收款日期-->
           <td>  
-            <div v-for="subitem in item.IncomeList" :key="item.id">
+            <div v-for="subitem in item.IncomeList" class="border-b">
              {{ subitem.Money }}
            </div>
           </td><!--收款金额-->
          <td>  
-            <div v-for="subitem in item.IncomeList">
+            <div v-for="subitem in item.IncomeList" class="border-b">
              <div v-for="_subitem in subitem.TradeWayList">
              {{ _subitem.TypeName }}
             </div>
            </div>
           </td><!--收款方式-->
           <td>  
-            <div v-for="subitem in item.IncomeList">
-             <div v-for="_subitem in subitem.TradeWayList">
-             {{ _subitem.BankNo }}
+            <div v-for="subitem in item.IncomeList" class="border-b">
+             <div v-for="_subitem in subitem.TradeWayList" >
+             {{ _subitem.Alias||'/' }}
             </div>
            </div>
           </td><!--收款账户-->
@@ -236,8 +232,8 @@
           <!-- -剩余情况-- -->
           <td>{{item.AdjustPrice}}</td><!--协调金额-->
           <td>{{item.SurplusCourseHours}}</td><!--剩余课时-->
-          <td :class="{'color-red':item.SurplusMoney<0,'color-green':item.SurplusMoney>0&&item.SurplusMoney<500,'color-black':item.SurplusMoney=0||item.SurplusMoney>=500}">{{item.SurplusMoney}}</td><!--剩余金额-->
-          <td><q-btn color="primary" label="协调金额"   @click="show($event),AdjustPriceMsg.ContractId=item.Id,AdjustPriceMsg.AdjustPrice=item.AdjustPrice"/></td><!--操作-->
+          <td :class="{'color-red':item.SurplusMoney<0,'color-green':item.SurplusMoney>0&&item.SurplusMoney<500,'color-black':item.SurplusMoney==0||item.SurplusMoney>=500}">{{item.SurplusMoney}}</td><!--剩余金额-->
+          <td><q-btn color="primary" style="width:100px;" label="协调金额"   @click="show($event),AdjustPriceMsg.ContractId=item.Id,AdjustPriceMsg.AdjustPrice=item.AdjustPrice"/></td><!--操作-->
         </tr>
         
       </template>
@@ -272,14 +268,14 @@
     </template>
     
     <div v-if="DataList.length>0">
-      <!-- <el-pagination
+      <el-pagination
         background
         @current-change="handleCurrentChange"
-        :current-page.sync="currentPage"
+        :current-page.sync="msg.pageIndex"
         layout="total,prev, pager, next, jumper"
         :page-size='msg.pageSize'
         :total='total'>
-      </el-pagination> -->
+      </el-pagination>
     </div>
   </div>
 </template>
@@ -301,7 +297,7 @@
   export default {
     data() {
       return {
-       
+       total:0,
         msg: {
           pageIndex:1,
           pageSize:10,
@@ -591,76 +587,11 @@
       this.Financial_post_GetBranchAccountList();
     },
     methods: {
-      GoUrlFan(path, month, year, BranchId, ids) {
-        this.$router.push({
-          path: "/financial/" + path,
-          query: {
-            year: year,
-            month: month,
-            BranchId: BranchId,
-            CostIds: ids,
-            blank: "y"
-          }
-        });
-      },
-      rowDbClick(rowIndex, rowData, column) {
-
-      },
-      rowClick(rowIndex, rowData, column) {
-    
-        if (column.field == "ErYue") {
-          
-        } 
-      },
-      getFirstAndLastMonthDay(year, month) {
-        var firstdate = year + '-' + month + '-01';
-        var day = new Date(year, month, 0);
-        var lastdate = year + '-' + month + '-' + day.getDate(); //获取当月最后一天日期
-        return lastdate;
-      },
-      togbu: function () {
-        this.AALloading = true
-        let msg = {
-          Year: this.year,
-          sharelist: [],
-        }
-        this.monthList.forEach(x => {
-          let obj = {
-            ID: 0,
-            Money: x.value,
-            Month: x.id,
-            Year: this.year
-          }
-          msg.sharelist.push(obj)
-        })
-        this.apipost('financestatistics_post_InsertBatchSimple', msg, res => {
-          if (res.data.resultCode == 1) {
-            this.$message.success(res.data.message)
-          } else {
-            this.AALloading = false
-            this.$message.error(res.data.message)
-          }
-        })
-      },
-      filterMethod: function (filters) {
-
-      },
-      sortChange: function (param) {
-
-      },
-      customCompFunc: function (param) {},
-      columnCellClass: function (rowIndex, columnName, rowData) {
-        if(columnName==="SurplusMoney"){
-            if(rowData.SurplusMoney<0){
-                return 'color-red'
-            }else if(rowData.SurplusMoney>0&&rowData.SurplusMoney<500){
-                 return 'color-green'
-            }else{
-                return 'color-black'
-            }
-        }
-
+       handleCurrentChange: function (val) { //翻页
+        this.msg.pageIndex = val;
+        this.getData();
       },
+      
       exportExcel: function () {
         EduDownLoad("/finance/OutToExcelOrderStudentClassHoursList", this.msg, "订单完成统计.xls")
       },
@@ -672,6 +603,7 @@
                 item.Progress=item.Progress+"%"
               })
               this.DataList=res.Data.PageData
+              this.total=res.Data.Count
           })
       },
       getCompanyList() {