|
@@ -923,7 +923,7 @@
|
|
|
return this.$store.state.theme.styleResponsive;
|
|
return this.$store.state.theme.styleResponsive;
|
|
|
},
|
|
},
|
|
|
columns() {
|
|
columns() {
|
|
|
- let list = this.formColumnList.map((item) => {
|
|
|
|
|
|
|
+ let list = this.formColumnList.filter(item => item.name && item.name != '自定义区域').map((item) => {
|
|
|
return {
|
|
return {
|
|
|
prop: item.model,
|
|
prop: item.model,
|
|
|
label: item.name,
|
|
label: item.name,
|
|
@@ -1012,7 +1012,7 @@
|
|
|
];
|
|
];
|
|
|
},
|
|
},
|
|
|
deptColumns() {
|
|
deptColumns() {
|
|
|
- let list = this.formColumnList.map((item) => {
|
|
|
|
|
|
|
+ let list = this.formColumnList.filter(item => item.name && item.name != '自定义区域').map((item) => {
|
|
|
return {
|
|
return {
|
|
|
prop: item.model,
|
|
prop: item.model,
|
|
|
label: item.name,
|
|
label: item.name,
|
|
@@ -1209,6 +1209,7 @@
|
|
|
this.params.formId = this.defaultTemplateList[0]?.id;
|
|
this.params.formId = this.defaultTemplateList[0]?.id;
|
|
|
let makingJson =
|
|
let makingJson =
|
|
|
JSON.parse(this.defaultTemplateList[0].formJson.makingJson) || {};
|
|
JSON.parse(this.defaultTemplateList[0].formJson.makingJson) || {};
|
|
|
|
|
+ console.log('makingJson~~~', makingJson);
|
|
|
this.formColumnList = makingJson.list;
|
|
this.formColumnList = makingJson.list;
|
|
|
console.log(this.formColumnList);
|
|
console.log(this.formColumnList);
|
|
|
},
|
|
},
|