Browse Source

Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner-admin into dev

lifanagju_citu 9 months ago
parent
commit
0238e0b03a

+ 2 - 2
src/views/menduner/system/enterprise/message/details/index.vue

@@ -9,7 +9,7 @@
           <Info :id="id"/>
         </el-card>
       </el-col>
-      <el-col :span="12">
+      <el-col v-hasPermi="['menduner:system:enterprise-business:query']" :span="12">
         <el-card shadow="never">
           <template #header>
             <CardTitle title="企业工商信息" />
@@ -26,7 +26,7 @@
             <el-tab-pane label="下级企业">
               <SubordinateEnterprises :id="id" />
             </el-tab-pane>
-            <el-tab-pane label="岗位管理">
+            <el-tab-pane v-hasPermi="['menduner:system:enterprise-post:query']" label="岗位管理">
               <EnterprisePost :id="id" />
             </el-tab-pane>
             <el-tab-pane label="企业用户">

+ 1 - 1
src/views/menduner/system/enterprise/userbind/details/index.vue

@@ -12,7 +12,7 @@
       <el-col :span="12">
         <el-card shadow="never">
           <template #header>
-            <CardTitle title="账户详情" />
+            <CardTitle title="账户信息" />
           </template>
           <Account :user-id="userId" :enterprise-id="enterpriseId" />
         </el-card>

+ 4 - 4
src/views/menduner/system/person/details/components/account.vue

@@ -3,10 +3,10 @@
     <el-descriptions class="margin-top" :column="1" border>
       <el-descriptions-item label="用户类型">{{ info.userType === '1' ? '管理员' : '普通用户' }}</el-descriptions-item>
       <el-descriptions-item label="账户积分">{{ info.point }}</el-descriptions-item>
-      <el-descriptions-item label="账户余额">{{ info.balance }}</el-descriptions-item>
-      <el-descriptions-item label="累计支出">{{ info.totalExpense }}</el-descriptions-item>
-      <el-descriptions-item label="累计充值">{{ info.totalRecharge }}</el-descriptions-item>
-      <el-descriptions-item label="冻结金额">{{ info.freezePrice }}</el-descriptions-item>
+      <el-descriptions-item label="账户余额">{{ (info.balance / 100.0).toFixed(2) }}</el-descriptions-item>
+      <el-descriptions-item label="累计支出">{{ (info.totalExpense / 100.0).toFixed(2) }}</el-descriptions-item>
+      <el-descriptions-item label="累计充值">{{ (info.totalRecharge / 100.0).toFixed(2) }}</el-descriptions-item>
+      <el-descriptions-item label="冻结金额">{{ (info.freezePrice / 100.0).toFixed(2) }}</el-descriptions-item>
       <el-descriptions-item label="创建时间">{{ formatDate(info.createTime) }}</el-descriptions-item>
     </el-descriptions>
   </div>

+ 6 - 6
src/views/menduner/system/person/details/index.vue

@@ -31,22 +31,22 @@
       <el-col :span="24">
         <el-card shadow="never">
           <el-tabs>
-            <el-tab-pane label="教育经历">
+            <el-tab-pane v-hasPermi="['menduner:system:edu-exp:query']" label="教育经历">
               <Edu :user-id="userId" />
             </el-tab-pane>
-            <el-tab-pane label="工作经历">
+            <el-tab-pane v-hasPermi="['menduner:system:work-exp:query']" label="工作经历">
               <Exp :user-id="userId" />
             </el-tab-pane>
-            <el-tab-pane label="项目经历">
+            <el-tab-pane v-hasPermi="['menduner:system:project-exp:query']" label="项目经历">
               <Project :user-id="userId" />
             </el-tab-pane>
-            <el-tab-pane label="求职意向">
+            <el-tab-pane v-hasPermi="['menduner:system:job-interested:query']" label="求职意向">
               <JobIntention :user-id="userId" />
             </el-tab-pane>
-            <el-tab-pane label="钱包充值记录">
+            <el-tab-pane v-hasPermi="['menduner:system:user-account:query']" label="钱包充值记录">
               <RechargeOrder :user-id="userId" />
             </el-tab-pane>
-            <el-tab-pane label="积分变动记录">
+            <el-tab-pane v-hasPermi="['menduner:system:user-account-record:query']" label="积分变动记录">
               <PointsChange :user-id="userId" />
             </el-tab-pane>
           </el-tabs>

+ 2 - 3
src/views/menduner/system/person/index.vue

@@ -103,14 +103,14 @@
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
+        <!-- <el-button
           type="primary"
           plain
           @click="openForm('create')"
           v-hasPermi="['menduner:system:person-info:create']"
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
+        </el-button> -->
         <el-button
           type="success"
           plain
@@ -127,7 +127,6 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="id" align="center" prop="id" />
       <el-table-column label="用户id" align="center" prop="userId" />
       <el-table-column label="真实姓名" align="center" prop="name" />
       <el-table-column label="用户性别" align="center" prop="sex">