lihongxiao 1 год назад
Родитель
Сommit
85f5a2da06

+ 2 - 2
src/views/PeopleManage/InstitutionalPremium.vue

@@ -136,7 +136,7 @@ export default {
 
           { prop: "deptName", label: "机构名称", type: "text" },
           { prop: "sumpremium", label: "总保费", type: "text" },
-          { prop: "proportional", label: "抽成比例", type: "text" },
+          // { prop: "proportional", label: "抽成比例", type: "text" },
           { prop: "extractFee", label: "抽成总金额", type: "text" },
           { prop: "historyFee", label: "提现金额", type: "text" },
           { prop: "cashFee", label: "申请金额", type: "text" },
@@ -156,7 +156,7 @@ export default {
           },
           { prop: "remark", label: "审批意见", type: "text" },
           { name: "picture", label: "转账图片", type: "slot" },
-          { prop: "startTime", label: "核算开始时间", type: "text" },
+          // { prop: "startTime", label: "核算开始时间", type: "text" },
         ],
         loading: true,
         isPaginationShow: true,

+ 6 - 6
src/views/PeopleManage/Partner.vue

@@ -572,9 +572,9 @@ export default {
       tableConfig: {
         columns: [
           // 数据列
-          { prop: "id", label: "工号", type: "text" },
+          { prop: "userId", label: "工号", type: "text" },
           {
-            prop: "name",
+            prop: "userName",
             label: "名称",
             type: "text",
           },
@@ -762,7 +762,7 @@ export default {
             this.$api.insCompany
               .addProportionConfig({
                 ...this.proportionData,
-                userId: this.listData.id,
+                userId: this.listData.userId,
               })
               .then((res) => {
                 if (res.code == 200) {
@@ -908,7 +908,7 @@ export default {
     proportionalAllocation(row){
       this.listData=row
       this.$api.insCompany
-        .getProportionConfig( {id:row.id} )
+        .getProportionConfig( {id:row.userId} )
         .then((res) => {
           this.proportionDialogVisible=true
           this.proportionData={
@@ -931,7 +931,7 @@ export default {
     },
     findPagerelationship(){
       this.$api.insCompany
-        .getRelationInfo( this.listData.id )
+        .getRelationInfo( this.listData.userId )
         .then((res) => {
           this.tableConfigrelationship.loading = false;
           this.pageResultrelationship = res.data;
@@ -953,7 +953,7 @@ export default {
       };
       this.imagesIdList = [];
       this.activeName = "1";
-      let res = await this.$api.user.getUserDatail(params.id);
+      let res = await this.$api.user.getUserDatail(params.userId);
       if (res.code == 200) {
         // this.$api.user.findBackUserList1({ agentFlag: 0 }).then((res) => {
         //   this.leaderOptions = res.data;