5.17修改

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java

@@ -915,7 +915,6 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
                 voucherEntity.setVoucherType("3");
             }
             voucherEntity.setVoucherSource("1");//凭证来源
-            voucherEntity.setVoucherStatus("1");//凭证状态
             voucherEntity.setPoundlistTime(null);//磅单时间
             voucherEntity.setAssociatedDocumentNo("");//关联单据号
             voucherEntity.setPreparationTime(new Date());//制单时间
@@ -944,6 +943,7 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
             voucherEntity.setIsSaleDeliveryVoucher("1");//是否生成销售发货凭证/是否生成采购收货凭证(1：否2：是)
             voucherEntity.setIsReturnCargoOrder("1");//是否生成退货订单(1：否2：是)
             voucherEntity.setDeliveryType(StringUtil.equals(model.getDeliveryType(), "仓配") ? "1" : "2");//配送方式
+            voucherEntity.setVoucherStatus(StringUtil.equals(model.getDeliveryType(), "仓配") ? "3" : "4");//凭证状态
             voucherEntity.setAssociateThirdSuppliers("");//关联三级供应商
             voucherEntity.setContractNo(model.getContractNo());//合同编号
             //根据合同编号取查合同

jnpf-java-boot/jnpf-web/src/layout/components/NavbarRight.vue

@@ -16,9 +16,9 @@
           </el-badge>
         </div>
       </el-tooltip>
-      <template v-if="showLanguage">
+      <!-- <template v-if="showLanguage">
         <lang-select class="right-menu-item hover-effect" />
-      </template>
+      </template> -->
     </template>
     <el-dropdown class="avatar-container right-menu-item hover-effect" trigger='click'>
       <div class="avatar-wrapper">
@@ -123,7 +123,7 @@ export default {
   components: {
     Screenfull,
     SizeSelect,
-    // LangSelect,
+    LangSelect,
     Search,
     MessageList,
     UserList,

jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue

@@ -2614,7 +2614,6 @@
         let query = {
           warehousingPoundList: storageList
         }
-        debugger
         request({
           url: `/api/scm/WarehousingStorage/getWarehousingstorageoutboundPoundlist`,
           method: 'post',
@@ -2626,33 +2625,33 @@
               //扣杂
               item.bucklesWeight = 0;
               //小计重量
-              item.subtotalWeight = this.jnpf.floatSub(item.netWeight, item.bucklesWeight);
+              item.subtotalWeight = this.jnpf.floatSub(item.netWeight, item.bucklesWeight).toFixed(2);
               //合同小计（含税）
-              item.contractSubtotal = this.jnpf.floatMul(Number(item.subtotalWeight), Number(item.contractPrice));
+              item.contractSubtotal = this.jnpf.floatMul(Number(item.subtotalWeight), Number(item.contractPrice)).toFixed(2);
               //结算数量
               item.settlementSum = Number(item.subtotalWeight);
               //结算单价（含税）
               item.settlementPrice = Number(item.settlementPrice);
               //结算小计（含税）
-              item.settlementSubtotal = this.jnpf.floatMul(Number(item.settlementSum), Number(item.settlementPrice));
+              item.settlementSubtotal = this.jnpf.floatMul(Number(item.settlementSum), Number(item.settlementPrice)).toFixed(2);
               //结算单价（不含税）
-              item.settlementPriceNo = this.jnpf.floatDiv(Number(item.settlementPrice), this.jnpf.floatDiv(this.jnpf.floatAdd(100 + Number(item.rate)), 100));
+              item.settlementPriceNo = this.jnpf.floatDiv(Number(item.settlementPrice), this.jnpf.floatDiv(this.jnpf.floatAdd(100 + Number(item.rate)), 100)).toFixed(2);
               //结算小计（不含税）
-              item.settlementSubtotalNo = this.jnpf.floatMul(Number(item.settlementSum), Number(item.settlementPriceNo));
+              item.settlementSubtotalNo = this.jnpf.floatMul(Number(item.settlementSum), Number(item.settlementPriceNo)).toFixed(2);
               //其他费用类型（1：增加（+） 2：减少（-））
               item.otherType = '1';
               //其他费用
               item.otherExpenses = 0;
               if(item.otherType == '1'){
                 //结算合计（含税）
-                item.settlementTotal = this.jnpf.floatAdd(item.settlementSubtotal, item.otherExpenses);
+                item.settlementTotal = this.jnpf.floatAdd(item.settlementSubtotal, item.otherExpenses).toFixed(2);
                 //结算合计（不含税）
-                item.settlementTotalNo = this.jnpf.floatAdd(item.settlementSubtotalNo, item.otherExpenses);
+                item.settlementTotalNo = this.jnpf.floatAdd(item.settlementSubtotalNo, item.otherExpenses).toFixed(2);
               }else if(item.otherType == '2'){
                 //结算合计（含税）
-                item.settlementTotal = this.jnpf.floatSub(item.settlementSubtotal, item.otherExpenses);
+                item.settlementTotal = this.jnpf.floatSub(item.settlementSubtotal, item.otherExpenses).toFixed(2);
                 //结算合计（不含税）
-                item.settlementTotalNo = this.jnpf.floatSub(item.settlementSubtotalNo, item.otherExpenses);
+                item.settlementTotalNo = this.jnpf.floatSub(item.settlementSubtotalNo, item.otherExpenses).toFixed(2);
               }
             })
           }
@@ -2660,18 +2659,18 @@
       },
       bucklesWeightChangeData(row, index){
         //小计重量
-        this.dataForm.cwaccountvoucherList[index].subtotalWeight = this.jnpf.floatSub(Number(this.dataForm.cwaccountvoucherList[index].netWeight), Number(this.dataForm.cwaccountvoucherList[index].bucklesWeight));
+        this.dataForm.cwaccountvoucherList[index].subtotalWeight = this.jnpf.floatSub(Number(this.dataForm.cwaccountvoucherList[index].netWeight), Number(this.dataForm.cwaccountvoucherList[index].bucklesWeight)).toFixed(2);
         //合同小计（含税）
-        this.dataForm.cwaccountvoucherList[index].contractSubtotal = this.jnpf.floatMul(Number(this.dataForm.cwaccountvoucherList[index].subtotalWeight), Number(this.dataForm.cwaccountvoucherList[index].contractPrice));
+        this.dataForm.cwaccountvoucherList[index].contractSubtotal = this.jnpf.floatMul(Number(this.dataForm.cwaccountvoucherList[index].subtotalWeight), Number(this.dataForm.cwaccountvoucherList[index].contractPrice)).toFixed(2);
         //结算数量
         this.dataForm.cwaccountvoucherList[index].settlementSum = this.dataForm.cwaccountvoucherList[index].subtotalWeight;
         //结算小计（含税）
-        this.dataForm.cwaccountvoucherList[index].settlementSubtotal = this.jnpf.floatMul(Number(this.dataForm.cwaccountvoucherList[index].settlementSum), Number(this.dataForm.cwaccountvoucherList[index].settlementPrice));
+        this.dataForm.cwaccountvoucherList[index].settlementSubtotal = this.jnpf.floatMul(Number(this.dataForm.cwaccountvoucherList[index].settlementSum), Number(this.dataForm.cwaccountvoucherList[index].settlementPrice)).toFixed(2);
         this.dataForm.cwaccountvoucherList[index].settlementPrice = Number(this.dataForm.cwaccountvoucherList[index].contractPrice);
         //结算单价（不含税）
-        this.dataForm.cwaccountvoucherList[index].settlementPriceNo = this.jnpf.floatDiv(Number(this.dataForm.cwaccountvoucherList[index].settlementPrice), this.jnpf.floatDiv(this.jnpf.floatAdd(100 + Number(this.dataForm.cwaccountvoucherList[index].rate)), 100));
+        this.dataForm.cwaccountvoucherList[index].settlementPriceNo = this.jnpf.floatDiv(Number(this.dataForm.cwaccountvoucherList[index].settlementPrice), this.jnpf.floatDiv(this.jnpf.floatAdd(100 + Number(this.dataForm.cwaccountvoucherList[index].rate)), 100)).toFixed(2);
         //结算小计（不含税）
-        this.dataForm.cwaccountvoucherList[index].settlementSubtotalNo = this.jnpf.floatMul(Number(this.dataForm.cwaccountvoucherList[index].settlementSum), Number(this.dataForm.cwaccountvoucherList[index].settlementPriceNo));
+        this.dataForm.cwaccountvoucherList[index].settlementSubtotalNo = this.jnpf.floatMul(Number(this.dataForm.cwaccountvoucherList[index].settlementSum), Number(this.dataForm.cwaccountvoucherList[index].settlementPriceNo)).toFixed(2);
         //结算合计（含税）
         this.dataForm.cwaccountvoucherList[index].settlementTotal = this.dataForm.cwaccountvoucherList[index].settlementSubtotal;
         //结算合计（不含税）
@@ -2702,60 +2701,60 @@
         //结算单价（含税）
         //item.settlementPrice = Number(item.contractPrice);
         //结算小计（含税）
-        this.dataForm.cwaccountvoucherList[index].settlementSubtotal = this.jnpf.floatMul(Number(this.dataForm.cwaccountvoucherList[index].settlementSum), Number(this.dataForm.cwaccountvoucherList[index].settlementPrice));
+        this.dataForm.cwaccountvoucherList[index].settlementSubtotal = this.jnpf.floatMul(Number(this.dataForm.cwaccountvoucherList[index].settlementSum), Number(this.dataForm.cwaccountvoucherList[index].settlementPrice)).toFixed(2);
         //结算单价（不含税）
-        this.dataForm.cwaccountvoucherList[index].settlementPriceNo = this.jnpf.floatDiv(Number(this.dataForm.cwaccountvoucherList[index].settlementPrice), this.jnpf.floatDiv(this.jnpf.floatAdd(100 + Number(this.dataForm.cwaccountvoucherList[index].rate)), 100));
+        this.dataForm.cwaccountvoucherList[index].settlementPriceNo = this.jnpf.floatDiv(Number(this.dataForm.cwaccountvoucherList[index].settlementPrice), this.jnpf.floatDiv(this.jnpf.floatAdd(100 + Number(this.dataForm.cwaccountvoucherList[index].rate)), 100)).toFixed(2);
         //结算小计（不含税）
-        this.dataForm.cwaccountvoucherList[index].settlementSubtotalNo = this.jnpf.floatMul(Number(this.dataForm.cwaccountvoucherList[index].settlementSum), Number(this.dataForm.cwaccountvoucherList[index].settlementPriceNo));
+        this.dataForm.cwaccountvoucherList[index].settlementSubtotalNo = this.jnpf.floatMul(Number(this.dataForm.cwaccountvoucherList[index].settlementSum), Number(this.dataForm.cwaccountvoucherList[index].settlementPriceNo)).toFixed(2);
         //其他费用类型（1：增加（+） 2：减少（-））
         if(this.dataForm.cwaccountvoucherList[index].otherType == '1'){
           //结算合计（含税）
-          this.dataForm.cwaccountvoucherList[index].settlementTotal = this.jnpf.floatAdd(this.dataForm.cwaccountvoucherList[index].settlementSubtotal, this.dataForm.cwaccountvoucherList[index].otherExpenses);
+          this.dataForm.cwaccountvoucherList[index].settlementTotal = this.jnpf.floatAdd(this.dataForm.cwaccountvoucherList[index].settlementSubtotal, this.dataForm.cwaccountvoucherList[index].otherExpenses).toFixed(2);
           //结算合计（不含税）
-          this.dataForm.cwaccountvoucherList[index].settlementTotalNo = this.jnpf.floatAdd(this.dataForm.cwaccountvoucherList[index].settlementSubtotalNo, this.dataForm.cwaccountvoucherList[index].otherExpenses);
+          this.dataForm.cwaccountvoucherList[index].settlementTotalNo = this.jnpf.floatAdd(this.dataForm.cwaccountvoucherList[index].settlementSubtotalNo, this.dataForm.cwaccountvoucherList[index].otherExpenses).toFixed(2);
         }else if(this.dataForm.cwaccountvoucherList[index].otherType == '2'){
           //结算合计（含税）
-          this.dataForm.cwaccountvoucherList[index].settlementTotal = this.jnpf.floatSub(this.dataForm.cwaccountvoucherList[index].settlementSubtotal, this.dataForm.cwaccountvoucherList[index].otherExpenses);
+          this.dataForm.cwaccountvoucherList[index].settlementTotal = this.jnpf.floatSub(this.dataForm.cwaccountvoucherList[index].settlementSubtotal, this.dataForm.cwaccountvoucherList[index].otherExpenses).toFixed(2);
           //结算合计（不含税）
-          this.dataForm.cwaccountvoucherList[index].settlementTotalNo = this.jnpf.floatSub(this.dataForm.cwaccountvoucherList[index].settlementSubtotalNo, this.dataForm.cwaccountvoucherList[index].otherExpenses);
+          this.dataForm.cwaccountvoucherList[index].settlementTotalNo = this.jnpf.floatSub(this.dataForm.cwaccountvoucherList[index].settlementSubtotalNo, this.dataForm.cwaccountvoucherList[index].otherExpenses).toFixed(2);
         }
       },
       settlementSubtotalChange(row, index){
         //结算数量
         //item.settlementSum = Number(item.subtotalWeight);
         //结算单价（含税）
-        this.dataForm.cwaccountvoucherList[index].settlementPrice = this.jnpf.floatDiv(this.dataForm.cwaccountvoucherList[index].settlementSubtotal, this.dataForm.cwaccountvoucherList[index].settlementSum);
+        this.dataForm.cwaccountvoucherList[index].settlementPrice = this.jnpf.floatDiv(this.dataForm.cwaccountvoucherList[index].settlementSubtotal, this.dataForm.cwaccountvoucherList[index].settlementSum).toFixed(2);
         //结算小计（含税）
-        //this.dataForm.cwaccountvoucherList[index].settlementSubtotal = this.jnpf.floatMul(Number(this.dataForm.cwaccountvoucherList[index].settlementSum), Number(this.dataForm.cwaccountvoucherList[index].settlementPrice));
+        //this.dataForm.cwaccountvoucherList[index].settlementSubtotal = this.jnpf.floatMul(Number(this.dataForm.cwaccountvoucherList[index].settlementSum), Number(this.dataForm.cwaccountvoucherList[index].settlementPrice)).toFixed(2);
         //结算单价（不含税）
-        this.dataForm.cwaccountvoucherList[index].settlementPriceNo = this.jnpf.floatDiv(Number(this.dataForm.cwaccountvoucherList[index].settlementPrice), this.jnpf.floatDiv(this.jnpf.floatAdd(100 + Number(this.dataForm.cwaccountvoucherList[index].rate)), 100));
+        this.dataForm.cwaccountvoucherList[index].settlementPriceNo = this.jnpf.floatDiv(Number(this.dataForm.cwaccountvoucherList[index].settlementPrice), this.jnpf.floatDiv(this.jnpf.floatAdd(100 + Number(this.dataForm.cwaccountvoucherList[index].rate)), 100)).toFixed(2);
         //结算小计（不含税）
-        this.dataForm.cwaccountvoucherList[index].settlementSubtotalNo = this.jnpf.floatMul(Number(this.dataForm.cwaccountvoucherList[index].settlementSum), Number(this.dataForm.cwaccountvoucherList[index].settlementPriceNo));
+        this.dataForm.cwaccountvoucherList[index].settlementSubtotalNo = this.jnpf.floatMul(Number(this.dataForm.cwaccountvoucherList[index].settlementSum), Number(this.dataForm.cwaccountvoucherList[index].settlementPriceNo)).toFixed(2);
         //其他费用类型（1：增加（+） 2：减少（-））
         if(this.dataForm.cwaccountvoucherList[index].otherType == '1'){
           //结算合计（含税）
-          this.dataForm.cwaccountvoucherList[index].settlementTotal = this.jnpf.floatAdd(this.dataForm.cwaccountvoucherList[index].settlementSubtotal, this.dataForm.cwaccountvoucherList[index].otherExpenses);
+          this.dataForm.cwaccountvoucherList[index].settlementTotal = this.jnpf.floatAdd(this.dataForm.cwaccountvoucherList[index].settlementSubtotal, this.dataForm.cwaccountvoucherList[index].otherExpenses).toFixed(2);
           //结算合计（不含税）
-          this.dataForm.cwaccountvoucherList[index].settlementTotalNo = this.jnpf.floatAdd(this.dataForm.cwaccountvoucherList[index].settlementSubtotalNo, this.dataForm.cwaccountvoucherList[index].otherExpenses);
+          this.dataForm.cwaccountvoucherList[index].settlementTotalNo = this.jnpf.floatAdd(this.dataForm.cwaccountvoucherList[index].settlementSubtotalNo, this.dataForm.cwaccountvoucherList[index].otherExpenses).toFixed(2);
         }else if(this.dataForm.cwaccountvoucherList[index].otherType == '2'){
           //结算合计（含税）
-          this.dataForm.cwaccountvoucherList[index].settlementTotal = this.jnpf.floatSub(this.dataForm.cwaccountvoucherList[index].settlementSubtotal, this.dataForm.cwaccountvoucherList[index].otherExpenses);
+          this.dataForm.cwaccountvoucherList[index].settlementTotal = this.jnpf.floatSub(this.dataForm.cwaccountvoucherList[index].settlementSubtotal, this.dataForm.cwaccountvoucherList[index].otherExpenses).toFixed(2);
           //结算合计（不含税）
-          this.dataForm.cwaccountvoucherList[index].settlementTotalNo = this.jnpf.floatSub(this.dataForm.cwaccountvoucherList[index].settlementSubtotalNo, this.dataForm.cwaccountvoucherList[index].otherExpenses);
+          this.dataForm.cwaccountvoucherList[index].settlementTotalNo = this.jnpf.floatSub(this.dataForm.cwaccountvoucherList[index].settlementSubtotalNo, this.dataForm.cwaccountvoucherList[index].otherExpenses).toFixed(2);
         }
       },
       otherTypeChange(row, index){
         //其他费用类型（1：增加（+） 2：减少（-））
         if(this.dataForm.cwaccountvoucherList[index].otherType == '1'){
           //结算合计（含税）
-          this.dataForm.cwaccountvoucherList[index].settlementTotal = this.jnpf.floatAdd(this.dataForm.cwaccountvoucherList[index].settlementSubtotal, this.dataForm.cwaccountvoucherList[index].otherExpenses);
+          this.dataForm.cwaccountvoucherList[index].settlementTotal = this.jnpf.floatAdd(this.dataForm.cwaccountvoucherList[index].settlementSubtotal, this.dataForm.cwaccountvoucherList[index].otherExpenses).toFixed(2);
           //结算合计（不含税）
-          this.dataForm.cwaccountvoucherList[index].settlementTotalNo = this.jnpf.floatAdd(this.dataForm.cwaccountvoucherList[index].settlementSubtotalNo, this.dataForm.cwaccountvoucherList[index].otherExpenses);
+          this.dataForm.cwaccountvoucherList[index].settlementTotalNo = this.jnpf.floatAdd(this.dataForm.cwaccountvoucherList[index].settlementSubtotalNo, this.dataForm.cwaccountvoucherList[index].otherExpenses).toFixed(2);
         }else if(this.dataForm.cwaccountvoucherList[index].otherType == '2'){
           //结算合计（含税）
-          this.dataForm.cwaccountvoucherList[index].settlementTotal = this.jnpf.floatSub(this.dataForm.cwaccountvoucherList[index].settlementSubtotal, this.dataForm.cwaccountvoucherList[index].otherExpenses);
+          this.dataForm.cwaccountvoucherList[index].settlementTotal = this.jnpf.floatSub(this.dataForm.cwaccountvoucherList[index].settlementSubtotal, this.dataForm.cwaccountvoucherList[index].otherExpenses).toFixed(2);
           //结算合计（不含税）
-          this.dataForm.cwaccountvoucherList[index].settlementTotalNo = this.jnpf.floatSub(this.dataForm.cwaccountvoucherList[index].settlementSubtotalNo, this.dataForm.cwaccountvoucherList[index].otherExpenses);
+          this.dataForm.cwaccountvoucherList[index].settlementTotalNo = this.jnpf.floatSub(this.dataForm.cwaccountvoucherList[index].settlementSubtotalNo, this.dataForm.cwaccountvoucherList[index].otherExpenses).toFixed(2);
         }
       },
       delcwaccountvoucherList(index) {
@@ -2782,15 +2781,15 @@
             return item.productId === cur.productId
           })
           if (found) {
-            found.settlementSum = this.jnpf.floatAdd(Number(found.settlementSum), Number(cur.settlementSum));
-            found.settlementSubtotal = this.jnpf.floatAdd(Number(found.settlementSubtotal), Number(cur.settlementSubtotal));
-            found.settlementSubtotalNo = this.jnpf.floatAdd(Number(found.settlementSubtotalNo), Number(cur.settlementSubtotalNo));
-            found.settlementTotal = this.jnpf.floatAdd(Number(found.settlementTotal), Number(cur.settlementTotal));
-            found.settlementTotalNo = this.jnpf.floatAdd(Number(found.settlementTotalNo), Number(cur.settlementTotalNo));
+            found.settlementSum = this.jnpf.floatAdd(Number(found.settlementSum), Number(cur.settlementSum)).toFixed(2);
+            found.settlementSubtotal = this.jnpf.floatAdd(Number(found.settlementSubtotal), Number(cur.settlementSubtotal)).toFixed(2);
+            found.settlementSubtotalNo = this.jnpf.floatAdd(Number(found.settlementSubtotalNo), Number(cur.settlementSubtotalNo)).toFixed(2);
+            found.settlementTotal = this.jnpf.floatAdd(Number(found.settlementTotal), Number(cur.settlementTotal)).toFixed(2);
+            found.settlementTotalNo = this.jnpf.floatAdd(Number(found.settlementTotalNo), Number(cur.settlementTotalNo)).toFixed(2);
             if(cur.otherType == '1'){
-              found.otherExpenses = this.jnpf.floatAdd(Number(found.otherExpenses), Number(cur.otherExpenses));
+              found.otherExpenses = this.jnpf.floatAdd(Number(found.otherExpenses), Number(cur.otherExpenses)).toFixed(2);
             }else if(cur.otherType == '2'){
-              found.otherExpenses = this.jnpf.floatSub(Number(found.otherExpenses), Number(cur.otherExpenses));
+              found.otherExpenses = this.jnpf.floatSub(Number(found.otherExpenses), Number(cur.otherExpenses)).toFixed(2);
             }
           } else {
             acc.push({ productId: cur.productId, productName: cur.productName, spec:cur.spec, rate:cur.rate, settlementSum: cur.settlementSum, settlementTotal: cur.settlementTotal, settlementUnit: cur.unit, settlementPrice: cur.settlementPrice, settlementSubtotal: cur.settlementSubtotal, settlementPriceNo: cur.settlementPriceNo, settlementSubtotalNo: cur.settlementSubtotalNo, otherType: cur.otherType, otherExpenses: cur.otherExpenses, settlementTotal: cur.settlementTotal, settlementTotalNo: cur.settlementTotalNo})
@@ -2810,8 +2809,8 @@
         }
         this.dataForm.cwaccountsummaryList = this.sameReduce(this.dataForm.cwaccountvoucherList);
         this.dataForm.cwaccountsummaryList.forEach(item => {
-          item.settlementPrice = this.jnpf.floatDiv(item.settlementSubtotal, item.settlementSum);
-          item.settlementPriceNo = this.jnpf.floatDiv(item.settlementSubtotalNo, item.settlementSum);
+          item.settlementPrice = this.jnpf.floatDiv(item.settlementSubtotal, item.settlementSum).toFixed(2);
+          item.settlementPriceNo = this.jnpf.floatDiv(item.settlementSubtotalNo, item.settlementSum).toFixed(2);
         })
         /* let item = {
           productId: undefined,

jnpf-java-boot/jnpf-web/src/views/extend/cwpaymentreceipt/form.vue

@@ -851,15 +851,15 @@
       addcwpaymentsummaryList() {
         this.dataForm.cwpaymentsummaryList.forEach(item => {
           //结算合计（含税）
-          item.settlementTotal = this.jnpf.floatMul(this.dataForm.paymentAmount, item.proportion)
+          item.settlementTotal = this.jnpf.floatMul(this.dataForm.paymentAmount, item.proportion).toFixed(2)
           //结算合计（不含税）
-          item.settlementTotalNo = this.jnpf.floatDiv(Number(item.settlementTotal), this.jnpf.floatDiv(this.jnpf.floatAdd(100 + Number(item.rate)), 100));
+          item.settlementTotalNo = this.jnpf.floatDiv(Number(item.settlementTotal), this.jnpf.floatDiv(this.jnpf.floatAdd(100 + Number(item.rate)), 100)).toFixed(2);
           //结算小计（含税）
           item.settlementSubtotal = item.settlementTotal
           //结算小计（不含税）
           item.settlementSubtotalNo = item.settlementTotalNo
           //结算数量
-          item.settlementSum = this.jnpf.floatDiv(item.settlementSubtotal, item.settlementPrice)
+          item.settlementSum = this.jnpf.floatDiv(item.settlementSubtotal, item.settlementPrice).toFixed(2)
         })
         /* let item = {
           productId: undefined,
@@ -1046,7 +1046,7 @@
             this.dataForm.cwpaymentsummaryList = res.data.cwsettlementsummaryList;
             //计算小计占比
             this.dataForm.cwpaymentsummaryList.forEach(item => {
-              item.proportion = this.jnpf.floatDiv(item.settlementSubtotal, this.dataForm.paymentAmount)
+              item.proportion = this.jnpf.floatDiv(item.settlementSubtotal, this.dataForm.paymentAmount).toFixed(2)
             })
             this.dataForm.cwpaymentlastsummaryList = JSON.parse(JSON.stringify(res.data.cwsettlementsummaryList))
             /* this.dataForm.cwpaymentsummaryList.forEach(item => {

jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue

@@ -2225,15 +2225,15 @@
             return item.productId === cur.productId
           })
           if (found) {
-            found.settlementSum = this.jnpf.floatAdd(Number(found.settlementSum), Number(cur.settlementSum));
-            found.settlementSubtotal = this.jnpf.floatAdd(Number(found.settlementSubtotal), Number(cur.settlementSubtotal));
-            found.settlementSubtotalNo = this.jnpf.floatAdd(Number(found.settlementSubtotalNo), Number(cur.settlementSubtotalNo));
-            found.settlementTotal = this.jnpf.floatAdd(Number(found.settlementTotal), Number(cur.settlementTotal));
-            found.settlementTotalNo = this.jnpf.floatAdd(Number(found.settlementTotalNo), Number(cur.settlementTotalNo));
+            found.settlementSum = this.jnpf.floatAdd(Number(found.settlementSum), Number(cur.settlementSum)).toFixed(2);
+            found.settlementSubtotal = this.jnpf.floatAdd(Number(found.settlementSubtotal), Number(cur.settlementSubtotal)).toFixed(2);
+            found.settlementSubtotalNo = this.jnpf.floatAdd(Number(found.settlementSubtotalNo), Number(cur.settlementSubtotalNo)).toFixed(2);
+            found.settlementTotal = this.jnpf.floatAdd(Number(found.settlementTotal), Number(cur.settlementTotal)).toFixed(2);
+            found.settlementTotalNo = this.jnpf.floatAdd(Number(found.settlementTotalNo), Number(cur.settlementTotalNo)).toFixed(2);
             if(cur.otherType == '1'){
-              found.otherExpenses = this.jnpf.floatAdd(Number(found.otherExpenses), Number(cur.otherExpenses));
+              found.otherExpenses = this.jnpf.floatAdd(Number(found.otherExpenses), Number(cur.otherExpenses)).toFixed(2);
             }else if(cur.otherType == '2'){
-              found.otherExpenses = this.jnpf.floatSub(Number(found.otherExpenses), Number(cur.otherExpenses));
+              found.otherExpenses = this.jnpf.floatSub(Number(found.otherExpenses), Number(cur.otherExpenses)).toFixed(2);
             }
           } else {
             acc.push({ productId: cur.productId, productName: cur.productName, spec:cur.spec, rate:cur.rate, settlementSum: cur.settlementSum, settlementTotal: cur.settlementTotal, settlementUnit: cur.settlementUnit, settlementPrice: cur.settlementPrice, settlementSubtotal: cur.settlementSubtotal, settlementPriceNo: cur.settlementPriceNo, settlementSubtotalNo: cur.settlementSubtotalNo, otherType: cur.otherType, otherExpenses: cur.otherExpenses, settlementTotal: cur.settlementTotal, settlementTotalNo: cur.settlementTotalNo})
@@ -2782,15 +2782,15 @@
           let summarySettlementSum = 0;//结算汇总数量和
           this.dataForm.cwsettlementcostList.forEach(item => {
             if('抵扣金额' == item.costType){
-              underpaymentAmount = this.jnpf.floatAdd(underpaymentAmount, item.costPrice);
+              underpaymentAmount = this.jnpf.floatAdd(underpaymentAmount, item.costPrice).toFixed(2);
             }else if('抵扣保证金' == item.costType){
-              marginAmount = this.jnpf.floatAdd(marginAmount, item.costPrice);
+              marginAmount = this.jnpf.floatAdd(marginAmount, item.costPrice).toFixed(2);
             }else if('抵扣利息' == item.costType){
-              overdueAmount = this.jnpf.floatAdd(overdueAmount, item.costPrice);
+              overdueAmount = this.jnpf.floatAdd(overdueAmount, item.costPrice).toFixed(2);
             }else if('预付款抵扣' == item.costType){
-              prepaidDeductionAmount = this.jnpf.floatAdd(prepaidDeductionAmount, item.costPrice);
+              prepaidDeductionAmount = this.jnpf.floatAdd(prepaidDeductionAmount, item.costPrice).toFixed(2);
             }
-            costAmount = this.jnpf.floatAdd(costAmount, item.costPrice);
+            costAmount = this.jnpf.floatAdd(costAmount, item.costPrice).toFixed(2);
           })
           this.dataForm.prepaidDeductionAmount = prepaidDeductionAmount;
           this.dataForm.marginAmount = marginAmount;
@@ -2798,28 +2798,28 @@
           this.dataForm.overdueAmount = overdueAmount;
           this.dataForm.cwsettlementsummaryList = this.sameReduce(res.data);
           this.dataForm.cwsettlementsummaryList.forEach(item => {
-            item.settlementPrice = this.jnpf.floatDiv(item.settlementSubtotal, item.settlementSum);//汇总结算含税单价
-            item.settlementPriceNo = this.jnpf.floatDiv(item.settlementSubtotalNo, item.settlementSum);//汇总结算不含税单价
-            summarySettlementSum = this.jnpf.floatAdd(summarySettlementSum, item.settlementSum);//结算汇总数量和
+            item.settlementPrice = this.jnpf.floatDiv(item.settlementSubtotal, item.settlementSum).toFixed(2);//汇总结算含税单价
+            item.settlementPriceNo = this.jnpf.floatDiv(item.settlementSubtotalNo, item.settlementSum).toFixed(2);//汇总结算不含税单价
+            summarySettlementSum = this.jnpf.floatAdd(summarySettlementSum, item.settlementSum).toFixed(2);//结算汇总数量和
           })
           this.dataForm.cwsettlementsummaryList.forEach(item => {
             //费用单总价/数量总和 = 单价增加量(含税单价)
-            item.settlementPrice = this.jnpf.floatAdd(item.settlementPrice, this.jnpf.floatDiv(costAmount, summarySettlementSum));//汇总结算含税单价
+            item.settlementPrice = this.jnpf.floatAdd(item.settlementPrice, this.jnpf.floatDiv(costAmount, summarySettlementSum)).toFixed(2);//汇总结算含税单价
             //结算小计(含税)=含税单价*数量
-            item.settlementSubtotal = this.jnpf.floatMul(item.settlementPrice, item.settlementSum)
+            item.settlementSubtotal = this.jnpf.floatMul(item.settlementPrice, item.settlementSum).toFixed(2)
             //结算合计（含税）= 结算小计+其他费用
-            item.settlementTotal = item.settlementSubtotal + item.otherExpenses
+            item.settlementTotal = this.jnpf.floatAdd(item.settlementSubtotal, item.otherExpenses).toFixed(2)
             //结算单价(不含税)
-            item.settlementPriceNo = this.jnpf.floatDiv(Number(item.settlementPrice), this.jnpf.floatDiv(this.jnpf.floatAdd(100 + Number(item.rate)), 100));
+            item.settlementPriceNo = this.jnpf.floatDiv(Number(item.settlementPrice), this.jnpf.floatDiv(this.jnpf.floatAdd(100 + Number(item.rate)), 100)).toFixed(2);
             //结算小计(不含税)
-            item.settlementSubtotalNo = this.jnpf.floatMul(Number(item.settlementSum), Number(item.settlementPriceNo));
+            item.settlementSubtotalNo = this.jnpf.floatMul(Number(item.settlementSum), Number(item.settlementPriceNo)).toFixed(2);
             //应收/应付合计（含税）
-            settlementAmount = this.jnpf.floatAdd(settlementAmount, item.settlementTotal);
+            settlementAmount = this.jnpf.floatAdd(settlementAmount, item.settlementTotal).toFixed(2);
           })
 
 
           this.dataForm.settlementAmount = settlementAmount;//应收/应付合计（含税）
-          this.dataForm.returnAmount = this.jnpf.floatSub(this.dataForm.settlementAmount, this.dataForm.prepaidDeductionAmount);//退回金额
+          this.dataForm.returnAmount = this.jnpf.floatSub(this.dataForm.settlementAmount, this.dataForm.prepaidDeductionAmount).toFixed(2);//退回金额
           //应结金额
           //this.dataForm.payableAmount = this.jnpf.floatSub(this.jnpf.floatSub(this.jnpf.floatSub(this.jnpf.floatSub(this.dataForm.returnAmount, this.dataForm.prepaidDeductionAmount), this.dataForm.underpaymentAmount), this.dataForm.marginAmount), this.dataForm.overdueAmount)
           this.dataForm.payableAmount = this.dataForm.settlementAmount
@@ -2837,7 +2837,7 @@
             }
           }) */
           //可结金额
-          this.dataForm.settlableAmount = this.jnpf.floatSub(this.jnpf.floatSub(this.dataForm.payableAmount, this.dataForm.currentUnderpaymentAmount), this.dataForm.currentMarginAmount)
+          this.dataForm.settlableAmount = this.jnpf.floatSub(this.jnpf.floatSub(this.dataForm.payableAmount, this.dataForm.currentUnderpaymentAmount), this.dataForm.currentMarginAmount).toFixed(2)
         })
       },
       delcwsettlementsummaryList(index) {

jnpf-java-boot/jnpf-web/src/views/scm/publicPage/organizeSelectIndex.vue

@@ -166,7 +166,6 @@ export default {
       inputHovering: false,
       inputWidth: 0,
       initialInputHeight: 0,
-      businessLineIdProp: '',
     }
   },
   computed: {
@@ -202,10 +201,10 @@ export default {
   },
   created() {
     this.getData()
-    this.businessLineIdProp = businessLineIdProp
+    // this.businessLineIdProp = businessLineIdProp
   },
   mounted() {
-    addResizeListener(this.$el, this.handleResize);
+    //addResizeListener(this.$el, this.handleResize);
 
     const reference = this.$refs.reference;
     if (reference && reference.$el) {
@@ -417,13 +416,6 @@ export default {
       this.confirm()
       event.stopPropagation();
     },
-    resetInputWidth() {
-      this.inputWidth = this.$refs.reference.$el.getBoundingClientRect().width;
-    },
-    handleResize() {
-      this.resetInputWidth();
-      if (this.multiple) this.resetInputHeight();
-    },
     resetInputHeight() {
       if (this.collapseTags) return;
       this.$nextTick(() => {