Merge branch 'x_d_5.1' of http://120.79.166.78:19005/zhongzheng-edu/saas_masterPlatform into dev

src/api/financed/index.js

@@ -73,6 +73,22 @@ export function orderExport(query) {
     params: query,
   });
 }
+// 机构分成列表导出
+export function tenantExport(query) {
+  return request({
+    url: "/system/top/order/tenantListExport",
+    method: "get",
+    params: query,
+  });
+}
+// 订单应收应付统计
+export function sellerExport(query) {
+  return request({
+    url: "/system/top/order/sellerListExport",
+    method: "get",
+    params: query,
+  });
+}
 // 新增催款提醒
 export function orderNote(data) {
   return request({
@@ -121,4 +137,4 @@ export function countOrderNum(query) {
     method: "get",
     params: query,
   });
-}
+}

src/views/financed/arap/index.vue

@@ -67,7 +67,9 @@
               props.scope.row.refundStatus
             ]
           }}
-          <span></span>
+          <span style="color: #409eff" v-if="props.scope.row.roleName">
+            ({{ props.scope.row.roleName }})
+          </span>
         </div>
       </template>
       <template slot="status" slot-scope="props">
@@ -138,6 +140,8 @@ import {
   sellerList,
   tenantList,
   orderExport,
+  tenantExport,
+  sellerExport,
   countOrderNum,
 } from "@/api/financed/index";
 export default {
@@ -391,10 +395,13 @@ export default {
       ] = true;
     },
     batchExport() {
-      const fn = [orderExport, orderExport, orderExport][this.type];
+      const fn = [orderExport, tenantExport, sellerExport][this.type];
       fn(this.backData()).then((res) => {
         if (res.msg) {
-          exportFn(res.msg, "导出应收应付数据");
+          exportFn(
+            res.msg,
+            `导出${["应收应付", "机构分成", "业务员提成"][this.type]}数据`
+          );
         } else {
           this.$message.error("导出失败");
         }

src/views/financed/cost/dislogSet.vue

@@ -70,7 +70,11 @@
             :prop="'itemList.' + index + '.itemCategory'"
             :rules="rules['itemCategory']"
           >
-            <el-select v-model="item.itemCategory" placeholder="请选择成本类型">
+            <el-select
+              @change="changeCategory(item)"
+              v-model="item.itemCategory"
+              placeholder="请选择成本类型"
+            >
               <el-option label="业务类型" :value="1"></el-option>
               <el-option label="非分成" :value="2"></el-option>
             </el-select>
@@ -229,6 +233,7 @@ export default {
           callback(new Error("最低价不能小于最高价"));
         }
       }
+
       if (businessId) {
         const levelList = this.itemList.filter(
           (e) => e.businessId == list.businessId
@@ -324,6 +329,10 @@ export default {
     changeBus(data, projectId) {
       data.projectId = projectId;
     },
+    changeCategory(data) {
+      data.educationTypeId = undefined;
+      this.changeEdu(data);
+    },
     add(index, data) {
       data = data || {
         projectId: undefined,
@@ -402,6 +411,7 @@ export default {
       }
       list = list.sort((a, b) => a.minValue - b.minValue);
       for (let i = 0, len = list.length - 1; i < len; i++) {
+        console.log(i, list);
         if (list[i].maxValue >= list[i + 1].minValue) {
           return "阶梯计价存在范围冲突";
         }