货代 2024-1-13

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -790,6 +790,25 @@
                     obj.checkNo = this.form.checkNo // CHK NO 对账单号
                     finstlbillsGetByDetail(obj).then(res=>{
                         let arr = res.data.data.finStlBillsItemsList.map((item)=>{
+                            if(item.curCode == 'CNY') {
+                                // 发票
+                                this.$set(item,'currentInvoiceAmountRMB',item.currentInvoiceAmount)
+                                // 应结算金额
+                                this.$set(item,'amountRMB',item.amount)
+                                // 已结算金额
+                                this.$set(item,'stlTtlAmountRMB',item.stlTtlAmount)
+                                // 本次金额
+                                this.$set(item,'currentStlAmountRMB',item.appliedCurrentStlAmount)
+                            }else {
+                                // 发票
+                                this.$set(item,'currentInvoiceAmountUSD',item.currentInvoiceAmount)
+                                // 应结算金额
+                                this.$set(item,'amountUSD',item.amount)
+                                // 已结算金额
+                                this.$set(item,'stlTtlAmountUSD',item.stlTtlAmount)
+                                // 本次金额
+                                this.$set(item,'currentStlAmountUSD',item.appliedCurrentStlAmount)
+                            }
                             delete item.id
                             return item
                         })
@@ -839,7 +858,7 @@
                                 // 已结算金额
                                 this.$set(item,'stlTtlAmountRMB',item.stlTtlAmount)
                                 // 本次金额
-                                this.$set(item,'currentStlAmountRMB',(Number(item.amount) - Number(item.stlTtlAmount) - Number(item.appliedAmount)).toFixed(2))
+                                this.$set(item,'currentStlAmountRMB',item.appliedCurrentStlAmount)
                             }else {
                                 // 发票
                                 this.$set(item,'currentInvoiceAmountUSD',item.currentInvoiceAmount)
@@ -848,7 +867,7 @@
                                 // 已结算金额
                                 this.$set(item,'stlTtlAmountUSD',item.stlTtlAmount)
                                 // 本次金额
-                                this.$set(item,'currentStlAmountUSD',(Number(item.amount) - Number(item.stlTtlAmount) - Number(item.appliedAmount)).toFixed(2))
+                                this.$set(item,'currentStlAmountUSD',item.appliedCurrentStlAmount)
                             }
                             return item
                         })

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -1045,7 +1045,7 @@ export default {
                     obj.corpId = this.form.corpId // 结算单位
                     obj.checkNo = this.form.checkNo // CHK NO 对账单号
                     finstlbillsGetByDetail(obj).then(res=>{
-                        let arr = res.data.data.map((item,index)=>{
+                        let arr = res.data.data.finStlBillsItemsList.map((item,index)=>{
                             item.lineNo = Number(index) + 1 // 行号
                             item.accBillId = item.id
                             item.accBillNo = item.billNo // JOB NO
@@ -1053,14 +1053,12 @@ export default {
                             item.accDate = item.createTime
                             item.currentCurCode = item.curCode
                             item.currentExrate = item.exrate
-                            item.dc = item.accountDc
-                            let amountdata = (Number(item.amount) - Number(item.appliedInvoiceAmount)).toFixed(2)
                             if (item.currentCurCode == 'CNY') {
                                 // 本次发票金额
-                                this.$set(item,'currentAmountCNY',amountdata)
+                                this.$set(item,'currentAmountCNY',item.appliedInvoiceCurrentStlAmount)
                             }else {
                                 // 本次发票金额
-                                this.$set(item,'currentAmountUSD',amountdata)
+                                this.$set(item,'currentAmountUSD',item.appliedInvoiceCurrentStlAmount)
                             }
                             delete item.id
                             return item
@@ -1098,13 +1096,12 @@ export default {
                             item.currentCurCode = item.curCode
                             item.currentExrate = item.exrate
                             item.dc = item.accountDc
-                            let amountdata = (Number(item.amount) - Number(item.appliedInvoiceAmount)).toFixed(2)
                             if (item.currentCurCode == 'CNY') {
                                 // 本次发票金额
-                                this.$set(item,'currentAmountCNY',amountdata)
+                                this.$set(item,'currentAmountCNY',item.appliedInvoiceCurrentStlAmount)
                             }else {
                                 // 本次发票金额
-                                this.$set(item,'currentAmountUSD',amountdata)
+                                this.$set(item,'currentAmountUSD',item.appliedInvoiceCurrentStlAmount)
                             }
                             delete item.id
                             return item

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -472,7 +472,7 @@
                 <finstlbillsitems :tableData="tableData"
                                   :form="form"
                                   :handleSelectionData="handleSelectionData"
-                                  :editSave="editSave"
+                                  :brfalse="!editSave"
                                   @handleSelectionChange="handleSelectionChange">
                 </finstlbillsitems>
             </el-card>
@@ -876,6 +876,7 @@
                     finstlbillsConfirmReconciliation(this.form).then(res=>{
                         this.pageLoading = false
                         this.$message.success('操作成功');
+                        this.editSave = true
                         this.finstlbillsDetailfun(res.data.data.id)
                     }).catch(err=>{
                         this.pageLoading = false