Compare commits

..

No commits in common. '94d7caf3ad28e058f69c75851613e8c49e4cb191' and '7a4d19d4e2d492c7d54ffa92ce98de7b981320b9' have entirely different histories.

  1. 7
      ant-design-vue-jeecg/src/views/fieldx/FieldxList.vue
  2. 4
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/functionx/entity/Functionx.java

@ -248,7 +248,6 @@
column: 'createTime', column: 'createTime',
order: 'asc', order: 'asc',
}, },
tableName:'',
} }
}, },
@ -291,11 +290,10 @@
// //
added(event) { added(event) {
const {type, row, column, value, target} = event const {type, row, column, value, target} = event
console.log(event,"-------") this.tableid = this.model.id
target.setValues([{ target.setValues([{
rowKey: row.id, rowKey: row.id,
values: {tableId_dictText: this.tableName} values: {tableId_dictText: this.model.tableName}
}]) }])
}, },
// //
@ -344,7 +342,6 @@
//console.log(topicid); //console.log(topicid);
this.queryParam.tableId = this.model.id; this.queryParam.tableId = this.model.id;
this.tableid = this.model.id this.tableid = this.model.id
this.tableName=this.model.tableName;
//console.log(this.queryParam.topicid); //console.log(this.queryParam.topicid);
this.loadData(); this.loadData();
}, },

@ -88,8 +88,8 @@ public class Functionx implements Serializable {
@ApiModelProperty(value = "用户角色") @ApiModelProperty(value = "用户角色")
private java.lang.String userRole; private java.lang.String userRole;
/**责任人*/ /**责任人*/
@Excel(name = "责任人", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id") @Excel(name = "责任人", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id") @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
@ApiModelProperty(value = "责任人") @ApiModelProperty(value = "责任人")
private java.lang.String managerUsers; private java.lang.String managerUsers;
/**任务等级*/ /**任务等级*/

Loading…
Cancel
Save