t20-common-lib 0.10.5 → 0.10.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "t20-common-lib",
-  "version": "0.10.5",
+  "version": "0.10.7",
   "description": "T20",
   "private": false,
   "main": "dist/index.js",

package/packages/multi-currency-statistics/src/main.vue

@@ -97,21 +97,23 @@ export default {
         const coins = selectedList.filter(item => {
           return item.currencyName === statistic.title
         })
-
+        
+        const statisChildList = this.config.filter(c => !c.currencyType || c.currencyType === 'origin')
         if (coins.length) {
           const statis = [
             {
               type: this.$l('已选合计'), //已选合计
-              list: this.config.map(c => ({
-                label: c.label,
-                value: (() => {
-                  if (c.label === this.$l('笔数')) {
-                    //笔|条 数
-                    return coins.length
-                  }
-                  return coins.reduce((amount, item) => amount + item[c.key], 0)
-                })()
-              }))
+              list: statisChildList.map(c => {
+                return {
+                  label: c.label,
+                  value: (() => {
+                    if (c.label === this.$l('笔数')) {
+                      //笔|条 数
+                      return coins.length
+                    }
+                    return coins.reduce((amount, item) => amount + item[c.key], 0)
+                  })()
+                }})
             }
           ]
           this.selectStatistics.push({...statistic, statis})
@@ -165,19 +167,24 @@ export default {
       const allStatistics = []
       const selectedStatistics = []
       let defaultCurrencyName = this.$l('人民币')
+      let defaultCurrencyNo = 'CNY'
       if (this.$store && this.$store.state && this.$store.state.user && this.$store.state.user.defaultCurrencyName) {
         defaultCurrencyName = this.$store.state.user.defaultCurrencyName
+        defaultCurrencyNo = this.$store.state.user.defaultCurrencyNo
       }
       this.views.forEach(item => {
+        const statisChildList = item.currencyNo !== defaultCurrencyNo ? this.config : this.config.filter(c => !c.currencyType || c.currencyType === 'origin')
         allStatistics.push({
           title: item.currencyName,
           currencyNo: item.currencyNo,
           statis: [
             {
               type: this.$l('全部合计'), //全部合计
-              list: this.config.map((c, i) => {
+              list: statisChildList.map(c => {
                 let label = c.label
-                if (i !== 0) {
+                if (item.currencyNo === defaultCurrencyNo) {
+                  label = c.label + this.$l('(原币)')
+                } else if (c.key) {
                   label = c.currencyType === 'origin' ? `${c.label}(${this.$l('原币')})` : `${c.label}(${this.$l('折')}${this.$l(defaultCurrencyName)})`
                 }
                 return {
@@ -194,7 +201,7 @@ export default {
           statis: [
             {
               type: this.$l('已选合计'), //已选合计
-              list: this.config.map(c => ({label: c.label, value: 0}))
+              list: (this.config.filter(c => !c.currencyType || c.currencyType === 'origin')).map(c => ({label: c.label, value: 0}))
             }
           ]
         })