|
@@ -203,7 +203,7 @@ export default {
|
|
|
getColumnData (columnArrs = []) {
|
|
|
const returnData = [...columnArrs]
|
|
|
this.$store.dispatch('auth/changeAuthMsg', returnData)
|
|
|
- const tableColsCopy = _.cloneDeep(returnData).filter((item) => item.isdisplay == 1 || item.isdisplay == 'true');
|
|
|
+ const tableColsCopy = _.cloneDeep(returnData).filter((item) => item.isdisplay !=0);
|
|
|
const tableColsCopyOrder = _.orderBy(tableColsCopy, ['displaynumber'], ['asc']);
|
|
|
// const formItemCopy = _.cloneDeep(returnData).filter((item) => item.isdisplay == 2 || item.isdisplay == 3);
|
|
|
// this.formItem = _.orderBy(formItemCopy, ['displaynumber'], ['asc']);
|
|
@@ -217,14 +217,9 @@ export default {
|
|
|
},
|
|
|
//获取tree点击
|
|
|
treeNodeClick (data) {
|
|
|
- const dataValues = Object.values(data)
|
|
|
- if (dataValues.includes('全部') || dataValues.includes(-1)) {
|
|
|
- this.defaultfilter = { 1: 1 }
|
|
|
- } else {
|
|
|
- const filterItem = this.formatDefault(this.treeParameters, data)
|
|
|
- if (!Object.keys(filterItem).length) return
|
|
|
- this.defaultfilter = filterItem
|
|
|
- }
|
|
|
+ const filterItem = this.formatDefault(this.treeParameters, data)
|
|
|
+ if (!Object.keys(filterItem).length) return
|
|
|
+ this.defaultfilter = filterItem
|
|
|
this.queryTableData(true)
|
|
|
},
|
|
|
//格式化传递参数数据
|
|
@@ -257,8 +252,8 @@ export default {
|
|
|
this.tableType = "add";
|
|
|
this.tableTitle = "新增";
|
|
|
this.tableForm = {};
|
|
|
- for (let k in this.defaultfilter) {
|
|
|
- if (k != 1) {
|
|
|
+ for(let k in this.defaultfilter){
|
|
|
+ if(k!=1){
|
|
|
this.tableForm[k] = this.defaultfilter[k]
|
|
|
}
|
|
|
}
|