提成发放调整

src/Form/commissionDistribution/add.vue

@@ -40,7 +40,7 @@
                 <tableNewLayout style="margin-bottom: 20px" ref="tableRef" :checkbox="true" :layout="tablecols" :data="list" :opwidth="200" height="calc(100vh - 410px)" :width="true" :custom="true" @selectionChange="selectionChange">
                   <template v-slot:customcol="scope">
                     <div v-if="scope.column.columnname === 'rate'">
-                      <div>{{scope.column.data.rate?Math.round((scope.column.data.rate * 100)*100)/100:'--'}}</div>
+                      <div>{{scope.column.data.rate?Math.round((scope.column.data.rate * 100)*100)/100 + '%':'0%'}}</div>
                     </div>
                     <div v-else>
                       {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}

src/SDrpManagement/commissionDistribution/detail/modules/addDetail.vue

@@ -40,7 +40,7 @@
                 <tableNewLayout style="margin-bottom: 20px" ref="tableRef" :checkbox="true" :layout="tablecols" :data="list" :opwidth="200" height="calc(100vh - 250px)" :width="true" :custom="true" @selectionChange="selectionChange">
                   <template v-slot:customcol="scope">
                     <div v-if="scope.column.columnname === 'rate'">
-                      <div>{{scope.column.data.rate?Math.round((scope.column.data.rate * 100)*100)/100:'--'}}</div>
+                      <div>{{scope.column.data.rate?Math.round((scope.column.data.rate * 100)*100)/100 + '%':'0%'}}</div>
                     </div>
                     <div v-else>
                       {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}

src/SDrpManagement/salerAccount/modules/detail.vue

@@ -41,7 +41,7 @@
         </div>
       </div>
       <div style="padding:0 16px 0 16px">
-        <tableNewLayout :layout="tablecols" :data="list" :opwidth="200" height="calc(100vh - 154px)" :width="true" :custom="true" >
+        <tableNewLayout :layout="tablecols" :data="list" :opwidth="200" height="calc(100vh - 184px)" :width="true" :custom="true" >
           <template v-slot:customcol="scope">
             <div v-if="scope.column.columnname === 'type'">
               {{scope.column.data[[scope.column.columnname]] == '1' ? '收入':'支出'}}
@@ -57,7 +57,7 @@
             <el-button type="text" size="mini" @click="detailGo(scope.data)">详情</el-button>
           </template>
         </tableNewLayout>
-<!--        <div  class="container normal-panel" style="text-align:right">
+        <div  class="container normal-panel" style="text-align:right">
           <el-pagination
               background
               @size-change="handleSizeChange"
@@ -68,7 +68,7 @@
               layout="total,sizes, prev, pager, next, jumper"
               :total="total">
           </el-pagination>
-        </div>-->
+        </div>
       </div>
 
     </el-drawer>
@@ -115,8 +115,8 @@ export default {
       this.param.content.hrid = this.$route.query.id
       const res = await this.$api.requested(this.param)
       this.list = res.data.rows
-      /*this.total = res.total
-      this.currentPage = res.pageNumner*/
+      this.total = res.data.total1
+      this.currentPage = res.pageNumner
     },
     selectChange(){
       console.log(this.dateSelect)