From b3c6c445d0657e6ab5bf4bd1196938b9a31ead6e Mon Sep 17 00:00:00 2001
From: "XI_TENG\\xixi_" <971623072>
Date: Fri, 21 Jun 2024 09:45:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=80=E9=87=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml  | 1 +
 .../src/views/scm/purchaseCenter/receiptVoucher/index.vue       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml
index 5217090f..d4e3dcd6 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml
@@ -449,6 +449,7 @@
         d.tare_weight,
         d.buckle_weight,
         d.net_weight,
+        d.clear_weight,
         d.spec,
         d.unit,
         e.vehicle_number,
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue
index 755f172b..57a77fd7 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue
@@ -160,7 +160,7 @@
           </el-table-column>
           <el-table-column prop="buckleWeight" label="扣重" align="center" width="200">
           </el-table-column>
-          <el-table-column prop="clearWeight" label="净重" align="center" width="200">
+          <el-table-column prop="netWeight" label="净重" align="center" width="200">
           </el-table-column>
           <el-table-column prop="purchaseContractNo" label="采购合同编号" align="center" width="260">
           </el-table-column>