lilei 2 週間 前
コミット
dc867c3527

+ 1 - 1
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -56,7 +56,7 @@
           应收合计 <strong>{{ (productTotal&&(productTotal.receiveSettleAmountReceipt || productTotal.receiveSettleAmountReceipt==0)) ? toThousands(productTotal.receiveSettleAmountReceipt) : '--' }}</strong> ,
           已收合计 <strong>{{ (productTotal&&(productTotal.settleAmountReceipt || productTotal.settleAmountReceipt==0)) ? toThousands(productTotal.settleAmountReceipt) : '--' }}</strong> ,
           待收合计 <strong>{{ (productTotal&&(productTotal.unsettleAmountReceipt || productTotal.unsettleAmountReceipt==0)) ? toThousands(productTotal.unsettleAmountReceipt) : '--' }}</strong> ,
-          应付合计 <strong>{{ (productTotal&&(productTotal.receivesettleAmountPay || productTotal.receivesettleAmountPay==0)) ? toThousands(productTotal.receivesettleAmountPay) : '--' }}</strong> ;
+          应付合计 <strong>{{ (productTotal&&(productTotal.receiveSettleAmountPay || productTotal.receiveSettleAmountPay==0)) ? toThousands(productTotal.receiveSettleAmountPay) : '--' }}</strong> ;
           已付合计 <strong>{{ (productTotal&&(productTotal.settleAmountPay || productTotal.settleAmountPay==0)) ? toThousands(productTotal.settleAmountPay) : '--' }}</strong> ,
           待付合计 <strong>{{ (productTotal&&(productTotal.unsettleAmountPay || productTotal.unsettleAmountPay==0)) ? toThousands(productTotal.unsettleAmountPay) : '--' }}</strong> ,
           折让合计 <strong>{{ (productTotal&&(productTotal.discountAmount || productTotal.discountAmount==0)) ? toThousands(productTotal.discountAmount) : '--' }}</strong> ;

+ 4 - 4
src/views/financialManagement/companyReceivablePayableNew/list.vue

@@ -56,12 +56,12 @@
         <div class="table-operator">
           <div slot="message">
             共 <strong>{{ total }}</strong> 条记录,
-            应收合计 <strong>{{ (productTotal&&(productTotal.unsettleAmountReceipt || productTotal.unsettleAmountReceipt==0)) ? toThousands(productTotal.unsettleAmountReceipt) : '--' }}</strong> ,
+            应收合计 <strong>{{ (productTotal&&(productTotal.receiveSettleAmountReceipt || productTotal.receiveSettleAmountReceipt==0)) ? toThousands(productTotal.receiveSettleAmountReceipt) : '--' }}</strong> ,
             已收合计 <strong>{{ (productTotal&&(productTotal.settleAmountReceipt || productTotal.settleAmountReceipt==0)) ? toThousands(productTotal.settleAmountReceipt) : '--' }}</strong> ,
-            待收合计 <strong>{{ (productTotal&&(productTotal.waitSettleAmountReceipt || productTotal.waitSettleAmountReceipt==0)) ? toThousands(productTotal.waitSettleAmountReceipt) : '--' }}</strong> ,
-            应付合计 <strong>{{ (productTotal&&(productTotal.unsettleAmountPay || productTotal.unsettleAmountPay==0)) ? toThousands(productTotal.unsettleAmountPay) : '--' }}</strong> ;
+            待收合计 <strong>{{ (productTotal&&(productTotal.unsettleAmountReceipt || productTotal.unsettleAmountReceipt==0)) ? toThousands(productTotal.unsettleAmountReceipt) : '--' }}</strong> ,
+            应付合计 <strong>{{ (productTotal&&(productTotal.receiveSettleAmountPay || productTotal.receiveSettleAmountPay==0)) ? toThousands(productTotal.receiveSettleAmountPay) : '--' }}</strong> ;
             已付合计 <strong>{{ (productTotal&&(productTotal.settleAmountPay || productTotal.settleAmountPay==0)) ? toThousands(productTotal.settleAmountPay) : '--' }}</strong> ,
-            待付合计 <strong>{{ (productTotal&&(productTotal.waitSettleAmountPay || productTotal.waitSettleAmountPay==0)) ? toThousands(productTotal.waitSettleAmountPay) : '--' }}</strong> ,
+            待付合计 <strong>{{ (productTotal&&(productTotal.unsettleAmountPay || productTotal.unsettleAmountPay==0)) ? toThousands(productTotal.unsettleAmountPay) : '--' }}</strong> ,
             折让合计 <strong>{{ (productTotal&&(productTotal.discountAmount || productTotal.discountAmount==0)) ? toThousands(productTotal.discountAmount) : '--' }}</strong> ;
             余额合计 <strong>{{ (productTotal&&(productTotal.balance || productTotal.balance==0)) ? toThousands(productTotal.balance) : '--' }}</strong> ;
           </div>