Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt

src/views/bpm/handleTask/components/purchaseOrder/accountstatement/page.vue

@@ -9,7 +9,7 @@
     <headerTitle title="对账明细" style="margin-top: 30px">
       <template v-slot>
         <el-row style="font-weight: 700; color: red">
-            <span>总金额：</span>
+            <span>订单总金额：</span>
             <span>{{ dataForm.orderTotalAmount || 0 }}</span>
             <el-divider direction="vertical"></el-divider>
             <span>已对账金额：</span>
@@ -120,9 +120,10 @@ export default {
       let data = await accountstatementInfoAPI(id)
       this.datasource = data?.orderList || []
       // this.recorpayList=data?.recorpayList||[]
-      data.amountTotalPrice = data.orderList.reduce((pre, cur) => pre + +cur.amountTotalPrice, 0),
-      data.amountCompletePrice = data.orderList.reduce((pre, cur) => pre + +cur.statementAmount, 0),
-      data.amountUnCompletePrice = data.orderList.reduce((pre, cur) => pre + +cur.unStatementAmount, 0)
+      data.orderTotalAmount = data.orderList.reduce((pre, cur) => pre + Math.round(+cur.orderAmount * 100), 0) / 100;
+      data.amountTotalPrice = data.orderList.reduce((pre, cur) => pre + Math.round(+cur.statementAmount * 100), 0) / 100;
+      data.amountCompletePrice = data.orderList.reduce((pre, cur) => pre + Math.round(+cur.statementedAmount * 100), 0) / 100;
+      data.amountUnCompletePrice = data.orderList.reduce((pre, cur) => pre + Math.round(+cur.unStatementAmount * 100), 0) / 100;
       this.dataForm = data
       // this.priceObj.amountNotInvoicedPrice = data.amountNotInvoicedPrice
       switch (this.dataForm.dateType) {

src/views/bpm/handleTask/components/saleOrder/accountstatement/inventoryTable.vue

@@ -82,9 +82,9 @@
             <div class="collapse-title-left"><span class="collapse-title-index">{{ index + 1 }}</span> {{ type == 'purchase' ? '采购订单' : '销售订单' }}：{{ item.orderNo }}</div>
             <div class="collapse-title-right">
               <span>订单金额：{{ item.orderAmount || 0 }}元</span>
-              <span>已对账金额：{{ item.statementAmount || 0 }}元</span>
+              <span>已对账金额：{{ item.statementedAmount || 0 }}元</span>
               <span>未对账金额：{{ item.unStatementAmount || 0 }}元</span>
-              <span>本次对账金额：{{ item.amountTotalPrice || 0 }}元</span>
+              <span>本次对账金额：{{ item.statementAmount || 0 }}元</span>
             </div>
           </div>
         </template>

src/views/bpm/handleTask/components/saleOrder/accountstatement/page.vue

@@ -9,7 +9,7 @@
     <headerTitle title="对账明细" style="margin-top: 30px">
       <template v-slot>
         <el-row style="font-weight: 700; color: red">
-            <span>总金额：</span>
+            <span>订单总金额：</span>
             <span>{{ dataForm.orderTotalAmount || 0 }}</span>
             <el-divider direction="vertical"></el-divider>
             <span>已对账金额：</span>
@@ -124,9 +124,10 @@ export default {
       let data = await accountstatementInfoAPI(id)
       this.datasource = data?.orderList || []
       // this.recorpayList=data?.recorpayList||[]
-      data.amountTotalPrice = data.orderList.reduce((pre, cur) => pre + +cur.amountTotalPrice, 0),
-      data.amountCompletePrice = data.orderList.reduce((pre, cur) => pre + +cur.statementAmount, 0),
-      data.amountUnCompletePrice = data.orderList.reduce((pre, cur) => pre + +cur.unStatementAmount, 0)
+      data.orderTotalAmount = data.orderList.reduce((pre, cur) => pre + Math.round(+cur.orderAmount * 100), 0) / 100;
+      data.amountTotalPrice = data.orderList.reduce((pre, cur) => pre + Math.round(+cur.statementAmount * 100), 0) / 100;
+      data.amountCompletePrice = data.orderList.reduce((pre, cur) => pre + Math.round(+cur.statementedAmount * 100), 0) / 100;
+      data.amountUnCompletePrice = data.orderList.reduce((pre, cur) => pre + Math.round(+cur.unStatementAmount * 100), 0) / 100;
       this.dataForm = data
       //this.priceObj.previousPeriodEndDebt = data.previousPeriodEndDebt
       switch (this.dataForm.dateType) {