WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

Browse Source
This commit is contained in:
wangzhijiang
2023-04-16 22:21:44 +08:00
parent b0ab12e353 7855f487b6
commit 1ba1e2900a
31 changed files with 436 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java
+14 -4
View File
@@ -17,10 +17,7 @@ import com.jero.modules.ota.utils.ImportFileUtil;
import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysDictService;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -871,25 +868,38 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
cell.setCellValue(bass.getEdrScqy()); cell.setCellValue(bass.getEdrScqy());
CellStyle style = wb.createCellStyle();
style.setBorderTop(BorderStyle.THIN);
style.setBorderBottom(BorderStyle.THIN);
style.setBorderLeft(BorderStyle.THIN);
style.setBorderRight(BorderStyle.THIN);
List<OtaBaCxSjmk> sjmkList = OtaBaCxSjmkService.queryByOtaId(otaId); List<OtaBaCxSjmk> sjmkList = OtaBaCxSjmkService.queryByOtaId(otaId);
int startRow = 63; int startRow = 63;
for (OtaBaCxSjmk sjmk : sjmkList) { for (OtaBaCxSjmk sjmk : sjmkList) {
row = s.createRow(startRow); row = s.createRow(startRow);
cell = row.createCell(0); cell = row.createCell(0);
cell.setCellStyle(style);
cell.setCellValue(sjmk.getBjmc()); cell.setCellValue(sjmk.getBjmc());
cell = row.createCell(1); cell = row.createCell(1);
cell.setCellStyle(style);
cell.setCellValue(ImportFileUtil.getCellValueHaveOrNot(sjmk.getPzqk())); cell.setCellValue(ImportFileUtil.getCellValueHaveOrNot(sjmk.getPzqk()));
cell = row.createCell(2); cell = row.createCell(2);
cell.setCellStyle(style);
cell.setCellValue(sjmk.getKzqmc()); cell.setCellValue(sjmk.getKzqmc());
cell = row.createCell(3); cell = row.createCell(3);
cell.setCellStyle(style);
cell.setCellValue(sjmk.getYjggxh()); cell.setCellValue(sjmk.getYjggxh());
cell = row.createCell(4); cell = row.createCell(4);
cell.setCellStyle(style);
cell.setCellValue(sjmk.getYjscqy()); cell.setCellValue(sjmk.getYjscqy());
cell = row.createCell(5); cell = row.createCell(5);
cell.setCellStyle(style);
cell.setCellValue(sjmk.getRjbb()); cell.setCellValue(sjmk.getRjbb());
cell = row.createCell(6); cell = row.createCell(6);
cell.setCellStyle(style);
cell.setCellValue(sjmk.getRjkfqy()); cell.setCellValue(sjmk.getRjkfqy());
cell = row.createCell(7); cell = row.createCell(7);
cell.setCellStyle(style);
cell.setCellValue(sjmk.getBzwz()); cell.setCellValue(sjmk.getBzwz());
startRow++; startRow++;
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java
+22 -4
View File
@@ -20,10 +20,7 @@ import com.jero.modules.ota.utils.ImportFileUtil;
import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysDictService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -340,44 +337,65 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl<OtaBaCxKsjjsmccsMap
List<OtaBaCxKsjjsmccs> mccsList = this.getByOtaId(otaId); List<OtaBaCxKsjjsmccs> mccsList = this.getByOtaId(otaId);
Workbook wb = ImportFileUtil.readExcel(file); Workbook wb = ImportFileUtil.readExcel(file);
Sheet s = wb.getSheetAt(0); Sheet s = wb.getSheetAt(0);
CellStyle style = wb.createCellStyle();
style.setBorderTop(BorderStyle.THIN);
style.setBorderBottom(BorderStyle.THIN);
style.setBorderLeft(BorderStyle.THIN);
style.setBorderRight(BorderStyle.THIN);
int startRow = 3; int startRow = 3;
for (int i = 0; i < mccsList.size(); i++) { for (int i = 0; i < mccsList.size(); i++) {
OtaBaCxKsjjsmccs mccs = mccsList.get(i); OtaBaCxKsjjsmccs mccs = mccsList.get(i);
Row row = s.getRow(startRow); Row row = s.getRow(startRow);
Cell cell = row.createCell(0); Cell cell = row.createCell(0);
cell.setCellStyle(style);
cell.setCellValue(mccs.getGnmc()); cell.setCellValue(mccs.getGnmc());
cell = row.createCell(1); cell = row.createCell(1);
cell.setCellStyle(style);
cell.setCellValue(ImportFileUtil.getCellValueHaveOrNot(mccs.getPzqk())); cell.setCellValue(ImportFileUtil.getCellValueHaveOrNot(mccs.getPzqk()));
cell = row.createCell(2); cell = row.createCell(2);
cell.setCellStyle(style);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(mccs.getSfksj())); cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(mccs.getSfksj()));
cell = row.createCell(3); cell = row.createCell(3);
cell.setCellStyle(style);
cell.setCellValue(ComparisonUtil.queryDictTextByKey("driving_automation_level", mccs.getJszdhjb(), sysDictService)); cell.setCellValue(ComparisonUtil.queryDictTextByKey("driving_automation_level", mccs.getJszdhjb(), sysDictService));
cell = row.createCell(4); cell = row.createCell(4);
cell.setCellStyle(style);
cell.setCellValue(mccs.getSjggcs()); cell.setCellValue(mccs.getSjggcs());
cell = row.createCell(5); cell = row.createCell(5);
cell.setCellStyle(style);
cell.setCellValue(mccs.getGnms()); cell.setCellValue(mccs.getGnms());
cell = row.createCell(6); cell = row.createCell(6);
cell.setCellStyle(style);
cell.setCellValue(mccs.getSytj()); cell.setCellValue(mccs.getSytj());
cell = row.createCell(7); cell = row.createCell(7);
cell.setCellStyle(style);
cell.setCellValue(mccs.getKzqmc()); cell.setCellValue(mccs.getKzqmc());
cell = row.createCell(8); cell = row.createCell(8);
cell.setCellStyle(style);
cell.setCellValue(mccs.getKzqscqy()); cell.setCellValue(mccs.getKzqscqy());
cell = row.createCell(9); cell = row.createCell(9);
cell.setCellStyle(style);
cell.setCellValue(mccs.getKzqxh()); cell.setCellValue(mccs.getKzqxh());
cell = row.createCell(10); cell = row.createCell(10);
cell.setCellStyle(style);
cell.setCellValue(mccs.getYjbbxx()); cell.setCellValue(mccs.getYjbbxx());
cell = row.createCell(11); cell = row.createCell(11);
cell.setCellStyle(style);
cell.setCellValue(mccs.getRjkfqy()); cell.setCellValue(mccs.getRjkfqy());
cell = row.createCell(12); cell = row.createCell(12);
cell.setCellStyle(style);
cell.setCellValue(mccs.getCzxtbbh()); cell.setCellValue(mccs.getCzxtbbh());
cell = row.createCell(13); cell = row.createCell(13);
cell.setCellStyle(style);
cell.setCellValue(mccs.getCsyzsj()); cell.setCellValue(mccs.getCsyzsj());
startRow++; startRow++;
} }
Row row = s.createRow(startRow); Row row = s.createRow(startRow);
Cell cell = row.createCell(0); Cell cell = row.createCell(0);
cell.setCellStyle(style);
cell.setCellValue("证明材料"); cell.setCellValue("证明材料");
cell = row.createCell(1); cell = row.createCell(1);
cell.setCellStyle(style);
OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId); OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId);
if (ObjectUtils.isNotEmpty(otaBaCxList)) { if (ObjectUtils.isNotEmpty(otaBaCxList)) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java
+23 -4
View File
@@ -20,10 +20,7 @@ import com.jero.modules.ota.utils.ImportFileUtil;
import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysDictService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -414,19 +411,28 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl<OtaBaCxKsjxtmccsMap
List<OtaBaCxKsjxtmccs> mccsList = this.getByOtaId(otaId); List<OtaBaCxKsjxtmccs> mccsList = this.getByOtaId(otaId);
Workbook wb = ImportFileUtil.readExcel(file); Workbook wb = ImportFileUtil.readExcel(file);
Sheet s = wb.getSheetAt(0); Sheet s = wb.getSheetAt(0);
CellStyle style = wb.createCellStyle();
style.setBorderTop(BorderStyle.THIN);
style.setBorderBottom(BorderStyle.THIN);
style.setBorderLeft(BorderStyle.THIN);
style.setBorderRight(BorderStyle.THIN);
int startRow = 3; int startRow = 3;
for (OtaBaCxKsjxtmccs mccs : mccsList) { for (OtaBaCxKsjxtmccs mccs : mccsList) {
Row row = s.getRow(startRow); Row row = s.getRow(startRow);
Cell cell = row.createCell(0); Cell cell = row.createCell(0);
cell.setCellStyle(style);
cell.setCellValue(mccs.getXtlb()); cell.setCellValue(mccs.getXtlb());
cell = row.createCell(1); cell = row.createCell(1);
cell.setCellStyle(style);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(mccs.getSfksj())); cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(mccs.getSfksj()));
cell = row.createCell(2); cell = row.createCell(2);
cell.setCellStyle(style);
cell.setCellValue(mccs.getSjbgcs()); cell.setCellValue(mccs.getSjbgcs());
cell = row.createCell(3); cell = row.createCell(3);
cell.setCellStyle(style);
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
String tptStr = mccs.getTpt(); String tptStr = mccs.getTpt();
if (StringUtils.isNotEmpty(tptStr)) { if (StringUtils.isNotEmpty(tptStr)) {
@@ -446,26 +452,37 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl<OtaBaCxKsjxtmccsMap
cell.setCellValue(sb.toString()); cell.setCellValue(sb.toString());
} }
cell = row.createCell(4); cell = row.createCell(4);
cell.setCellStyle(style);
cell.setCellValue(mccs.getKzqmc()); cell.setCellValue(mccs.getKzqmc());
cell = row.createCell(5); cell = row.createCell(5);
cell.setCellStyle(style);
cell.setCellValue(mccs.getAqwzxdj()); cell.setCellValue(mccs.getAqwzxdj());
cell = row.createCell(6); cell = row.createCell(6);
cell.setCellStyle(style);
cell.setCellValue(mccs.getKzqscqy()); cell.setCellValue(mccs.getKzqscqy());
cell = row.createCell(7); cell = row.createCell(7);
cell.setCellStyle(style);
cell.setCellValue(mccs.getKzqxh()); cell.setCellValue(mccs.getKzqxh());
cell = row.createCell(8); cell = row.createCell(8);
cell.setCellStyle(style);
cell.setCellValue(mccs.getYjbbxx()); cell.setCellValue(mccs.getYjbbxx());
cell = row.createCell(9); cell = row.createCell(9);
cell.setCellStyle(style);
cell.setCellValue(mccs.getCsrjbbh()); cell.setCellValue(mccs.getCsrjbbh());
cell = row.createCell(10); cell = row.createCell(10);
cell.setCellStyle(style);
cell.setCellValue(mccs.getCsrjbwzsj()); cell.setCellValue(mccs.getCsrjbwzsj());
cell = row.createCell(11); cell = row.createCell(11);
cell.setCellStyle(style);
cell.setCellValue(mccs.getSjsfyx()); cell.setCellValue(mccs.getSjsfyx());
cell = row.createCell(12); cell = row.createCell(12);
cell.setCellStyle(style);
cell.setCellValue(mccs.getCzxtlx()); cell.setCellValue(mccs.getCzxtlx());
cell = row.createCell(13); cell = row.createCell(13);
cell.setCellStyle(style);
cell.setCellValue(mccs.getCzxtscqy()); cell.setCellValue(mccs.getCzxtscqy());
cell = row.createCell(14); cell = row.createCell(14);
cell.setCellStyle(style);
cell.setCellValue(mccs.getCzxtbbh()); cell.setCellValue(mccs.getCzxtbbh());
startRow++; startRow++;
} }
@@ -474,8 +491,10 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl<OtaBaCxKsjxtmccsMap
row = s.createRow(startRow); row = s.createRow(startRow);
} }
Cell cell = row.createCell(0); Cell cell = row.createCell(0);
cell.setCellStyle(style);
cell.setCellValue("证明材料"); cell.setCellValue("证明材料");
cell = row.createCell(1); cell = row.createCell(1);
cell.setCellStyle(style);
OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId); OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId);
if (ObjectUtils.isNotEmpty(otaBaCxList)) { if (ObjectUtils.isNotEmpty(otaBaCxList)) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java
+4 -4
View File
@@ -200,8 +200,8 @@ public class OtaBaSjListServiceImpl extends ServiceImpl<OtaBaSjListMapper, OtaBa
File sjmbcxFile = ImportFileUtil.findFile(exportFile, "升级目标车型.xlsx"); File sjmbcxFile = ImportFileUtil.findFile(exportFile, "升级目标车型.xlsx");
otaBaSjSjmbcxService.exportData(sjmbcxFile, otaId, cut); otaBaSjSjmbcxService.exportData(sjmbcxFile, otaId, cut);
File mbclFile = ImportFileUtil.findFile(exportFile, "本次升级涉及的目标车辆.xlsx"); File mbclFile = ImportFileUtil.findFile(exportFile, "本次升级的目标车辆.xlsx");
File mbclAttFile = ImportFileUtil.findFoder(exportFile, "本次升级涉及的目标车辆"); File mbclAttFile = ImportFileUtil.findFoder(exportFile, "本次升级的目标车辆");
otaBaSjSjmbclService.exportData(mbclFile, mbclAttFile, otaId, cut); otaBaSjSjmbclService.exportData(mbclFile, mbclAttFile, otaId, cut);
@@ -211,10 +211,10 @@ public class OtaBaSjListServiceImpl extends ServiceImpl<OtaBaSjListMapper, OtaBa
File pgAtt2File = ImportFileUtil.findFoder(pgAttFile, "硬件版本号附件"); File pgAtt2File = ImportFileUtil.findFoder(pgAttFile, "硬件版本号附件");
otaBaSjSjyxpgService.exportData(pgFile, pgAtt1File, pgAtt2File, otaId, cut); otaBaSjSjyxpgService.exportData(pgFile, pgAtt1File, pgAtt2File, otaId, cut);
File sjSjxtbhFile = ImportFileUtil.findFile(exportFile, "本次升级的系统名称与变更参数.xlsx"); File sjSjxtbhFile = ImportFileUtil.findFile(exportFile, "本次升级的系统名称与参数变化.xlsx");
otaBaSjSjxtbhService.exportData(sjSjxtbhFile, otaId, cut); otaBaSjSjxtbhService.exportData(sjSjxtbhFile, otaId, cut);
File sjfzbhFile = ImportFileUtil.findFile(exportFile, "本次升级的驾驶辅助功能与参数变化.xlsx"); File sjfzbhFile = ImportFileUtil.findFile(exportFile, "本次升级的驾驶辅助功能名称与参数变化.xlsx");
otaBaSjSjfzbhService.exportData(sjfzbhFile, otaId, cut); otaBaSjSjfzbhService.exportData(sjfzbhFile, otaId, cut);
File fsFile = ImportFileUtil.findFile(exportFile, "用户告知内容及方式.xlsx"); File fsFile = ImportFileUtil.findFile(exportFile, "用户告知内容及方式.xlsx");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java
+15 -6
View File
@@ -18,10 +18,7 @@ import com.jero.modules.ota.utils.ImportFileUtil;
import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysDictService;
import com.jero.modules.system.util.StringUtils; import com.jero.modules.system.util.StringUtils;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -219,7 +216,7 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl<OtaBaSjSjfzbhMapper, O
@Override @Override
public void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception { public void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception {
ImportFileUtil.exportTemplate(response, templatePath + "本次升级的驾驶辅助功能与参数变化.zip"); ImportFileUtil.exportTemplate(response, templatePath + "本次升级的驾驶辅助功能名称与参数变化.zip");
} }
@Override @Override
@@ -232,7 +229,7 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl<OtaBaSjSjfzbhMapper, O
public void parseFileList(List<File> upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { public void parseFileList(List<File> upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception {
File upFile = null; File upFile = null;
for (File f : upLoadFiles) { for (File f : upLoadFiles) {
if (f.getName().equals("本次升级的驾驶辅助功能与参数变化.xlsx")) { if (f.getName().equals("本次升级的驾驶辅助功能名称与参数变化.xlsx")) {
upFile = f; upFile = f;
} }
} }
@@ -297,24 +294,36 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl<OtaBaSjSjfzbhMapper, O
if (ObjectUtils.isNotEmpty(fzbhList)) { if (ObjectUtils.isNotEmpty(fzbhList)) {
Workbook wb = ImportFileUtil.readExcel(file); Workbook wb = ImportFileUtil.readExcel(file);
Sheet s = wb.getSheetAt(0); Sheet s = wb.getSheetAt(0);
CellStyle style = wb.createCellStyle();
style.setBorderTop(BorderStyle.THIN);
style.setBorderBottom(BorderStyle.THIN);
style.setBorderLeft(BorderStyle.THIN);
style.setBorderRight(BorderStyle.THIN);
Row row; Row row;
Cell cell; Cell cell;
int start = 4; int start = 4;
for (OtaBaSjSjfzbh bh : fzbhList) { for (OtaBaSjSjfzbh bh : fzbhList) {
row = s.createRow(start); row = s.createRow(start);
cell = row.createCell(0); cell = row.createCell(0);
cell.setCellStyle(style);
cell.setCellValue(bh.getGnmc()); cell.setCellValue(bh.getGnmc());
cell = row.createCell(1); cell = row.createCell(1);
cell.setCellStyle(style);
cell.setCellValue(bh.getSjmdlx()); cell.setCellValue(bh.getSjmdlx());
cell = row.createCell(2); cell = row.createCell(2);
cell.setCellStyle(style);
cell.setCellValue(bh.getSjqbgcs()); cell.setCellValue(bh.getSjqbgcs());
cell = row.createCell(3); cell = row.createCell(3);
cell.setCellStyle(style);
cell.setCellValue(bh.getSjhbgcs()); cell.setCellValue(bh.getSjhbgcs());
cell = row.createCell(4); cell = row.createCell(4);
cell.setCellStyle(style);
cell.setCellValue(bh.getGnbgms()); cell.setCellValue(bh.getGnbgms());
cell = row.createCell(5); cell = row.createCell(5);
cell.setCellStyle(style);
cell.setCellValue(bh.getSytjbg()); cell.setCellValue(bh.getSytjbg());
cell = row.createCell(6); cell = row.createCell(6);
cell.setCellStyle(style);
cell.setCellValue(bh.getSjsjkzq()); cell.setCellValue(bh.getSjsjkzq());
start++; start++;
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
+2 -2
View File
@@ -177,14 +177,14 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl<OtaBaSjSjmbclMapper, O
@Override @Override
public void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception { public void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception {
ImportFileUtil.exportTemplate(response, templatePath + "本次升级涉及的目标车辆.zip"); ImportFileUtil.exportTemplate(response, templatePath + "本次升级的目标车辆.zip");
} }
@Override @Override
public OtaBaSjSjmbcl parseFileList(List<File> upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { public OtaBaSjSjmbcl parseFileList(List<File> upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception {
File upFile = null; File upFile = null;
for (File f : upLoadFiles) { for (File f : upLoadFiles) {
if (f.getName().equals("本次升级涉及的目标车辆.xlsx")) { if (f.getName().equals("本次升级的目标车辆.xlsx")) {
upFile = f; upFile = f;
} }
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java
+21 -6
View File
@@ -18,10 +18,8 @@ import com.jero.modules.ota.utils.ImportFileUtil;
import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysDictService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.hssf.usermodel.HSSFCellStyle;
import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -199,7 +197,7 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl<OtaBaSjSjxtbhMapper, O
@Override @Override
public void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception { public void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception {
ImportFileUtil.exportTemplate(response, templatePath + "本次升级的系统名称与变更参数.zip"); ImportFileUtil.exportTemplate(response, templatePath + "本次升级的系统名称与参数变化.zip");
} }
@Override @Override
@@ -212,7 +210,7 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl<OtaBaSjSjxtbhMapper, O
public void parseFileList(List<File> upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { public void parseFileList(List<File> upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception {
File upFile = null; File upFile = null;
for (File f : upLoadFiles) { for (File f : upLoadFiles) {
if (f.getName().equals("本次升级的系统名称与变更参数.xlsx")) { if (f.getName().equals("本次升级的系统名称与参数变化.xlsx")) {
upFile = f; upFile = f;
} }
} }
@@ -290,34 +288,51 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl<OtaBaSjSjxtbhMapper, O
if (ObjectUtils.isNotEmpty(bhList)) { if (ObjectUtils.isNotEmpty(bhList)) {
Workbook wb = ImportFileUtil.readExcel(file); Workbook wb = ImportFileUtil.readExcel(file);
Sheet s = wb.getSheetAt(0); Sheet s = wb.getSheetAt(0);
CellStyle style = wb.createCellStyle();
style.setBorderTop(BorderStyle.THIN);
style.setBorderBottom(BorderStyle.THIN);
style.setBorderLeft(BorderStyle.THIN);
style.setBorderRight(BorderStyle.THIN);
Row row; Row row;
Cell cell; Cell cell;
int start = 4; int start = 4;
for (OtaBaSjSjxtbh bh : bhList) { for (OtaBaSjSjxtbh bh : bhList) {
row = s.createRow(start); row = s.createRow(start);
cell = row.createCell(0); cell = row.createCell(0);
cell.setCellStyle(style);
cell.setCellValue(bh.getXtmc()); cell.setCellValue(bh.getXtmc());
cell = row.createCell(1); cell = row.createCell(1);
cell.setCellStyle(style);
cell.setCellValue(bh.getSjqbgcs()); cell.setCellValue(bh.getSjqbgcs());
cell = row.createCell(2); cell = row.createCell(2);
cell.setCellStyle(style);
cell.setCellValue(bh.getSjhbgcs()); cell.setCellValue(bh.getSjhbgcs());
cell = row.createCell(3); cell = row.createCell(3);
cell.setCellStyle(style);
cell.setCellValue(bh.getSjkzqmc()); cell.setCellValue(bh.getSjkzqmc());
cell = row.createCell(4); cell = row.createCell(4);
cell.setCellStyle(style);
cell.setCellValue(bh.getYjbb()); cell.setCellValue(bh.getYjbb());
cell = row.createCell(5); cell = row.createCell(5);
cell.setCellStyle(style);
cell.setCellValue(bh.getSjqrjbb()); cell.setCellValue(bh.getSjqrjbb());
cell = row.createCell(6); cell = row.createCell(6);
cell.setCellStyle(style);
cell.setCellValue(bh.getSjhrjbb()); cell.setCellValue(bh.getSjhrjbb());
cell = row.createCell(7); cell = row.createCell(7);
cell.setCellStyle(style);
cell.setCellValue(bh.getSjqczxt()); cell.setCellValue(bh.getSjqczxt());
cell = row.createCell(8); cell = row.createCell(8);
cell.setCellStyle(style);
cell.setCellValue(bh.getSjhczxt()); cell.setCellValue(bh.getSjhczxt());
cell = row.createCell(9); cell = row.createCell(9);
cell.setCellStyle(style);
cell.setCellValue(bh.getSjbyzsj()); cell.setCellValue(bh.getSjbyzsj());
cell = row.createCell(10); cell = row.createCell(10);
cell.setCellStyle(style);
cell.setCellValue(bh.getSjbdx()); cell.setCellValue(bh.getSjbdx());
cell = row.createCell(11); cell = row.createCell(11);
cell.setCellStyle(style);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(bh.getSfcfsj())); cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(bh.getSfcfsj()));
start++; start++;
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java
+5 -1
View File
@@ -515,7 +515,11 @@ public class ImportFileUtil {
// 需要保留原来的文件结构时,需要对空文件夹进行处理 // 需要保留原来的文件结构时,需要对空文件夹进行处理
if (KeepDirStructure) { if (KeepDirStructure) {
// 空文件夹的处理 // 空文件夹的处理
zos.putNextEntry(new ZipEntry(name + "/")); ZipEntry folderEntry = new ZipEntry(name + "/");
folderEntry.setMethod(ZipEntry.STORED);
folderEntry.setSize(0);
folderEntry.setCrc(0);
zos.putNextEntry(folderEntry);
// 没有文件，不需要文件的copy // 没有文件，不需要文件的copy
zos.closeEntry(); zos.closeEntry();
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+8 -3
View File
@@ -11343,14 +11343,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) { for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) {
//未发起或拒绝 可以发起清单确认 //未发起或拒绝 可以发起清单确认
boolean checkStatus = (StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) boolean checkStatus = (StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
||StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())); ||StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
||StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
||StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
);
//如果该数据的法规工程师不为空 //如果该数据的法规工程师不为空
boolean checkUser = (StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId())); boolean checkUser = (StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId()));
if(checkStatus && checkUser){ if(checkStatus && checkUser){
if(StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())){ if(StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
||StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())){
projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
} }
if(StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())){ if(StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
||StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())){
projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
} }
jero-web/src/common/lang/en-us.js
+5 -2
View File
@@ -1115,7 +1115,7 @@ module.exports = {
requiredParametersEmpty: 'Required parameters cannot be empty', requiredParametersEmpty: 'Required parameters cannot be empty',
PleaseTaskConfirmationRejected: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected', PleaseTaskConfirmationRejected: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected',
theProjectContactEmpty: 'The project contact person of cannot be empty', theProjectContactEmpty: 'The project contact person of cannot be empty',
pleaseSelectinitiatedOrRejected: 'Please select the data whose design compliance confirmation process status is List to be Published or whose verification compliance confirmation process status is List to be Published', pleaseSelectinitiatedOrRejected: 'Please select the data whose design compliance confirmation process status is List Pending Release, Regulatory Engineer Returned or Verification Compliance Confirmation Process status is List Pending Release, Regulatory Engineer Returned',
TheEngineerAndCertification: 'The regulatory engineer of cannot be empty', TheEngineerAndCertification: 'The regulatory engineer of cannot be empty',
pleaseSelectTheDataverificationVerified:'Please select the data whose design compliance confirmation process status is List Pending Verification, Responsible Person Rejected, or Verification Compliance Confirmation process status is List Pending Verification, Responsible Person Rejected', pleaseSelectTheDataverificationVerified:'Please select the data whose design compliance confirmation process status is List Pending Verification, Responsible Person Rejected, or Verification Compliance Confirmation process status is List Pending Verification, Responsible Person Rejected',
theResponsiblePersonAndDeadlineClank: 'The responsible person and deadline of cannot be blank', theResponsiblePersonAndDeadlineClank: 'The responsible person and deadline of cannot be blank',
@@ -1748,7 +1748,7 @@ module.exports = {
databasereportingtime:'Synchronize the database reporting time', databasereportingtime:'Synchronize the database reporting time',
synchronizationtime:'Synchronization time', synchronizationtime:'Synchronization time',
listToBeReleased:'List to be released', listToBeReleased:'List to be released',
listToBeChecked:'List to be checked', listToBeChecked:'Task to be initiated',
taskToBeConfirmed:'Task to be confirmed', taskToBeConfirmed:'Task to be confirmed',
resultsToBeSubmitted:'Results to be submitted', resultsToBeSubmitted:'Results to be submitted',
resultsToBeReviewed:'Results to be reviewed', resultsToBeReviewed:'Results to be reviewed',
@@ -1787,4 +1787,7 @@ module.exports = {
pleaseSelectRegulatoryCurrentLogin:'Please select Regulatory Engineer as the data for the current login', pleaseSelectRegulatoryCurrentLogin:'Please select Regulatory Engineer as the data for the current login',
cannotSetResponsibilityAreas:'Cannot set an interface person due to different responsibility areas', cannotSetResponsibilityAreas:'Cannot set an interface person due to different responsibility areas',
lidar:'lidar', lidar:'lidar',
history:'History',
deliveryDate:'Delivery Date',
regulatoryEngineerReturns:'Regulatory engineer returns',
} }
jero-web/src/common/lang/zh-cn.js
+5 -2
View File
@@ -710,7 +710,7 @@ module.exports = {
listConfirmation: '清单确认', listConfirmation: '清单确认',
ListConfirmationDeadline: '清单确认截止时间', ListConfirmationDeadline: '清单确认截止时间',
dataConfirmation: '请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空', dataConfirmation: '请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空',
pleaseSelectinitiatedOrRejected: '请选择设计符合性确认流程状态为清单待发布或验证符合性确认流程状态为清单待发布的数据', pleaseSelectinitiatedOrRejected: '请选择设计符合性确认流程状态为清单待发布、法规工程师退回或验证符合性确认流程状态为清单待发布、法规工程师退回的数据',
pleaseSelectTheDataverificationVerified: '请选择设计符合性确认流程状态为清单待校核、责任人拒绝或验证符合性确认流程状态为清单待校核、责任人拒绝的数据', pleaseSelectTheDataverificationVerified: '请选择设计符合性确认流程状态为清单待校核、责任人拒绝或验证符合性确认流程状态为清单待校核、责任人拒绝的数据',
TheEngineerAndCertification: '的法规工程师不能为空', TheEngineerAndCertification: '的法规工程师不能为空',
taskDataConfirmation: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空', taskDataConfirmation: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空',
@@ -1850,7 +1850,7 @@ module.exports = {
databasereportingtime: '同步上报库时间', databasereportingtime: '同步上报库时间',
synchronizationtime: '同步时间', synchronizationtime: '同步时间',
listToBeReleased: '清单待发布', listToBeReleased: '清单待发布',
listToBeChecked: '清单待校核', listToBeChecked: '任务待发起',
taskToBeConfirmed: '任务待确认', taskToBeConfirmed: '任务待确认',
resultsToBeSubmitted: '结果待提交', resultsToBeSubmitted: '结果待提交',
resultsToBeReviewed: '结果待审查', resultsToBeReviewed: '结果待审查',
@@ -1889,4 +1889,7 @@ module.exports = {
pleaseSelectRegulatoryCurrentLogin:'请选择法规工程师为当前登录人的数据', pleaseSelectRegulatoryCurrentLogin:'请选择法规工程师为当前登录人的数据',
cannotSetResponsibilityAreas:'所属不同责任领域，不能设置接口人', cannotSetResponsibilityAreas:'所属不同责任领域，不能设置接口人',
lidar:'激光雷达', lidar:'激光雷达',
history:'历史',
deliveryDate:'交付日期',
regulatoryEngineerReturns:'法规工程师退回',
} }
jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue
+4 -4
View File
@@ -2,7 +2,7 @@
<a-drawer <a-drawer
:title="$t('Transfer')" :title="$t('Transfer')"
:maskClosable="false" :maskClosable="false"
:width="1000" :width="1100"
placement="right" placement="right"
:closable="true" :closable="true"
@close="handleCancel" @close="handleCancel"
@@ -45,7 +45,7 @@
<a-table <a-table
:columns="columns" :columns="columns"
rowKey="id" rowKey="id"
:scroll="{x: 800,y:600}" :scroll="{x: 800,y:'calc(100vh - 330px)'}"
:data-source="dataList" :data-source="dataList"
:pagination="false" :pagination="false"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@@ -95,7 +95,7 @@ export default {
title: this.$t('standard'), title: this.$t('standard'),
align: 'left', align: 'left',
dataIndex: 'serialNumber', dataIndex: 'serialNumber',
width: 100, width: 180,
ellipsis: true, ellipsis: true,
scopedSlots: { customRender: 'standard' } scopedSlots: { customRender: 'standard' }
}, },
@@ -103,7 +103,7 @@ export default {
title: this.$t('title'), title: this.$t('title'),
align: 'left', align: 'left',
dataIndex: 'title', dataIndex: 'title',
width: 100, width: 180,
ellipsis: true, ellipsis: true,
scopedSlots: { customRender: 'titleName' } scopedSlots: { customRender: 'titleName' }
}, },
jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+51 -51
View File
@@ -534,30 +534,30 @@
dataIndex: 'dutyTerritory_dictText', dataIndex: 'dutyTerritory_dictText',
width: 180 width: 180
}, },
{ // {
title: this.$t('regulatoryEngineer'), // title: this.$t('regulatoryEngineer'),
align: 'left', // align: 'left',
ellipsis: true, // ellipsis: true,
sorter: true, // sorter: true,
dataIndex: 'regulationOwnerName', // dataIndex: 'regulationOwnerName',
width: 180 // width: 180
}, // },
{ // {
title: this.$t('certifiedEngineer'), // title: this.$t('certifiedEngineer'),
align: 'left', // align: 'left',
ellipsis: true, // ellipsis: true,
sorter: true, // sorter: true,
dataIndex: 'homologationEngineerName', // dataIndex: 'homologationEngineerName',
width: 180 // width: 180
}, // },
{ // {
title: this.$t('engineeringInterfacePerson'), // title: this.$t('engineeringInterfacePerson'),
align: 'left', // align: 'left',
ellipsis: true, // ellipsis: true,
sorter: true, // sorter: true,
dataIndex: 'engineeringInterfacePersonName', // dataIndex: 'engineeringInterfacePersonName',
width: 180 // width: 180
}, // },
{ {
title: this.$t('remarks'), title: this.$t('remarks'),
align: 'left', align: 'left',
@@ -801,33 +801,33 @@
key: 15, key: 15,
moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
}, },
{ // {
sort: '', // sort: '',
name: this.$t('regulatoryEngineer'), // name: this.$t('regulatoryEngineer'),
headFieldCn: '法规工程师', // headFieldCn: '法规工程师',
headFieldEn: 'Regulation Engineer', // headFieldEn: 'Regulation Engineer',
field: 'regulationOwnerName', // field: 'regulationOwnerName',
key: 16, // key: 16,
moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' // moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
}, // },
{ // {
sort: '', // sort: '',
name: this.$t('certifiedEngineer'), // name: this.$t('certifiedEngineer'),
headFieldCn: '认证工程师', // headFieldCn: '认证工程师',
headFieldEn: 'Homo Engineer', // headFieldEn: 'Homo Engineer',
field: 'homologationEngineerName', // field: 'homologationEngineerName',
key: 17, // key: 17,
moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' // moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
}, // },
{ // {
sort: '', // sort: '',
name: this.$t('engineeringInterfacePerson'), // name: this.$t('engineeringInterfacePerson'),
headFieldCn: '工程接口人', // headFieldCn: '工程接口人',
headFieldEn: 'Eng. Interface', // headFieldEn: 'Eng. Interface',
field: 'engineeringInterfacePersonName', // field: 'engineeringInterfacePersonName',
key: 18, // key: 18,
moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' // moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
}, // },
{ {
sort: '', sort: '',
name: this.$t('remarks'), name: this.$t('remarks'),
jero-web/src/views/documentTools/virtualList/index.vue
+9 -9
View File
@@ -5,10 +5,10 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text" :title="$t('VirtualListName')"> <div class="title-text" :title="$t('marketRegulationList')">
<span>{{$t('VirtualListName')}}</span> <span>{{$t('marketRegulationList')}}</span>
</div> </div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('VirtualListName')" <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('marketRegulationList')"
v-model="queryParam.name"></j-input> v-model="queryParam.name"></j-input>
</div> </div>
</a-col> </a-col>
@@ -54,7 +54,7 @@
size="middle" size="middle"
:loading="loading" :loading="loading"
:pagination="false" :pagination="false"
:scroll="{x: '100%'}" :scroll="{x: '100%',y:'calc(100vh - 300px)'}"
:rowKey="(record)=>JSON.stringify(record)" :rowKey="(record)=>JSON.stringify(record)"
:data-source="dataSource" :data-source="dataSource"
@change="tableOnChange" @change="tableOnChange"
@@ -119,12 +119,12 @@
<div class="box-title-text-add"> <div class="box-title-text-add">
<div class="title-text-add"> <div class="title-text-add">
<span class="Required">*</span> <span class="Required">*</span>
<span class="title-text-text" :title="$t('VirtualListName')">{{$t('VirtualListName')}}</span> <span class="title-text-text" :title="$t('marketRegulationList')">{{$t('marketRegulationList')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="name"> <a-form-model-item class="itemModel" prop="name">
<a-input class="box-input-add" <a-input class="box-input-add"
v-model.trim="formInline.name" v-model.trim="formInline.name"
:placeholder="$t('PleaseEnter')+$t('VirtualListName')"/> :placeholder="$t('PleaseEnter')+$t('marketRegulationList')"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -180,12 +180,12 @@
name: [ name: [
{ {
required: true, required: true,
message: this.$t('VirtualListName') + this.$t('cannotEmpty'), message: this.$t('marketRegulationList') + this.$t('cannotEmpty'),
trigger: 'blur' trigger: 'blur'
}, },
{ {
max: 100, max: 100,
message: this.$t('VirtualListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'), message: this.$t('marketRegulationList') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
trigger: 'blur' trigger: 'blur'
} }
], ],
@@ -218,7 +218,7 @@
title: this.$t('newlyAdded'), title: this.$t('newlyAdded'),
columns: [ columns: [
{ {
title: this.$t('VirtualListName'), title: this.$t('marketRegulationList'),
align: 'left', align: 'left',
dataIndex: 'name', dataIndex: 'name',
width: '40', width: '40',
jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue
+116 -115
View File
@@ -68,139 +68,140 @@
</template> </template>
<script> <script>
import { getAction, postAction, deleteAction } from '@/api/manage' import { getAction, postAction, deleteAction } from '@/api/manage'
import moment from 'moment' import moment from 'moment'
export default { export default {
name: 'basicInformation', name: 'basicInformation',
components:{ components: {},
}, data() {
data() { return {
return { confirmLoading: false,
confirmLoading: false, disabled: false,
disabled: false, queryParam: {
queryParam:{ sjjzsj: ''
sjjzsj:'' }
} }
} },
}, mounted() {
mounted() { this.getData()
this.getData() },
}, methods: {
methods: { getData() {
getData(){ let otaIdT = localStorage.getItem('otaIdT')
let otaIdT=localStorage.getItem('otaIdT') if (otaIdT == null) {
if(otaIdT==null){ otaIdT = ''
otaIdT=''
} }
let otaId=localStorage.getItem('otaId') let otaId = localStorage.getItem('otaId')
if(otaId==null){ if (otaId == null) {
otaId='' otaId = ''
} }
getAction('/ota/otaBaSjQtsjxx/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ getAction('/ota/otaBaSjQtsjxx/queryByOtaId', { otaIdT: otaIdT, otaId: otaId }).then(res => {
if(res.code == 200){ if (res.code == 200) {
this.queryParam= res.result ==null ? {} :res.result this.queryParam = res.result == null ? {} : res.result
} }
}) })
}, },
save(){ save() {
let otaId = localStorage.getItem('otaId') let otaId = localStorage.getItem('otaId')
if(otaId == null || otaId == undefined){ if (otaId == null || otaId == undefined) {
otaId='' otaId = ''
}
this.queryParam.otaId = otaId
postAction('/ota/otaBaSjQtsjxx/add' ,this.queryParam).then(res=>{
if(res.code==200){
this.$message.success(this.$t('SavedSuccessfully'))
this.getData()
} }
}) this.queryParam.otaId = otaId
}, postAction('/ota/otaBaSjQtsjxx/add', this.queryParam).then(res => {
if (res.code == 200) {
last(){ this.$message.success(this.$t('SavedSuccessfully'))
this.save() this.getData()
this.$emit('otherup') }
}, })
dateChange(item) { },
this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
}, last() {
submit(){ this.save()
this.$router.push('upgradeactivity') this.$emit('otherup')
}, },
dateChange(item) {
this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
},
submit() {
this.save()
this.$router.push('upgradeactivity')
}
}
} }
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import'~@assets/less/common.less'; @import '~@assets/less/common.less';
.box {
height: 500px;
padding: 0 24px 24px 24px;
box-sizing: border-box;
}
.box-title-text-add { .box {
line-height: 1.4; height: 500px;
display: flex; padding: 0 24px 24px 24px;
box-sizing: border-box;
}
} .box-title-text-add {
line-height: 1.4;
display: flex;
.title-text-add { }
width: 114px;
text-align: right;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
height: 42px;
line-height: 42px;
margin-top: 3px;
}
.title-text-add-input { .title-text-add {
width: 80%; width: 114px;
display: inline-block; text-align: right;
font-weight: 500; display: inline-block;
font-size: 14px; font-weight: 500;
margin-right: 16px; font-size: 14px;
overflow: hidden; margin-right: 16px;
text-overflow: ellipsis; overflow: hidden;
white-space: nowrap; text-overflow: ellipsis;
height: 42px; white-space: nowrap;
line-height: 42px; height: 42px;
margin-top: 3px; line-height: 42px;
margin-bottom: 20px; margin-top: 3px;
} }
.title-text-text { .title-text-add-input {
margin-top: 9px; width: 80%;
} display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
height: 42px;
line-height: 42px;
margin-top: 3px;
margin-bottom: 20px;
}
.itemModel { .title-text-text {
width: calc(100% - 130px); margin-top: 9px;
display: inline-block; }
margin-top: 2px;
}
.box-input { .itemModel {
display: inline-block; width: calc(100% - 130px);
width: 100%; display: inline-block;
height: 38px; margin-top: 2px;
margin-top: 2px; }
}
.formAdd { .box-input {
margin: 0 auto; display: inline-block;
width: 670px; width: 100%;
} height: 38px;
margin-top: 2px;
}
.bootom-button{ .formAdd {
position: absolute; margin: 0 auto;
bottom: 0px; width: 670px;
left: 40%; }
text-align: center!important;
} .bootom-button {
position: absolute;
bottom: 0px;
left: 40%;
text-align: center !important;
}
</style> </style>
jero-web/src/views/projectManagement/components/certificationList/components/addCodeNumber.vue
+7 -1
View File
@@ -66,7 +66,7 @@
:scroll="{x: '100%',y:'calc(100vh - 300px)'}" :scroll="{x: '100%',y:'calc(100vh - 300px)'}"
:data-source="dataList" :data-source="dataList"
:pagination="false" :pagination="false"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange ,columnTitle:' ' , type:'radio'}" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange ,columnTitle:' '}"
:loading="loading"> :loading="loading">
</a-table> </a-table>
</div> </div>
@@ -204,7 +204,13 @@
}, },
onSelectChange(value, row) { onSelectChange(value, row) {
this.selectedRowKeys = value this.selectedRowKeys = value
if (this.selectedRowKeys.length > 1) {
this.selectedRowKeys.shift()
}
this.selectedRowList = row this.selectedRowList = row
if (this.selectedRowList.length > 1) {
this.selectedRowList.shift()
}
}, },
handleSubmit() { handleSubmit() {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue
+9 -2
View File
@@ -33,10 +33,10 @@
<a-table <a-table
:columns="columns" :columns="columns"
rowKey="id" rowKey="id"
:scroll="{x: '100%',y:600}" :scroll="{x: '100%',y:'calc(100vh - 330px)'}"
:data-source="dataList" :data-source="dataList"
:pagination="false" :pagination="false"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' , type:'radio'}" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' '}"
:loading="loading"> :loading="loading">
</a-table> </a-table>
@@ -87,6 +87,13 @@
dataIndex: 'studioEngineerName', dataIndex: 'studioEngineerName',
align: 'left', align: 'left',
ellipsis: true, ellipsis: true,
width: 140
},
{
title: this.$t('explain'),
dataIndex: 'explanation',
align: 'left',
ellipsis: true,
width: 223 width: 223
} }
], ],
jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue
+1 -1
View File
@@ -45,7 +45,7 @@
<a-table <a-table
:columns="columns" :columns="columns"
rowKey="id" rowKey="id"
:scroll="{x: 800,y:600}" :scroll="{x: 800,y:'calc(100vh - 330px)'}"
:data-source="dataList" :data-source="dataList"
:pagination="false" :pagination="false"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:'' }" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:'' }"
jero-web/src/views/projectManagement/components/certificationList/index.vue
+3 -3
View File
@@ -292,7 +292,7 @@
</a> </a>
<a class="text-operation" <a class="text-operation"
@click="modifyHistoryClick(record)"> @click="modifyHistoryClick(record)">
{{ $t('modifyHistory') }} {{ $t('history') }}
</a> </a>
<a class="text-operation" <a class="text-operation"
v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2" v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
@@ -662,7 +662,7 @@
title: this.$t('configurationItem'), title: this.$t('configurationItem'),
align: 'left', align: 'left',
dataIndex: 'configItem', dataIndex: 'configItem',
width: 180, width: 100,
ellipsis: true ellipsis: true
}, },
{ {
@@ -778,7 +778,7 @@
title: this.$t('operation'), title: this.$t('operation'),
align: 'left', align: 'left',
fixed: 'right', fixed: 'right',
width: 230, width: localStorage.getItem('language') == 'zh-cn' ? 160 : 180,
scopedSlots: { customRender: 'operation' } scopedSlots: { customRender: 'operation' }
} }
], ],
jero-web/src/views/projectManagement/components/listEditModel.vue
+6 -6
View File
@@ -211,14 +211,14 @@
<span class="Required" <span class="Required"
v-if="!formInline.designDeliverableType.join(',').includes('1645667531513237506')">*</span> v-if="!formInline.designDeliverableType.join(',').includes('1645667531513237506')">*</span>
<span class="title-text-text" <span class="title-text-text"
:title="$t('cutoffTime')">{{$t('cutoffTime')}}</span> :title="$t('deliveryDate')">{{$t('deliveryDate')}}</span>
</div> </div>
<a-form-model-item class="itemModel" <a-form-model-item class="itemModel"
:prop="formInline.designDeliverableType.join(',').includes('1645667531513237506')?'':'designDueDate'" :prop="formInline.designDeliverableType.join(',').includes('1645667531513237506')?'':'designDueDate'"
:rules="[{ required: formInline.designDeliverableType.join(',').includes('1645667531513237506')?false:true, :rules="[{ required: formInline.designDeliverableType.join(',').includes('1645667531513237506')?false:true,
message: $t('cutoffTime') + $t('cannotEmpty'), trigger: 'change'}]"> message: $t('deliveryDate') + $t('cannotEmpty'), trigger: 'change'}]">
<a-date-picker class="box-input" <a-date-picker class="box-input"
:placeholder="$t('PleaseSelect')+$t('cutoffTime')" :placeholder="$t('PleaseSelect')+$t('deliveryDate')"
@change="dateChange({db_field_name:'designDueDate'})" @change="dateChange({db_field_name:'designDueDate'})"
format="YYYY-MM-DD" format="YYYY-MM-DD"
:disabled="isEdit(this.formInline)" :disabled="isEdit(this.formInline)"
@@ -342,14 +342,14 @@
<span class="Required" <span class="Required"
v-if="!formInline.verifyDeliverableType.join(',').includes('1645667531513237506')">*</span> v-if="!formInline.verifyDeliverableType.join(',').includes('1645667531513237506')">*</span>
<span class="title-text-text" <span class="title-text-text"
:title="$t('cutoffTime')">{{$t('cutoffTime')}}</span> :title="$t('deliveryDate')">{{$t('deliveryDate')}}</span>
</div> </div>
<a-form-model-item class="itemModel" <a-form-model-item class="itemModel"
:prop="formInline.verifyDeliverableType.join(',').includes('1645667531513237506')?'':'verifyDueDate'" :prop="formInline.verifyDeliverableType.join(',').includes('1645667531513237506')?'':'verifyDueDate'"
:rules="[{ required: formInline.verifyDeliverableType.join(',').includes('1645667531513237506')?false:true, :rules="[{ required: formInline.verifyDeliverableType.join(',').includes('1645667531513237506')?false:true,
message: $t('cutoffTime') + $t('cannotEmpty'), trigger: 'change'}]"> message: $t('deliveryDate') + $t('cannotEmpty'), trigger: 'change'}]">
<a-date-picker class="box-input" <a-date-picker class="box-input"
:placeholder="$t('PleaseSelect')+$t('cutoffTime')" :placeholder="$t('PleaseSelect')+$t('deliveryDate')"
@change="dateChange({db_field_name:'verifyDueDate'})" @change="dateChange({db_field_name:'verifyDueDate'})"
format="YYYY-MM-DD" format="YYYY-MM-DD"
:disabled="isEditVerifi(this.formInline)" :disabled="isEditVerifi(this.formInline)"
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+59 -42
View File
@@ -97,10 +97,10 @@
style="overflow:hidden;margin-bottom: 20px"> style="overflow:hidden;margin-bottom: 20px">
<div style="float: left;margin-bottom: 0px;margin-left: 20px"> <div style="float: left;margin-bottom: 0px;margin-left: 20px">
<!-- 调取--> <!-- 调取-->
<div @click="profileClick" class="operator-text"> <!-- <div @click="profileClick" class="operator-text">-->
<a-icon type="profile"/> <!-- <a-icon type="profile"/>-->
重置流程（数据迁移） <!-- 重置流程（数据迁移）-->
</div> <!-- </div>-->
<!-- 调取--> <!-- 调取-->
<div @click="transferClick" class="operator-text" v-if="this.roleSwitchingCode == '0'"> <div @click="transferClick" class="operator-text" v-if="this.roleSwitchingCode == '0'">
<a-icon type="profile"/> <a-icon type="profile"/>
@@ -291,11 +291,13 @@
<a class="text-operation" <a class="text-operation"
v-if="( v-if="(
record.verifyFlowStatus == 'List to be released' || record.verifyFlowStatus == 'List to be released' ||
record.verifyFlowStatus == 'Regulatory engineer returns' ||
record.verifyFlowStatus == 'Compliance' || record.verifyFlowStatus == 'Compliance' ||
record.verifyFlowStatus == 'Non-Compliance' || record.verifyFlowStatus == 'Non-Compliance' ||
record.verifyFlowStatus == 'To be tracked' || record.verifyFlowStatus == 'To be tracked' ||
record.verifyFlowStatus == 'NA') record.verifyFlowStatus == 'NA')
&& (record.designFlowStatus == 'List to be released' || && (record.designFlowStatus == 'List to be released' ||
record.designFlowStatus == 'Regulatory engineer returns' ||
record.designFlowStatus == 'Compliance' || record.designFlowStatus == 'Compliance' ||
record.designFlowStatus == 'Non-Compliance' || record.designFlowStatus == 'Non-Compliance' ||
record.designFlowStatus == 'To be tracked' || record.designFlowStatus == 'To be tracked' ||
@@ -346,6 +348,7 @@
</span> </span>
<span slot="designFlowStatusName" slot-scope="text,result"> <span slot="designFlowStatusName" slot-scope="text,result">
<span v-if="result.designFlowStatus == 'List to be released' || <span v-if="result.designFlowStatus == 'List to be released' ||
result.designFlowStatus == 'Regulatory engineer returns' ||
result.designFlowStatus == 'List to be checked'" result.designFlowStatus == 'List to be checked'"
:title="text"> :title="text">
{{text}} {{text}}
@@ -355,7 +358,8 @@
</span> </span>
<span slot="verifyFlowStatusName" slot-scope="text,result"> <span slot="verifyFlowStatusName" slot-scope="text,result">
<span v-if="result.verifyFlowStatus == 'List to be released' || <span v-if="result.verifyFlowStatus == 'List to be released' ||
result.verifyFlowStatus == 'List to be checked'" result.verifyFlowStatus == 'Regulatory engineer returns' ||
result.verifyFlowStatus == 'List to be checked'"
:title="text"> :title="text">
{{text}} {{text}}
</span> </span>
@@ -776,7 +780,7 @@
ellipsis: true ellipsis: true
}, },
{ {
title: this.$t('TaskCutOffTime'), title: this.$t('deliveryDate'),
dataIndex: 'designDueDate', dataIndex: 'designDueDate',
align: 'left', align: 'left',
ellipsis: true, ellipsis: true,
@@ -822,7 +826,7 @@
sorter: true sorter: true
}, },
{ {
title: this.$t('TaskCutOffTime'), title: this.$t('deliveryDate'),
dataIndex: 'verifyDueDate', dataIndex: 'verifyDueDate',
align: 'left', align: 'left',
ellipsis: true, ellipsis: true,
@@ -1048,9 +1052,9 @@
}, },
{ {
sort: '', sort: '',
name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('TaskCutOffTime'), name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('deliveryDate'),
headFieldCn: '截止时间', headFieldCn: '截止时间',
headFieldEn: 'Due Date', headFieldEn: 'Delivery Date',
field: 'designDueDate', field: 'designDueDate',
affirmFlag: '1', affirmFlag: '1',
key: 23, key: 23,
@@ -1098,9 +1102,9 @@
}, },
{ {
sort: '', sort: '',
name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('TaskCutOffTime'), name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('deliveryDate'),
headFieldCn: '截止时间', headFieldCn: '交付日期',
headFieldEn: 'Due Date', headFieldEn: 'Delivery Date',
field: 'verifyDueDate', field: 'verifyDueDate',
affirmFlag: '3', affirmFlag: '3',
key: 33, key: 33,
@@ -1118,7 +1122,7 @@
}, },
{ {
sort: '', sort: '',
name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('typeOfDeliverables'), name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('typeOfDeliverables'),
headFieldCn: '交付物类型', headFieldCn: '交付物类型',
headFieldEn: 'Deliverable Type', headFieldEn: 'Deliverable Type',
field: 'verifyDeliverableTypeName', field: 'verifyDeliverableTypeName',
@@ -1240,6 +1244,11 @@
key: 'List to be released', key: 'List to be released',
label: this.$t('listToBeReleased') label: this.$t('listToBeReleased')
}, },
{
value: 'Regulatory engineer returns',
key: 'Regulatory engineer returns',
label: this.$t('regulatoryEngineerReturns')
},
{ {
value: 'Duty Person Rejected', value: 'Duty Person Rejected',
key: 'Duty Person Rejected', key: 'Duty Person Rejected',
@@ -1296,6 +1305,11 @@
key: 'List to be released', key: 'List to be released',
label: this.$t('listToBeReleased') label: this.$t('listToBeReleased')
}, },
{
value: 'Regulatory engineer returns',
key: 'Regulatory engineer returns',
label: this.$t('regulatoryEngineerReturns')
},
{ {
value: 'Duty Person Rejected', value: 'Duty Person Rejected',
key: 'Duty Person Rejected', key: 'Duty Person Rejected',
@@ -1543,7 +1557,7 @@
designFlowStatusClick(row, name) { designFlowStatusClick(row, name) {
let query = {} let query = {}
let TaskKey = '' let TaskKey = ''
if (name == this.$t('designComplianceReview')) { if (name == this.$t('designComplianceProcess')) {
if (row.designFlowStatus == 'Task to be confirmed' || row.designFlowStatus == 'Duty Person Rejected') { if (row.designFlowStatus == 'Task to be confirmed' || row.designFlowStatus == 'Duty Person Rejected') {
TaskKey = 'zrrqr' TaskKey = 'zrrqr'
} else if (row.designFlowStatus == 'Results to be submitted') { } else if (row.designFlowStatus == 'Results to be submitted') {
@@ -1749,9 +1763,9 @@
} }
} }
} }
if (!isTrue){ if (!isTrue) {
this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), code,content[0]) this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), code, content[0])
}else{ } else {
this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), code) this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), code)
} }
} else { } else {
@@ -2369,7 +2383,7 @@
if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) { if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) {
for (let k = 0; k < this.columnsAll[j].children.length; k++) { for (let k = 0; k < this.columnsAll[j].children.length; k++) {
for (let l = 0; l < this.column[i].children.length; l++) { for (let l = 0; l < this.column[i].children.length; l++) {
if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) { if (this.columnsAll[j].children[k].dataIndex == this.column[i].children[l].dataIndex) {
this.columnsAll[j].children[k] = this.column[i].children[l] this.columnsAll[j].children[k] = this.column[i].children[l]
} }
} }
@@ -2381,7 +2395,7 @@
if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) { if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) {
for (let k = 0; k < this.columnsAll[j].children.length; k++) { for (let k = 0; k < this.columnsAll[j].children.length; k++) {
for (let l = 0; l < this.column[i].children.length; l++) { for (let l = 0; l < this.column[i].children.length; l++) {
if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) { if (this.columnsAll[j].children[k].dataIndex == this.column[i].children[l].dataIndex) {
this.columnsAll[j].children[k] = this.column[i].children[l] this.columnsAll[j].children[k] = this.column[i].children[l]
} }
} }
@@ -2475,7 +2489,10 @@
} }
} }
for (let i = 0; i < dataSource.length; i++) { for (let i = 0; i < dataSource.length; i++) {
if (dataSource[i].verifyFlowStatus == 'List to be released' || dataSource[i].designFlowStatus == 'List to be released') { if (dataSource[i].verifyFlowStatus == 'List to be released' ||
dataSource[i].verifyFlowStatus == 'Regulatory engineer returns' ||
dataSource[i].designFlowStatus == 'List to be released' ||
dataSource[i].designFlowStatus == 'Regulatory engineer returns') {
if (dataSource[i].regulationOwnerId) { if (dataSource[i].regulationOwnerId) {
this.detailedSuccessList.push(dataSource[i]) this.detailedSuccessList.push(dataSource[i])
} else { } else {
@@ -2965,28 +2982,28 @@
download(item) { download(item) {
downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username }) downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username })
}, },
profileClick() { // profileClick() {
let _this = this // let _this = this
this.$confirm({ // this.$confirm({
width: 760, // width: 760,
content: _this.$t('NoteConfirmTheChange'), // content: _this.$t('NoteConfirmTheChange'),
onOk() { // onOk() {
let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) // let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
postAction('/project/projectLawsInventoryEO/resetFlowTemp', { // postAction('/project/projectLawsInventoryEO/resetFlowTemp', {
ids: idList.join(','), // ids: idList.join(','),
projectLibraryId: _this.$route.query.id // projectLibraryId: _this.$route.query.id
}).then((res) => { // }).then((res) => {
if (res.success) { // if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful')) // _this.$message.success(_this.$t('OperationSuccessful'))
_this.selectedRowKeys = [] // _this.selectedRowKeys = []
_this.getList() // _this.getList()
} else { // } else {
_this.$message.warning(_this.$t('operationFailed')) // _this.$message.warning(_this.$t('operationFailed'))
} // }
}) // })
} // }
}) // })
} // }
} }
} }
</script> </script>
jero-web/src/views/projectManagement/components/transferListvirtal.vue
+4 -4
View File
@@ -2,7 +2,7 @@
<a-drawer <a-drawer
:title="$t('Transfer')" :title="$t('Transfer')"
:maskClosable="false" :maskClosable="false"
:width="1000" :width="1100"
placement="right" placement="right"
:closable="true" :closable="true"
@close="handleCancel" @close="handleCancel"
@@ -45,7 +45,7 @@
<a-table <a-table
:columns="columns" :columns="columns"
rowKey="id" rowKey="id"
:scroll="{x: 800,y:600}" :scroll="{x: 800,y:'calc(100vh - 330px)'}"
:data-source="dataList" :data-source="dataList"
:pagination="false" :pagination="false"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -94,7 +94,7 @@ export default {
title: this.$t('standard'), title: this.$t('standard'),
align: 'left', align: 'left',
dataIndex: 'serialNumber', dataIndex: 'serialNumber',
width: 100, width: 180,
fixed: 'left', fixed: 'left',
ellipsis: true, ellipsis: true,
scopedSlots: { customRender: 'standard' } scopedSlots: { customRender: 'standard' }
@@ -103,7 +103,7 @@ export default {
title: this.$t('title'), title: this.$t('title'),
align: 'left', align: 'left',
dataIndex: 'title', dataIndex: 'title',
width: 100, width: 180,
fixed: 'left', fixed: 'left',
ellipsis: true, ellipsis: true,
scopedSlots: { customRender: 'titleName' } scopedSlots: { customRender: 'titleName' }
jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+3 -3
View File
@@ -69,7 +69,7 @@
dataIndex: 'projectName', dataIndex: 'projectName',
scopedSlots: { customRender: 'RelatedItems' }, scopedSlots: { customRender: 'RelatedItems' },
ellipsis: true, ellipsis: true,
width: 300 width: 200
}, },
{ {
title: this.$t('standardInformation'), title: this.$t('standardInformation'),
@@ -77,7 +77,7 @@
dataIndex: 'standardInfo', dataIndex: 'standardInfo',
scopedSlots: { customRender: 'standardInformation' }, scopedSlots: { customRender: 'standardInformation' },
ellipsis: true, ellipsis: true,
width: 300 width: 200
}, },
{ {
title: this.$t('ProcessType'), title: this.$t('ProcessType'),
@@ -122,7 +122,7 @@
dataIndex: 'endTime', dataIndex: 'endTime',
ellipsis: true, ellipsis: true,
sorter: true, sorter: true,
width: 108 width: 100
}, },
// { // {
// title: this.$t('taskStatus'), // title: this.$t('taskStatus'),
jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue
+1 -1
View File
@@ -180,7 +180,7 @@
width: 120 width: 120
}, },
{ {
title: this.$t('closingDate'), title: this.$t('deliveryDate'),
align: 'left', align: 'left',
dataIndex: 'endTime', dataIndex: 'endTime',
ellipsis: true, ellipsis: true,
jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+3 -3
View File
@@ -81,7 +81,7 @@
dataIndex: 'projectName', dataIndex: 'projectName',
ellipsis: true, ellipsis: true,
scopedSlots: { customRender: 'RelatedItems' }, scopedSlots: { customRender: 'RelatedItems' },
width: 300 width: 200
}, },
{ {
title: this.$t('standardInformation'), title: this.$t('standardInformation'),
@@ -89,7 +89,7 @@
dataIndex: 'standardInfo', dataIndex: 'standardInfo',
ellipsis: true, ellipsis: true,
scopedSlots: { customRender: 'standardInformation' }, scopedSlots: { customRender: 'standardInformation' },
width: 300 width: 200
}, },
{ {
title: this.$t('ProcessType'), title: this.$t('ProcessType'),
@@ -126,7 +126,7 @@
align: 'left', align: 'left',
dataIndex: 'endTime', dataIndex: 'endTime',
ellipsis: true, ellipsis: true,
width: 172, width: 100,
sorter: true, sorter: true,
scopedSlots: { customRender: 'endTime' } scopedSlots: { customRender: 'endTime' }
}, },
jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
+5 -5
View File
@@ -11,10 +11,6 @@
style="height: 100%;overflow: auto;margin-bottom: 436px;"> style="height: 100%;overflow: auto;margin-bottom: 436px;">
<JLoading :loading="loading">{{textLoading}}</JLoading> <JLoading :loading="loading">{{textLoading}}</JLoading>
<a-button style="float: right;" @click="referenceDeliverablesClick"
v-if="this.queryData.isDisplay && (queryData.TaskKey == 'zrrtjjfw' || queryData.TaskKey == 'dezrrtjjfw')"
type="primary">{{$t('referenceDeliverables')}}
</a-button>
<a-icon v-if="this.queryData.isDisplay" <a-icon v-if="this.queryData.isDisplay"
class="questionClass" class="questionClass"
:title="queryData.flowType == '2' ? this.$t('checkRegulatoryCompletedBefore') : this.$t('checkVerificationResultsBeforeMP')" :title="queryData.flowType == '2' ? this.$t('checkRegulatoryCompletedBefore') : this.$t('checkVerificationResultsBeforeMP')"
@@ -46,6 +42,10 @@
<!--:class="{'drawer-review':isDrawerClass, <!--:class="{'drawer-review':isDrawerClass,
'drawer-review-One':!isDrawerClass}"--> 'drawer-review-One':!isDrawerClass}"-->
<div v-if="this.queryData.isDisplay" class="drawer-review"> <div v-if="this.queryData.isDisplay" class="drawer-review">
<a-button style="float: right;" @click="referenceDeliverablesClick"
v-if="this.queryData.isDisplay && (queryData.TaskKey == 'zrrtjjfw' || queryData.TaskKey == 'dezrrtjjfw')"
type="primary">{{$t('referenceDeliverables')}}
</a-button>
<reviewedByThePersonInCharge <reviewedByThePersonInCharge
v-if="isDisplay" v-if="isDisplay"
ref="reviewedByThePersonInChargeRef" ref="reviewedByThePersonInChargeRef"
@@ -221,7 +221,7 @@
value: this.queryData.personLiable value: this.queryData.personLiable
}, },
{ {
title: this.$t('cutoffTime'), title: this.$t('deliveryDate'),
value: this.queryData.DueDate value: this.queryData.DueDate
}, },
{ {
jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+3 -3
View File
@@ -74,7 +74,7 @@
dataIndex: 'projectName', dataIndex: 'projectName',
ellipsis: true, ellipsis: true,
scopedSlots: { customRender: 'RelatedItems' }, scopedSlots: { customRender: 'RelatedItems' },
width: 300 width: 200
}, },
{ {
title: this.$t('standardInformation'), title: this.$t('standardInformation'),
@@ -82,7 +82,7 @@
dataIndex: 'standardInfo', dataIndex: 'standardInfo',
ellipsis: true, ellipsis: true,
scopedSlots: { customRender: 'standardInformation' }, scopedSlots: { customRender: 'standardInformation' },
width: 300 width: 200
}, },
{ {
title: this.$t('ProcessType'), title: this.$t('ProcessType'),
@@ -120,7 +120,7 @@
dataIndex: 'endTime', dataIndex: 'endTime',
ellipsis: true, ellipsis: true,
sorter: true, sorter: true,
width: 108 width: 100
}, },
// { // {
// title: this.$t('taskStatus'), // title: this.$t('taskStatus'),
jero-web/src/views/toDoCenter/projectRegulationTasks/components/referenceDeliverablesList.vue
+12 -2
View File
@@ -33,10 +33,10 @@
<a-table <a-table
:columns="columns" :columns="columns"
rowKey="id" rowKey="id"
:scroll="{x: '100%',y:600}" :scroll="{x: '100%',y:'calc(100vh - 330px)'}"
:data-source="dataList" :data-source="dataList"
:pagination="false" :pagination="false"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' , type:'radio'}" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' '}"
:loading="loading"> :loading="loading">
</a-table> </a-table>
@@ -87,6 +87,13 @@
dataIndex: 'studioEngineerName', dataIndex: 'studioEngineerName',
align: 'left', align: 'left',
ellipsis: true, ellipsis: true,
width: 140
},
{
title: this.$t('explain'),
dataIndex: 'explanation',
align: 'left',
ellipsis: true,
width: 223 width: 223
} }
], ],
@@ -151,6 +158,9 @@
}, },
onSelectChange(value) { onSelectChange(value) {
this.selectedRowKeys = value this.selectedRowKeys = value
if (this.selectedRowKeys.length > 1) {
this.selectedRowKeys.shift()
}
}, },
handleCancel() { handleCancel() {
this.visible = false this.visible = false
jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
+1 -2
View File
@@ -2,8 +2,7 @@
<div class="box"> <div class="box">
<div class="box-text"> <div class="box-text">
<div class="header-text"> <div class="header-text">
{{query.TaskKey == 'zrrqr' || query.TaskKey == 'dezrrqr' || query.TaskKey == 'zrrtjjfw' || $route.query.TaskKey {{query.TaskKey == 'zrrqr' || query.TaskKey == 'dezrrqr' || query.TaskKey == 'zrrtjjfw' || query.TaskKey == 'dezrrtjjfw'
== 'dezrrtjjfw'
? $t('personLiableConfirm'):$t('sponsorReview')}} ? $t('personLiableConfirm'):$t('sponsorReview')}}
</div> </div>
</div> </div>
jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
+6 -6
View File
@@ -23,10 +23,10 @@
</a-col> </a-col>
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<div class="box-title-text tree-select"> <div class="box-title-text tree-select">
<div class="title-text" :title="$t('taskType')"> <div class="title-text" :title="$t('ProcessType')">
<span>{{$t('taskType')}}</span> <span>{{$t('ProcessType')}}</span>
</div> </div>
<a-select :placeholder="$t('PleaseSelect')+$t('taskType')" <a-select :placeholder="$t('PleaseSelect')+$t('ProcessType')"
class="box-input" class="box-input"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
allowClear allowClear
@@ -44,10 +44,10 @@
<template v-if="toggleSearchStatus"> <template v-if="toggleSearchStatus">
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text" :title="$t('taskStatus')"> <div class="title-text" :title="$t('ProcessStatus')">
<span>{{$t('taskStatus')}}</span> <span>{{$t('ProcessStatus')}}</span>
</div> </div>
<a-select :placeholder="$t('PleaseSelect')+$t('taskStatus')" <a-select :placeholder="$t('PleaseSelect')+$t('ProcessStatus')"
class="box-input" class="box-input"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
allowClear allowClear
jero-web/src/views/virtualAuthenticationList/index.vue
+9 -9
View File
@@ -5,10 +5,10 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text" :title="$t('CertificationListName')"> <div class="title-text" :title="$t('marketCertificationList')">
<span>{{$t('CertificationListName')}}</span> <span>{{$t('marketCertificationList')}}</span>
</div> </div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('CertificationListName')" <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('marketCertificationList')"
v-model="queryParam.name"></j-input> v-model="queryParam.name"></j-input>
</div> </div>
</a-col> </a-col>
@@ -114,12 +114,12 @@
<div class="title-text-add"> <div class="title-text-add">
<span class="Required">*</span> <span class="Required">*</span>
<span class="title-text-text" <span class="title-text-text"
:title="$t('CertificationListName')">{{$t('CertificationListName')}}</span> :title="$t('marketCertificationList')">{{$t('marketCertificationList')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="name"> <a-form-model-item class="itemModel" prop="name">
<a-input class="box-input-add" <a-input class="box-input-add"
v-model.trim="formInline.name" v-model.trim="formInline.name"
:placeholder="$t('PleaseEnter')+$t('CertificationListName')"/> :placeholder="$t('PleaseEnter')+$t('marketCertificationList')"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -167,12 +167,12 @@
name: [ name: [
{ {
required: true, required: true,
message: this.$t('CertificationListName') + this.$t('cannotEmpty'), message: this.$t('marketCertificationList') + this.$t('cannotEmpty'),
trigger: 'blur' trigger: 'blur'
}, },
{ {
max: 100, max: 100,
message: this.$t('CertificationListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'), message: this.$t('marketCertificationList') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
trigger: 'blur' trigger: 'blur'
} }
], ],
@@ -212,10 +212,10 @@
dataSource: [], dataSource: [],
columns: [ columns: [
{ {
title: this.$t('CertificationListName'), title: this.$t('marketCertificationList'),
align: 'left', align: 'left',
dataIndex: 'name', dataIndex: 'name',
width: '40%', width: '40',
ellipsis: true, ellipsis: true,
scopedSlots: { customRender: 'CertificationListName' } scopedSlots: { customRender: 'CertificationListName' }
}, },