姜永辉 1 an în urmă
părinte
comite
03c5a67fb0

+ 4 - 3
package-basic-data/pages/customer-list/detail/detail.js

@@ -206,14 +206,15 @@ Page({
   setValuesByEdit(data) {
   setValuesByEdit(data) {
     data.name = 'edit'
     data.name = 'edit'
     if (!this.data.freeVersionFlag) { //专业版
     if (!this.data.freeVersionFlag) { //专业版
-      // 欠款 = 出库中 - 收款总额 - 期初
-      let outboundAmount = data.outboundAmount || 0 //出库
+      // 欠款 = 1️已出库 - 收款总额 + 期初(欠款)+ 退货(负值)))
+      let outboundAmount = data.outboundAmount || 0 //1️已出库
       let receiptResidue = data.receiptResidue || 0 //收款总额
       let receiptResidue = data.receiptResidue || 0 //收款总额
       let receiptLock = data.receiptLock || 0 //总收款锁定金额
       let receiptLock = data.receiptLock || 0 //总收款锁定金额
       let startAmount = data.startAmount || 0 //期初
       let startAmount = data.startAmount || 0 //期初
+      let outboundReturnAmount = data.outboundReturnAmount || 0
       let showreceiptResidue = receiptResidue + receiptLock
       let showreceiptResidue = receiptResidue + receiptLock
       data.showreceiptResidue = showreceiptResidue
       data.showreceiptResidue = showreceiptResidue
-      data.cusArrears = outboundAmount - showreceiptResidue - startAmount
+      data.cusArrears = outboundAmount - showreceiptResidue + startAmount + outboundReturnAmount
     }
     }
 
 
     this.setData({
     this.setData({

+ 4 - 3
package-purchase/pages/supplier-list/detail/detail.js

@@ -254,12 +254,13 @@ Page({
    * @author : 于继渤
    * @author : 于继渤
    */
    */
   setValuesByEdit(data) {
   setValuesByEdit(data) {
-    if (!this.data.freeVersionFlag) { //专业版
-      // 欠款 = 已入库 - 付款总额 - 期初余额
+    if (!this.data.freeVersionFlag) { //专业版 
+      // 欠款 = 已入库 - 付款总额  + 期初(欠款)+ 退货(负值)))
       let inboundAmount = data.inboundAmount || 0 //已入库
       let inboundAmount = data.inboundAmount || 0 //已入库
       let payment = data.payment || 0 //付款总额
       let payment = data.payment || 0 //付款总额
       let sumAmtPayable = data.sumAmtPayable || 0 //期初余额
       let sumAmtPayable = data.sumAmtPayable || 0 //期初余额
-      data.supplierArrears = inboundAmount - payment - sumAmtPayable
+      let inboundReturnAmount = data.inboundReturnAmount || 0
+      data.supplierArrears = inboundAmount - payment + sumAmtPayable + inboundReturnAmount
     }
     }
     this.setData({
     this.setData({
       item: data
       item: data