问题修复

SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java

@@ -278,6 +278,14 @@ public class CollectionController {
     public ActionResult create(@RequestBody @Valid CollectionCrForm collectionCrForm) throws DataException {
         List<Collection_item0Entity> Collection_item0List = JsonUtil.getJsonToList(collectionCrForm.getCollection_item0List(),Collection_item0Entity.class);
         for (Collection_item0Entity collectionItem0Entity : Collection_item0List){
+            if (StringUtils.isNotEmpty(collectionItem0Entity.getSalesorderId())){
+                SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(collectionItem0Entity.getSalesorderId());
+                if (saleorderitemEntity.getInvoiceAmount() != null && saleorderitemEntity.getPrice() != null){
+                    if (saleorderitemEntity.getInvoiceAmount().compareTo(saleorderitemEntity.getPrice()) != 0){
+                        return ActionResult.fail("订单金额与发票金额不一致,无法回款");
+                    }
+                }
+            }
             if (collectionItem0Entity.getAmount() == null ){
                 return ActionResult.fail("请输入收款金额");
             }
@@ -574,6 +582,14 @@ public class CollectionController {
 
             List<Collection_item0Entity> Collection_item0List = JsonUtil.getJsonToList(collectionUpForm.getCollection_item0List(),Collection_item0Entity.class);
             for(Collection_item0Entity entitys : Collection_item0List){
+                if (StringUtils.isNotEmpty(entitys.getSalesorderId())){
+                    SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(entitys.getSalesorderId());
+                    if (saleorderitemEntity.getInvoiceAmount() != null && saleorderitemEntity.getPrice() != null){
+                        if (saleorderitemEntity.getInvoiceAmount().compareTo(saleorderitemEntity.getPrice()) != 0){
+                            return ActionResult.fail("订单金额与发票金额不一致,无法回款");
+                        }
+                    }
+                }
                 if (entitys.getAmount() == null ){
                     return ActionResult.fail("请输入收款金额");
                 }

SC-boot/linkage-scm/src/main/java/jnpf/invoices/controller/InvoicesController.java

@@ -420,6 +420,14 @@ public class InvoicesController {
     @PutMapping("/{id}")
     @Transactional
     public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid InvoicesUpForm invoicesUpForm) throws DataException {
+        if (StringUtils.isNotEmpty(invoicesUpForm.getPurchaseorderId())){
+            PurchaseorderEntity purchaseorderEntity = purchaseorderService.getById(invoicesUpForm.getPurchaseorderId());
+            if (StringUtils.isNotEmpty(purchaseorderEntity.getStatus())){
+                if (purchaseorderEntity.getStatus().equals("2") || purchaseorderEntity.getStatus().equals("3")){
+                    return ActionResult.fail("已入库或已归档,无法修改");
+                }
+            }
+        }
         UserInfo userInfo=userProvider.get();
         InvoicesEntity entity= invoicesService.getInfo(id);
         if(entity!=null){

SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java

@@ -22,6 +22,7 @@ import jnpf.poundlist.entity.PoundlistEntity;
 import jnpf.poundlist.service.PoundlistService;
 import jnpf.purchaseback.entity.PurchaseorderEntity;
 import jnpf.purchaseback.service.PurchaseorderService;
+import jnpf.purchaseorder.entity.Purchaseorder_item0Entity;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import jnpf.base.entity.ProvinceEntity;
@@ -65,6 +66,7 @@ import jnpf.util.GeneraterSwapUtil;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import jnpf.util.file.UploadUtil;
 import jnpf.util.enums.FileTypeEnum;
@@ -124,6 +126,14 @@ public class PaymentdocController {
         for(PaymentdocEntity entity:list){
             Map<String,Object> supplierIdMap = new HashMap<>();
             entity.setSupplierName(generaterSwapUtil.getPopupSelectValue("389674191453990661","id","supplier_name",entity.getSupplierId(),supplierIdMap));
+
+
+            QueryWrapper<PaymentdocItem1Entity> PaymentdocItem1EntityqueryWrapper = new QueryWrapper<>();
+            PaymentdocItem1EntityqueryWrapper.lambda().eq(PaymentdocItem1Entity::getPaymentdocId, entity.getId());
+            PaymentdocItem1EntityqueryWrapper.lambda().select(PaymentdocItem1Entity::getPoundlistId);
+            List<String> poundlistIdList = paymentdocItem1Service.listObjs(PaymentdocItem1EntityqueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList());
+            List<PoundlistEntity> poundlistEntityList = poundlistService.queryPoundListByIds(poundlistIdList);
+            entity.setPoundlistEntityList(poundlistEntityList);
             /*QueryWrapper<PaymentEntity> PaymentqueryWrapper = new QueryWrapper<>();
             PaymentqueryWrapper.lambda().eq(PaymentEntity::getPaymentno, entity.getDocumentNo());
             List<PaymentEntity> paymentEntityList = paymentService.list(PaymentqueryWrapper);

SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocEntity.java

@@ -3,6 +3,7 @@ package jnpf.paymentdoc.entity;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.*;
 import jnpf.payment.entity.PaymentEntity;
+import jnpf.poundlist.entity.PoundlistEntity;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +11,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
+import java.util.List;
+
 /**
  *
  * 付款申请主表 
@@ -136,4 +139,7 @@ public class PaymentdocEntity  {
 
     @TableField("payment_amount_history")
     private String paymentAmountHistory;
+
+    @TableField(exist = false)
+    private List<PoundlistEntity> poundlistEntityList;
 }

SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListVO.java

@@ -3,12 +3,16 @@
 package jnpf.paymentdoc.model.paymentdoc;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import jnpf.poundlist.entity.PoundlistEntity;
 import lombok.Data;
 import java.sql.Time;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.math.BigDecimal;
+import java.util.List;
+
 /**
  *
  * 
@@ -144,4 +148,7 @@ public class PaymentdocListVO{
     private String isStop;
     @JsonProperty("docStatus")
     private String docStatus;
+
+    @JsonProperty("poundlistEntityList")
+    private List<PoundlistEntity> poundlistEntityList;
 }

SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java

@@ -52,6 +52,7 @@ import jnpf.util.file.UploadUtil;
 import jnpf.warehouse.service.WareHouseService;
 import lombok.Cleanup;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -679,25 +680,26 @@ public class PurchaseorderController {
         PurchaseorderInfoVO vo = JsonUtil.getJsonToBean(entity, PurchaseorderInfoVO.class);
 
         //子表数据转换
-        List<Purchaseorder_item0Entity> jg_purchaseorder_item0List = purchaseorderitemService.GetPurchaseorder_item0List(id);
+        List<Purchaseorder_item0Entity> jg_purchaseorder_item0List = purchaseorderitemService.queryPurchaseOrderItemInfo(id);
+//        List<Purchaseorder_item0Entity> jg_purchaseorder_item0List = purchaseorderitemService.GetPurchaseorder_item0List(id);
         List<Purchaseorder_item0Model> jg_purchaseorder_item0ModelList = JsonUtil.getJsonToList(jg_purchaseorder_item0List, Purchaseorder_item0Model.class);
-        for (Purchaseorder_item0Model jg_purchaseorder_item0Model : jg_purchaseorder_item0ModelList) {
-            Map<String, Object> vehicleIdMap = new HashMap<>();
-            jg_purchaseorder_item0Model.setVehicleName(generaterSwapUtil.getPopupSelectValue("389754644018016581", "vehicle_id", "ticketno", jg_purchaseorder_item0Model.getVehicleId(), vehicleIdMap));
-            Map<String, Object> materialIdMap = new HashMap<>();
-            jg_purchaseorder_item0Model.setMaterialName(generaterSwapUtil.getPopupSelectValue("397736371898382533", "id", "item_name", jg_purchaseorder_item0Model.getMaterialId(), materialIdMap));
-            PoundlistEntity poundlistEntity = poundlistService.getById(jg_purchaseorder_item0Model.getPoundlistId());
-            jg_purchaseorder_item0Model.setPoundDate(poundlistEntity.getPoundDate());
-
-            SupplierEntity supplierEntity = supplierService.getById(jg_purchaseorder_item0Model.getSupplierId());
-            if (supplierEntity != null) {
-                jg_purchaseorder_item0Model.setSupplierName(supplierEntity.getSupplierName());
-            }
-            UserEntity userEntity = userService.getById(poundlistEntity.getBusinessId());
-            if (userEntity != null) {
-                jg_purchaseorder_item0Model.setBusinessName(userEntity.getRealName());
-            }
-        }
+//        for (Purchaseorder_item0Model jg_purchaseorder_item0Model : jg_purchaseorder_item0ModelList) {
+//            Map<String, Object> vehicleIdMap = new HashMap<>();
+//            jg_purchaseorder_item0Model.setVehicleName(generaterSwapUtil.getPopupSelectValue("389754644018016581", "vehicle_id", "ticketno", jg_purchaseorder_item0Model.getVehicleId(), vehicleIdMap));
+//            Map<String, Object> materialIdMap = new HashMap<>();
+//            jg_purchaseorder_item0Model.setMaterialName(generaterSwapUtil.getPopupSelectValue("397736371898382533", "id", "item_name", jg_purchaseorder_item0Model.getMaterialId(), materialIdMap));
+//            PoundlistEntity poundlistEntity = poundlistService.getById(jg_purchaseorder_item0Model.getPoundlistId());
+//            jg_purchaseorder_item0Model.setPoundDate(poundlistEntity.getPoundDate());
+//
+//            SupplierEntity supplierEntity = supplierService.getById(jg_purchaseorder_item0Model.getSupplierId());
+//            if (supplierEntity != null) {
+//                jg_purchaseorder_item0Model.setSupplierName(supplierEntity.getSupplierName());
+//            }
+//            UserEntity userEntity = userService.getById(poundlistEntity.getBusinessId());
+//            if (userEntity != null) {
+//                jg_purchaseorder_item0Model.setBusinessName(userEntity.getRealName());
+//            }
+//        }
         vo.setPurchaseorder_item0List(jg_purchaseorder_item0ModelList);
         List<Invoices_item0itemEntity> jg_invoices_item0List = purchaseorderitemService.GetInvoices_item0itemList(id);
         List<Invoices_item0itemModel> jg_invoices_item0ModelList = JsonUtil.getJsonToList(jg_invoices_item0List, Invoices_item0itemModel.class);
@@ -775,10 +777,18 @@ public class PurchaseorderController {
         //附表数据转换
 
 //添加到详情表单对象中
-        Map<String, Object> contractCodeMap = new HashMap<>();
-        vo.setContractName(generaterSwapUtil.getPopupSelectValue("390143765857220229", "id", "contract_name", vo.getContractCode(), contractCodeMap));
-        Map<String, Object> supplierIdMap = new HashMap<>();
-        vo.setSupplierName(generaterSwapUtil.getPopupSelectValue("397751667988199621", "id", "supplier_name", vo.getSupplierId(), supplierIdMap));
+        ContractFileEntity contractFileEntity = contractFileService.getInfo(vo.getContractCode());
+        if (ObjectUtils.isNotEmpty(contractFileEntity) && StringUtils.isNotEmpty(contractFileEntity.getContractName())){
+            vo.setContractName(contractFileEntity.getContractName());
+        }
+        SupplierEntity supplierEntity = supplierService.getInfo(vo.getSupplierId());
+        if (ObjectUtils.isNotEmpty(supplierEntity) && StringUtils.isNotEmpty(supplierEntity.getSupplierName())){
+            vo.setSupplierName(supplierEntity.getSupplierName());
+        }
+//        Map<String, Object> contractCodeMap = new HashMap<>();
+//        vo.setContractName(generaterSwapUtil.getPopupSelectValue("390143765857220229", "id", "contract_name", vo.getContractCode(), contractCodeMap));
+//        Map<String, Object> supplierIdMap = new HashMap<>();
+//        vo.setSupplierName(generaterSwapUtil.getPopupSelectValue("397751667988199621", "id", "supplier_name", vo.getSupplierId(), supplierIdMap));
         vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
 
         return ActionResult.success(vo);

SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jnpf.purchaseorder.entity.Purchaseorder_item0Entity;
 import jnpf.purchaseorder.entity.PurchaseorderitemEntity;
 import jnpf.purchaseorder.model.purchaseorder.PurchaseorderPagination;
 import org.apache.ibatis.annotations.Param;
@@ -26,4 +27,5 @@ public interface PurchaseorderitemMapper extends BaseMapper<PurchaseorderitemEnt
     List<HashMap<String,Object>> getWordExcelInfo(@Param("ew")Wrapper<PurchaseorderitemEntity> queryWrapper);
     List<HashMap<String,Object>> getVehicleInfo(@Param("ew")Wrapper<PurchaseorderitemEntity> queryWrapper);
     IPage<PurchaseorderitemEntity> queryByKeyword(@Param("page") Page<PurchaseorderitemEntity> page, @Param("purchaseorderPagination") PurchaseorderPagination purchaseorderPagination);
+    List<Purchaseorder_item0Entity> queryPurchaseOrderItem(String id);
 }

SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderitemService.java

@@ -58,5 +58,7 @@ public interface PurchaseorderitemService extends IService<PurchaseorderitemEnti
     PurchaseOrderImportVo importData(List<PurchaseorderDTO> dataList) throws ParseException, DataException;
 
     List<PoundlistEntity> getPoundList(String id);
+
+    List<Purchaseorder_item0Entity> queryPurchaseOrderItemInfo(String id);
     //列表子表数据方法
 }

SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java

@@ -1781,5 +1781,10 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
         //queryWrapper2.lambda().in(PoundlistEntity::getId, poundlistIdList).orderByDesc(PoundlistEntity::getAdvance).orderByAsc(PoundlistEntity::getPoundDate);
         return poundlistEntityList;
     }
+
+    @Override
+    public List<Purchaseorder_item0Entity> queryPurchaseOrderItemInfo(String id) {
+        return purchaseorderitemMapper.queryPurchaseOrderItem(id);
+    }
     //列表子表数据方法
 }

SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml

@@ -251,4 +251,28 @@
         </if>
     </select>
 
+    <select id="queryPurchaseOrderItem" resultType="jnpf.purchaseorder.entity.Purchaseorder_item0Entity">
+        SELECT
+	        a.*,
+	        b.pound_date poundDate,
+	        c.ticketno vehicleName,
+	        d.item_name materialName,
+	        e.supplier_name supplierName,
+	        f.F_RealName realName
+        FROM
+        	jg_purchaseorder_item0 a
+        	LEFT JOIN jg_poundlist b ON a.poundlist_id = b.id
+        	LEFT JOIN jg_vehicle c ON a.vehicle_id = c.id
+        	LEFT JOIN jg_material d ON a.material_id = d.id
+        	LEFT JOIN jg_supplier e ON a.supplier_id = e.id
+        	LEFT JOIN base_user f ON b.business_id = f.F_Id
+        WHERE
+        	a.delete_mark = '0'
+        	AND b.delete_mark = '0'
+        	AND c.delete_mark = '0'
+        	AND d.delete_mark = '0'
+        	AND e.delete_mark = '0'
+        	AND a.purchaseorder_id = #{id}
+    </select>
+
 </mapper>

SC-web/src/views/extend/paymentdoc/form.vue

@@ -139,7 +139,7 @@
 							</el-select>
 						</el-form-item>
 					</el-col> -->
-					<!-- 
+					<!--
 					<el-col :span="8" v-if="judgeShow('status')">
 						<el-form-item label="单据状态" prop="status">
 							<el-select :disabled="judgeWrite('status')" v-model="dataForm.status" placeholder="请选择"
@@ -864,7 +864,7 @@
 						sums[index] = values.reduce((prev, curr) => {
 							const value = Number(curr);
 							if (!isNaN(value)) {
-								return prev + curr;
+								return this.jnpf.floatAdd(prev,curr);
 							} else {
 								return prev;
 							}
@@ -893,7 +893,7 @@
 						sums[index] = values.reduce((prev, curr) => {
 							const value = Number(curr);
 							if (!isNaN(value)) {
-			  			return prev + curr;
+			  			return this.jnpf.floatAdd(prev,curr);
 							} else {
 								return prev;
 							}
@@ -1083,7 +1083,7 @@
 			dataFormSubmit(eventType) {
 				var statusFlag = true;
 				this.dataForm.paymentdocitem0List.forEach((item, index) => {
-					if (item.amount > item.allAmount) {
+					if (this.jnpf.floatAdd(item.amount,item.paymentAmount) > item.allAmount) {
 						statusFlag = false;
 						return
 					}
@@ -1091,7 +1091,7 @@
 				if (!statusFlag) {
 					this.$message({
 				 	type: 'error',
-						message: '申请金额不能大于订单金额',
+						message: '已超出订单金额，请核查',
 						duration: 1000
 					});
 					return

SC-web/src/views/scm/basicInformation/arinvoices/Form.vue

@@ -309,7 +309,7 @@
     <span slot="footer" class="dialog-footer">
         <el-button type="primary" icon="el-icon-upload2" @click="uploadForm">导入</el-button>
         <el-button @click="visible = false"> 取 消</el-button>
-        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail" :disabled="submitDisabled"> 确 定</el-button>
     </span>
   <ImportForm v-if="importFormVisible" ref="importForm" @importData="importData" />
     </el-dialog>
@@ -324,6 +324,7 @@
         props: [],
         data() {
             return {
+                submitDisabled: false,
                 visible: false,
                 loading: false,
                 isDetail: false,
@@ -541,6 +542,7 @@
                 })
             },
             request() {
+                this.submitDisabled = true;
                 var _data =this.dataList()
                 if (!this.dataForm.id) {
                     request({
@@ -553,6 +555,7 @@
                             type: 'success',
                             duration: 1000,
                             onClose: () => {
+                                this.submitDisabled = true;
                                 this.visible = false
                                 this.$emit('refresh', true)
                             }
@@ -569,6 +572,7 @@
                             type: 'success',
                             duration: 1000,
                             onClose: () => {
+                                this.submitDisabled = false;
                                 this.visible = false
                                 this.$emit('refresh', true)
                             }
@@ -598,12 +602,12 @@
                             invoiceNo:undefined,
                             invoiceQuantity:undefined,
                             involceAmount:undefined,
-                            taxRate:undefined,
+                            taxRate:'0',
                             taxAmount:undefined,
                             amountNotTax:undefined,
-                            invoiceStatus:undefined,
+                            invoiceStatus:'0',
                             creatorUserName:undefined,
-                            invoiceDate:undefined,
+                            invoiceDate:new Date().getTime(),
                             attachMent:undefined,
                 }
                     this.dataForm.arinvoices_item0List.push(item)

SC-web/src/views/scm/basicInformation/collection/Form.vue

@@ -217,7 +217,7 @@
     </el-row>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false"> 取 消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+      <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail" :disabled="submitDisabled"> 确 定</el-button>
     </span>
   </el-dialog>
 </template>
@@ -234,6 +234,7 @@
     props: [],
     data() {
       return {
+        submitDisabled: false,
         paymentType: "0",
         currency: "0",
         settlementType: "0",
@@ -602,6 +603,7 @@
         })
       },
       request() {
+        this.submitDisabled = true;
         var _data = this.dataList()
         if (!this.dataForm.id) {
           request({
@@ -614,6 +616,7 @@
               type: 'success',
               duration: 1000,
               onClose: () => {
+                this.submitDisabled = false;
                 this.visible = false
                 this.$emit('refresh', true)
               }
@@ -630,6 +633,7 @@
               type: 'success',
               duration: 1000,
               onClose: () => {
+                this.submitDisabled = false;
                 this.visible = false
                 this.$emit('refresh', true)
               }

SC-web/src/views/scm/basicInformation/invoices/Form.vue

@@ -546,7 +546,7 @@
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr);
               if (!isNaN(value)) {
-                return prev + curr;
+                return this.jnpf.floatAdd(prev,curr);
               } else {
                 return prev;
               }
@@ -574,7 +574,7 @@
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr);
               if (!isNaN(value)) {
-                return prev + curr;
+                return this.jnpf.floatAdd(prev,curr);
               } else {
                 return prev;
               }

SC-web/src/views/scm/basicInformation/payment/Form.vue

@@ -110,7 +110,14 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="16">
+          <el-col :span="8">
+            <el-form-item label="供应商" prop="suppliername">
+              <el-input v-model="dataForm.suppliername" placeholder="请输入" clearable :style='{"width":"100%"}' :disabled="true">
+
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
@@ -381,7 +388,7 @@
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr);
               if (!isNaN(value)) {
-                return prev + curr;
+                return this.jnpf.floatAdd(prev,curr);
               } else {
                 return prev;
               }

SC-web/src/views/scm/basicInformation/paymentdoc/index.vue

@@ -411,6 +411,20 @@
 				}).catch(() => {});
 			},
 			fukuanHandle(id, flowState, isSubmit, isStop) {
+			  var flag = true;
+			  this.list.poundlistEntityList.forEach((item,index) => {
+			    if (item.isInvoicing == '0' || (item.advance == '0' && item.isCollection == '0')){
+            flag = false;
+          }
+        })
+        if (!flag){
+          this.$message({
+            type: 'error',
+            message: '不满足付款条件',
+            duration: 1000
+          });
+          return
+        }
 				if (flowState == 2) {
 					if (isSubmit == 0 && isStop == 0) {
 						this.formVisible = true

SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue

@@ -830,7 +830,7 @@
                 sums[index] = values.reduce((prev, curr) => {
                   const value = Number(curr);
                   if (!isNaN(value)) {
-                    return prev + curr;
+                    return this.jnpf.floatAdd(prev,curr);
                   } else {
                     return prev;
                   }

SC-web/src/views/scm/basicInformation/receiptin/Detail.vue

@@ -478,7 +478,7 @@
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr);
               if (!isNaN(value)) {
-                return prev + curr;
+                return this.jnpf.floatAdd(prev,curr);
               } else {
                 return prev;
               }

SC-web/src/views/scm/basicInformation/receiptin/Form.vue

@@ -477,7 +477,7 @@
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr);
               if (!isNaN(value)) {
-                return prev + curr;
+                return this.jnpf.floatAdd(prev,curr);
               } else {
                 return prev;
               }

SC-web/src/views/scm/basicInformation/receiptout/Form.vue

@@ -225,7 +225,7 @@
     </el-row>
     <span slot="footer" class="dialog-footer">
         <el-button @click="visible = false"> 取 消</el-button>
-        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail" :disabled="submitDisabled"> 确 定</el-button>
     </span>
     </el-dialog>
 </template>
@@ -238,6 +238,7 @@
         props: [],
         data() {
             return {
+                submitDisabled: false,
                 visible: false,
                 loading: false,
                 isDetail: false,
@@ -388,6 +389,7 @@
                 })
             },
             request() {
+                this.submitDisabled = true;
                 var _data =this.dataList()
                 if (!this.dataForm.id) {
                     request({
@@ -400,6 +402,7 @@
                             type: 'success',
                             duration: 1000,
                             onClose: () => {
+                                this.submitDisabled = false;
                                 this.visible = false
                                 this.$emit('refresh', true)
                             }
@@ -416,6 +419,7 @@
                             type: 'success',
                             duration: 1000,
                             onClose: () => {
+                                this.submitDisabled = false;
                                 this.visible = false
                                 this.$emit('refresh', true)
                             }

SC-web/src/views/scm/basicInformation/saleback/Form.vue

@@ -168,7 +168,7 @@
 		</el-row>
 		<span slot="footer" class="dialog-footer">
 			<el-button @click="visible = false"> 取 消</el-button>
-			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail" :disabled="submitDisabled"> 确 定</el-button>
 		</span>
 	</el-dialog>
 </template>
@@ -185,6 +185,7 @@
 		props: [],
 		data() {
 			return {
+			  submitDisabled: false,
         excludeFields: [],
 				visible: false,
 				loading: false,
@@ -428,6 +429,7 @@
 				})
 			},
 			request() {
+        this.submitDisabled = true;
 				var _data = this.dataList()
 				if (!this.dataForm.id) {
 					request({
@@ -440,6 +442,7 @@
 							type: 'success',
 							duration: 1000,
 							onClose: () => {
+                this.submitDisabled = false;
 								this.visible = false
 								this.$emit('refresh', true)
 							}
@@ -456,6 +459,7 @@
 							type: 'success',
 							duration: 1000,
 							onClose: () => {
+                this.submitDisabled = false;
 								this.visible = false
 								this.$emit('refresh', true)
 							}

SC-web/src/views/scm/basicInformation/saleorder/Form.vue

@@ -656,7 +656,7 @@
     </el-row>
     <span slot="footer" class="dialog-footer">
         <el-button @click="visible = false"> 取 消</el-button>
-        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail" :disabled="submitDisabled"> 确 定</el-button>
     </span>
   </el-dialog>
 </template>
@@ -671,6 +671,7 @@
     props: [],
     data() {
       return {
+        submitDisabled: false,
         excludeFields: [],
         visible: false,
         loading: false,
@@ -1028,6 +1029,7 @@
         })
       },
       request() {
+        this.submitDisabled = true;
         var _data = this.dataList()
         if (!this.dataForm.id) {
           request({
@@ -1040,6 +1042,7 @@
               type: 'success',
               duration: 1000,
               onClose: () => {
+                this.submitDisabled = false;
                 this.visible = false
                 this.$emit('refresh', true)
               }
@@ -1056,6 +1059,7 @@
               type: 'success',
               duration: 1000,
               onClose: () => {
+                this.submitDisabled = false;
                 this.visible = false
                 this.$emit('refresh', true)
               }

SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue

@@ -321,7 +321,7 @@
     <span slot="footer" class="dialog-footer">
         <el-button type="primary" icon="el-icon-upload2" @click="uploadForm">导入</el-button>
         <el-button @click="visible = false"> 取 消</el-button>
-        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail" :disabled="submitDisabled"> 确 定</el-button>
     </span>
         <ImportForm v-if="importFormVisible" ref="importForm" @importData="importData" />
     </el-dialog>
@@ -337,6 +337,7 @@
         props: [],
         data() {
             return {
+              submitDisabled: false,
               importFormVisible: false,
                 visible: false,
                 loading: false,
@@ -575,6 +576,7 @@
                 })
             },
             request() {
+                this.submitDisabled = true;
                 var _data =this.dataList()
                 if (!this.dataForm.id) {
                     request({
@@ -587,6 +589,7 @@
                             type: 'success',
                             duration: 1000,
                             onClose: () => {
+                                this.submitDisabled = false;
                                 this.visible = false
                                 this.$emit('refresh', true)
                             }
@@ -603,6 +606,7 @@
                             type: 'success',
                             duration: 1000,
                             onClose: () => {
+                                this.submitDisabled = false;
                                 this.visible = false
                                 this.$emit('refresh', true)
                             }

SC-web/src/views/scm/basicInformation/saleorder/collectionForm.vue

@@ -223,7 +223,7 @@
     </el-row>
     <span slot="footer" class="dialog-footer">
         <el-button @click="visible = false"> 取 消</el-button>
-        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail" :disabled="submitDisabled"> 确 定</el-button>
     </span>
     </el-dialog>
 </template>
@@ -237,6 +237,7 @@
         props: ["datas"],
         data() {
             return {
+                submitDisabled: false,
                 visible: false,
                 loading: false,
                 isDetail: false,
@@ -360,6 +361,7 @@
                 })
             },
             request() {
+              this.submitDisabled = true;
                 var _data =this.dataList()
               for(let i=0;i<this.dataForm.collection_item0List.length;i++) {
                 if (this.dataForm.collection_item0List[i].amount > this.dataForm.collection_item0List[i].price) {
@@ -382,6 +384,7 @@
                             type: 'success',
                             duration: 1000,
                             onClose: () => {
+                                this.submitDisabled = false;
                                 this.visible = false
                                 this.$emit('refresh', true)
                             }
@@ -398,6 +401,7 @@
                             type: 'success',
                             duration: 1000,
                             onClose: () => {
+                                this.submitDisabled = false;
                                 this.visible = false
                                 this.$emit('refresh', true)
                             }

SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue

@@ -249,7 +249,7 @@
     </el-row>
     <span slot="footer" class="dialog-footer">
         <el-button @click="visible = false"> 取 消</el-button>
-        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail" :disabled="submitDisabled"> 确 定</el-button>
     </span>
   </el-dialog>
 </template>
@@ -263,6 +263,7 @@
     props: [],
     data() {
       return {
+        submitDisabled: false,
         visible: false,
         loading: false,
         isDetail: false,
@@ -429,6 +430,7 @@
         })
       },
       request() {
+        this.submitDisabled = true;
         var _data = this.dataList()
         if (!this.dataForm.id) {
           request({
@@ -441,6 +443,7 @@
               type: 'success',
               duration: 1000,
               onClose: () => {
+                this.submitDisabled = false;
                 this.visible = false
                 this.$emit('refresh', true)
               }
@@ -457,6 +460,7 @@
               type: 'success',
               duration: 1000,
               onClose: () => {
+                this.submitDisabled = false;
                 this.visible = false
                 this.$emit('refresh', true)
               }

SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue

@@ -179,7 +179,7 @@
 		</el-row>
 		<span slot="footer" class="dialog-footer">
 			<el-button @click="visible = false"> 取 消</el-button>
-			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail" :disabled="submitDisabled"> 确 定</el-button>
 		</span>
 	</el-dialog>
 </template>
@@ -196,6 +196,7 @@
 		props: [],
 		data() {
 			return {
+			  submitDisabled: false,
         excludeFields: [],
 				visible: false,
 				loading: false,
@@ -416,6 +417,7 @@
 				})
 			},
 			request() {
+        this.submitDisabled = true;
 				var _data = this.dataList()
 				if (!this.dataForm.id) {
 					request({
@@ -428,6 +430,7 @@
 							type: 'success',
 							duration: 1000,
 							onClose: () => {
+                this.submitDisabled = false;
 								this.visible = false
 								this.$emit('refresh', true)
 							}
@@ -444,6 +447,7 @@
 							type: 'success',
 							duration: 1000,
 							onClose: () => {
+                this.submitDisabled = false;
 								this.visible = false
 								this.$emit('refresh', true)
 							}

SC-web/src/views/scm/basicInformation/tradeupload/Form.vue

@@ -7,17 +7,17 @@
 				<template v-if="!loading">
 					<el-col :span="12">
 						<el-form-item label="磅单上传" prop="poundPictures">
-							<JNPF-UploadImg2B v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="1"
-								@change="imgChange">
+							<JNPF-UploadImg2 v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="1"
+								@change="imgChange" ref="poundUpload">
 
-							</JNPF-UploadImg2B>
+							</JNPF-UploadImg2>
 						</el-form-item>
 					</el-col>
 					<el-col :span="12">
 						<el-form-item label="车辆图片" prop="vehiclePictures">
-							<JNPF-UploadImgB v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9">
+							<JNPF-UploadImg v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9">
 
-							</JNPF-UploadImgB>
+							</JNPF-UploadImg>
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
@@ -62,31 +62,31 @@
 					</el-col>
 					<el-col :span="6">
 						<el-form-item label="销售价格" prop="salesPrice">
-							<el-input-number v-model="dataForm.salesPrice" :style='{"width":"100%"}' :precision="6">
+							<el-input-number v-model="dataForm.salesPrice" :style='{"width":"100%"}' :precision="6" :min="0">
 							</el-input-number>
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
 						<el-form-item label="毛重" prop="grossWeight">
 							<el-input-number v-model="dataForm.grossWeight" :style='{"width":"100%"}'
-								@change="grossWeightChange" :precision="6"></el-input-number>
+								@change="grossWeightChange" :precision="6" :min="0"></el-input-number>
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
 						<el-form-item label="皮重" prop="tareWeight">
 							<el-input-number v-model="dataForm.tareWeight" :style='{"width":"100%"}'
-								@change="grossWeightChange" :precision="6"></el-input-number>
+								@change="grossWeightChange" :precision="6" :min="0"></el-input-number>
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
 						<el-form-item label="扣重" prop="buckleWeight">
 							<el-input-number v-model="dataForm.buckleWeight" :style='{"width":"100%"}'
-								@change="grossWeightChange" :precision="6"></el-input-number>
+								@change="grossWeightChange" :precision="6" :min="0"></el-input-number>
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
 						<el-form-item label="净重" prop="netWeight">
-							<el-input-number v-model="dataForm.netWeight" :style='{"width":"100%"}' :precision="6">
+							<el-input-number v-model="dataForm.netWeight" :style='{"width":"100%"}' :precision="6" :min="0">
 							</el-input-number>
 						</el-form-item>
 					</el-col>
@@ -136,7 +136,7 @@
 					</el-col>
 					<el-col :span="6">
 						<el-form-item label="运费" prop="transportPrice">
-							<el-input-number v-model="dataForm.transportPrice" :style='{"width":"100%"}' :precision="6">
+							<el-input-number v-model="dataForm.transportPrice" :style='{"width":"100%"}' :precision="6" :min="0">
 							</el-input-number>
 						</el-form-item>
 					</el-col>
@@ -154,7 +154,7 @@
 								field="businessId" interfaceId="ebcc44be142e43b795c0d769abd6d25a"
 								:columnOptions="businessIdcolumnOptions" propsValue="F_Id" relationField="F_RealName"
 								popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage :pageSize="20"
-								:bissId="dataForm.businessId">
+								:bissId="dataForm.businessId" disabled>
 
 							</popupSelect>
 						</el-form-item>
@@ -172,7 +172,7 @@
 
 					<el-col :span="6">
 						<el-form-item label="收货价格" prop="collectPrice">
-							<el-input-number v-model="dataForm.collectPrice" :style='{"width":"100%"}' :precision="6">
+							<el-input-number v-model="dataForm.collectPrice" :style='{"width":"100%"}' :precision="6" :min="0">
 							</el-input-number>
 						</el-form-item>
 					</el-col>
@@ -657,6 +657,7 @@
 								this.dataForm.buckleWeight = 0; //扣重
 								this.dataForm.netWeight = 0; //净重
 								this.dataForm.poundlistNo = '';
+                this.$refs.poundUpload.handleRemove(0);
 							}
 						})
 					})
@@ -677,6 +678,7 @@
 								this.dataForm.buckleWeight = 0; //扣重
 								this.dataForm.netWeight = 0; //净重
 								this.dataForm.poundlistNo = '';
+                this.$refs.poundUpload.handleRemove(0);
 							}
 						})
 					})

SC-web/src/views/scm/basicInformation/tradeupload/Form2.vue

@@ -166,7 +166,7 @@
               <popupSelect v-model="dataForm.businessId" placeholder="请选择业务员1" clearable field="businessId"
                 interfaceId="ebcc44be142e43b795c0d769abd6d25a" :columnOptions="businessIdcolumnOptions"
                 propsValue="F_Id" relationField="F_RealName" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
-                hasPage :pageSize="20" :bissId="dataForm.businessId">
+                hasPage :pageSize="20" :bissId="dataForm.businessId" disabled>
 
               </popupSelect>
             </el-form-item>