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 18:28:04 +08:00
parent b0bf90b597 4222d6bbcc
commit 00d281f9e8
7 changed files with 58 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java
+10 -10
View File
@@ -70,7 +70,7 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String serialNumber;
/**标题*/
@Excel(name = "title", width = 15)
@Excel(name = "Title", width = 15)
@ApiModelProperty(value = "标题")
private String title;
@@ -92,7 +92,7 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String shi4Yong4Fan4Wei2;
/**状态*/
@Excel(name = "state", width = 15,dicCode ="state")
@Excel(name = "State", width = 15,dicCode ="state")
@ApiModelProperty(value = "状态")
@Dict(dicCode ="state")
private String state;
@@ -171,7 +171,7 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String remark;
/**设计符合性确认-交付物类型*/
@Excel(name = "design-Deliverables", width = 15,dicCode ="deliverable_template")
@Excel(name = "Design-Deliverables", width = 15,dicCode ="deliverable_template")
@ApiModelProperty(value = "设计符合性确认-交付物类型")
@Dict(dicCode ="deliverable_template")
private String designDeliverableType;
@@ -182,17 +182,17 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String designDeliverableTemplate;
@TableField(exist = false)
@Excel(name = "design-Deliverable Template", width = 15)
@Excel(name = "Design-Deliverable Template", width = 15)
private String designDeliverableTemplateName;
/**设计符合性确认-发起人*/
@Excel(name = "design-Initiator", width = 15)
@Excel(name = "Design-Initiator", width = 15)
@ApiModelProperty(value = "设计符合性确认-发起人")
@Dict(dicCode ="fa1_qi3_ren2")
private String designInitiator;
/**设计符合性确认-责任人*/
@Excel(name = "design-Assignee", width = 15)
@Excel(name = "Design-Assignee", width = 15)
@ApiModelProperty(value = "设计符合性确认-责任人")
@Dict(dicCode ="ze2_ren4_ren2")
private String designDuty;
@@ -225,7 +225,7 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String prehomoDuty;
/**验证符合性确认-交付物类型*/
@Excel(name = "verify-Deliverables", width = 15,dicCode ="deliverable_template")
@Excel(name = "Verify-Deliverables", width = 15,dicCode ="deliverable_template")
@ApiModelProperty(value = "验证符合性确认-交付物类型")
@Dict(dicCode ="deliverable_template")
private String verifyDeliverableType;
@@ -236,17 +236,17 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String verifyDeliverableTemplate;
@TableField(exist = false)
@Excel(name = "verify-Deliverable Template", width = 15)
@Excel(name = "Verify-Deliverable Template", width = 15)
private String verifyDeliverableTemplateName;
/**验证符合性确认-发起人*/
@Excel(name = "verify-Initiator", width = 15)
@Excel(name = "Verify-Initiator", width = 15)
@ApiModelProperty(value = "验证符合性确认-发起人")
@Dict(dicCode ="fa1_qi3_ren2")
private String verifyInitiator;
/**验证符合性确认-责任人*/
@Excel(name = "verify-Assignee", width = 15)
@Excel(name = "Verify-Assignee", width = 15)
@ApiModelProperty(value = "验证符合性确认-责任人")
@Dict(dicCode ="ze2_ren4_ren2")
private String verifyDuty;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+22 -2
View File
@@ -382,9 +382,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
List<ProjectLawsInventoryEO> dataList = list(queryWrapper.eq("id", projectLawsInventoryEO.getId()));
List<ProjectLawsInventoryEO> dataListCopy = DeepCopyListUtil.depCopy(dataList);
LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper = new LambdaUpdateWrapper<>();
setDateNull(projectLawsInventoryEO, updateWrapper);
//保存
saveOrUpdate(projectLawsInventoryEO);
this.update(projectLawsInventoryEO,updateWrapper);
// saveOrUpdate(projectLawsInventoryEO);
//翻译-中文
translateData(infoEOList);
@@ -412,6 +414,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
}
private void setDateNull(ProjectLawsInventoryEO projectLawsInventoryEO, LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper) {
if(ObjectUtils.isEmpty(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){
updateWrapper.set(ProjectLawsInventoryEO::getXin1Che1Xing2Shi2Shi1Ri4Qi1,null);
}
if(ObjectUtils.isEmpty(projectLawsInventoryEO.getImplementTime())){
updateWrapper.set(ProjectLawsInventoryEO::getImplementTime,null);
}
if(ObjectUtils.isEmpty(projectLawsInventoryEO.getDesignDueDate())){
updateWrapper.set(ProjectLawsInventoryEO::getDesignDueDate,null);
}
if(ObjectUtils.isEmpty(projectLawsInventoryEO.getPrehomoDueDate())){
updateWrapper.set(ProjectLawsInventoryEO::getPrehomoDueDate,null);
}
if(ObjectUtils.isEmpty(projectLawsInventoryEO.getVerifyDueDate())){
updateWrapper.set(ProjectLawsInventoryEO::getVerifyDueDate,null);
}
}
/**
* 更新流程信息
* @param projectLawsInventoryEO
jero-web/src/common/lang/en-us.js
+1
View File
@@ -708,6 +708,7 @@ module.exports = {
uploadTime: 'Upload time',
enclosure: 'Enclosure',
// 认证
Correspondingstandarddeleted: 'Correspondingstandarddeleted',
changeTheTitle: 'Title already exists, please change the title',
resetPassword: 'reset Password',
departmentAllocation: 'department Allocation',
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -718,6 +718,7 @@ module.exports = {
uploadTime: '上传时间',
enclosure: '附件',
// 认证
Correspondingstandarddeleted: '对应标准已删除',
changeTheTitle: '标题已存在，请更换标题',
resetPassword: '重置密码',
departmentAllocation: '部门配置',
jero-web/src/components/SplitTable/index.vue
+9 -1
View File
@@ -126,7 +126,15 @@
},
methods: {
urlClick(text,record) {
this.$emit('detailClick', record)
if(record.documentId === null) {
this.$message.warning(this.$t('Correspondingstandarddeleted'))
} else {
let newUrl = this.$router.resolve({
path: '/docManage/library/detail',
query: record
})
window.open(newUrl.href, '_blank')
}
},
getTextWith(text, fontStyle) {
var canvas = document.createElement('canvas')
jero-web/src/views/documentManage/library/docDetail/index.vue
+3 -1
View File
@@ -353,7 +353,9 @@
},
methods: {
getInfoById() {
getAction(this.url.getInfo, { id: this.$route.query.id }).then((res) => {
let _id = this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId
console.log(_id)
getAction(this.url.getInfo, { id: _id }).then((res) => {
if (res.success) {
this.detailList = res.result
} else {
jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
+12 -72
View File
@@ -24,10 +24,10 @@
</a-row>
<a-row :gutter='24'>
<a-col :span='9'>
<a-form-model-item :label="$t('entryName')" prop='entryName'>
<a-form-model-item :label="$t('entryName')" prop='projectName'>
<a-input style='width: 420px'
:placeholder="$t('PleaseEnter')+$t('entryName')"
v-model='formData.title' />
v-model='formData.projectName' />
</a-form-model-item>
</a-col>
<a-col :span='9'>
@@ -90,7 +90,7 @@ export default {
columns: [
{
title: this.$t('entryName'),
dataIndex: 'region_dictText',
dataIndex: 'projectName',
key: 'showArea',
align: 'center',
ellipsis: true
@@ -98,7 +98,7 @@ export default {
{
title: this.$t('ListTitle'),
align: 'center',
dataIndex: 'paramsTemplateName',
dataIndex: 'title',
ellipsis: true
},
{
@@ -168,8 +168,9 @@ export default {
let params = {
pageNo: this.pageNo,
pageSize: this.pageSize,
projectName: this.formData.title
...this.formData
}
this.loading = true
axios({
url: `/jero-boot/params/manifest/getAllManifest`,
method: 'post',
@@ -188,9 +189,12 @@ export default {
})
.then( (res) =>{
if (res.data.success) {
// _this.$message.success(res.data.result)
console.log(res.data)
this.loading = false
this.areaTable = res.data.result.records || []
this.total = res.data.result.total
}else{
// _this.$message.warning(res.data.result)
this.loading = false
}
})
.catch( (error) =>{
@@ -201,40 +205,12 @@ export default {
this.loadData()
},
searchReset() {
this.form = {}
this.formData = {}
this.loadData()
},
handleCancel() {
this.$emit('areaVisible', false)
},
// onGetCheckboxProps(val,value) {
// let _val = {}
// // 新增时没有
// if(this.formData.id === undefined) {
// props : {}
// } else {
// // 编辑
// props : {
// disabled: val.id === 'ce879dab56a243fd99119553d3899e62'
// }
// }
// console.log(this.formData.id,'this.formData.id')
// console.log(val)
// return(_val
// // {
// // 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
@@ -247,11 +223,6 @@ export default {
this.newVisible = true
this.form = {}
},
editData(edit) {
this.formData = {...edit}
this.selectedRowKeys = edit.paramsTemplateId.split(',')
},
//新增
handleSubmit() {
if (this.selectedRowKeys.length == 0) {
@@ -324,37 +295,6 @@ export default {
})
}
},
cancelModel() {
this.newVisible = false
this.$refs.ruleForm.resetFields()
},
//删除按钮
deleteArea(val) {
this.$confirm({
title: this.$t('confirmDeletion'),
content: '',
onOk:
async () => {
getAction(`tag/onlCgformArea/delete`, { id: val }).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
if (this.areaTable.length == 1 && this.queryParams.pageNo != 1) {
this.queryParams.pageNo = this.queryParams.pageNo - 1
}
this.loadData()
} else {
// this.$message.warning(res.message)
if (res.message == '该展示区域有关联数据，无法删除！') {
this.$message.warning(this.$t('noDelete'))
} else {
this.$message.warning(this.$t('operationFailed'))
}
}
})
}
})
},
// 编辑
},
watch: {
selectedRowKeyS(val) {