Browse Source

修改财务管理 空白补0 检索转换数字型

Qukatie 3 months ago
parent
commit
518a13382d

+ 24 - 14
src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -810,7 +810,8 @@ export default {
                                 this.$set(item, 'stlTtlAmountNetRMB', item.stlTtlAmountNet)
 
                                 this.$set(item, 'currentStlAmountNetRMB', item.currentStlAmountNet)
-                                this.$set(item, 'currentStlAmountRMB', item.currentStlAmount)
+                                this.$set(item, 'currentStlAmountRMB', Number(item.currentStlAmount?item.currentStlAmount:0))
+                                this.$set(item, 'currentStlAmountUSD', Number(0))
                             } else {
                                 this.$set(item, 'currentInvoiceAmountUSD', item.currentInvoiceAmount)
                                 this.$set(item, 'amountUSD', item.amount)
@@ -818,7 +819,8 @@ export default {
                                 this.$set(item, 'stlTtlAmountNetUSD', item.stlTtlAmountNet)
                                 this.$set(item, 'stlTtlAmountUSD', item.stlTtlAmount)
                                 this.$set(item, 'currentStlAmountNetUSD', item.currentStlAmountNet)
-                                this.$set(item, 'currentStlAmountUSD', item.currentStlAmount)
+                                this.$set(item, 'currentStlAmountUSD', Number(item.currentStlAmount?item.currentStlAmount:0))
+                                this.$set(item, 'currentStlAmountRMB', Number(0))
                             }
 
                             if (item.srcIdInvoices) {
@@ -870,7 +872,8 @@ export default {
                         this.$set(item, 'stlTtlAmountNetRMB', item.stlTtlAmountNet)
 
                         this.$set(item, 'currentStlAmountNetRMB', item.currentStlAmountNet)
-                        this.$set(item, 'currentStlAmountRMB', item.currentStlAmount)
+                        this.$set(item, 'currentStlAmountRMB', Number(item.currentStlAmount?item.currentStlAmount:0))
+                        this.$set(item, 'currentStlAmountUSD', Number(0))
                     } else {
                         this.$set(item, 'currentInvoiceAmountUSD', item.currentInvoiceAmount)
                         this.$set(item, 'amountUSD', item.amount)
@@ -879,7 +882,8 @@ export default {
                         this.$set(item, 'stlTtlAmountUSD', item.stlTtlAmount)
 
                         this.$set(item, 'currentStlAmountNetUSD', item.currentStlAmountNet)
-                        this.$set(item, 'currentStlAmountUSD', item.currentStlAmount)
+                        this.$set(item, 'currentStlAmountUSD', Number(item.currentStlAmount?item.currentStlAmount:0))
+                        this.$set(item, 'currentStlAmountRMB', Number(0))
                     }
 
                     if (item.srcIdInvoices) {
@@ -919,7 +923,8 @@ export default {
                         this.$set(item, 'stlTtlAmountNetRMB', item.stlTtlAmountNet)
 
                         this.$set(item, 'currentStlAmountNetRMB', item.currentStlAmountNet)
-                        this.$set(item, 'currentStlAmountRMB', item.currentStlAmount)
+                        this.$set(item, 'currentStlAmountRMB', Number(item.currentStlAmount?item.currentStlAmount:0))
+                        this.$set(item, 'currentStlAmountUSD', Number(0))
                     } else {
                         this.$set(item, 'currentInvoiceAmountUSD', item.currentInvoiceAmount)
                         this.$set(item, 'amountUSD', item.amount)
@@ -928,7 +933,8 @@ export default {
                         this.$set(item, 'stlTtlAmountUSD', item.stlTtlAmount)
 
                         this.$set(item, 'currentStlAmountNetUSD', item.currentStlAmountNet)
-                        this.$set(item, 'currentStlAmountUSD', item.currentStlAmount)
+                        this.$set(item, 'currentStlAmountUSD', Number(item.currentStlAmount?item.currentStlAmount:0))
+                        this.$set(item, 'currentStlAmountRMB', Number(0))
                     }
                     if (item.srcIdInvoices) {
                         this.settlementdistar = true
@@ -1038,11 +1044,12 @@ export default {
                             this.$set(item, 'stlTtlAmountRMB', item.stlTtlAmount)
                             if (item.dc == 'D') {
                                 // 本次金额
-                                this.$set(item, 'currentStlAmountRMB', item.currentStlAmount)
+                                this.$set(item, 'currentStlAmountRMB', Number(item.currentStlAmount?item.currentStlAmount:0))
                             } else {
                                 // 本次金额
-                                this.$set(item, 'currentStlAmountRMB', item.appliedCurrentStlAmount)
+                                this.$set(item, 'currentStlAmountRMB', Number(item.appliedCurrentStlAmount?item.appliedCurrentStlAmount:0))
                             }
+                            this.$set(item, 'currentStlAmountUSD', Number(0))
                         } else {
                             // 发票
                             this.$set(item, 'currentInvoiceAmountUSD', item.currentInvoiceAmount)
@@ -1053,11 +1060,12 @@ export default {
                             // 本次金额
                             if (item.dc == 'D') {
                                 // 本次金额
-                                this.$set(item, 'currentStlAmountUSD', item.currentStlAmount)
+                                this.$set(item, 'currentStlAmountUSD', Number(item.currentStlAmount?item.currentStlAmount:0))
                             } else {
                                 // 本次金额
-                                this.$set(item, 'currentStlAmountUSD', item.appliedCurrentStlAmount)
+                                this.$set(item, 'currentStlAmountUSD', Number(item.appliedCurrentStlAmount?item.appliedCurrentStlAmount:0))
                             }
+                            this.$set(item, 'currentStlAmountRMB', Number(0))
                         }
                         return item
                     })
@@ -1111,11 +1119,12 @@ export default {
                             // 本次金额
                             if (item.dc == 'D') {
                                 // 本次金额
-                                this.$set(item, 'currentStlAmountRMB', item.appliedInvoiceCurrentStlAmount)
+                                this.$set(item, 'currentStlAmountRMB', Number(item.appliedInvoiceCurrentStlAmount?item.appliedInvoiceCurrentStlAmount:0))
                             } else {
                                 // 本次金额
-                                this.$set(item, 'currentStlAmountRMB', item.appliedCurrentStlAmount)
+                                this.$set(item, 'currentStlAmountRMB', Number(item.appliedCurrentStlAmount?item.appliedCurrentStlAmount:0))
                             }
+                            this.$set(item, 'currentStlAmountUSD', Number(0))
                         } else {
                             // 发票
                             this.$set(item, 'currentInvoiceAmountUSD', item.currentInvoiceAmount)
@@ -1126,11 +1135,12 @@ export default {
                             // 本次金额
                             if (item.dc == 'D') {
                                 // 本次金额
-                                this.$set(item, 'currentStlAmountUSD', item.appliedInvoiceCurrentStlAmount)
+                                this.$set(item, 'currentStlAmountUSD', Number(item.appliedInvoiceCurrentStlAmount?item.appliedInvoiceCurrentStlAmount:0))
                             } else {
                                 // 本次金额
-                                this.$set(item, 'currentStlAmountUSD', item.appliedCurrentStlAmount)
+                                this.$set(item, 'currentStlAmountUSD', Number(item.appliedCurrentStlAmount?item.appliedCurrentStlAmount:0))
                             }
+                            this.$set(item, 'currentStlAmountRMB', Number(0))
                         }
                         return item
                     })

+ 12 - 6
src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -834,7 +834,8 @@ export default {
                         this.$set(item, 'stlTtlAmountNetRMB', item.stlTtlAmountNet)
 
                         this.$set(item, 'currentStlAmountNetRMB', item.currentStlAmountNet)
-                        this.$set(item, 'currentStlAmountRMB', item.currentStlAmount)
+                        this.$set(item, 'currentStlAmountRMB', Number(item.currentStlAmount ? item.currentStlAmount : 0))
+                        this.$set(item, 'currentStlAmountUSD', Number(0))
                     } else {
                         this.$set(item, 'currentInvoiceAmountUSD', item.currentInvoiceAmount)
                         this.$set(item, 'amountUSD', item.amount)
@@ -843,7 +844,8 @@ export default {
                         this.$set(item, 'stlTtlAmountUSD', item.stlTtlAmount)
 
                         this.$set(item, 'currentStlAmountNetUSD', item.currentStlAmountNet)
-                        this.$set(item, 'currentStlAmountUSD', item.currentStlAmount)
+                        this.$set(item, 'currentStlAmountUSD', Number(item.currentStlAmount ? item.currentStlAmount : 0))
+                        this.$set(item, 'currentStlAmountRMB', Number(0))
                     }
                     this.$set(item, 'costDate', [])
                     return item
@@ -948,7 +950,8 @@ export default {
                             // 已结算金额
                             this.$set(item, 'stlTtlAmountRMB', item.stlTtlAmount)
                             // 本次金额
-                            this.$set(item, 'currentStlAmountRMB', item.appliedCurrentStlAmount)
+                            this.$set(item, 'currentStlAmountRMB', Number(item.appliedCurrentStlAmount ? item.appliedCurrentStlAmount : 0))
+                            this.$set(item, 'currentStlAmountUSD', Number(0))
                         } else {
                             // 发票
                             this.$set(item, 'currentInvoiceAmountUSD', item.currentInvoiceAmount)
@@ -957,7 +960,8 @@ export default {
                             // 已结算金额
                             this.$set(item, 'stlTtlAmountUSD', item.stlTtlAmount)
                             // 本次金额
-                            this.$set(item, 'currentStlAmountUSD', item.appliedCurrentStlAmount)
+                            this.$set(item, 'currentStlAmountUSD', Number(item.appliedCurrentStlAmount ? item.appliedCurrentStlAmount : 0))
+                            this.$set(item, 'currentStlAmountRMB', Number(0))
                         }
                         delete item.id
                         return item
@@ -1011,7 +1015,8 @@ export default {
                             // 已结算金额
                             this.$set(item, 'stlTtlAmountRMB', item.stlTtlAmount)
                             // 本次金额
-                            this.$set(item, 'currentStlAmountRMB', item.appliedCurrentStlAmount)
+                            this.$set(item, 'currentStlAmountRMB', Number(item.appliedCurrentStlAmount ? item.appliedCurrentStlAmount : 0))
+                            this.$set(item, 'currentStlAmountUSD', Number(0))
                         } else {
                             // 发票
                             this.$set(item, 'currentInvoiceAmountUSD', item.currentInvoiceAmount)
@@ -1020,7 +1025,8 @@ export default {
                             // 已结算金额
                             this.$set(item, 'stlTtlAmountUSD', item.stlTtlAmount)
                             // 本次金额
-                            this.$set(item, 'currentStlAmountUSD', item.appliedCurrentStlAmount)
+                            this.$set(item, 'currentStlAmountUSD', Number(item.appliedCurrentStlAmount ? item.appliedCurrentStlAmount : 0))
+                            this.$set(item, 'currentStlAmountRMB', Number(0))
                         }
                         return item
                     })

+ 21 - 12
src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -1104,11 +1104,11 @@ export default {
                         item.currentCurCode = item.curCode
                         item.currentExrate = item.exrate
                         if (item.currentCurCode == 'CNY') {
-                            // 本次发票金额
-                            this.$set(item, 'currentAmountCNY', item.appliedInvoiceCurrentAmount)
+                            this.$set(item, 'currentAmountCNY', Number(item.appliedInvoiceCurrentAmount ? item.appliedInvoiceCurrentAmount : 0))
+                            this.$set(item, 'currentAmountUSD', Number(0))
                         } else {
-                            // 本次发票金额
-                            this.$set(item, 'currentAmountUSD', item.appliedInvoiceCurrentAmount)
+                            this.$set(item, 'currentAmountUSD', Number(item.appliedInvoiceCurrentAmount ? item.appliedInvoiceCurrentAmount : 0))
+                            this.$set(item, 'currentAmountCNY', Number(0))
                         }
                         delete item.id
                         return item
@@ -1151,11 +1151,11 @@ export default {
                         item.currentExrate = item.exrate
                         item.dc = item.accountDc
                         if (item.currentCurCode == 'CNY') {
-                            // 本次发票金额
-                            this.$set(item, 'currentAmountCNY', item.appliedInvoiceCurrentAmount)
+                            this.$set(item, 'currentAmountCNY', Number(item.appliedInvoiceCurrentAmount ? item.appliedInvoiceCurrentAmount : 0))
+                            this.$set(item, 'currentAmountUSD', Number(0))
                         } else {
-                            // 本次发票金额
-                            this.$set(item, 'currentAmountUSD', item.appliedInvoiceCurrentAmount)
+                            this.$set(item, 'currentAmountUSD', Number(item.appliedInvoiceCurrentAmount ? item.appliedInvoiceCurrentAmount : 0))
+                            this.$set(item, 'currentAmountCNY', Number(0))
                         }
                         delete item.id
                         return item
@@ -1207,10 +1207,17 @@ export default {
                 this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.split(',') : [] // 业务类型转换成数组显示
                 this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.split(',') : []
                 this.tableData = this.form.finInvoicesItemsList.map(item => {
+                    // if (item.currentCurCode == 'CNY') {
+                    //     item.currentAmountCNY = item.currentAmount
+                    // } else {
+                    //     item.currentAmountUSD = item.currentAmount
+                    // }
                     if (item.currentCurCode == 'CNY') {
-                        item.currentAmountCNY = item.currentAmount
+                        this.$set(item, 'currentAmountCNY', Number(item.currentAmount ? item.currentAmount : 0))
+                        this.$set(item, 'currentAmountUSD', Number(0))
                     } else {
-                        item.currentAmountUSD = item.currentAmount
+                        this.$set(item, 'currentAmountUSD', Number(item.currentAmount ? item.currentAmount : 0))
+                        this.$set(item, 'currentAmountCNY', Number(0))
                     }
                     return item
                 })
@@ -1233,9 +1240,11 @@ export default {
                 if (Array.isArray(this.form.finInvoicesItemsList)) {
                     this.tableData = this.form.finInvoicesItemsList.map(item => {
                         if (item.currentCurCode == 'CNY') {
-                            item.currentAmountCNY = item.currentAmount
+                            item.currentAmountCNY = Number(item.currentAmount ? item.currentAmount : 0)
+                            item.currentAmountUSD = Number(0)
                         } else {
-                            item.currentAmountUSD = item.currentAmount
+                            item.currentAmountUSD = Number(item.currentAmount ? item.currentAmount : 0)
+                            item.currentAmountCNY = Number(0)
                         }
                         return item
                     })

+ 12 - 6
src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -1288,10 +1288,12 @@ export default {
                         item.currentExrate = item.exrate
                         if (item.currentCurCode == 'CNY') {
                             // 本次发票金额
-                            this.$set(item, 'currentAmountCNY', item.appliedInvoiceCurrentAmount)
+                            this.$set(item, 'currentAmountCNY', Number(item.appliedInvoiceCurrentAmount?item.appliedInvoiceCurrentAmount:0))
+                            this.$set(item, 'currentAmountUSD',  Number(0))
                         } else {
                             // 本次发票金额
-                            this.$set(item, 'currentAmountUSD', item.appliedInvoiceCurrentAmount)
+                            this.$set(item, 'currentAmountUSD',  Number(item.appliedInvoiceCurrentAmount?item.appliedInvoiceCurrentAmount:0))
+                            this.$set(item, 'currentAmountCNY', Number(0))
                         }
                         delete item.id
                         return item
@@ -1335,10 +1337,12 @@ export default {
                         item.dc = item.accountDc
                         if (item.currentCurCode == 'CNY') {
                             // 本次发票金额
-                            this.$set(item, 'currentAmountCNY', item.appliedInvoiceCurrentAmount)
+                            this.$set(item, 'currentAmountCNY', Number(item.appliedInvoiceCurrentAmount?item.appliedInvoiceCurrentAmount:0))
+                            this.$set(item, 'currentAmountUSD',  Number(0))
                         } else {
                             // 本次发票金额
-                            this.$set(item, 'currentAmountUSD', item.appliedInvoiceCurrentAmount)
+                            this.$set(item, 'currentAmountUSD',  Number(item.appliedInvoiceCurrentAmount?item.appliedInvoiceCurrentAmount:0))
+                            this.$set(item, 'currentAmountCNY', Number(0))
                         }
                         delete item.id
                         return item
@@ -1392,9 +1396,11 @@ export default {
                 this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.split(',') : []
                 this.tableData = this.form.finInvoicesItemsList.map(item => {
                     if (item.currentCurCode == 'CNY') {
-                        this.$set(item, 'currentAmountCNY', item.currentAmount)
+                        this.$set(item, 'currentAmountCNY', Number(item.currentAmount?item.currentAmount:0))
+                        this.$set(item, 'currentAmountUSD',  Number(0))
                     } else {
-                        this.$set(item, 'currentAmountUSD', item.currentAmount)
+                        this.$set(item, 'currentAmountUSD', Number(item.currentAmount?item.currentAmount:0))
+                        this.$set(item, 'currentAmountCNY', Number(0))
                     }
                     return item
                 })

+ 17 - 8
src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -1234,10 +1234,12 @@ export default {
                         item.currentExrate = item.exrate
                         if (item.currentCurCode == 'CNY') {
                             // 本次发票金额
-                            item.currentAmountCNY = item.appliedInvoiceCurrentAmount
+                            item.currentAmountCNY = Number(item.appliedInvoiceCurrentAmount ? item.appliedInvoiceCurrentAmount : 0)
+                            item.currentAmountUSD = Number(0)
                         } else {
                             // 本次发票金额
-                            item.currentAmountUSD = item.appliedInvoiceCurrentAmount
+                            item.currentAmountUSD = Number(item.appliedInvoiceCurrentAmount ? item.appliedInvoiceCurrentAmount : 0)
+                            item.currentAmountCNY = Number(0)
                         }
                         delete item.id
                         return item
@@ -1283,10 +1285,12 @@ export default {
                         item.dc = item.accountDc
                         if (item.currentCurCode == 'CNY') {
                             // 本次发票金额
-                            item.currentAmountCNY = item.appliedInvoiceCurrentAmount
+                            item.currentAmountCNY = Number(item.appliedInvoiceCurrentAmount ? item.appliedInvoiceCurrentAmount : 0)
+                            item.currentAmountUSD = Number(0)
                         } else {
                             // 本次发票金额
-                            item.currentAmountUSD = item.appliedInvoiceCurrentAmount
+                            item.currentAmountUSD = Number(item.appliedInvoiceCurrentAmount ? item.appliedInvoiceCurrentAmount : 0)
+                            item.currentAmountCNY = Number(0)
                         }
                         delete item.id
                         return item
@@ -1338,9 +1342,11 @@ export default {
                 this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.split(',') : []
                 this.tableData = this.form.finInvoicesItemsList.map(item => {
                     if (item.currentCurCode == 'CNY') {
-                        item.currentAmountCNY = item.currentAmount
+                        this.$set(item, 'currentAmountCNY', Number(item.currentAmount?item.currentAmount:0))
+                        this.$set(item, 'currentAmountUSD',  Number(0))
                     } else {
-                        item.currentAmountUSD = item.currentAmount
+                        this.$set(item, 'currentAmountUSD', Number(item.currentAmount?item.currentAmount:0))
+                        this.$set(item, 'currentAmountCNY', Number(0))
                     }
                     return item
                 })
@@ -1366,10 +1372,13 @@ export default {
                 if (Array.isArray(this.form.finInvoicesItemsList)) {
                     this.tableData = this.form.finInvoicesItemsList.map(item => {
                         if (item.currentCurCode == 'CNY') {
-                            item.currentAmountCNY = item.currentAmount
+                            item.currentAmountCNY = Number(item.currentAmount?item.currentAmount:0)
+                            item.currentAmountUSD = Number(0)
                         } else {
-                            item.currentAmountUSD = item.currentAmount
+                            item.currentAmountUSD = Number(item.currentAmount?item.currentAmount:0)
+                            item.currentAmountCNY = Number(0)
                         }
+
                         return item
                     })
                 }

+ 15 - 11
src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -854,14 +854,16 @@ export default {
                 this.tableData = this.form.finStlBillsItemsList.map(item => {
                     if (item.curCode == 'CNY') {
                         this.$set(item, 'amountRMB', item.amount)
-                        this.$set(item, 'currentInvoiceAmountRMB', item.currentInvoiceAmount)
-                        this.$set(item, 'unsettledAmountRMB', item.unsettledAmount)
-                        this.$set(item, 'currentStlAmountRMB', item.currentStlAmount)
+                        this.$set(item, 'currentInvoiceAmountRMB', Number(item.currentInvoiceAmount?item.currentInvoiceAmount:0))
+                        this.$set(item, 'unsettledAmountRMB', Number(item.unsettledAmount?item.unsettledAmount:0))
+                        this.$set(item, 'currentStlAmountRMB', Number(item.currentStlAmount?item.currentStlAmount:0))
+                        this.$set(item, 'currentStlAmountUSD', Number(0))
                     } else {
                         this.$set(item, 'amountUSD', item.amount)
                         this.$set(item, 'currentInvoiceAmountUSD', item.currentInvoiceAmount)
-                        this.$set(item, 'unsettledAmountUSD', item.unsettledAmount)
-                        this.$set(item, 'currentStlAmountUSD', item.currentStlAmount)
+                        this.$set(item, 'unsettledAmountUSD', Number(item.unsettledAmount?item.unsettledAmount:0))
+                        this.$set(item, 'currentStlAmountUSD', Number(item.currentStlAmount?item.currentStlAmount:0))
+                        this.$set(item, 'currentStlAmountRMB', Number(0))
                     }
                     this.$set(item, 'costDate', [])
                     return item
@@ -1002,14 +1004,16 @@ export default {
                     item.dc = item.accountDc // 收付
                     if (item.curCode == 'CNY') {
                         this.$set(item, 'amountRMB', item.amount)
-                        this.$set(item, 'currentInvoiceAmountRMB', item.currentInvoiceAmount)
-                        this.$set(item, 'unsettledAmountRMB', item.unsettledAmount)
-                        this.$set(item, 'currentStlAmountRMB', item.reconciliationCurrentAmount)
+                        this.$set(item, 'currentInvoiceAmountRMB',Number(item.currentInvoiceAmount?item.currentInvoiceAmount:0) )
+                        this.$set(item, 'unsettledAmountRMB', Number(item.unsettledAmount?item.unsettledAmount:0))
+                        this.$set(item, 'currentStlAmountRMB', Number(item.reconciliationCurrentAmount?item.reconciliationCurrentAmount:0))
+                        this.$set(item, 'currentStlAmountUSD', Number(0))
                     } else {
                         this.$set(item, 'amountUSD', item.amount)
-                        this.$set(item, 'currentInvoiceAmountUSD', item.currentInvoiceAmount)
-                        this.$set(item, 'unsettledAmountUSD', item.unsettledAmount)
-                        this.$set(item, 'currentStlAmountUSD', item.reconciliationCurrentAmount)
+                        this.$set(item, 'currentInvoiceAmountUSD', Number(item.currentInvoiceAmount?item.currentInvoiceAmount:0))
+                        this.$set(item, 'unsettledAmountUSD', Number(item.unsettledAmount?item.unsettledAmount:0))
+                        this.$set(item, 'currentStlAmountUSD', Number(item.reconciliationCurrentAmount?item.reconciliationCurrentAmount:0))
+                        this.$set(item, 'currentStlAmountRMB', Number(0))
                     }
                     return item
                 })