修改

jinlin

2024-07-16 8b11f020f8fd532c3fa1f6ce7dcab3d48b057d63

修改

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java

@@ -220,23 +220,6 @@
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写设备名称", sheetName, row1);
                        continue;
                    }
                    if (StringUtils.isEmpty(reliabDistribType)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写可靠性分布类型", sheetName, row1);
                        continue;
                    }
                    if (StringUtils.isEmpty(basicJoinCompute)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写是否参加计算", sheetName, row1);
                        continue;
                    }
                    if (StringUtils.isEmpty(repairable)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写是否可维修", sheetName, row1);
                        continue;
                    }
                    if (StringUtils.isNotBlank(repairable) && StringUtils.isEmpty(repairDistribType)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "有未填写的维修分布类型", sheetName, row1);
                        continue;
                    }

                    //导入型号产品结果库
                    XhProductModel xhProductModel = new XhProductModel();


 web/src/views/modules/basicInfo/ProductImport.vue

@@ -1,5 +1,5 @@
<template>
  <zt-dialog ref="dialog" title="导入产品模型" :hasConfirm="false" append-to-body>
  <zt-dialog ref="dialog" title="导入产品模型" :hasConfirm="false" :editAble="false" append-to-body>
    <el-form>
      <zt-form-item style="width:100%;" label="" prop="remark">
        <el-upload