Browse Source

bug修改

钱惠东 1 week ago
parent
commit
6be3240855

+ 4 - 2
RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/domain/vo/account/AgentAddProject.java

@@ -5,6 +5,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
+
 /**
  * @author fangk
  * @date 2024/6/19
@@ -59,7 +61,7 @@ public class AgentAddProject {
 
     /** 新建项目金额 */
     @Excel(name = "新建项目金额")
-    private Long priceWeek;
+    private BigDecimal priceWeek;
 
     /** 合计项目数量 */
     @Excel(name = "合计项目数量")
@@ -72,7 +74,7 @@ public class AgentAddProject {
 
     /** 合计项目金额 */
     @Excel(name = "合计项目金额")
-    private Long priceTotal;
+    private BigDecimal priceTotal;
 
     /** 数据权限字符 */
     private String permissionChar;

+ 1 - 1
RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/service/quotation/impl/PriceCalcServiceImpl.java

@@ -287,7 +287,7 @@ public class PriceCalcServiceImpl implements IPriceCalcService {
                 JEPSplitEnum.PARAM_SPLIT_FLAG.getFuncKey()
                     + markupName
                     + JEPSplitEnum.PARAM_SPLIT_FLAG.getFuncKey(),
-                BigDecimal.ZERO.toPlainString());
+                "-1");
             paramCodeInputTypeMap.put(JEPSplitEnum.PARAM_SPLIT_FLAG.getFuncKey()
                 + markupName
                 + JEPSplitEnum.PARAM_SPLIT_FLAG.getFuncKey(), InputTypeEnum.INPUT_NUMBER.getCode());

+ 1 - 1
ruoyi-ui-vue2/src/views/quotation/elevator.vue

@@ -52,7 +52,7 @@
                   <!-- 电梯组号-->
                   <el-form-item :label="$t('elevator.groupCode')" prop="elevatorGroupCode">
                     <el-input :disabled="disableFlag" v-model.trim="form.elevatorGroupCode" :placeholder="$t('common.pleaseInput') + $t('elevator.groupCode')"
-                              @input="e => form.elevatorGroupCode = replaceGroupCode(e)" maxlength="5" class="w-100"/>
+                              @input="e => form.elevatorGroupCode = replaceGroupCode(e)" maxlength="20" class="w-100"/>
                   </el-form-item>
                 </div>
               </el-card>