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:
liyawei
2022-05-30 13:35:17 +08:00
parent e3313142ed d50fdb6b0c
commit ad11fd43e0
5 changed files with 58 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+19 -8
View File
@@ -1558,12 +1558,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
@Override
public void setBatch(ProjectLawsInventoryEO projectLawsInventoryEO) {/////
if(org.apache.commons.lang3.StringUtils.isNotBlank(projectLawsInventoryEO.getIds())){
//根据id查询数据库中完整信息,翻译
List<String> idList = Arrays.asList(projectLawsInventoryEO.getIds().split(","));
QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
List<ProjectLawsInventoryEO> infoList = list(queryWrapper.in("id", idList));
String projectLibraryId = infoList.get(0).getProjectLibraryId();
List<ProjectLawsInventoryEO> projectLawsInventoryEOList = new ArrayList<>();
for (String id : projectLawsInventoryEO.getIds().split(",")) {
ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO();
@@ -1584,6 +1578,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())){
projectLawsInventoryEOTemp.setDutyTerritory(projectLawsInventoryEO.getDutyTerritory());
}
//在产车实施日期implementTime
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getImplementTime())){
projectLawsInventoryEOTemp.setImplementTime(projectLawsInventoryEO.getImplementTime());
}
//新车型实施日期xin1Che1Xing2Shi2Shi1Ri4Qi1
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){
projectLawsInventoryEOTemp.setXin1Che1Xing2Shi2Shi1Ri4Qi1(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1());
}
//适用地区region
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getRegion())){
projectLawsInventoryEOTemp.setRegion(projectLawsInventoryEO.getRegion());
}
//设计符合性确认截止时间
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getDesignDueDate())){
projectLawsInventoryEOTemp.setDesignDueDate(projectLawsInventoryEO.getDesignDueDate());
@@ -1600,6 +1606,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
this.updateBatchById(projectLawsInventoryEOList);
//根据id查询数据库中完整信息,翻译
List<String> idList = Arrays.asList(projectLawsInventoryEO.getIds().split(","));
QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
List<ProjectLawsInventoryEO> infoList = list(queryWrapper.in("id", idList));
String projectLibraryId = infoList.get(0).getProjectLibraryId();
//更新log
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String username = sysUser.getUsername();
@@ -1725,9 +1736,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
}
}
projectLawsInventoryEOList.add(projectLawsInventoryEOTemp);
// projectLawsInventoryEOList.add(projectLawsInventoryEOTemp);
}
this.updateBatchById(projectLawsInventoryEOList);
// this.updateBatchById(projectLawsInventoryEOList);
contentLog = contentLogBuilder.substring(0, contentLogBuilder.length() - 1);
enContentLog = enContentLogBuilder.substring(0, enContentLogBuilder.length() - 1);
jero-web/src/common/lang/en-us.js
+1
View File
@@ -708,6 +708,7 @@ module.exports = {
uploadTime: 'Upload time',
enclosure: 'Enclosure',
// 认证
changeTheTitle: 'Title already exists, please change the title',
resetPassword: 'reset Password',
departmentAllocation: 'department Allocation',
ListTitle: 'List Title',
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -718,6 +718,7 @@ module.exports = {
uploadTime: '上传时间',
enclosure: '附件',
// 认证
changeTheTitle: '标题已存在，请更换标题',
resetPassword: '重置密码',
departmentAllocation: '部门配置',
ListTitle: '清单标题',
jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+2 -2
View File
@@ -76,8 +76,7 @@
</div>
<!-- 参数模板-->
<a-modal v-model="areaVisible" :title="$t('parameterTemplate')" width='750px' :footer="null">
<parameter-template-add :url='url' ref='templateRef' v-if='areaVisible' @areaVisible='handleCancel' :templateTitle='templatetitle'
:selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version'
<parameter-template-add :url='url' ref='templateRef' v-if='areaVisible' @areaVisible='handleCancel' :version='version'
:projectId='this.$route.query.id'></parameter-template-add>
</a-modal>
<!-- 配置-->
@@ -357,6 +356,7 @@
pageNo: this.pageNo,
...this.queryParam
}
console.log(query,'projectIdprojectIdbainji ')
getAction(this.url.list, query).then((res) => {
if (res.success) {
if (res.result.current > 1 && res.result.records.length == 0) {
jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
+35 -44
View File
@@ -11,10 +11,10 @@
>
<a-row :gutter='24'>
<a-col :span='9'>
<a-form-model-item :label="$t('title')" prop='templatetitle'>
<a-form-model-item :label="$t('title')" prop='title'>
<a-input style='width: 420px'
:placeholder="$t('PleaseEnter')+$t('title')"
v-model='formData.templatetitle' />
v-model='formData.title' />
</a-form-model-item>
</a-col>
<a-col :span='9'>
@@ -55,7 +55,7 @@
:pagination='false'
:loading='loading'
:scroll='{x: 600}'
:rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
:rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, getCheckboxProps: onGetCheckboxProps}'
@change='handleTableChange'>
</a-table>
<div class="page" style='display: flex;justify-content: flex-end;'>
@@ -116,7 +116,7 @@ export default {
form: {},
formData: {},
rules: {
templatetitle: [
title: [
{ required: true, message: this.$t('enterTitle'), trigger: 'blur' }
]
},
@@ -124,28 +124,12 @@ export default {
flag: false, //表单提交标识
spinLoading: false,
confirmLoading: false,
templatetitle: '',
selectedRowKeys: [],
pageNo: 1,
pageSize: 10
}
},
props: {
templateTitle: {
type: String,
default: '',
required: false
},
selectedRowKeyS: {
type: Array,
default: '',
required: false
},
rowId: {
type: String,
default: '',
required: false
},
version: {
type: Number,
default: '',
@@ -201,11 +185,27 @@ export default {
handleCancel() {
this.$emit('areaVisible', false)
},
onGetCheckboxProps(val,value) {
console.log(val)
return({
props: {
// console.log(value,'value')
// // 全部默认禁止选中
// // disabled: true,
// // 某几项默认禁止选中(R: 当state等于1时)
disabled: val.id === 'ce879dab56a243fd99119553d3899e62'
// // 某几项默认选中(R: 当state等于1时)
// // defaultChecked: record.state == 1,
}
})
},
onSelectChange(selectedRowKeys, selectedRowKeysDate) {
this.selectedRowKeysDate = selectedRowKeysDate
this.selectedRowKeys = selectedRowKeys
},
handleTableChange(val) {
console.log(',,,')
},
showModal() {
this.title = this.$t('add')
@@ -213,18 +213,9 @@ export default {
this.form = {}
},
editData(edit) {
let query = {
id: edit.id
}
getAction(this.url.queryById, query).then((res) => {
if (res.success) {
this.formData.templatetitle = res.result.title
this.selectedRowKeys = res.result.paramsTemplateId.split(',')
// this.rowId = res.result.id
// this.version = res.result.paramsTemplatePublishVersion
} else {
}
})
this.formData = {...edit}
this.selectedRowKeys = edit.paramsTemplateId.split(',')
},
//新增
handleSubmit() {
@@ -239,18 +230,21 @@ export default {
this.spinLoading = true
// 新增編輯之前 判断 标题唯一
getAction(`params/manifest/verifyTitle?projectId=${this.$route.query.id}
&title=${this.formData.templatetitle}`, {})
&title=${this.formData.title}`, {})
.then(res => {
if (res.success) {
if (res.result) {
let postDate = {
title: this.formData.templatetitle,
paramsTemplateId: this.rowId || this.selectedRowKeysDate[0].id,
paramsTemplatePublishVersion: this.version || this.selectedRowKeysDate[0].version,
title: this.formData.title,
paramsTemplateId: this.paramsTemplateId || this.selectedRowKeys[0],
paramsTemplatePublishVersion: this.version,
projectId: this.projectId
}
if (this.rowId) {
console.log('编辑')
if (this.formData.id) {
//编辑
postDate = {
id : this.formData.id,
...postDate
}
postAction(`params/manifest/edit`, postDate).then(res => {
if (res.success) {
this.newVisible = false
@@ -266,7 +260,6 @@ export default {
this.newVisible = false
})
} else {
console.log('新增')
//新增
postAction(`params/manifest/add`, postDate).then(res => {
if (res.success) {
@@ -284,7 +277,8 @@ export default {
})
}
} else {
this.$message.warning(res.message)
this.$message.warning(this.$t('changeTheTitle'))
this.spinLoading = false
}
}).finally(() => {
this.loading = false
@@ -328,9 +322,6 @@ export default {
// 编辑
},
watch: {
templateTitle(val) {
this.formData.templatetitle = val
},
selectedRowKeyS(val) {
this.selectedRowKeys = val
}