1、代理分润记录

src/api/guosen/bussinessbonusaccout.js → src/api/guosen/bussinessbonusaccount.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/cyzh-guosen/bussinessbonusaccout/list',
+    url: '/api/cyzh-guosen/bussinessbonusaccount/list',
     method: 'get',
     params: {
       ...params,
@@ -14,7 +14,7 @@ export const getList = (current, size, params) => {
 
 export const getDetail = (id) => {
   return request({
-    url: '/api/cyzh-guosen/bussinessbonusaccout/detail',
+    url: '/api/cyzh-guosen/bussinessbonusaccount/detail',
     method: 'get',
     params: {
       id
@@ -24,7 +24,7 @@ export const getDetail = (id) => {
 
 export const remove = (ids) => {
   return request({
-    url: '/api/cyzh-guosen/bussinessbonusaccout/remove',
+    url: '/api/cyzh-guosen/bussinessbonusaccount/remove',
     method: 'post',
     params: {
       ids,
@@ -34,7 +34,7 @@ export const remove = (ids) => {
 
 export const add = (row) => {
   return request({
-    url: '/api/cyzh-guosen/bussinessbonusaccout/submit',
+    url: '/api/cyzh-guosen/bussinessbonusaccount/submit',
     method: 'post',
     data: row
   })
@@ -42,7 +42,7 @@ export const add = (row) => {
 
 export const update = (row) => {
   return request({
-    url: '/api/cyzh-guosen/bussinessbonusaccout/submit',
+    url: '/api/cyzh-guosen/bussinessbonusaccount/submit',
     method: 'post',
     data: row
   })

src/api/guosen/bussinessbonusstatic.js

@@ -22,11 +22,13 @@ export const getDetail = (id) => {
   })
 }
 
-export const getYesterdayData = () => {
+export const getYesterdayData = (params) => {
   return request({
     url: '/api/cyzh-guosen/bussinessbonusstatic/getYestoday',
     method: 'get',
-
+    params: {
+      ...params
+    }
   })
 }
 

src/views/guosen/bussinessbonusaccout.vue → src/views/guosen/bussinessbonusaccount.vue

@@ -32,7 +32,7 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove} from "@/api/guosen/bussinessbonusaccout";
+  import {getList, getDetail, add, update, remove} from "@/api/guosen/bussinessbonusaccount";
   import {mapGetters} from "vuex";
 
   export default {
@@ -62,7 +62,7 @@
           column: [
             {
               label: "账号名称",
-              prop: "accout",
+              prop: "account",
               span: 24,
               rules: [{
                 required: true,

src/views/guosen/bussinessbonusrecords.vue

@@ -17,9 +17,17 @@
         </el-button>
       </template> -->
       <template slot="menu" slot-scope="scope">
-        <el-button type="success" size="small" icon="el-icon-s-promotion" plain @click="bonusDo(scope.row)">分润
+        <el-button v-if="scope.row.bonusStatus != 2" type="success" size="small" icon="el-icon-s-promotion" plain @click="bonusDo(scope.row)">分润
         </el-button>
       </template>
+      <template slot="bonusStatus" slot-scope="scope">
+        <el-tag v-if="scope.row.bonusStatus == 0">待分配</el-tag>
+        <el-tag v-else-if="scope.row.bonusStatus == 1" type="warning">分配中</el-tag>
+        <el-tag v-else-if="scope.row.bonusStatus == 2" type="success">分配成功</el-tag>
+        <el-tag v-else-if="scope.row.bonusStatus == 3" type="danger">分配失败</el-tag>
+        <el-tag v-else-if="scope.row.bonusStatus == 4" type="info">系统异常</el-tag>
+        <el-tag v-else>未知</el-tag>
+      </template>
     </avue-crud>
   </basic-container>
 </template>
@@ -39,6 +47,7 @@
   import {
     mapGetters
   } from "vuex";
+  import {dateFormat} from '@/util/date'
 
   export default {
     data() {
@@ -66,21 +75,39 @@
           viewBtn: false,
           selection: true,
           dialogClickModal: false,
-          column: [{
-              label: "广告充值分润账号",
-              prop: "bonusAccoutId",
+          column: [
+            {
+              label: "分润账号",
+              prop: "bonusAccountId",
               type: "select",
-              dicUrl: "/api/cyzh-guosen/bussinessbonusaccout/list",
-              props: {
-                label: "accout",
-                value: "id"
-              },
-              dicFormatter: (res) => {
+              dicUrl: "/api/cyzh-guosen/bussinessbonusaccount/list?size=500",
+              dicFormatter:(res)=>{
                 return res.data.records;
               },
+              hide:true,
+              display: false,
+              props:{
+                label: "account",
+                value: "id"
+              },
+              search: true,
+
+            },
+            {
+              label: "分润账号",
+              prop: "bonusAccountName",
+              // type: "select",
+              // dicUrl: "/api/cyzh-guosen/bussinessbonusaccount/list",
+              // props: {
+              //   label: "account",
+              //   value: "account"
+              // },
+              // dicFormatter: (res) => {
+              //   return res.data.records;
+              // },
               rules: [{
                 required: true,
-                message: "请输入广告充值红利账号id",
+                message: "请输入广告充值红利账号名称",
                 trigger: "blur"
               }]
             },
@@ -106,6 +133,8 @@
               label: "分成状态",
               prop: "bonusStatus",
               type: "select",
+              search: true,
+              slot: true,
               dicData: [{
                   label: "待分配",
                   value: 0
@@ -121,6 +150,10 @@
                 {
                   label: "分配失败",
                   value: 3
+                },
+                {
+                  label: "系统异常",
+                  value: 4
                 }
               ],
               rules: [{
@@ -149,18 +182,18 @@
           span: 6,
           data: [{
               count: 1000000,
-              title: '广告昨日充值',
+              title: '充值金额',
               decimals: 2
             },
 
             {
               count: 5000,
-              title: '服务费昨日收入 ',
+              title: '服务费金额 ',
               decimals: 5
             },
             {
               count: 4000,
-              title: '昨日可分配利润',
+              title: '分配金额',
               decimals: 5
             }
           ]
@@ -306,10 +339,16 @@
           params.beginDate = params.bonusDate[0];
           params.endDate = params.bonusDate[1];
           params.bonusDate = undefined
+        }else{
+          var time=(new Date).getTime()-24*60*60*1000;
+          var yesterday=new Date(time);
+          params.beginDate = dateFormat(yesterday, "yyyy-MM-dd");
+          params.endDate = dateFormat(yesterday, "yyyy-MM-dd");
+          params.bonusDate = undefined
         }
         var _that = this;
         this.loading = true;
-        getYesterdayData().then(res => {
+        getYesterdayData(params).then(res => {
           _that.staticOption.data[0].count = res.data.data.totalAmt;
           _that.staticOption.data[1].count = res.data.data.serviceAmt;
           _that.staticOption.data[2].count = res.data.data.bonusAmt;