页面优化

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())){

SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/impl/VehicleServiceImpl.java

@@ -227,7 +227,7 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, VehicleEntity
         boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
         if(isPc && pcPermission){
             if (!userProvider.get().getIsAdministrator()){
-                Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle"));
+                Object vehicleObj=authorizeService.getCondition2(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle"));
                 if (ObjectUtil.isEmpty(vehicleObj)){
                     return new ArrayList<>();
                 } else {
@@ -238,7 +238,7 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, VehicleEntity
         }
         if(!isPc && appPermission){
             if (!userProvider.get().getIsAdministrator()){
-                Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle"));
+                Object vehicleObj=authorizeService.getCondition2(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle"));
                 if (ObjectUtil.isEmpty(vehicleObj)){
                     return new ArrayList<>();
                 } else {

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
           })
         }
       },