Merge branch 'master' of http://code.diaosaas.com/yuchen/park-ui

src/views/analysis/eattingAnalysis/index.vue

@@ -46,12 +46,12 @@
       <el-table-column label="名称" align="center" prop="userName" />
       <el-table-column label="账号" align="center" prop="employeeId" />
       <el-table-column label="早餐就餐份数" align="center" prop="breakfastCount" />
-      <el-table-column label="早餐就餐总费用" align="center" prop="breakfastPrice" :formatter="formatterrebreakfastPrice"/>
+      <el-table-column label="早餐就餐总费用(单位：元）" align="center" prop="breakfastPrice" :formatter="formatterrebreakfastPrice"/>
       <el-table-column label="午餐就餐份数" align="center" prop="lunchCount" />
-      <el-table-column label="午餐就餐总费用" align="center" prop="lunchPrice"  :formatter="formatterrelunchPrice"/>
+      <el-table-column label="午餐就餐总费用(单位：元）" align="center" prop="lunchPrice"  :formatter="formatterrelunchPrice"/>
       <el-table-column label="晚餐就餐份数" align="center" prop="dinnerCount" />
-      <el-table-column label="晚餐就餐总费用" align="center" prop="dinnerPrice" :formatter="formatterredinnerPrice"/>
-      <el-table-column label="全天用餐总费用" align="center" prop="totalPrice" :formatter="formatterretotalPrice"/>
+      <el-table-column label="晚餐就餐总费用(单位：元）" align="center" prop="dinnerPrice" :formatter="formatterredinnerPrice"/>
+      <el-table-column label="全天用餐总费用(单位：元）" align="center" prop="totalPrice" :formatter="formatterretotalPrice"/>
       <el-table-column label="日期" align="center" prop="createDate" />
     </el-table>
 

src/views/analysis/personalAnalysis/index.vue

@@ -43,11 +43,11 @@
       <el-table-column label="员工账号" align="center" prop="userId" />
       <el-table-column label="所属部门" align="center" prop="department" />
       <el-table-column label="员工名称" align="center" prop="nickName" />
-      <el-table-column label="余额" align="center" prop="balance" :formatter="formatterbalance" />
-      <el-table-column label="充值总额" align="center" prop="rechargeTotal" :formatter="formatterrechargeTotal"/>
-      <el-table-column label="待付款" align="center" prop="prepayment"  :formatter="formatterprepayment"/>
-      <el-table-column label="消费总额" align="center" prop="consumeTotal" :formatter="formatterconsumeTotal" />
-      <el-table-column label="补贴金额" align="center" prop="allowanceTotal" :formatter="formatterallowanceTotal" />
+      <el-table-column label="余额(单位：元）" align="center" prop="balance" :formatter="formatterbalance" />
+      <el-table-column label="充值总额(单位：元）" align="center" prop="rechargeTotal" :formatter="formatterrechargeTotal"/>
+      <el-table-column label="待付款(单位：元）" align="center" prop="prepayment"  :formatter="formatterprepayment"/>
+      <el-table-column label="消费总额(单位：元）" align="center" prop="consumeTotal" :formatter="formatterconsumeTotal" />
+      <el-table-column label="补贴金额(单位：元）" align="center" prop="allowanceTotal" :formatter="formatterallowanceTotal" />
     </el-table>
 
     <pagination

src/views/analysis/rechargeRecord/index.vue

@@ -44,7 +44,7 @@
       <el-table-column label="充值日期" align="center" prop="createTime" />
       <el-table-column label="姓名" align="center" prop="name" />
       <el-table-column label="部门名称" align="center" prop="deptName" />
-      <el-table-column label="金额" align="center" prop="amount" />
+      <el-table-column label="金额(单位：元）" align="center" prop="amount" :formatter="formatteramount" />
     </el-table>
 
     <pagination
@@ -123,6 +123,9 @@
           this.loading = false;
         });
       },
+      formatteramount(row, column) {
+        return row.amount / 100;
+      },
       /** 查询所有部门 */
       getallList() {
         this.loading = true;

src/views/analysis/summaryAnalysis/index.vue

@@ -32,16 +32,16 @@
     <el-table v-loading="loading" :data="applyList" @selection-change="handleSelectionChange">
       <el-table-column label="部门" align="center" prop="deptName" />
       <el-table-column label="职员总报餐" align="center" prop="totalRecipeCount" />
-      <el-table-column label="职员总消费" align="center" prop="totalRecipePrice" />
+      <el-table-column label="职员总消费(单位：元）" align="center" prop="totalRecipePrice" :formatter="formattertotalRecipePrice"/>
       <el-table-column label="部门早餐汇总报餐" align="center" prop="breakfastCount" />
-      <el-table-column label="早餐消费" align="center" prop="breakfastPrice" />
+      <el-table-column label="早餐消费(单位：元）" align="center" prop="breakfastPrice" :formatter="formatterbreakfastPrice"/>
       <el-table-column label="部门中餐总报餐" align="center" prop="lunchCount" />
-      <el-table-column label="中餐消费" align="center" prop="lunchPrice" />
+      <el-table-column label="中餐消费(单位：元）" align="center" prop="lunchPrice" :formatter="formatterlunchPrice"/>
       <el-table-column label="部门晚餐总报餐" align="center" prop="dinnerCount" />
-      <el-table-column label="晚餐消费" align="center" prop="dinnerPrice" />
+      <el-table-column label="晚餐消费(单位：元）" align="center" prop="dinnerPrice" :formatter="formatterdinnerPrice"/>
 <!--      <el-table-column label="部门总补贴" align="center" prop="status" />-->
       <el-table-column label="部门客餐总报餐" align="center" prop="formalCount" />
-      <el-table-column label="客餐消费" align="center" prop="formalPrice" />
+      <el-table-column label="客餐消费(单位：元）" align="center" prop="formalPrice" :formatter="formatterformalPrice"/>
       <el-table-column label="日期" align="center" prop="date" />
     </el-table>
 
@@ -117,6 +117,26 @@
       });
     },
     methods: {
+      formattertotalRecipePrice(row, column) {
+        return row.totalRecipePrice / 100;
+      },
+
+      formatterbreakfastPrice(row, column) {
+        return row.breakfastPrice / 100;
+      },
+
+      formatterlunchPrice(row, column) {
+        return row.lunchPrice / 100;
+      },
+
+      formatterdinnerPrice(row, column) {
+        return row.dinnerPrice / 100;
+      },
+
+      formatterformalPrice(row, column) {
+        return row.formalPrice / 100;
+      },
+
       /** 查询数据列表 */
       getList() {
         this.loading = true;

src/views/formalRecipe/formalRecipeCheck/index.vue

@@ -57,7 +57,7 @@
       <el-table-column label="客餐类型" align="center" prop="applyPeriod" />
       <el-table-column label="客餐理由" align="center" prop="remark" />
       <el-table-column label="客餐数量" align="center" prop="applyAmount" />
-      <el-table-column label="客餐总金额" align="center" prop="totalMoneny" :formatter="formatterTotalMoneny"/>
+      <el-table-column label="客餐总金额(单位：元）" align="center" prop="totalMoneny" :formatter="formatterTotalMoneny"/>
       <el-table-column label="申请人" align="center" prop="nickName" />
       <el-table-column label="所在部门" align="center" prop="deptName" />
       <el-table-column label="状态" align="center" prop="status" >

src/views/rule/allowance/index.vue

@@ -11,7 +11,7 @@
     <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="40" align="center" :show-overflow-tooltip="true"/>
       <el-table-column label="部门" align="center" prop="deptName" :show-overflow-tooltip="true" />
-      <el-table-column label="补贴" align="center" prop="departmentAllowance" :formatter="formatter" :show-overflow-tooltip="true"/>
+      <el-table-column label="补贴(单位：元）" align="center" prop="departmentAllowance" :formatter="formatter" :show-overflow-tooltip="true"/>
     </el-table>
 
     <!--分页按钮组-->