临时提交

package.json

@@ -41,7 +41,7 @@
     "af-table-column": "^1.0.3",
     "axios": "0.21.0",
     "clipboard": "2.0.6",
-    "core-js": "3.8.1",
+    "core-js": "^3.30.2",
     "echarts": "4.9.0",
     "element-ui": "2.15.6",
     "file-saver": "^2.0.5",
@@ -77,6 +77,7 @@
     "babel-eslint": "10.1.0",
     "chalk": "4.1.0",
     "connect": "3.6.6",
+    "core-js": "^3.30.2",
     "eslint": "7.15.0",
     "eslint-plugin-vue": "7.2.0",
     "less": "^4.1.2",

src/api/financed/index.js

@@ -114,6 +114,14 @@ export function sellerList(query) {
     params: query,
   });
 }
+// 查询机构分成记录列表
+export function companyList(query) {
+  return request({
+    url: "/divide/log/companyList",
+    method: "get",
+    params: query,
+  });
+}
 // 机构分成列表
 export function tenantList(query) {
   return request({

src/components/searchBoxNew.vue

@@ -494,6 +494,15 @@
             >
             </el-date-picker>
           </div>
+          <el-date-picker
+            v-else-if="item.scope === 'moreMonth'"
+            type="months"
+            :size="size"
+            v-model="formData[item.prop]"
+            :placeholder="item.placeholder || '选择月份'"
+            value-format="timestamp"
+          >
+          </el-date-picker>
           <el-input
             :style="item.prop === 'searchKey' ? 'width:260px;' : ''"
             v-else-if="!item.scope"

src/components/tableList.vue

@@ -127,6 +127,7 @@
       <el-table-column
         v-if="navText.dontNum ? false : true"
         type="index"
+        :index="setIndex"
         label="序号"
         width="70"
         align="center"
@@ -1153,6 +1154,7 @@ export default {
     "loading",
     "studentTable",
     "objectSpanMethod",
+    "setIndex",
     "radio",
   ],
   data: function () {

src/views/financed/arap/index.vue

@@ -1,5 +1,7 @@
 <template>
   <div id="ActivityList">
+    <el-date-picker type="months" placeholder="选择一个或多个月">
+    </el-date-picker>
     <el-radio-group
       v-model="type"
       @change="changeSearch"
@@ -29,6 +31,7 @@
       :tableData="tableData"
       :navText="navText"
       :loading="loading"
+      :setIndex="setIndex"
       :objectSpanMethod="spanMethod"
     >
       <template slot="customize">
@@ -58,7 +61,7 @@
       </template>
       <template slot="divideCheckStatus" slot-scope="props">
         <div>
-          {{ divideCheckStatus(props.scope.row.divideCheckStatus) }}
+          {{ divideCheckStatus(props.scope.row.checkStatus) }}
           <span style="color: #409eff" v-if="props.scope.row.roleName">
             ({{ props.scope.row.roleName }})
           </span>
@@ -154,6 +157,7 @@ import {
   orderList,
   sellerList,
   tenantList,
+  companyList,
   orderExport,
   tenantExport,
   sellerExport,
@@ -174,6 +178,7 @@ export default {
   },
   data() {
     return {
+      value5: [],
       showTabList: [
         [
           {
@@ -330,27 +335,27 @@ export default {
         },
         {
           label: "已付分成(元)",
-          prop: "divideCompanyMoney",
+          prop: "payMoneyTotal",
           hidden: true,
         },
         {
           label: "已扣分成(元)",
-          prop: "divideCompanyMoney",
+          prop: "deductMoneyTotal",
           hidden: true,
         },
         {
           label: "待付月份",
-          prop: "divideCompanyMoney",
+          prop: "month",
           hidden: true,
         },
         {
           label: "待付分成(元)",
-          prop: "divideCompanyMoney",
+          prop: "payMoney",
           hidden: true,
         },
         {
           label: "待扣分成(元)",
-          prop: "divideCompanyMoney",
+          prop: "deductMoney",
           hidden: true,
         },
         {
@@ -479,27 +484,12 @@ export default {
     };
   },
   created() {
-    // this.init();
-    let data = [
-      { tenantName: 1, chi: [{}, {}, {}] },
-      { tenantName: 2, chi: [{}, {}] },
-      { tenantName: 3, chi: [{}] },
-    ];
-    let total = 0;
-    data.forEach((ele) => {
-      this.spanData[total] = ele.chi.length;
-      total += ele.chi.length;
-      ele.chi.map((e) => {
-        e.tenantName = ele.tenantName;
-      });
-      this.tableData.push(...ele.chi);
-    });
-    console.log(this.spanData, "this.spanData");
+    this.init();
   },
   methods: {
     spanMethod({ row, column, rowIndex, columnIndex }) {
       let t = [3, 5, 2][this.type - 1];
-      if (columnIndex > 0 && columnIndex <= t) {
+      if (columnIndex <= t) {
         const num = this.spanData[rowIndex];
         if (num) {
           return {
@@ -514,6 +504,10 @@ export default {
         }
       }
     },
+    // 设置序号
+    setIndex(index) {
+      return Object.keys(this.spanData).findIndex((e) => index == e) + 1;
+    },
     divideCheckStatus(e) {
       var a = "";
       switch (e) {
@@ -568,14 +562,13 @@ export default {
       return data;
     },
     changeSearch() {
-      return;
       this.search(2);
     },
     getDataList(data) {
-      const fn = [orderList, tenantList, sellerList][this.type];
+      const fn = [orderList, companyList, sellerList][this.type];
       fn(data)
         .then((res) => {
-          this.tableData = res.rows;
+          this.tableData = this.changeData(res.rows);
           this.total = res.total;
           this.navText.index = res.total;
         })
@@ -583,12 +576,33 @@ export default {
           this.loading = false;
         });
     },
+    changeData(data) {
+      if (this.type == 0) {
+        return data;
+      }
+      let total = 0;
+      let arr = [];
+      data.forEach((ele) => {
+        const monthList = ele.monthList;
+        delete ele.monthList;
+        this.spanData[total] = monthList.length;
+        total += monthList.length;
+        monthList.map((e) => {
+          Object.keys(e).forEach((key) => {
+            e[key] = e[key] || ele[key];
+          });
+        });
+        arr.push(...monthList);
+      });
+      return arr;
+    },
     search(v) {
       this.loading = true;
       if (v === 2) {
         this.formData = {
           pageSize: 10,
           pageNum: 1,
+          month: "",
         };
       }
       this.getDataList(this.backData());
@@ -634,25 +648,23 @@ export default {
           placeholder: "机构选择",
           scope: "systemtenantlist",
         },
-        {
-          prop1: "startTime",
-          prop2: "endTime",
-          placeholder1: key + "开始时间",
-          placeholder2: key + "结束时间",
-          scope: "moreDataPicker",
-        },
       ];
       if (this.type != 0) {
-        data.unshift(
+        data.push(
           {
-            prop: "divideStatus",
+            prop: "month",
+            scope: "moreMonth",
+          },
+          {
+            prop: "checkStatus",
             placeholder: "审核状态",
             scope: "select",
             options: [
               { label: "待审核", value: 0 },
               { label: "已通过", value: 1 },
-              { label: "未通过", value: 2 },
-              { label: "已撤销", value: 3 },
+              { label: "未通过", value: -1 },
+              { label: "待支付", value: 2 },
+              { label: "已支付", value: 3 },
             ],
           },
           {
@@ -666,10 +678,19 @@ export default {
         );
       }
       if (this.type == 0) {
-        data.push({
-          prop: "orderSn",
-          placeholder: "订单单号",
-        });
+        data.push(
+          {
+            prop1: "startTime",
+            prop2: "endTime",
+            placeholder1: key + "开始时间",
+            placeholder2: key + "结束时间",
+            scope: "moreDataPicker",
+          },
+          {
+            prop: "orderSn",
+            placeholder: "订单单号",
+          }
+        );
       }
       if (this.type == 0 || this.type == 2) {
         data.push({

src/views/financed/components/dislogArapDetails.vue

@@ -58,6 +58,7 @@ import pagination from "@/components/pagination";
 import searchBoxNew from "@/components/searchBoxNew";
 import pictureList from "@/components/Comon/pictureList.vue";
 import dislogOrderDetails from "../components/dislogOrderDetails.vue";
+import { sellerList, tenantList } from "@/api/financed/index";
 export default {
   name: "SaasMasterPlatformDislogArapDetails",
   props: {
@@ -148,7 +149,9 @@ export default {
   mounted() {},
 
   methods: {
-    init() {},
+    init() {
+      this.search(2);
+    },
     search(v) {
       this.loading = true;
       if (v === 2) {
@@ -157,11 +160,10 @@ export default {
           pageNum: 1,
         };
       }
-      //   this.getDataList(this.backData());
+      this.getDataList();
     },
-    getDataList(data) {
-      const fn = [orderList, tenantList, sellerList][this.type];
-      fn(data)
+    getDataList() {
+      this.fn(this.backData())
         .then((res) => {
           this.tableData = res.rows;
           this.total = res.total;
@@ -171,6 +173,20 @@ export default {
           this.loading = false;
         });
     },
+    backData() {
+      let data = this.formData;
+      let { startTime, endTime } = this.formData;
+      if (startTime || endTime) {
+        data = JSON.parse(JSON.stringify(this.formData));
+        if (startTime) {
+          data.startTime = parseInt(startTime / 1000);
+        }
+        if (endTime) {
+          data.endTime = parseInt(endTime / 1000);
+        }
+      }
+      return data;
+    },
     changeGroup() {},
     openDialog(data) {
       this.activeOrderInfo = data;
@@ -259,12 +275,12 @@ export default {
           data.push(
             {
               label: "预付时间",
-              prop: "majorName",
+              prop: "predictPayTime",
               hidden: true,
             },
             {
               label: "剩余天数",
-              prop: "predictPayDay",
+              prop: "predictReceiveDay",
               hidden: true,
             }
           );
@@ -380,6 +396,14 @@ export default {
         return data;
       }
     },
+    fn() {
+      const list = {
+        1: [tenantList],
+        2: [],
+        3: [],
+      };
+      return list[this.type][this.status];
+    },
   },
 };
 </script>