From 134c06beb2b6b7f7025fb030a9e52bcceebbfc98 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 15 七月 2024 14:36:49 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java | 234 ++++++++++++++++++++++++++++++++++------------
web/src/views/modules/basicInfo/XhProductModel.vue | 7
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ParamData.java | 1
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java | 2
modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml | 2
web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue | 6
modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml | 4
web/src/views/modules/basicInfo/ParamData.vue | 18 +-
web/src/views/modules/basicInfo/ProductImport.vue | 1
9 files changed, 194 insertions(+), 81 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ParamData.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ParamData.java
index f8732be..b85f512 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ParamData.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ParamData.java
@@ -24,6 +24,7 @@
@ApiModelProperty(value = "婧怚D")
private Long productId;
+ @TableField(exist = false)
@ApiModelProperty(value = "鍚嶇О")
private String name;
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 ad9d5a7..af6fbf1 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
@@ -13,6 +13,7 @@
import com.zt.life.modules.mainPart.basicInfo.model.ParamData;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
+import com.zt.life.modules.mainPart.sysPictureBase.service.SysPictureBaseService;
import com.zt.modules.sys.dto.DictTypeDto;
import com.zt.modules.sys.model.SysDictData;
import com.zt.modules.sys.model.SysDictType;
@@ -42,7 +43,11 @@
*/
@Service
public class XhProductModelService extends BaseService<XhProductModelDao, XhProductModel> {
- @Autowired ParamDataService paramDataService;
+ @Autowired
+ ParamDataService paramDataService;
+ @Autowired
+ SysPictureBaseService sysPictureBaseService;
+
/**
* 鍒嗛〉鏌ヨ
*
@@ -67,17 +72,17 @@
List<XhProductModel> productList = null;
if (showXdy) {
productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
- Constant.Bool.NO).gt("product_type", 1).orderByAsc(Constant.TableColumn.SORT));
+ Constant.Bool.NO).lt("product_type", 5).orderByAsc(Constant.TableColumn.SORT));
} else {
if (ztShow == 1) {
productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
- Constant.Bool.NO).gt("product_type", 1).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
+ Constant.Bool.NO).lt("product_type", 5).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
} else if (ztShow == 2) {
productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
- Constant.Bool.NO).gt("product_type", 2).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
+ Constant.Bool.NO).lt("product_type", 4).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
} else if (ztShow == 3) {
productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
- Constant.Bool.NO).gt("product_type", 3).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
+ Constant.Bool.NO).lt("product_type", 3).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
}
}
@@ -124,8 +129,8 @@
repairType.put("鎸囨暟鍒嗗竷", 1);
repairType.put("濞佸竷灏斿垎甯�", 2);
Map<String, Integer> isOrNot = new HashMap<>();
- isOrNot.put("鏄�", 1);
- isOrNot.put("鍚�", 2);
+ isOrNot.put("鏄�", 0);
+ isOrNot.put("鍚�", 1);
try {
// 鑾峰彇瀵煎叆鏂囦欢鐨勫悗缂�鍚�
String fileName = mutFile.getOriginalFilename();
@@ -142,72 +147,177 @@
//List<LifeManagement> lifeManagementList = new ArrayList<LifeManagement>();
String xt = null;
String fxt = null;
- if (sheets == 1) {
- for (int i = 0; i < sheets; i++) {
- Sheet sheet = workbook.getSheetAt(i);
- int num = sheet.getLastRowNum(); // 涓�鍏辨湁澶氬皯琛�
- for (int j = 1; j <= num; j++) {
- CacheUtils.put(progressId, "speed", CommonUtils.getPercent(j, num));
- CacheUtils.put(progressId, "msg", "鍏�" + num + "琛岋紝宸插畬鎴愮" + j + "琛�");
- DictTypeDto lifeManagement = new DictTypeDto();
- boolean isErr = false;
- row1 = j + 1;
- String pattern = "yyyy-MM-dd";
- Row row = sheet.getRow(row1);
- String sort = com.zt.core.shiro.ImportUtil.getCellValue(row, 0, pattern); //搴忓彿
- if (com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern) != null) {
- xt = com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern); //绯荤粺
- }
- if (com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern) != null) {
- fxt = com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern); //鍒嗙郴缁�
- }
- String sb = com.zt.core.shiro.ImportUtil.getCellValue(row, 3, pattern); //璁惧
- String reliabDistribType = com.zt.core.shiro.ImportUtil.getCellValue(row, 4, pattern); //鍙潬鎬у垎甯冪被鍨�
- String basicJoinCompute = com.zt.core.shiro.ImportUtil.getCellValue(row, 5, pattern); //鍙傚姞璁＄畻
- String basicMtbfRegulate = com.zt.core.shiro.ImportUtil.getCellValue(row, 6, pattern); //mtbf
- String basicMtbfRegulSuccRate = com.zt.core.shiro.ImportUtil.getCellValue(row, 7, pattern); //鎴愬姛鐜�
- String basicMtbfOperatingRatio = com.zt.core.shiro.ImportUtil.getCellValue(row, 8, pattern); //杩愯姣�
- String taskMtbcfRegulate = com.zt.core.shiro.ImportUtil.getCellValue(row, 9, pattern); //mtbcf
- String taskMtbcfOtherParams2 = com.zt.core.shiro.ImportUtil.getCellValue(row, 10, pattern); //mtbcf鍏朵粬鍙傛暟2
- String taskMtbcfOtherParams3 = com.zt.core.shiro.ImportUtil.getCellValue(row, 11, pattern); //mtbcf鍏朵粬鍙傛暟3
- String taskMtbcfRegulSuccRate = com.zt.core.shiro.ImportUtil.getCellValue(row, 12, pattern); //mtbcf鎴愬姛鐜�
- String taskMtbcfOperatingRatio = com.zt.core.shiro.ImportUtil.getCellValue(row, 13, pattern); //mtbcf杩愯姣�
- String repairable = com.zt.core.shiro.ImportUtil.getCellValue(row, 14, pattern); //鏄惁鍙淮淇�
- String repairDistribType = com.zt.core.shiro.ImportUtil.getCellValue(row, 15, pattern); //缁翠慨鍙戝竷绫诲瀷
- String repairMttcr = com.zt.core.shiro.ImportUtil.getCellValue(row, 16, pattern); //mttcr
- String repairMttcrOtherParams2 = com.zt.core.shiro.ImportUtil.getCellValue(row, 17, pattern); //mttcr鍏朵粬鍙傛暟2
- String repairMttcrOtherParams3 = com.zt.core.shiro.ImportUtil.getCellValue(row, 18, pattern); //mttcr鍏朵粬鍙傛暟3
+ Long xtId = null;
+ Long fxtId = null;
- XhProductModel xhProductModel = new XhProductModel();
- xhProductModel.setShipId(shipId);
- Long id =UUIDUtil.generateId();
- xhProductModel.setId(id);
+ //瀵煎叆棰勮鍙傛暟
+ ParamData itemEntity1 = new ParamData();
+ itemEntity1.setProductId(shipId);
+ itemEntity1.setPageCode("expect");
+ paramDataService.insert(itemEntity1);
+
+ for (int i = 0; i < sheets; i++) {
+ Sheet sheet = workbook.getSheetAt(i);
+ int num = sheet.getLastRowNum(); // 涓�鍏辨湁澶氬皯琛�
+ String sheetName = sheet.getSheetName(); //鑾峰彇褰撳墠sheet鍚嶇О
+ for (int j = 1; j <= num; j++) {
+ CacheUtils.put(progressId, "speed", CommonUtils.getPercent(j, num));
+ CacheUtils.put(progressId, "msg", "鍏�" + num + "琛岋紝宸插畬鎴愮" + j + "琛�");
+ DictTypeDto lifeManagement = new DictTypeDto();
+ boolean isToggleXt = false;
+ boolean isToggleFxt = false;
+ row1 = j + 1;
+ String pattern = "yyyy-MM-dd";
+ Row row = sheet.getRow(row1);
+ String sort = com.zt.core.shiro.ImportUtil.getCellValue(row, 0, pattern); //搴忓彿
+ if (StringUtils.isNotBlank(com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern))) {
+ if (!com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern).equals(xt)) {
+ isToggleXt = true;
+ xtId = UUIDUtil.generateId();
+ }
+ xt = com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern); //绯荤粺
+ }
+
+ if (StringUtils.isNotBlank(com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern)) && !isToggleXt) {
+ fxt = com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern); //鍒嗙郴缁�
+ fxtId = UUIDUtil.generateId();
+ isToggleFxt = true;
+ } else if (isToggleXt) {
+ if (StringUtils.isNotBlank(com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern))) {
+ fxt = com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern); //鍒嗙郴缁�
+ fxtId = UUIDUtil.generateId();
+ isToggleFxt = true;
+ } else {
+ fxt = null;
+ isToggleFxt = true;
+ }
+ }
+
+ String sb = com.zt.core.shiro.ImportUtil.getCellValue(row, 3, pattern); //璁惧
+ String reliabDistribType = com.zt.core.shiro.ImportUtil.getCellValue(row, 4, pattern); //鍙潬鎬у垎甯冪被鍨�
+ String basicJoinCompute = com.zt.core.shiro.ImportUtil.getCellValue(row, 5, pattern); //鍙傚姞璁＄畻
+ String basicMtbfRegulate = com.zt.core.shiro.ImportUtil.getCellValue(row, 6, pattern); //mtbf
+ String basicMtbfRegulSuccRate = com.zt.core.shiro.ImportUtil.getCellValue(row, 7, pattern); //鎴愬姛鐜�
+ String basicMtbfOperatingRatio = com.zt.core.shiro.ImportUtil.getCellValue(row, 8, pattern); //杩愯姣�
+ String taskMtbcfRegulate = com.zt.core.shiro.ImportUtil.getCellValue(row, 9, pattern); //mtbcf
+ String taskMtbcfOtherParams2 = com.zt.core.shiro.ImportUtil.getCellValue(row, 10, pattern); //mtbcf鍏朵粬鍙傛暟2
+ String taskMtbcfOtherParams3 = com.zt.core.shiro.ImportUtil.getCellValue(row, 11, pattern); //mtbcf鍏朵粬鍙傛暟3
+ String taskMtbcfRegulSuccRate = com.zt.core.shiro.ImportUtil.getCellValue(row, 12, pattern); //mtbcf鎴愬姛鐜�
+ String taskMtbcfOperatingRatio = com.zt.core.shiro.ImportUtil.getCellValue(row, 13, pattern); //mtbcf杩愯姣�
+ String repairable = com.zt.core.shiro.ImportUtil.getCellValue(row, 14, pattern); //鏄惁鍙淮淇�
+ String repairDistribType = com.zt.core.shiro.ImportUtil.getCellValue(row, 15, pattern); //缁翠慨鍙戝竷绫诲瀷
+ String repairMttcr = com.zt.core.shiro.ImportUtil.getCellValue(row, 16, pattern); //mttcr
+ String repairMttcrOtherParams2 = com.zt.core.shiro.ImportUtil.getCellValue(row, 17, pattern); //mttcr鍏朵粬鍙傛暟2
+ String repairMttcrOtherParams3 = com.zt.core.shiro.ImportUtil.getCellValue(row, 18, pattern); //mttcr鍏朵粬鍙傛暟3
+
+ if (StringUtils.isEmpty(sb)) {
+ 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(basicMtbfRegulate)) {
+ com.zt.life.util.ImportUtil.updateErrMap(errMap, "娌℃湁濉啓mtbf", sheetName, row1);
+ continue;
+ }
+ if (StringUtils.isEmpty(taskMtbcfRegulate)) {
+ com.zt.life.util.ImportUtil.updateErrMap(errMap, "娌℃湁濉啓mtbcf", 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();
+
+
+ Long defultImg = null;
+ xhProductModel.setShipId(shipId);
+
+ //娣诲姞绯荤粺
+ if (isToggleXt) {
+ xhProductModel.setPid(shipId);
+ xhProductModel.setId(xtId);
xhProductModel.setName(xt);
xhProductModel.setProductType("3");
+ xhProductModel.setSort(Integer.valueOf(sort));
+ defultImg = sysPictureBaseService.getDefaultImg(3).getId();
+ xhProductModel.setOperatImg(defultImg);
this.insert(xhProductModel);
//瀵煎叆棰勮鍙傛暟
ParamData itemEntity = new ParamData();
- //缁戝畾璁惧ID
- itemEntity.setProductId(id);
- itemEntity.setName(sb);
- itemEntity.setReliabDistribType(reliabType.get(reliabDistribType));
- itemEntity.setBasicJoinCompute(isOrNot.get(basicJoinCompute));
- itemEntity.setBasicMtbfRegulate(basicMtbfRegulate);
- itemEntity.setBasicMtbfRegulSuccRate(basicMtbfRegulSuccRate);
- itemEntity.setBasicMtbfOperatingRatio(basicMtbfOperatingRatio);
- itemEntity.setTaskMtbcfRegulate(taskMtbcfRegulate);
- itemEntity.setTaskMtbcfOtherParams(taskMtbcfOtherParams2 + "," + taskMtbcfOtherParams3);
- itemEntity.setTaskMtbcfRegulSuccRate(taskMtbcfRegulSuccRate);
- itemEntity.setTaskMtbcfOperatingRatio(taskMtbcfOperatingRatio);
- itemEntity.setRepairable(isOrNot.get(repairable));
- itemEntity.setRepairDistribType(repairType.get(repairDistribType));
- itemEntity.setRepairMttcr(repairMttcr);
- itemEntity.setRepairMttcrOtherParams(repairMttcrOtherParams2 + "," + repairMttcrOtherParams3);
+ itemEntity.setProductId(xtId);
+ itemEntity.setPageCode("expect");
paramDataService.insert(itemEntity);
}
+
+
+ if (StringUtils.isNotBlank(fxt) && isToggleFxt) {
+ xhProductModel.setPid(xtId);
+ xhProductModel.setId(fxtId);
+ xhProductModel.setName(fxt);
+ xhProductModel.setProductType("4");
+ xhProductModel.setSort(Integer.valueOf(sort));
+ defultImg = sysPictureBaseService.getDefaultImg(4).getId();
+ xhProductModel.setOperatImg(defultImg);
+ this.insert(xhProductModel);
+
+ //瀵煎叆棰勮鍙傛暟
+ ParamData itemEntity = new ParamData();
+ itemEntity.setProductId(fxtId);
+ itemEntity.setPageCode("expect");
+ paramDataService.insert(itemEntity);
+ }
+
+ Long sbId = UUIDUtil.generateId();
+ if (StringUtils.isNotBlank(fxt)) {
+ xhProductModel.setPid(fxtId);
+ } else {
+ xhProductModel.setPid(xtId);
+ }
+ xhProductModel.setId(sbId);
+ xhProductModel.setName(sb);
+ xhProductModel.setProductType("5");
+ xhProductModel.setSort(Integer.valueOf(sort));
+ defultImg = sysPictureBaseService.getDefaultImg(5).getId();
+ xhProductModel.setOperatImg(defultImg);
+ this.insert(xhProductModel);
+
+ //瀵煎叆棰勮鍙傛暟
+ ParamData itemEntity = new ParamData();
+ //缁戝畾璁惧ID
+ itemEntity.setProductId(sbId);
+ itemEntity.setPageCode("expect");
+ itemEntity.setReliabDistribType(reliabType.get(reliabDistribType));
+ itemEntity.setBasicJoinCompute(isOrNot.get(basicJoinCompute));
+ itemEntity.setBasicMtbfRegulate(basicMtbfRegulate);
+ itemEntity.setBasicMtbfRegulSuccRate(basicMtbfRegulSuccRate);
+ itemEntity.setBasicMtbfOperatingRatio(basicMtbfOperatingRatio);
+ itemEntity.setTaskMtbcfRegulate(taskMtbcfRegulate);
+ itemEntity.setTaskMtbcfOtherParams(taskMtbcfOtherParams2 + "," + taskMtbcfOtherParams3);
+ itemEntity.setTaskMtbcfRegulSuccRate(taskMtbcfRegulSuccRate);
+ itemEntity.setTaskMtbcfOperatingRatio(taskMtbcfOperatingRatio);
+ itemEntity.setRepairable(isOrNot.get(repairable));
+ itemEntity.setRepairDistribType(repairType.get(repairDistribType));
+ itemEntity.setRepairMttcr(repairMttcr);
+ itemEntity.setRepairMttcrOtherParams(repairMttcrOtherParams2 + "," + repairMttcrOtherParams3);
+ paramDataService.insert(itemEntity);
}
}
+
} catch (Exception e) {
e.printStackTrace();
ImportUtil.updateErrMap(errMap, "瀵煎叆寮傚父" + e.getMessage(), "", row1);
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java
index fa2ec41..660d39d 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java
@@ -255,7 +255,7 @@
Long dataId = node.getDataId();
XhProductModel xhProductModel = xhProductModelDao.getById(dataId);
if (xhProductModel == null) return;
- if ("1".equals(xhProductModel.getProductType())) {
+ if ("5".equals(xhProductModel.getProductType())) {
// 璁惧
ParamData paramData = paramDataDao.getParamData(dataId, "expect");
if (paramData == null) return;
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index 17a7338..6c57b7d 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -40,7 +40,7 @@
select a.name, a.id
from product_model a
where a.is_delete = 0
- and a.product_type = 5
+ and a.product_type = 1
</select>
<select id="getProduct" resultType="com.zt.life.modules.mainPart.basicInfo.model.ProductImg">
SELECT a.operat_img as imgPath,
@@ -100,7 +100,7 @@
select a.name, a.id
from product_model a
where a.is_delete = 0
- and a.product_type = 4
+ and a.product_type = 2
</select>
<select id="getById" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
select a.*
diff --git a/modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml b/modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml
index 674c05e..cd015d3 100644
--- a/modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml
@@ -45,7 +45,7 @@
select a.name, a.id
from sys_picture_base a
where a.is_delete = 0
- and a.is_default = 1
+ and a.is_default = 0
and a.product_type = ${productType}
</select>
</mapper>
diff --git a/web/src/views/modules/basicInfo/ParamData.vue b/web/src/views/modules/basicInfo/ParamData.vue
index f90d815..48e8351 100644
--- a/web/src/views/modules/basicInfo/ParamData.vue
+++ b/web/src/views/modules/basicInfo/ParamData.vue
@@ -43,7 +43,7 @@
@selection-change="table.selectionChangeHandle">
<el-table-column type="selection" :key="1" width="40" align="center"/>
<el-table-column prop="name" :key="2" label="鍚嶇О" fixed="left" width="120"/>
- <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'"
+ <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='4'"
prop="reliabDistribType"
label="鍙潬鎬у垎甯冪被鍨�" :key="27"
>
@@ -61,13 +61,13 @@
:hit="hit"/>
</template>
</el-table-column>
- <el-table-column v-if="dataForm.productType==='4'" :key="3" prop="baseOperatRatio" label="鍩烘湰鍙潬鎬ц繍琛屾瘮">
+ <el-table-column v-if="dataForm.productType==='2'" :key="3" prop="baseOperatRatio" label="鍩烘湰鍙潬鎬ц繍琛屾瘮">
<template slot-scope="scope">
<el-input v-if="scope.row.isEdit" v-model="scope.row.baseOperatRatio"></el-input>
<span v-else v-text="scope.row.baseOperatRatio"></span>
</template>
</el-table-column>
- <el-table-column v-if="dataForm.productType==='5'||dataForm.productType==='4'" :key="4"
+ <el-table-column v-if="dataForm.productType==='1'||dataForm.productType==='2'" :key="4"
prop="actualRunTime"
label="瀹為檯杩愯鏃堕棿">
<template slot-scope="scope">
@@ -75,7 +75,7 @@
<span v-else v-text="scope.row.actualRunTime"></span>
</template>
</el-table-column>
- <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" :key="5"
+ <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='4'" :key="5"
label="鍩烘湰鍙潬鎬ц绠�">
<!-- <zt-table-column-dict prop="joinCompute" :keys="6" label="鍙傚姞璁＄畻" width="100" dict="is_or_not"/>-->
<el-table-column prop="basicJoinCompute" label="鍙傚姞璁＄畻" :key="6" width="100">
@@ -154,7 +154,7 @@
</el-tab-pane>
- <el-tab-pane label="浠诲姟鍙潬鎬�" name="second" v-if="dataForm.productType==='3'||dataForm.productType==='2'">
+ <el-tab-pane label="浠诲姟鍙潬鎬�" name="second" v-if="dataForm.productType==='3'||dataForm.productType==='4'">
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px"
v-adaptive="{bottomOffset:30}"
class="paramsDataTable"
@@ -162,7 +162,7 @@
<el-table-column type="selection" :key="1" width="40" align="center"/>
<el-table-column prop="name" :key="2" label="鍚嶇О" fixed="left" width="120"/>
- <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" :key="15"
+ <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='4'" :key="15"
label="浠诲姟鍙潬鎬ц绠�">
<el-table-column prop="taskMtbcfRegulate" :key="16" label="MTBCF" width="100">
<template slot-scope="scope">
@@ -201,7 +201,7 @@
</template>
</el-table-column>
</el-table-column>
- <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" :key="22" label="缁翠慨鍒嗗竷">
+ <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='4'" :key="22" label="缁翠慨鍒嗗竷">
<!-- <zt-table-column-dict prop="repairable" :keys="23" label="鍙淮淇�" dict="is_or_not"/>-->
<el-table-column prop="repairable" label="鍙淮淇�" :key="23" width="80">
<template v-slot="{ row }">
@@ -293,7 +293,7 @@
srcId: '',
name: '',
dataThreeList: null,
- productType: '5',
+ productType: '1',
basicJoinCompute: '',
repairable: '',
repairDistribType: '',
@@ -364,7 +364,7 @@
},
add() {
this.$refs.SelectTyModel.$refs.dialog.init(null, {
- type: this.dataForm.productType - 1,
+ type: this.dataForm.productType + 1,
id: this.dataForm.srcId,
pageCode: this.pageCode
})
diff --git a/web/src/views/modules/basicInfo/ProductImport.vue b/web/src/views/modules/basicInfo/ProductImport.vue
index 86c8fdf..188a729 100644
--- a/web/src/views/modules/basicInfo/ProductImport.vue
+++ b/web/src/views/modules/basicInfo/ProductImport.vue
@@ -88,6 +88,7 @@
// return val1 - val2
// }),
init(row) {
+ console.log(row,'ship')
this.fileList = []
this.resultData = []
this.progress.id = guid()
diff --git a/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue b/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue
index f48641b..cb0524c 100644
--- a/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue
@@ -56,10 +56,10 @@
if (params.type === 'xh') {
this.isShow = false
this.dataForm.pid = null
- this.dataForm.productType = 5
+ this.dataForm.productType = 1
} else if (params.type === 'zt') {
this.dataForm.pid = params.pid
- this.dataForm.productType = 4
+ this.dataForm.productType = 2
this.getProductList()
} else {
this.dataForm.pid = params.pid
@@ -104,7 +104,7 @@
async formSubmit() {
let flag = true
if (this.isShow) {
- if (this.dataForm.productType === '5') {
+ if (this.dataForm.productType === '1') {
this.$alert("涓嶆敮鎸佹柊澧炴鑺傜偣")
flag = false
}
diff --git a/web/src/views/modules/basicInfo/XhProductModel.vue b/web/src/views/modules/basicInfo/XhProductModel.vue
index 640b5b5..2909167 100644
--- a/web/src/views/modules/basicInfo/XhProductModel.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel.vue
@@ -37,7 +37,7 @@
<el-table-column prop="sort" label="鎺掑簭" width="100px"/>
<zt-table-column-handle :table="table" width="180px">
<template v-slot="{ row }">
- <zt-table-button v-if="productType==='5'" size="small" type="primary"
+ <zt-table-button v-if="productType==='1'" size="small" type="primary"
@click="importData(row)">瀵煎叆
</zt-table-button>
</template>
@@ -85,7 +85,8 @@
methods: {
add() {
this.dataForm.type = this.productType
- if (this.dataForm.type !== '5') {
+ alert(this.dataForm.type )
+ if (this.dataForm.type !== '1') {
if (this.dataForm.type !== '3') {
this.dataForm.type = this.dataForm.type - 1
} else if (this.dataForm.type === '3') {
@@ -121,7 +122,7 @@
}
},
importData(row) {
- this.$refs.ProductImport.$refs.dialog.init(row.id)
+ this.$refs.ProductImport.$refs.dialog.init(row)
}
}
}
--
Gitblit v1.9.1