From 4e184ff00222321a06f6b5ded5508804dcc0124b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= <vayne0702@163.com>
Date: Wed, 8 Mar 2023 09:18:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SaleorderitemController.java        |  2 ++
 .../jnpf/saleorder/entity/SaleorderitemEntity.java |  3 +++
 .../basicInformation/saleorder/arinvoicesForm.vue  | 14 +++++++-------
 .../basicInformation/saleorder/collectionForm.vue  |  7 +++----
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
index 679d6e17..ce151f46 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
@@ -371,6 +371,8 @@ public class SaleorderitemController {
                 }
                 sale.setList(dList);
                 sale.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false));
+                BigDecimal amount = sale.getPrice().subtract(sale.getAmountCollected());
+                sale.setAmount(amount);
                 list.add(sale);
             }else{
                 return ActionResult.fail("数据状态无法回款");
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java
index 8acee2c8..c50a862d 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java
@@ -168,4 +168,7 @@ public class SaleorderitemEntity  {
     @TableField("CUSTOMER_ID")
     private String customerId;
 
+    @TableField(exist = false)
+    private BigDecimal amount;
+
 }
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue
index e0ef739e..a68a26a8 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue
@@ -294,13 +294,13 @@
                 </el-date-picker>
             </template>
         </el-table-column>
-      <el-table-column prop="attachMent" label="发票附件">
-        <template slot-scope="scope">
-          <JNPF-UploadFz   v-model="scope.row.attachMent"
-                           :fileSize="100"    sizeUnit="MB"  :limit="5"  buttonText="点击上传" >
-          </JNPF-UploadFz>
-        </template>
-      </el-table-column>
+<!--      <el-table-column prop="attachMent" label="发票附件">-->
+<!--        <template slot-scope="scope">-->
+<!--          <JNPF-UploadFz   v-model="scope.row.attachMent"-->
+<!--                           :fileSize="100"    sizeUnit="MB"  :limit="5"  buttonText="点击上传" >-->
+<!--          </JNPF-UploadFz>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     <el-table-column label="操作" width="50" >
         <template slot-scope="scope">
             <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delarinvoices_item0List(scope.$index)">删除</el-button>
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/collectionForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/collectionForm.vue
index e09e1963..15ff6627 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/collectionForm.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/collectionForm.vue
@@ -343,12 +343,11 @@
                 for (let i = 0;i<list.length;i++){
                   this.dataForm.collection_item0List[i].salesorderId = list[i].id;
                   this.dataForm.collection_item0List[i].rate = list[i].price - list[i].notPrice;
-                  this.amount
-                  this.dataForm.collection_item0List[i].amount = list[i].price - list[i].amountCollected;
-                  amountCollected = amountCollected + this.dataForm.collection_item0List[i].amount;
+                  // this.dataForm.collection_item0List[i].amount = list[i].price - list[i].amountCollected;
+                  // amountCollected = amountCollected + this.dataForm.collection_item0List[i].amount;
                   debugger
                 }
-                this.dataForm.amountCollected = amountCollected;
+                // this.dataForm.amountCollected = amountCollected;
                 this.$store.commit('generator/UPDATE_RELATION_DATA', {})
             },
             // 表单提交