t20-common-lib 0.10.5 → 0.10.6

package/package.json

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

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

@@ -165,19 +165,22 @@ 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 && c.key) {
                   label = c.currencyType === 'origin' ? `${c.label}(${this.$l('原币')})` : `${c.label}(${this.$l('折')}${this.$l(defaultCurrencyName)})`
                 }
                 return {
@@ -194,7 +197,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}))
             }
           ]
         })