diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java index 6d41137b..c0cd13c4 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java @@ -271,7 +271,7 @@ public class PoundlistController { entity.setIsPay("0".equals(entity.getIsPay()) ? "否" : "是"); entity.setIsCollection("0".equals(entity.getIsCollection()) ? "否" : "是"); entity.setIsExpense("0".equals(entity.getIsExpense()) ? "否" : "是"); - entity.setUnit("0".equals(entity.getAdvance()) ? "吨" : "千克"); + entity.setUnit("0".equals(entity.getUnit()) ? "吨" : "千克"); if("0".equals(entity.getTransportType())){ entity.setTransportType("汽运"); }else if("1".equals(entity.getTransportType())){ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/impl/VehicleServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/impl/VehicleServiceImpl.java index d35c9d85..50a3ddbc 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/impl/VehicleServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/impl/VehicleServiceImpl.java @@ -227,7 +227,7 @@ public class VehicleServiceImpl extends ServiceImpl(); } else { @@ -238,7 +238,7 @@ public class VehicleServiceImpl extends ServiceImpl(); } else { diff --git a/SC-web/src/views/scm/basicInformation/invoices/Form.vue b/SC-web/src/views/scm/basicInformation/invoices/Form.vue index 26074ca8..0789b546 100644 --- a/SC-web/src/views/scm/basicInformation/invoices/Form.vue +++ b/SC-web/src/views/scm/basicInformation/invoices/Form.vue @@ -737,6 +737,8 @@ this.$emit('refresh', true) } }) + }).catch(() => { + this.submitDisabled = false }) } else { request({ @@ -754,6 +756,8 @@ this.$emit('refresh', true) } }) + }).catch(() => { + this.submitDisabled = false }) } },