From 8b11f020f8fd532c3fa1f6ce7dcab3d48b057d63 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 16 七月 2024 15:00:01 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java | 17 -----------------
web/src/views/modules/basicInfo/ProductImport.vue | 2 +-
2 files changed, 1 insertions(+), 18 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
index 31d1a1e..b942504 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
+++ b/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();
diff --git a/web/src/views/modules/basicInfo/ProductImport.vue b/web/src/views/modules/basicInfo/ProductImport.vue
index 188a729..6397668 100644
--- a/web/src/views/modules/basicInfo/ProductImport.vue
+++ b/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
--
Gitblit v1.9.1