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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangzhijiang
2022-05-06 18:37:24 +08:00
parent 92bd0eb337 014c8e0eb7
commit cafe37bcc3
26 changed files with 1320 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/ParamsConfigVO.java
+19
View File
@@ -0,0 +1,19 @@
package com.jero.modules.cert.collect;
import com.jero.modules.cert.collect.entity.ParamsConfigEO;
import lombok.Data;
import java.util.List;
/**
* @Author: liyawei
* @Description:
* @Date: Created in 11:50 2022/5/6
*/
@Data
public class ParamsConfigVO {
private String paramsManifestId;
private String deleteConfigIds;
private List<ParamsConfigEO> paramsConfigEOList;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigEOController.java
+17 -99
View File
@@ -4,19 +4,16 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.modules.cert.collect.ParamsConfigVO;
import com.jero.modules.cert.collect.entity.ParamsConfigEO;
import com.jero.modules.cert.collect.service.IParamsConfigEOService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
@@ -46,104 +43,25 @@ public class ParamsConfigEOController extends JeroController<ParamsConfigEO, IPa
@RequestParam(name = "paramsManifestId") String paramsManifestId) {
LambdaQueryWrapper<ParamsConfigEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsConfigEO::getParamsManifestId, paramsManifestId);
queryWrapper.orderByAsc(ParamsConfigEO::getDisplaySeq);
List<ParamsConfigEO> list = paramsConfigEOService.list(queryWrapper);
return Result.OK(cut, list);
}
/**
* 添加
*
* @param paramsConfigEO
* @return
*/
@AutoLog(value = "参数配置-添加")
@ApiOperation(value="参数配置-添加", notes="参数配置-添加")
@PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody ParamsConfigEO paramsConfigEO) {
paramsConfigEOService.add(paramsConfigEO);
/**
* 批量添加
* @param paramsConfigVO
* @return
*/
@AutoLog(value = "参数配置-批量添加")
@ApiOperation(value="参数配置-批量添加", notes="参数配置-批量添加")
@PostMapping(value = "/addBatch")
public Result<?> addBatch(@RequestBody ParamsConfigVO paramsConfigVO) {
String paramsManifestId = paramsConfigVO.getParamsManifestId();
if (StringUtils.isBlank(paramsManifestId)) {
return Result.error("参数不能为空");
}
paramsConfigEOService.addBatch(paramsConfigVO);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param paramsConfigEO
* @return
*/
@AutoLog(value = "参数配置-编辑")
@ApiOperation(value="参数配置-编辑", notes="参数配置-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody ParamsConfigEO paramsConfigEO) {
paramsConfigEOService.editById(paramsConfigEO);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "参数配置-通过id删除")
@ApiOperation(value="参数配置-通过id删除", notes="参数配置-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
paramsConfigEOService.deleteById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "参数配置-批量删除")
@ApiOperation(value="参数配置-批量删除", notes="参数配置-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.paramsConfigEOService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
@AutoLog(value = "参数配置-通过id查询")
@ApiOperation(value="参数配置-通过id查询", notes="参数配置-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
ParamsConfigEO paramsConfigEO = paramsConfigEOService.queryById(id);
if(paramsConfigEO==null) {
return Result.error("未找到对应数据");
}
return Result.OK(paramsConfigEO);
}
/**
* 导出excel
*
* @param request
* @param paramsConfigEO
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ParamsConfigEO paramsConfigEO) {
return super.exportXls(request, paramsConfigEO, ParamsConfigEO.class, "参数配置");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ParamsConfigEO.class);
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
+2 -2
View File
@@ -137,7 +137,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
*/
@AutoLog(value = "参数清单-通过id删除")
@ApiOperation(value="参数清单-通过id删除", notes="参数清单-通过id删除")
@DeleteMapping(value = "/delete")
@GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
paramsManifestEOService.deleteById(id);
return Result.OK("删除成功!");
@@ -151,7 +151,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
*/
@AutoLog(value = "参数清单-批量删除")
@ApiOperation(value="参数清单-批量删除", notes="参数清单-批量删除")
@DeleteMapping(value = "/deleteBatch")
@PostMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.paramsManifestEOService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigEO.java
+15 -8
View File
@@ -1,21 +1,18 @@
package com.jero.modules.cert.collect.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
/**
@@ -71,6 +68,11 @@ public class ParamsConfigEO implements Serializable {
@ApiModelProperty(value = "版本")
private String version;
/**车型*/
@Excel(name = "车型", width = 15)
@ApiModelProperty(value = "车型")
private String carType;
/**电池*/
@Excel(name = "电池", width = 15)
@ApiModelProperty(value = "电池")
@@ -86,4 +88,9 @@ public class ParamsConfigEO implements Serializable {
@ApiModelProperty(value = "参数清单id")
private String paramsManifestId;
/**展示顺序*/
@Excel(name = "展示顺序", width = 15)
@ApiModelProperty(value = "展示顺序")
private Integer displaySeq;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java
+1
View File
@@ -14,6 +14,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.List;
/**
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataEOMapper.java
+3 -4
View File
@@ -1,10 +1,8 @@
package com.jero.modules.cert.collect.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
import org.apache.ibatis.annotations.Param;
/**
* @Description: 参数配置数据
@@ -14,4 +12,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface ParamsConfigDataEOMapper extends BaseMapper<ParamsConfigDataEO> {
int deleteByParamsConfigIds(@Param("paramsConfigIds") String paramsConfigIds);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigEOMapper.java
+8 -4
View File
@@ -1,10 +1,10 @@
package com.jero.modules.cert.collect.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.jero.modules.cert.collect.entity.ParamsConfigEO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.modules.cert.collect.entity.ParamsConfigEO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @Description: 参数配置
@@ -14,4 +14,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface ParamsConfigEOMapper extends BaseMapper<ParamsConfigEO> {
int deleteByParamsManifestIds(@Param("paramsManifestIds") String paramsManifestIds);
int updateForeach(@Param("list") List<ParamsConfigEO> list);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataEOMapper.xml
+8
View File
@@ -14,4 +14,12 @@
<result column="params_config_id" property="paramsConfigId" />
<result column="params_collect_manifest_id" property="paramsCollectManifestId" />
</resultMap>
<delete id="deleteByParamsConfigIds" parameterType="java.lang.String">
delete from params_config_data
where params_config_id in
<foreach collection="paramsConfigIds.split(',')" index="index" separator="," open="(" close=")" item="item">
#{item}
</foreach>
</delete>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigEOMapper.xml
+27
View File
@@ -10,8 +10,35 @@
<result column="sys_org_code" property="sysOrgCode" />
<result column="config_name" property="configName" />
<result column="version" property="version" />
<result column="car_type" property="carType" />
<result column="battery" property="battery" />
<result column="motor" property="motor" />
<result column="params_manifest_id" property="paramsManifestId" />
<result column="display_seq" property="displaySeq" />
</resultMap>
<update id="updateForeach" parameterType="java.util.List">
<foreach collection="list" item="item" index="index" separator=";">
update params_config
<set >
config_name = #{item.configName, jdbcType=VARCHAR},
version = #{item.version, jdbcType=VARCHAR},
car_type = #{item.carType, jdbcType=VARCHAR},
battery = #{item.battery, jdbcType=VARCHAR},
motor = #{item.motor, jdbcType=VARCHAR},
display_seq = #{item.displaySeq, jdbcType=INTEGER},
update_by = #{item.updateBy, jdbcType=VARCHAR},
update_time = #{item.updateTime, jdbcType=TIMESTAMP},
</set>
where id = #{item.id, jdbcType=VARCHAR}
</foreach>;
</update>
<delete id="deleteByParamsManifestIds" parameterType="java.lang.String">
delete from params_config
where params_manifest_id in
<foreach collection="paramsManifestIds.split(',')" index="index" separator="," open="(" close=")" item="item">
#{item}
</foreach>
</delete>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigEOService.java
+5 -3
View File
@@ -1,7 +1,9 @@
package com.jero.modules.cert.collect.service;
import com.jero.modules.cert.collect.entity.ParamsConfigEO;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.cert.collect.ParamsConfigVO;
import com.jero.modules.cert.collect.entity.ParamsConfigEO;
import java.util.List;
/**
@@ -15,10 +17,10 @@ public interface IParamsConfigEOService extends IService<ParamsConfigEO> {
/**
* 保存
*
* @param paramsConfigEO
* @param paramsConfigVO
* @return
*/
void add(ParamsConfigEO paramsConfigEO);
void addBatch(ParamsConfigVO paramsConfigVO);
/**
* 更新
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java
+61 -8
View File
@@ -1,12 +1,22 @@
package com.jero.modules.cert.collect.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.cert.collect.ParamsConfigVO;
import com.jero.modules.cert.collect.entity.ParamsConfigEO;
import com.jero.modules.cert.collect.mapper.ParamsConfigDataEOMapper;
import com.jero.modules.cert.collect.mapper.ParamsConfigEOMapper;
import com.jero.modules.cert.collect.service.IParamsConfigEOService;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.List;
/**
* @Description: 参数配置
@@ -17,18 +27,61 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class ParamsConfigEOServiceImpl extends ServiceImpl<ParamsConfigEOMapper, ParamsConfigEO> implements IParamsConfigEOService {
@Autowired
private ParamsConfigEOMapper paramsConfigEOMapper;
@Autowired
private ParamsConfigDataEOMapper paramsConfigDataEOMapper;
/**
* 保存
*
* @param paramsConfigEO
* @param paramsConfigVO
* @return
*/
@Override
public void add(ParamsConfigEO paramsConfigEO) {
Date now = new Date();
paramsConfigEO.setCreateTime(now);
paramsConfigEO.setUpdateTime(now);
save(paramsConfigEO);
public void addBatch(ParamsConfigVO paramsConfigVO) {
String paramsManifestId = paramsConfigVO.getParamsManifestId();
List<ParamsConfigEO> paramsConfigEOList = paramsConfigVO.getParamsConfigEOList();
int ind = 1;
List<ParamsConfigEO> addConfigList = new ArrayList<>(); // 新增的配置
List<ParamsConfigEO> updateConfigList = new ArrayList<>(); // 修改的配置
for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) {
paramsConfigEO.setParamsManifestId(paramsManifestId);
paramsConfigEO.setDisplaySeq(ind);
if (StringUtils.isEmpty(paramsConfigEO.getId())) {
addConfigList.add(paramsConfigEO);
} else {
updateConfigList.add(paramsConfigEO);
}
ind++;
}
// 删除的配置
String deleteConfigIds = paramsConfigVO.getDeleteConfigIds();
if (StringUtils.isNotBlank(deleteConfigIds)) {
List<String> deleteConfigIdList = Arrays.asList(deleteConfigIds.split(","));
paramsConfigEOMapper.deleteBatchIds(deleteConfigIdList);
// 级联删除配置数据
paramsConfigDataEOMapper.deleteByParamsConfigIds(deleteConfigIds);
}
// 新增的配置
if (CollectionUtil.isNotEmpty(addConfigList)) {
addConfigList.forEach(paramsConfigEO -> {
paramsConfigEO.setParamsManifestId(paramsManifestId);
});
saveBatch(addConfigList);
}
// 修改的配置
if (CollectionUtil.isNotEmpty(updateConfigList)) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
updateConfigList.forEach(paramsConfigEO -> {
Date now = new Date();
paramsConfigEO.setUpdateBy(sysUser.getUsername());
paramsConfigEO.setUpdateTime(now);
});
paramsConfigEOMapper.updateForeach(updateConfigList);
}
}
/**
jero-web/src/common/lang/en-us.js
+23 -9
View File
@@ -336,7 +336,7 @@ module.exports = {
Users: 'users',
reduction: 'reduction',
UsersSucceeded: 'users succeeded!',
standard: 'serial number',
standard: 'Number',
title: 'title',
TextStatus: 'TextStatus',
PleaseEnter: 'Please enter',
@@ -523,7 +523,7 @@ module.exports = {
newClause: 'new clause',
clauseNo: 'clause No.',
functionalAreas: 'functional areas',
technicalField: 'technical field',
technicalField: 'Technical Field',
informationCategory: 'information category',
contentValidity: 'content validity',
content: 'content',
@@ -554,11 +554,10 @@ module.exports = {
newNode: 'new node',
modifyNode: 'modify node',
deleteNode: 'delete node',
ImplementationDate: 'Implementation Date',
vehicleInProductionDate: 'vehicle in Production Date',
ImplementationDate: 'New Type Execute Date',
vehicleInProductionDate: 'New Vehicle Execute Date',
deleteNodes: 'If there are child nodes under this node, they will be deleted synchronously. Are you sure to delete this data?',
leastTwo: 'please select at least two pieces of data',
vehicleInProductionDate: 'vehicle in Production Date',
mergeTerms: 'determine merger terms',
documentSplitTemplate: 'document split template',
batSetting: 'batch setting',
@@ -581,14 +580,14 @@ module.exports = {
withdraw: 'withdraw',
maintenanceList: 'Maintenance list',
instructionForUse: 'instruction for use',
subtitle: 'subtitle',
subtitle: 'Sub-Title',
scopeOfApplication: 'Scope of application',
correspondingStandard: 'Corresponding standard',
implementationCategory: 'Implementation category',
certificationType: 'Certification Type',
certificationLevel: 'Certification level',
areaOfResponsibility: 'Area of responsibility',
confirmationOfDesignConformity: 'Confirmation of design conformity',
certificationLevel: 'Certification Level',
areaOfResponsibility: 'Responsible Field',
confirmationOfDesignConformity: 'Design Compliance Check Deliverable',
Deliverables: 'Deliverables',
personLiable: 'person liable',
PrehomoConfirmation: 'Prehomo confirmation',
@@ -756,4 +755,19 @@ module.exports = {
VirtualList:'VirtualList',
importTemplate:'import template',
verificationConfirmationDeadline:'Verification compliance confirmation deadline',
technicalEvaluationResults:'technical evaluation results',
engineeringConfirmation:'engineeringConfirmation',
feedbackFromTheEngineer:'Feedback from the Engineer',
completedBy:'Completed by',
completedTime:'Completed time',
replyFromProjectContactPerson:'Reply from project contact person',
answer:'answer',
distributionEngineer:'Distribution Engineer',
reminderHandling:'Reminder handling',
addFeedback:'Add feedback',
engineer:'engineer',
engineeringConfirmationDetails:'Engineering confirmation details',
reminder:'reminder',
adopt:'adopt',
reviewedByThePersonInCharge:'Reviewed by the person in charge',
}
jero-web/src/common/lang/zh-cn.js
+15 -1
View File
@@ -560,7 +560,6 @@ module.exports = {
deleteNode: '删除节点',
ImplementationDate: '新车型实施日期',
vehicleInProductionDate: '在产车实施日期',
vehicleInProductionDate: '在产车实施日期',
deleteNodes: '该节点下若有子节点将同步删除，确认删除该条数据？',
leastTwo: '请选择至少两条数据',
mergeTerms: '确定合并条款',
@@ -761,4 +760,19 @@ module.exports = {
standardInformation:'标准信息',
importTemplate:'导入模板',
verificationConfirmationDeadline:'验证符合性确认截止时间',
technicalEvaluationResults:'技术评估结果',
engineeringConfirmation:'工程确认',
feedbackFromTheEngineer:'工程师反馈意见',
completedBy:'填写人',
completedTime:'填写时间',
replyFromProjectContactPerson:'工程接口人回复',
answer:'回复',
distributionEngineer:'分发工程师',
reminderHandling:'提醒办理',
addFeedback:'添加反馈',
engineer:'工程师',
engineeringConfirmationDetails:'工程确认详情',
reminder:'提醒',
adopt:'通过',
reviewedByThePersonInCharge:'负责人审核',
}
jero-web/src/components/layouts/TabLayout.vue
+1
View File
@@ -90,6 +90,7 @@
this.$route.path == '/system/MessageDetails' ||
this.$route.path == '/ProcessMapping' ||
this.$route.path == '/virtualListDetails' ||
this.$route.path == '/taskListProcess' ||
this.$route.path == '/ProjectDetails' ||
this.$route.path == '/handshakeProcess' ||
this.$route.path == '/historicalVersion' ||
jero-web/src/config/router.config.js
+5
View File
@@ -337,6 +337,11 @@ export const constantRouterMap = [
name: 'ProjectDetails',
component: () => import(/* webpackChunkName: "user" */ '@/views/projectManagement/ProjectDetails/index')
},
{
path: '/taskListProcess',
name: 'taskListProcess',
component: () => import(/* webpackChunkName: "user" */ '@/views/processCenter/processForm/taskListProcess/index')
},
{
path: '/handshakeProcess',
name: 'handshakeProcess',
jero-web/src/views/documentTools/virtualList/components/editModel.vue
+1 -1
View File
@@ -57,7 +57,7 @@
<div class="title-text">
<span class="title-text-text" :title="'WVTA ID'">WVTA ID</span>
</div>
<a-form-model-item class="itemModel" prop="WVTAID">
<a-form-model-item class="itemModel" prop="wvtaId">
<a-input class="box-input"
:disabled="false"
v-model="formInline.wvtaId"
jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+504
View File
@@ -0,0 +1,504 @@
<template>
<div class="box">
<div class="box-text">
<div class="header-text">
{{$t('engineeringConfirmation')}}
</div>
</div>
<div class="header-content">
<div class="operator-text" @click="distributionEngineerClick($t('distributionEngineer'))">
<a-icon type="audit"/>
{{ $t('distributionEngineer') }}
</div>
<div class="operator-text" @click="reminderHandling()">
<a-icon type="sound"/>
{{ $t('reminderHandling') }}
</div>
<div class="operator-text" @click="distributionEngineerClick($t('addFeedback'))">
<a-icon type="plus-circle"/>
{{ $t('addFeedback') }}
</div>
</div>
<a-table
ref="table"
:loading="loading"
:pagination="false"
:scroll="{x: true}"
:data-source="dataSource"
:columns="columns"
>
<span slot="operation" slot-scope="result">
<a class="text" @click="edit(result,$t('edit'))">{{$t('edit')}}</a>
<a class="text" @click="detailsClick(result)">{{$t('details')}}</a>
<a class="text" @click="answerClick(result,$t('replyFromProjectContactPerson'))">{{$t('answer')}}</a>
<a class="text">{{$t('deleteLib')}}</a>
</span>
</a-table>
<a-modal
:title="title"
:width="600"
:visible="visible"
:confirm-loading="confirmLoading"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
>
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
<a-row :gutter="24">
<a-col :span="24" v-if="title == $t('distributionEngineer')">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text"
:title="$t('engineer')">{{$t('engineer')}}</span>
</div>
<a-form-model-item class="itemModel">
<PersonnelSelection
:query="{db_field_name:'certificationEngineer',db_field_txt:$t('engineer')}"
:personneQuery="formInline"
@change="PersonnelSelectionChange"
v-model="formInline.certificationEngineerName"/>
</a-form-model-item>
</div>
</a-col>
<a-col :span="24" v-if="title == $t('addFeedback') || title == $t('edit')">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text"
:title="$t('feedbackFromTheEngineer')">{{$t('feedbackFromTheEngineer')}}</span>
</div>
<a-form-model-item class="itemModel" prop="engineerFeedbackContent">
<a-textarea
:placeholder="$t('PleaseEnter')+$t('feedbackFromTheEngineer')"
:disabled="false"
v-model="formInline.engineerFeedbackContent" :rows="4"/>
</a-form-model-item>
</div>
</a-col>
<a-col :span="24" v-if="title == $t('addFeedback') || title == $t('edit')">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text"
:title="$t('Deliverables')">{{$t('Deliverables')}}</span>
</div>
<a-form-model-item class="itemModel" prop="fileId">
<a-button type="primary" class="button-text"
@click="clickButtonToUpload('fileId')">
{{ (formInline.fileId === 'null' || formInline.fileId === '' ||
formInline.fileId == null) ? $t('clickUpload') : $t('viewUploadedFiles')
}}
</a-button>
</a-form-model-item>
</div>
</a-col>
<a-col :span="24" v-if="title == $t('replyFromProjectContactPerson')">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text"
:title="$t('replyFromProjectContactPerson')">{{$t('replyFromProjectContactPerson')}}</span>
</div>
<a-form-model-item class="itemModel" prop="engineeringInterfacePersonReply">
<a-textarea
:placeholder="$t('replyFromProjectContactPerson')"
:disabled="false"
v-model="formInline.engineeringInterfacePersonReply" :rows="4"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
</a-form-model>
</a-modal>
<a-modal
:title="$t('engineeringConfirmationDetails')"
:width="600"
:visible="visibleDetails"
:maskClosable="false"
@cancel="visibleDetails = false"
>
<template slot="footer">
<a-button key="back" @click="visibleDetails = false">
{{$t('cancel')}}
</a-button>
</template>
<a-row :gutter="24" style="margin-bottom: 18px">
<a-col :span="6">
<div class="text-field-left">{{this.$t('feedbackFromTheEngineer')}}:</div>
</a-col>
<a-col :span="18">
<div class="text-field-right">
{{this.formInlineDetails.engineerFeedbackContent}}
</div>
</a-col>
</a-row>
<a-row :gutter="24" style="margin-bottom: 18px">
<a-col :span="6">
<div class="text-field-left">{{this.$t('Deliverables')}}:</div>
</a-col>
<a-col :span="18">
<a-button type="primary" class="button-text"
@click="clickButtonToUploadDetails('fileId')">
{{ (formInlineDetails.fileId === 'null' || formInlineDetails.fileId === '' ||
formInlineDetails.fileId == null) ? $t('clickUpload') : $t('viewUploadedFiles')
}}
</a-button>
</a-col>
</a-row>
<a-row :gutter="24" style="margin-bottom: 18px">
<a-col :span="6">
<div class="text-field-left">{{this.$t('completedBy')}}:</div>
</a-col>
<a-col :span="18">
<div class="text-field-right">
{{formInlineDetails.createBy}}
</div>
</a-col>
</a-row>
<a-row :gutter="24" style="margin-bottom: 18px">
<a-col :span="6">
<div class="text-field-left">{{this.$t('completedTime')}}:</div>
</a-col>
<a-col :span="18">
<div class="text-field-right">
{{formInlineDetails.createTime}}
</div>
</a-col>
</a-row>
<a-row :gutter="24" style="margin-bottom: 18px">
<a-col :span="6">
<div class="text-field-left">{{this.$t('replyFromProjectContactPerson')}}:</div>
</a-col>
<a-col :span="18">
<div class="text-field-right">
{{formInlineDetails.engineeringInterfacePersonReply}}
</div>
</a-col>
</a-row>
</a-modal>
<a-modal
:title="$t('reminderHandling')"
:width="800"
:visible="visibleTable"
:maskClosable="false"
@cancel="visibleTable = false"
>
<template slot="footer">
<a-button key="back" @click="visibleTable = false">
{{$t('cancel')}}
</a-button>
</template>
<a-table
ref="table"
:loading="loadingTable"
:pagination="false"
:scroll="{x: true,y:400}"
:data-source="dataSourceTable"
:columns="columnsTable"
>
<span slot="operationTable" slot-scope="result">
<a>{{$t('reminder')}}</a>
</span>
</a-table>
</a-modal>
<uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
<uploadFile ref="uploadFileDetails" :disabled="true"/>
</div>
</template>
<script>
import PersonnelSelection from '@/components/PersonnelSelection/index'
import { getAction, postAction, putAction } from '@/api/manage'
import uploadFile from '@/components/uploadFile/file'
export default {
name: 'engineeringConfirmation',
components: {
PersonnelSelection,
uploadFile
},
data() {
return {
loading: false,
dataSource: [{}],
dataSourceTable: [],
columnsTable: [
{
title: this.$t('engineer'),
dataIndex: 'engineer',
align: 'center'
},
{
title: this.$t('operation'),
align: 'center',
width: 200,
scopedSlots: { customRender: 'operationTable' }
}
],
loadingTable: false,
visible: false,
confirmLoading: false,
visibleTable: false,
title: '',
formInline: {},
formInlineDetails: {},
rules: {
engineerFeedbackContent: [
{
required: true,
message: this.$t('feedbackFromTheEngineer') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{
max: 300,
message: this.$t('feedbackFromTheEngineer') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
trigger: 'blur'
}
],
engineeringInterfacePersonReply: [
{
required: true,
message: this.$t('replyFromProjectContactPerson') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{
max: 300,
message: this.$t('replyFromProjectContactPerson') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
trigger: 'blur'
}
],
fileId: [
{
required: true,
message: this.$t('Deliverables') + this.$t('cannotEmpty'),
trigger: 'change'
}
]
},
visibleDetails: false,
columns: [
{
title: this.$t('serialNumber'),
dataIndex: 'index',
key: 'index',
align: 'center',
customRender: (text, record, index) => `${index + 1}`
},
{
title: this.$t('feedbackFromTheEngineer'),
dataIndex: 'engineerFeedbackContent',
align: 'center'
},
{
title: this.$t('Deliverables'),
dataIndex: 'fileId',
align: 'center'
},
{
title: this.$t('completedBy'),
dataIndex: 'createBy',
align: 'center'
},
{
title: this.$t('completedTime'),
dataIndex: 'createTime',
align: 'center'
},
{
title: this.$t('replyFromProjectContactPerson'),
dataIndex: 'engineeringInterfacePersonReply',
align: 'center'
},
{
title: this.$t('operation'),
align: 'center',
width: 200,
scopedSlots: { customRender: 'operation' }
}
]
}
},
mounted() {
},
methods: {
handleOk() {
},
handleCancel() {
this.visible = false
},
distributionEngineerClick(title) {
this.title = title
this.visible = true
this.formInline = {}
},
reminderHandling() {
this.visibleTable = true
},
detailsClick(val) {
this.formInlineDetails = val
this.visibleDetails = true
},
PersonnelSelectionChange(value, id) {
this.formInline[value] = id
this.formInline = { ...this.formInline }
},
edit(val, title) {
this.title = title
this.visible = true
this.formInline = val
},
answerClick(val, title) {
this.title = title
this.visible = true
this.formInline = val
},
clickButtonToUpload(item) {
this.$refs.uploadFile.perentHandleFunc()
this.$refs.uploadFile.visible = true
this.uploadName = item
getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
if (res.success) {
this.$refs.uploadFile.perentHandleFunc(res.result)
} else {
this.$refs.uploadFile.perentHandleFunc()
}
})
},
clickButtonToUploadDetails(item) {
this.$refs.uploadFileDetails.perentHandleFunc()
this.$refs.uploadFileDetails.visible = true
this.uploadName = item
getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
if (res.success) {
this.$refs.uploadFileDetails.perentHandleFunc(res.result)
} else {
this.$refs.uploadFileDetails.perentHandleFunc()
}
})
},
/** 上传文件的回调 */
uploadSuccess(data) {
let attIdList = []
if (data && data.length > 0) {
data.map(item => {
attIdList.push(item.id || data.name)
})
}
/** 赋值给当前对应的表单文件 */
this.formInline[this.uploadName] = attIdList.join(',')
this.formInline = { ...this.formInline }
}
}
}
</script>
<style scoped lang="less">
.box {
padding: 0 24px 24px 24px;
box-sizing: border-box;
}
.box-text {
display: flex;
justify-content: space-between;
height: 80px;
line-height: 80px;
.header-text {
font-size: 16px;
font-weight: 400;
color: #000F16;
}
}
.header-content {
width: 100%;
text-align: right;
margin-bottom: 20px;
}
.text {
margin-right: 8px;
}
.operator-text {
cursor: pointer;
margin-right: 53px;
font-size: 14px;
font-weight: 400;
color: #040B29;
display: inline-block;
}
.operator-text:last-child {
margin-right: 16px;
}
.box-title-text {
line-height: 1.4;
display: flex;
}
.Required {
color: red;
margin-right: 4px;
}
.title-text {
width: 124px;
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;
}
.box-input {
display: inline-block;
height: 38px;
width: 100%;
}
.itemModel {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
}
.title-text-text {
margin-top: 9px;
}
.formAdd {
margin-bottom: 40px;
}
.button-text {
height: 38px;
width: calc(100% - 100px);
line-height: 38px;
background: #fff;
border: 1px #00B3BE solid;
color: #00B3BE;
}
.text-field-left {
font-size: 16px;
font-weight: 400;
color: #6F7385;
margin-top: 4px;
}
.text-field-right {
font-size: 16px;
color: #040B29;
font-weight: 400;
}
</style>
jero-web/src/views/processCenter/components/examineInformation.vue
+7
View File
@@ -133,6 +133,13 @@
message: this.$t('selectIssuer') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
approvalOpinion: [
{
max: 300,
message: this.$t('feedbackMessage') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
trigger: 'blur'
}
]
}
}
jero-web/src/views/processCenter/components/headerProcess.vue
+10 -1
View File
@@ -19,6 +19,7 @@
<a-button class="header-btn termin" v-if="isSendBack" @click="sendBackCkick" type="danger" ghost>
{{$t('sendBack')}}
</a-button>
<a-button class="header-btn submit" v-if="isAdopt" @click="adopt" type="primary">{{$t('adopt')}}</a-button>
</div>
</div>
</div>
@@ -59,6 +60,10 @@
type: Boolean,
default: false
},
isAdopt:{
type: Boolean,
default: false
},
},
methods: {
terminationProcess() {
@@ -81,7 +86,11 @@
},
backTo() {
}
},
adopt(){
let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
this.$emit('adopt',handlingTime)
},
}
}
</script>
jero-web/src/views/processCenter/components/projectInformation.vue
+21 -1
View File
@@ -8,13 +8,23 @@
<div class="content-text">
<div class="text-field" v-for="(item,index) in projectInformationList" :key="index">
<span class="text-field-left" :title="item.title">{{item.title}}</span>
<span class="text-field-right text-field-right-url"
:title="queryForm[item.value]"
@click="urlClick(queryForm[item.value])"
v-if="item.type == 1"
>{{queryForm[item.value]}}</span>
<span class="text-field-right" :title="queryForm[item.value]"
>{{queryForm[item.value]}}</span>
</div>
</div>
</div>
</template>
<!--
type:
1打开新页面
2显示文件
3点击事件处理\需要传点击事件
-->
<script>
import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
@@ -53,6 +63,11 @@
this.queryForm = {}
}
})
},
urlClick(val) {
if (val) {
window.open(val)
}
}
}
}
@@ -108,6 +123,11 @@
color: #040B29;
font-weight: 400;
}
.text-field-right-url {
color: #00B3BE !important;
cursor: pointer;
}
}
}
</style>
jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
+166
View File
@@ -0,0 +1,166 @@
<template>
<div class="box">
<div class="box-text">
<div class="header-text">
{{$t('reviewedByThePersonInCharge')}}
</div>
</div>
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('reviewResults')">{{$t('reviewResults')}}</span>
</div>
<a-form-model-item class="itemModel" prop="reviewResult">
<a-radio-group style="margin-top: 2px" class="box-input" v-model="formInline.reviewResult">
<a-radio value="conformity">
{{$t('accord')}}
</a-radio>
<a-radio value="inconformity">
{{$t('nonConformity')}}
</a-radio>
<a-radio value="to track">
{{$t('Tracked')}}
</a-radio>
<a-radio value="uninvolved">
{{$t('notInvolved')}}
</a-radio>
</a-radio-group>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span>
</div>
<a-form-model-item class="itemModel" prop="approvalOpinion">
<a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')" v-model="formInline.approvalOpinion"
:rows="4"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
</a-form-model>
</div>
</template>
<script>
export default {
name: 'reviewedByThePersonInCharge',
data() {
return {
formInline: {},
isTrue: false,
rules: {
reviewResult: [
{
required: true,
message: this.$t('reviewResults') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
approvalOpinion: [
{
max: 300,
message: this.$t('feedbackMessage') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
trigger: 'blur'
}
]
}
}
},
mounted() {
},
methods: {
submit(callBack) {
this.$refs.ruleForm.validate(valid => {
if (valid) {
callBack(this.formInline)
}
})
}
}
}
</script>
<style scoped lang="less">
.box {
padding: 0 24px 24px 24px;
box-sizing: border-box;
}
.box-text {
display: flex;
justify-content: space-between;
height: 60px;
line-height: 40px;
.header-text {
font-size: 16px;
font-weight: 400;
color: #000F16;
}
}
.box-title-text {
line-height: 1.4;
display: flex;
/*align-items: center;*/
}
.title-text {
width: 88px;
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: 48px;
color: #000F16;
}
.box-input {
display: inline-block;
height: 38px;
width: 100%;
}
.itemModel {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
margin-bottom: 12px;
}
.Required {
color: red;
margin-right: 4px;
}
.title-text-text {
margin-top: 9px;
}
.formAdd {
margin-bottom: 40px;
}
.button-text {
height: 38px;
width: calc(100% - 100px);
line-height: 38px;
background: #fff;
border: 1px #00B3BE solid;
color: #00B3BE;
}
</style>
jero-web/src/views/processCenter/components/standardContent.vue
+26 -3
View File
@@ -8,13 +8,25 @@
<div class="content-text">
<div class="text-field" v-for="(item,index) in standardContentList" :key="index">
<span class="text-field-left" :title="item.title">{{item.title}}</span>
<span class="text-field-right" :title="queryForm[item.value]"
<span class="text-field-right text-field-right-url"
:title="queryForm[item.value]"
@click="urlClick(queryForm[item.value])"
v-if="item.type == 1"
>{{queryForm[item.value]}}</span>
<span class="text-field-right"
:title="queryForm[item.value]" v-else
>{{queryForm[item.value]}}</span>
</div>
</div>
</div>
</template>
<!--
type:
1打开新页面
2显示文件
3点击事件处理\需要传点击事件
-->
<script>
import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
@@ -44,7 +56,13 @@
mounted() {
this.queryForm = this.standardContentQuery
},
methods: {}
methods: {
urlClick(val) {
if (val) {
window.open(val)
}
}
}
}
</script>
@@ -98,6 +116,11 @@
color: #040B29;
font-weight: 400;
}
.text-field-right-url {
color: #00B3BE !important;
cursor: pointer;
}
}
}
</style>
jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+218
View File
@@ -0,0 +1,218 @@
<template>
<div id="examineBox">
<headerProcess
:title="$t('confirmationOfDesignConformity')"
:is-termination-process="isTerminationProcess"
:is-adopt="isAdopt"
:isSendBack="isSendBack"
@terminationProcess="terminationProcess"
@adopt="adopt"
@sendBack="sendBack"
/>
<div class="detail-box">
<div class="detail-content">
<projectInformation
v-if="!loading"
:projectInformationList="projectInformationList"
:url="url"
:projectInformationId="this.queryBy.projectLibraryId"
/>
<standardContent
v-if="!loading"
:standardContentList="standardContentList"
:url="url"
:standardContentQuery="queryProject"
/>
<engineeringConfirmation
v-if="!loading"
/>
<reviewedByThePersonInCharge
v-if="!loading"
/>
<circulationHistory v-if="!loading" :url="url"/>
</div>
</div>
<JLoading :loading="loading">{{textLoading}}</JLoading>
</div>
</template>
<script>
import headerProcess from '../../components/headerProcess'
import projectInformation from '../../components/projectInformation'
import standardContent from '../../components/standardContent'
import standardContentListTable from '../../components/standardContentList'
import circulationHistory from '../../components/circulationHistory'
import engineeringConfirmation from '../../components/engineeringConfirmation'
import reviewedByThePersonInCharge from '../../components/reviewedByThePersonInCharge'
import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
import { mapGetters } from 'vuex'
export default {
name: 'index',
components: {
headerProcess,
projectInformation,
standardContent,
standardContentListTable,
reviewedByThePersonInCharge,
circulationHistory,
engineeringConfirmation
},
data() {
return {
url: {
urlFrom: 'project/projectLibraryBase/queryById',
queryProjectLawsInventoryInfoById: 'project/projectLawsInventoryEO/queryProjectLawsInventoryInfoById',
queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds'
},
queryBy: {},
queryProject: {},
loading: false,
textLoading:this.$t('dataLoading'),
projectInformationList: [
{
title: this.$t('entryName'),
value: 'projectName'
},
{
title: this.$t('targetMarket'),
value: 'targetMarket_dictText'
},
{
title: this.$t('projectStatus'),
value: 'projectStatus_dictText'
},
{
title: this.$t('StudioEngineer'),
value: 'studioEngineerName'
},
{
title: this.$t('certifiedEngineer'),
value: 'certificationEngineerName'
},
{},
{
title: this.$t('DigitalPlatform'),
value: 'digitalPlatform_dictText'
},
{
title: this.$t('ModelPlatform'),
value: 'vehiclePlatform_dictText'
},
{},
{
title: this.$t('IPDInformation'),
value: 'ipdInfo',
type: 1
},
{
title: this.$t('certificationProgram'),
value: 'attestationPlan',
type: 1
},
{
title: this.$t('dehicleDevelopmentPlan'),
value: 'vehicleDevelopmentPlan',
type: 1
}
],
standardContentList: [
{
title: this.$t('standard'),
value: 'serialNumber'
},
{
title: this.$t('title'),
value: 'title'
},
{
title: this.$t('subtitle'),
value: 'subtitle'
},
{
title: this.$t('correspondingStandard'),
value: 'correspondingStandard'
},
{
title: this.$t('Sponsor'),
value: 'designInitiatorName'
},
{
title: this.$t('personLiable'),
value: 'designDutyName'
},
{
title: this.$t('regulatoryEngineer'),
value: 'regulationOwnerName'
},
{
title: this.$t('certifiedEngineer'),
value: 'homologationEngineerName'
},
{},
{
title: this.$t('typeOfDeliverables'),
value: 'designDeliverableType_dictText'
},
{
title: this.$t('deliverableTemplate'),
value: 'designDeliverableTemplate',
name: 'designDeliverableTemplateName',
type: 2
},
{
title: this.$t('technicalEvaluationResults'),
value: 'technicalEvaluationResults'
},
{
title: this.$t('remarks'),
value: 'remark'
}
]
}
},
computed: {
isSendBack() {
return true
},
isTerminationProcess() {
return true
},
isAdopt() {
return true
}
},
mounted() {
},
methods: {
...mapGetters(['userInfo']),
terminationProcess() {
},
adopt() {
},
sendBack() {
}
}
}
</script>
<style lang="less" scoped>
.detail-box {
padding: 67px 0 0 0;
background: #ffffff;
height: 100%;
overflow: auto;
}
#examineBox {
display: flex;
flex-direction: column;
background: #fff;
position: relative;
height: 100%;
overflow-y: auto;
}
</style>
jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+36 -12
View File
@@ -35,17 +35,31 @@
</div>
<div style="width: 100%">
<a-table
ref="table"
:loading="loading"
:pagination="false"
:scroll="{x: true}"
rowKey="id"
:data-source="dataSource"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:columns="columns"
>
class='table-area'
ref='table'
size='middle'
rowKey='id'
:columns='columns'
:dataSource='dataSource'
:pagination='false'
:loading='loading'
:scroll='{x: 600}'
:rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
@change='handleTableChange'>
<!-- <a-table-->
<!-- ref="table"-->
<!-- :loading="loading"-->
<!-- :pagination="false"-->
<!-- :scroll="{x: true}"-->
<!-- rowKey="id"-->
<!-- :data-source="dataSource"-->
<!-- :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"-->
<!-- :columns="columns"-->
<!-- @change='handleTableChange'-->
<!-- >-->
<span slot="operation" slot-scope="text,record">
<a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
<a class="text-operation" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
</span>
</a-table>
</div>
@@ -61,7 +75,7 @@
/>
</div>
<a-modal v-model="areaVisible" :title="$t('parameterTemplate')" width='750px' :footer="null">
<parameter-template v-if='areaVisible'></parameter-template>
<parameter-template v-if='areaVisible' @areaVisible='handleCancel'></parameter-template>
</a-modal>
</a-card>
</template>
@@ -144,6 +158,16 @@
this.getlist()
},
methods:{
deleteLib() {
},
handleTableChange() {
},
handleCancel(val) {
this.areaVisible = val
this.getlist()
},
searchQuery() {
this.pageNo = 1
this.getlist()
@@ -153,8 +177,8 @@
this.pageNo = 1
this.getlist()
},
onSelectChange() {
onSelectChange(val,valdate) {
this.selectedRowKeys = val
},
edit(edit){
jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+33 -5
View File
@@ -135,7 +135,7 @@
<div class="title-text">
<span class="title-text-text" :title="$t('remarks')">{{$t('remarks')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-form-model-item class="itemModel" prop="remark">
<a-textarea
:placeholder="$t('PleaseEnter')+$t('remarks')"
:disabled="false"
@@ -214,29 +214,56 @@
certificationEngineerName: [
{
required: true,
message: this.$t('certifiedEngineer') + this.$t('certifiedEngineer'),
message: this.$t('certifiedEngineer') + this.$t('cannotEmpty'),
trigger: 'change'
},
{
max: 100,
message: this.$t('certifiedEngineer') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
trigger: 'change'
}
],
dutyTerritory: [
{
required: true,
message: this.$t('certifiedEngineer') + this.$t('areaOfResponsibility'),
message: this.$t('areaOfResponsibility') + this.$t('cannotEmpty'),
trigger: 'change'
},
{
max: 100,
message: this.$t('areaOfResponsibility') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
trigger: 'change'
}
],
lawEngineerName: [
{
required: true,
message: this.$t('certifiedEngineer') + this.$t('regulatoryEngineer'),
message: this.$t('regulatoryEngineer') + this.$t('cannotEmpty'),
trigger: 'change'
},
{
max: 100,
message: this.$t('regulatoryEngineer') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
trigger: 'change'
}
],
engineeringInterfacePersonName: [
{
required: true,
message: this.$t('certifiedEngineer') + this.$t('engineeringInterfacePerson'),
message: this.$t('engineeringInterfacePerson') + this.$t('cannotEmpty'),
trigger: 'change'
},
{
max: 100,
message: this.$t('engineeringInterfacePerson') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
trigger: 'change'
}
],
remark: [
{
max: 500,
message: this.$t('remarks') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
trigger: 'blur'
}
]
},
@@ -297,6 +324,7 @@
this.editVisible = true
this.$nextTick(() => {
this.formInline = JSON.parse(JSON.stringify(item))
this.$refs.ruleForm.clearValidate()
})
},
PersonnelSelectionChange(value, id) {
jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue
+88 -80
View File
@@ -11,9 +11,9 @@
>
<a-row :gutter='24'>
<a-col :span='9'>
<a-form-model-item :label="$t('title')" prop='title'>
<a-form-model-item :label="$t('title')" prop='templatetitle' :rules='rules'>
<a-input style='width: 420px'
v-model='title' />
v-model='templatetitle' />
</a-form-model-item>
</a-col>
<a-col :span='9'>
@@ -77,9 +77,11 @@ export default {
components: {},
data() {
return {
templatetitle: '',
title: this.$t('add'),
total: 0,
selectedRowKeys: [],
selectedRowKeysDate: {},
loading: false,
ipagination: true,
editId: '',
@@ -109,10 +111,9 @@ export default {
},
form: {},
rules: {
title: [
{ required: true, message: this.$t('enterTitle'), trigger: 'blur' },
{ min: 1, max: 50, message: this.$t('charactersLength'), trigger: 'blur' }
]
// templatetitle: [
// { required: true, message: this.$t('enterTitle'), trigger: 'blur' }
// ]
},
areaTable: [],
flag: false, //表单提交标识
@@ -147,17 +148,13 @@ export default {
this.loadData()
},
handleCancel() {
this.$emit('areaVisible',false)
},
handleSubmit() {
},
onSelectChange(selectedRowKeys) {
// console.log('selectedRowKeys changed: ', selectedRowKeys);
onSelectChange(selectedRowKeys,selectedRowKeysDate) {
this.selectedRowKeysDate = selectedRowKeysDate
this.selectedRowKeys = selectedRowKeys
},
handleTableChange() {
handleTableChange(val) {
},
showModal() {
this.title = this.$t('add')
@@ -165,74 +162,85 @@ export default {
this.form = {}
},
//新增
hideModal() {
this.$refs.ruleForm.validate(valid => {
if (valid) {
this.flag = true
this.spinLoading = true
//编辑
if (this.form.id) {
putAction(`tag/onlCgformArea/edit`, this.form).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.loadData()
this.form = {
isModel: '',
showArea: '',
enName: '',
sort: ''
}
} else {
this.$message.warning(res.message)
this.form = {
isModel: '',
showArea: '',
enName: '',
sort: ''
}
}
}).finally(() => {
this.flag = false
this.spinLoading = false
this.newVisible = false
this.form = {
isModel: '',
showArea: '',
enName: '',
sort: ''
}
})
} else {
//新增
postAction(`/tag/onlCgformArea/add`, this.form).then(res => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.loadData()
this.form = {
isModel: '',
showArea: '',
enName: '',
sort: ''
handleSubmit() {
if(this.selectedRowKeys.length == 0) {
this.$message.warning(this.$t('pleaseSelectData'))
} else if(this.selectedRowKeys.length > 1) {
this.$message.warning(this.$t('OnlyOneSelected'))
} else {
this.$refs.ruleForm.validate(valid => {
if (valid) {
this.flag = true
this.spinLoading = true
//编辑
if (this.form.id) {
// putAction(`tag/onlCgformArea/edit`, this.form).then((res) => {
// if (res.success) {
// this.$message.success(this.$t('OperationSuccessful'))
// this.loadData()
// this.form = {
// isModel: '',
// showArea: '',
// enName: '',
// sort: ''
// }
// } else {
// this.$message.warning(res.message)
// this.form = {
// isModel: '',
// showArea: '',
// enName: '',
// sort: ''
// }
// }
// }).finally(() => {
// this.flag = false
// this.spinLoading = false
// this.newVisible = false
// this.form = {
// isModel: '',
// showArea: '',
// enName: '',
// sort: ''
// }
// })
} else {
// 新增之前 判断 标题唯一
getAction(`params/manifest/verifyTitle?projectId=${this.$route.query.id}&title=${this.templatetitle}`, {}).then(res => {
if (res.success) {
console.log(this.selectedRowKeys[0])
let postDate = {
title: this.templatetitle,
paramsTemplateId : this.selectedRowKeysDate[0].id,
paramsTemplatePublishVersion: this.selectedRowKeysDate[0].version
}
//新增
postAction(`params/manifest/add`, postDate).then(res => {
if (res.success) {
this.newVisible = false
this.$emit('areaVisible',false)
this.$message.success(this.$t('OperationSuccessful'))
} else {
this.$message.warning(res.message)
}
}
).finally(() => {
this.flag = false
this.spinLoading = false
this.newVisible = false
})
} else {
this.$message.warning(res.message)
}
} else {
// this.$message.warning(this.$t('operationFailed'))
this.$message.warning(res.message)
}
}
).finally(() => {
this.flag = false
this.spinLoading = false
this.newVisible = false
})
}).finally(() => {
this.loading = false
})
}
} else {
return false
}
} else {
// console.log('error submit!!');
return false
}
})
})
}
},
cancelModel() {
this.newVisible = false