Sfoglia il codice sorgente

fix: 修复对账单总金额计算问题

liujt 4 mesi fa
parent
commit
ab62eedd27

+ 1 - 1
src/views/contractManage/contractBook/index.vue

@@ -221,7 +221,7 @@
     ></autogenerate-dialog>
     <process-submit-dialog
       api-fun-name="contractStatusAPI"
-      isCloseRefresh="false"
+      :isCloseRefresh="false"
       :processSubmitDialogFlag.sync="processSubmitDialogFlag"
       v-if="processSubmitDialogFlag"
       ref="processSubmitDialogRef"

+ 5 - 3
src/views/purchasingManage/purchaseOrder/accountstatement/components/addAccountDialog.vue

@@ -147,9 +147,10 @@
       async getInfo(row) {
         let data = await accountstatementInfoAPI(row.id);
         // 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 + +cur.orderAmount, 0);
+        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);
         this.datasource = data.orderList || [];
         this.dataForm = data;
         switch (this.dataForm.dateType) {
@@ -201,6 +202,7 @@
           // amountTotalPrice: data.amountTotalPrice,
           // amountPayablePass: data.amountPayablePass,
           // amountReceivablePass: data.amountReceivablePass
+          orderTotalAmount: data.reduce((pre, cur) => pre + +cur.orderAmount, 0),
           amountTotalPrice: data.reduce((pre, cur) => pre + +cur.amountTotalPrice, 0),
           amountCompletePrice: data.reduce((pre, cur) => pre + +cur.statementAmount, 0),
           amountUnCompletePrice: data.reduce((pre, cur) => pre + +cur.unStatementAmount, 0)

+ 2 - 0
src/views/purchasingManage/purchaseOrder/components/addDialogNew.vue

@@ -1643,6 +1643,7 @@
             //   return item;
             // });
             if (info.productList.length > 1) {
+              console.log('info.productList~~~~', info.productList);
               this.$refs.planTableListRef.contractOpen(
                 info.productList,
                 contractVO.contractStartDate
@@ -1672,6 +1673,7 @@
         }
       },
       contractSuccess({ productList, contractStartDate }) {
+        console.log('productList~~~contractSuccess', productList);
         this.$nextTick(() => {
           this.$refs.inventoryTable &&
             this.$refs.inventoryTable.putTableValue(

+ 5 - 4
src/views/saleManage/saleOrder/accountstatement/components/addAccountDialog.vue

@@ -184,10 +184,10 @@
       async getInfo(row) {
         let data = await accountstatementInfoAPI(row.id);
         // this.recorpayList = data.recorpayList || [];
-        data.orderTotalAmount = data.orderList.reduce((pre, cur) => pre + +cur.orderAmount, 0),
-        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 + +cur.orderAmount, 0);
+        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);
         this.datasource = data.orderList || [];
         this.dataForm = data;
         switch (this.dataForm.dateType) {
@@ -245,6 +245,7 @@
             // amountTotalPrice: data.amountTotalPrice,
             // amountPayablePass: data.amountPayablePass,
             // amountReceivablePass: data.amountReceivablePass
+            orderTotalAmount: data.reduce((pre, cur) => pre + +cur.orderAmount, 0),
             amountTotalPrice: data.reduce((pre, cur) => pre + +cur.amountTotalPrice, 0),
             amountCompletePrice: data.reduce((pre, cur) => pre + +cur.statementAmount, 0),
             amountUnCompletePrice: data.reduce((pre, cur) => pre + +cur.unStatementAmount, 0)

+ 1 - 1
src/views/saleManage/saleOrder/accountstatement/components/saleForm.vue

@@ -217,7 +217,7 @@
     </el-row>
     <el-row v-if="dialogType !== 'view'">
       <el-col :span="24">
-        <el-button style="float: right" @click="handleSearch" type="primary"
+        <el-button style="float: right" v-click-once @click="handleSearch" type="primary"
           >查询</el-button
         >
       </el-col>