合并修改

jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue

@@ -861,7 +861,7 @@ export default {
               } else {
                 return prev;
               }
-            }, 0).toFixed(2);
+            }, 0).toFixed(3);
             if ([].includes(column.property)) {
               sums[index] = thousandsFormat(sums[index]);
             }

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOutBoundNotice/form.vue

@@ -809,10 +809,13 @@ export default {
         { label: "地址详情", value: "addressDetail" }
       ],
       deliveryproductrelationcargoIdcolumnOptions: [
-        { label: "货区类型", value: "cargoType" },
+        { label: "商品名称", value: "name" },
-        { label: "货区名称", value: "cargoName" },
+        { label: "商品编码", value: "code" },
         { label: "批次号", value: "batch_number" },
         { label: "库存数量", value: "inventory_number" },
+        { label: "货区类型", value: "cargoType" },
+        { label: "货区名称", value: "cargoName" },
+
       ],
       businessorderproductrelationalproductIdcolumnOptions2: [
         { label: "商品编码", value: "code" },