Commit 94873de6 authored by 仇晓婷's avatar 仇晓婷

修改

parent 2796c156
......@@ -120,7 +120,7 @@ export default {
render: (h, params) => {
return h("state", {
props: {
code: "materail.category.status",
code: "material.main.status",
type: "text",
value: params.row.status + ""
}
......@@ -137,18 +137,18 @@ export default {
title: "描述",
align: "left"
},
{
{
key: "creationTime",
title: "创建时间",
hide:false,
hide: false,
align: "left"
},
{
{
key: "creatorUserId",
title: "创建人",
hide:false,
hide: false,
align: "left",
type:"user"
type: "user"
},
{
title: "操作",
......@@ -240,24 +240,26 @@ export default {
}).then(r => {
if (r.result) {
var items = r.result.filter(u => {
return !this.columns.some(p => {
return p.key == u.field;
})&&u.dataType!=5;
return (
!this.columns.some(p => {
return p.key == u.field;
}) && u.dataType != 5
);
});
this.cols=this.$u.clone(this.columns);
let extra= items.map(u=>{
var col={
key:u.field,
title:u.title
this.cols = this.$u.clone(this.columns);
let extra = items.map(u => {
var col = {
key: u.field,
title: u.title
};
if(u.dataType==3){
col.code=u.note;
if (u.dataType == 3) {
col.code = u.note;
}
return col
})
this.cols= this.cols.concat(extra);
var action=this.cols.splice(this.columns.length-1,1);
this.cols.push(this.columns[this.columns.length-1]);
return col;
});
this.cols = this.cols.concat(extra);
var action = this.cols.splice(this.columns.length - 1, 1);
this.cols.push(this.columns[this.columns.length - 1]);
}
});
},
......@@ -329,8 +331,8 @@ export default {
watch: {
nodeInfo: {
handler(newName, oldName) {
console.log("ovo",newName,oldName)
if(newName.rootCategoryId){
console.log("ovo", newName, oldName);
if (newName.rootCategoryId) {
this.initCols();
}
if (newName.categoryId) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment