diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java index 8ad2c2c07..5a8aa9b66 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java @@ -83,6 +83,20 @@ public class BussDocumentLibraryEO implements Serializable { @ApiModelProperty(value = "对应标准") private java.lang.String correspondingStandard; + + /**代替标准*/ + @ApiModelProperty(value = "代替标准") + @Dict(dicCode ="replace_standard") + private java.lang.String replaceStandard; + + + /**被代替标准*/ + @ApiModelProperty(value = "被代替标准") + @Dict(dicCode ="replaced_standard") + private java.lang.String replacedStandard; + + + @TableField(exist = false) private java.lang.String cut; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 3614ab30c..30304c593 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -1726,6 +1726,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 0) { - let content = JSON.parse(JSON.stringify(this.selectedRowKeys)) - // this.content.forEach(res => { - // content.push(res.serial_number) - // replace_standard_id.push(res.id) - // }) - this.$emit('input', content.join(',')) - // this.$emit('change', this.query.db_field_name, replace_standard_id.join(',')) + // let content = JSON.parse(JSON.stringify(this.selectedRowList)) + this.selectedRowList.forEach(res => { + serial_number.push(res.serial_number) + replace_standard_id.push(res.id) + }) + this.$emit('input', serial_number.join(',')) + console.log(replace_standard_id) + this.$emit('change', this.query.db_field_name, replace_standard_id.join(',')) // this.$emit('changecontent', this.content) this.visible = false } else { @@ -168,9 +170,11 @@ indexclick(event) { this.$emit('input', event.target.value) }, - onSelectChange(value) { + onSelectChange(value,row) { console.log(value) + console.log(row) this.selectedRowKeys = value + this.selectedRowList = row // this.content = [] // value.forEach(val => { // this.dataList.forEach((res) => { diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index 86cd81291..c99abc593 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -169,6 +169,7 @@ @@ -494,10 +495,11 @@ this.type = 'add' this.getForm() }, - // StandardselectionChange(value, id) { - // this.formInline[value + '_id'] = id - // this.formInline = { ...this.formInline } - // }, + StandardselectionChange(value, id) { + console.log(id) + this.formInline[value + '_id'] = id + this.formInline = { ...this.formInline } + }, PersonnelSelectionChange(value, id) { this.formInline[value + '_id'] = id this.formInline = { ...this.formInline }