Skip to content

A
account-book
Commit 5c3356b0 authored by Facius's avatar Facius
Browse files
Options

fix: 借支字段取错了

parent f5c56a8c
Pipeline #3989 canceled with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 2 additions and 2 deletions
      pages/workpoint/project-bill/components/cell-project-bill.vue
      View file @ 5c3356b0
      ...@@ -54,7 +54,7 @@ export default { ...@@ -54,7 +54,7 @@ export default {
      memberId: this.member.memberId, memberId: this.member.memberId,
      memberName: this.member.memberName, memberName: this.member.memberName,
      settleAmount: formatCount(Math.abs(Number(this.member.settleAmount || 0))), // 已结工资 settleAmount: formatCount(Math.abs(Number(this.member.settleAmount || 0))), // 已结工资
      borrowingAmount: formatCount(Number(this.member.contractorAmount || 0)), // 借支金额 borrowingAmount: formatCount(Number(this.member.borrowingAmount || 0)), // 借支金额
      unsettleAmount: formatCount(all + Number(this.member.settleAmount || 0)), // 未结工资 unsettleAmount: formatCount(all + Number(this.member.settleAmount || 0)), // 未结工资
      normalWorkTime: this.member.normalWorkTime, // 上班工时 normalWorkTime: this.member.normalWorkTime, // 上班工时
      overWorkTIme: this.member.overWorkTIme, // 加班工量 overWorkTIme: this.member.overWorkTIme, // 加班工量
      ......
      pages/workpoint/project-bill/components/summary-count.vue
      View file @ 5c3356b0
      ...@@ -40,7 +40,7 @@ export default { ...@@ -40,7 +40,7 @@ export default {
      return { return {
      all: keepWFull(all), // 项目工资 all: keepWFull(all), // 项目工资
      settleAmount: keepWFull(Math.abs(parseFloat(this.detail.settleAmount || 0))), // 已结工资 settleAmount: keepWFull(Math.abs(parseFloat(this.detail.settleAmount || 0))), // 已结工资
      borrowingAmount: keepWFull(parseFloat(this.detail.contractorAmount || 0)), // 借支金额 borrowingAmount: keepWFull(parseFloat(this.detail.unsettleAmount || 0)), // 借支金额
      unsettleAmount: keepWFull(all + parseFloat(this.detail.settleAmount || 0)), // 未结工资 unsettleAmount: keepWFull(all + parseFloat(this.detail.settleAmount || 0)), // 未结工资
      normalWorkTime: this.detail.normalWorkTime, // 上班工时 normalWorkTime: this.detail.normalWorkTime, // 上班工时
      overWorkTIme: this.detail.overWorkTIme, // 加班工量 overWorkTIme: this.detail.overWorkTIme, // 加班工量
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment