机构分成

src/api/financed/index.js

@@ -97,4 +97,12 @@ export function sellerList(query) {
     method: "get",
     params: query,
   });
+}
+// 机构分成列表
+export function tenantList(query) {
+  return request({
+    url: "/system/top/order/queryTenantList",
+    method: "get",
+    params: query,
+  });
 }

src/components/searchBoxNew.vue

@@ -116,7 +116,10 @@
           >
             <el-option
               v-for="(items, indexs) in educationType"
-              v-show="!item.filter || (item.filter && items.educationName === '继续教育')"
+              v-show="
+                !item.filter ||
+                (item.filter && items.educationName === '继续教育')
+              "
               :key="indexs"
               :label="items.educationName"
               :value="items.id"
@@ -147,7 +150,13 @@
             <el-option
               v-for="(items, indexs) in newBusinessLevel"
               :key="indexs"
-              v-show="!item.filter || (item.filter && (items.projectName === '造价师' || items.projectName === '建造师') && items.businessName === '二级')"
+              v-show="
+                !item.filter ||
+                (item.filter &&
+                  (items.projectName === '造价师' ||
+                    items.projectName === '建造师') &&
+                  items.businessName === '二级')
+              "
               :label="items.projectName + '-' + items.businessName"
               :value="items.id"
             ></el-option>
@@ -159,6 +168,7 @@
             :placeholder="item.placeholder"
             :size="size"
             clearable
+            filterable
           >
             <el-option
               v-for="(items, indexs) in systemtenantlist"
@@ -361,8 +371,8 @@
             <el-option
               v-for="(items, indexs) in item.options"
               :key="indexs"
-              :label="items.label"
-              :value="items.value"
+              :label="items[item.selectLabel || 'label']"
+              :value="items[item.selectValue || 'value']"
               :disabled="items.disable"
             ></el-option>
           </el-select>
@@ -708,7 +718,7 @@ export default {
       "beforeLists",
       "applySiteAddress",
       "certificate",
-      "systemtenantlist"
+      "systemtenantlist",
     ]),
     /**
      * @remarks 过滤选择器列表
@@ -1045,4 +1055,4 @@ export default {
     margin-bottom: 0px;
   }
 }
-</style>
+</style>

src/views/financed/arap/index.vue

@@ -69,12 +69,30 @@
       </template>
       <template slot="btn" slot-scope="props">
         <el-button
+          v-if="type == 1"
           type="text"
           :disabled="props.scope.row.creditStatus == 1"
           @click="handelClick(props.scope.row)"
         >
           催款提醒
         </el-button>
+        <template v-else>
+          <el-button
+            type="text"
+            :disabled="props.scope.row.creditStatus == 1"
+            @click="handelClick(props.scope.row)"
+          >
+            点击审核
+          </el-button>
+          <el-button
+            type="text"
+            style="color: #e6a23c"
+            :disabled="props.scope.row.creditStatus == 1"
+            @click="handelClick(props.scope.row)"
+          >
+            修改备注
+          </el-button>
+        </template>
       </template>
     </table-list>
     <pagination
@@ -101,7 +119,12 @@ import pagination from "@/components/pagination";
 import dislogTip from "./dislogTip.vue";
 import dislogOrderDetails from "../components/dislogOrderDetails.vue";
 import { exportFn } from "@/utils/index.js";
-import { orderList, sellerList, orderExport } from "@/api/financed/index";
+import {
+  orderList,
+  sellerList,
+  tenantList,
+  orderExport,
+} from "@/api/financed/index";
 export default {
   name: "cost",
   components: {
@@ -206,44 +229,46 @@ export default {
         },
         {
           label: "订单单号",
-          prop: "name",
+          prop: "orderSn",
           hidden: true,
         },
         {
           label: "机构名称",
-          prop: "name",
+          prop: "tenantName",
           hidden: true,
         },
         {
           label: "待付账款(元)",
-          prop: "name",
+          prop: "divideCompanyMoney",
           hidden: true,
         },
         {
           label: "预付时间",
-          prop: "name",
+          prop: "predictPayTime",
           hidden: true,
         },
         {
           label: "剩余天数",
-          prop: "name",
+          prop: "predictReceiveDay",
           hidden: true,
         },
         {
           label: "审核状态",
-          prop: "name",
+          prop: "refundStatus",
           hidden: true,
+          scope: "solt",
+          soltName: "refundStatus",
         },
         {
           label: "备注",
-          prop: "name",
+          prop: "remark",
           hidden: true,
         },
       ],
       tableSet3: [
         {
           label: "下单时间",
-          prop: "lastTime",
+          prop: "buyTime",
           hidden: true,
           scope: "aTimeList",
         },
@@ -289,6 +314,11 @@ export default {
           scope: "solt",
           soltName: "refundStatus",
         },
+        {
+          label: "备注",
+          prop: "remark",
+          hidden: true,
+        },
       ],
       tableData: [], //表单数据
       total: 0, //一共多少条
@@ -296,10 +326,11 @@ export default {
       orderDialogVisible: false,
       type: 1,
       activeOrderInfo: {},
+      roleList: [],
     };
   },
   created() {
-    this.search(2);
+    this.init();
   },
   methods: {
     openDialog(data) {
@@ -326,14 +357,14 @@ export default {
       return data;
     },
     changeSearch() {
-      this.init();
+      this.search(2);
     },
     handelClick(row) {
       this.activeOrderInfo = row;
       this.dialogVisible = true;
     },
     getDataList(data) {
-      const fn = [orderList, orderList, sellerList][this.type - 1];
+      const fn = [orderList, tenantList, sellerList][this.type - 1];
       fn(data)
         .then((res) => {
           this.tableData = res.rows;
@@ -369,8 +400,14 @@ export default {
       return data;
     },
     init() {
+      this.getRoleList();
       this.search(2);
     },
+    getRoleList() {
+      this.$api.obtainRoleList().then((res) => {
+        this.roleList = res.rows;
+      });
+    },
   },
   computed: {
     tableSet() {
@@ -398,16 +435,15 @@ export default {
       if (this.type != 1) {
         data.unshift(
           {
-            prop: "status1",
+            prop: "roleId",
             placeholder: "角色选择",
             scope: "select",
-            options: [
-              { label: "已结清", value: 1 },
-              { label: "未结清", value: 0 },
-            ],
+            options: this.roleList,
+            selectValue: "roleId",
+            selectLabel: "roleName",
           },
           {
-            prop: "checkStatus",
+            prop: "divideStatus",
             placeholder: "审核状态",
             scope: "select",
             options: [
@@ -416,6 +452,11 @@ export default {
               { label: "未通过", value: 2 },
               { label: "已撤销", value: 3 },
             ],
+          },
+          {
+            prop: "tenantId",
+            placeholder: "机构选择",
+            scope: "systemtenantlist",
           }
         );
       } else {

src/views/financed/cost/dislogSet.vue

@@ -36,7 +36,7 @@
               placeholder="请选择关联机构"
             >
               <el-option
-                v-for="item in companyList"
+                v-for="item in tenantList"
                 :key="item.tenantId"
                 :label="item.tenantName"
                 :value="item.tenantId"
@@ -269,7 +269,7 @@ export default {
         ],
         minValue: [{ validator: checkMinValue, trigger: "blur" }],
       },
-      companyList: [],
+      tenantList: [],
       eduList: [],
     };
   },
@@ -277,7 +277,7 @@ export default {
     init() {
       this.resetForm();
       this.tpId && this.getCostDetail();
-      this.getCompanyList();
+      this.getTenantList();
       this.getEduList();
     },
     getCostDetail() {
@@ -299,10 +299,10 @@ export default {
       let data = this.eduList.find((e) => e.id == eduId);
       return data.businessList || [];
     },
-    getCompanyList() {
-      if (this.companyList.length) return;
-      this.$api.systemtenantlist(this.formData).then((res) => {
-        this.companyList = res.rows;
+    getTenantList() {
+      if (this.tenantList.length) return;
+      this.$api.systemtenantlist().then((res) => {
+        this.tenantList = res.rows;
       });
     },
     changeEdu(data) {