Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

config/dev.env.js

@@ -21,7 +21,9 @@ module.exports = merge(prodEnv, {
   // BASE_URL: '"http:///192.168.0.55:8080/"',//蔡雅茹
   CONSOLE_BASE_URL: '"http://localhost:8080/"', //控制台测试服务器
   // CONSOLE_BASE_URL: '"https://test.baoxianzhanggui.com/console-api"' //控制台正式服务器
+
   APP_BASE_URL: '"https://pre.baoxianzhanggui.com/web-api"',    // app打包上传地址
+
 })
 
 

src/views/PeopleManage/Institutional.vue

@@ -51,12 +51,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="管理员工号" prop="userId">
+            <el-form-item label="工号" prop="userId">
               <el-input v-model="formData.userId" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="管理员名称" prop="userName">
+            <el-form-item label="名称" prop="userName">
               <el-select v-model="formData.userName" style="width: 200px;" clearable filterable placeholder="选择管理员名称"
                 @change="userChange">
                 <el-option v-for="(item, index) in useroption" :key="index" :label="item.name"
@@ -166,7 +166,7 @@ export default {
             label: "名称",
             type: "text",
           },
-          { prop: "deptId", label: "机构id", type: "text" },
+          { prop: "deptId", label: "机构编码", type: "text" },
 
           { prop: "deptName", label: "机构名称", type: "text" },
           { prop: "proportional", label: "抽成比例", type: "text" },

src/views/PeopleManage/InstitutionalExtraction.vue

@@ -46,14 +46,14 @@ export default {
             label: "名称",
             type: "text",
           },
-          { prop: "deptId", label: "机构id", type: "text" },
+          { prop: "deptId", label: "机构编码", type: "text" },
           { prop: "deptName", label: "机构名称", type: "text" },
           { prop: "proportional", label: "抽成比例", type: "text" },
           { prop: "sumpremium", label: "总保费", type: "text" },
-          { prop: "extractFee", label: "总保费抽成费用", type: "text" },
-          { prop: "historyFee", label: "已提现抽成费用", type: "text" },
-          { prop: "cashFee", label: "可提现抽成费用", type: "text" },
-          { prop: "startTime", label: "提层计算开始时间", type: "text" },
+          { prop: "extractFee", label: "抽成总金额", type: "text" },
+          { prop: "historyFee", label: "已提现金额", type: "text" },
+          { prop: "cashFee", label: "可提现金额", type: "text" },
+          { prop: "startTime", label: "核算开始时间", type: "text" },
         ],
         loading: true,
         isPaginationShow: true,

src/views/PeopleManage/InstitutionalPremium.vue

@@ -132,7 +132,7 @@ export default {
             label: "名称",
             type: "text",
           },
-          { prop: "deptId", label: "机构id", type: "text" },
+          { prop: "deptId", label: "机构编码", type: "text" },
 
           { prop: "deptName", label: "机构名称", type: "text" },
           { name: "picture", label: "转账图片", type: "slot" },
@@ -154,8 +154,8 @@ export default {
           { prop: "remark", label: "审批意见", type: "text" },
           { prop: "sumpremium", label: "总保费", type: "text" },
           { prop: "extractFee", label: "抽成总金额", type: "text" },
-          { prop: "historyFee", label: "已提现金额", type: "text" },
-          { prop: "cashFee", label: "提现金额", type: "text" },
+          { prop: "historyFee", label: "提现金额", type: "text" },
+          { prop: "cashFee", label: "申请金额", type: "text" },
           { prop: "startTime", label: "提层计算开始时间", type: "text" },
         ],
         loading: true,

src/views/PeopleManage/Partner.vue

@@ -121,7 +121,7 @@ export default {
             label: "名称",
             type: "text",
           },
-          { prop: "deptId", label: "机构工号", type: "text" },
+          { prop: "deptId", label: "机构编码", type: "text" },
           {
             prop: "deptName",
             label: "机构名称",

src/views/PeopleManage/PartnerExtraction.vue

@@ -48,10 +48,10 @@ export default {
           },
           { prop: "proportional", label: "抽成比例", type: "text" },
           { prop: "sumpremium", label: "总保费", type: "text" },
-          { prop: "extractFee", label: "总保费抽成费用", type: "text" },
-          { prop: "historyFee", label: "已提现抽成费用", type: "text" },
-          { prop: "cashFee", label: "可提现抽成费用", type: "text" },
-          { prop: "startTime", label: "提层计算开始时间", type: "text" },
+          { prop: "extractFee", label: "抽成总金额", type: "text" },
+          { prop: "historyFee", label: "已提现金额", type: "text" },
+          { prop: "cashFee", label: "可提现金额", type: "text" },
+          { prop: "startTime", label: "核算开始时间", type: "text" },
         ],
         loading: true,
         isPaginationShow: true,