|
|
@@ -684,6 +684,7 @@ export default {
|
|
|
isAsc: false,
|
|
|
timeFormat: "",
|
|
|
orderByColumn: "",
|
|
|
+ sqlKey: "",
|
|
|
},
|
|
|
tableGroupList: [],
|
|
|
// 成员表格提示
|
|
|
@@ -1083,8 +1084,8 @@ export default {
|
|
|
tId: this.tableItemForm.tId,
|
|
|
tableKey: this.tableItemForm.rowId || tableKey,
|
|
|
sortOrder: this.tableItemForm.isAsc,
|
|
|
- sqlKey: sqlKey,
|
|
|
- dtColumnName: columns,
|
|
|
+ sqlKey: this.tableItemForm.sqlKey || sqlKey,
|
|
|
+ dtColumnName: this.relateTitle ? columns : JSON.stringify(columns),
|
|
|
// timeFormat: "yyyy-MM-dd",
|
|
|
searchFieldList: searchFieldList,
|
|
|
conditionDefaultValueMap: this.conditionDefault,
|
|
|
@@ -1116,7 +1117,7 @@ export default {
|
|
|
orderByColumn: this.tableItemForm.orderByColumn,
|
|
|
sortOrder: this.tableItemForm.isAsc,
|
|
|
sqlKey: sqlKey,
|
|
|
- dtColumnName: columns,
|
|
|
+ dtColumnName: JSON.stringify(columns),
|
|
|
timeFormat: this.tableItemForm.timeFormat,
|
|
|
searchFieldList: searchFieldList,
|
|
|
conditionDefaultValueMap: this.conditionDefault,
|
|
|
@@ -1191,7 +1192,7 @@ export default {
|
|
|
console.log(row);
|
|
|
// console.log(this.orderByFieldList)
|
|
|
if (row.tableKey) {
|
|
|
- this.menuId = row.menuId;
|
|
|
+ // this.menuId = row.menuId;
|
|
|
this.conditionDefault = row.conditionDefaultValueMap;
|
|
|
let echoData = JSON.parse(row.echoData);
|
|
|
console.log(this.tableDataList);
|
|
|
@@ -1211,6 +1212,7 @@ export default {
|
|
|
this.tableFieldList = echoData.tableFieldData;
|
|
|
this.tableItemForm.tId = row.tId;
|
|
|
this.tableItemForm.rowId = row.tableKey;
|
|
|
+ this.tableItemForm.sqlKey = row.sqlKey;
|
|
|
this.$set(
|
|
|
this.tableItemForm,
|
|
|
"isAsc",
|
|
|
@@ -1262,6 +1264,9 @@ export default {
|
|
|
// 删除表格组
|
|
|
DeleteTableGroup(row) {
|
|
|
const fIds = row.id || this.ids;
|
|
|
+ if (row) {
|
|
|
+ this.menuIds = row;
|
|
|
+ }
|
|
|
const menus = row.menuId || this.menuIds;
|
|
|
this.$modal
|
|
|
.confirm(
|
|
|
@@ -1456,7 +1461,7 @@ export default {
|
|
|
tableKey: item.tableKey,
|
|
|
sort: index,
|
|
|
tablename: item.dtTableName,
|
|
|
- menuId: item.menuId,
|
|
|
+ menuId: this.menuId,
|
|
|
});
|
|
|
});
|
|
|
data.groupName = this.groupForm.groupName;
|
|
|
@@ -1468,6 +1473,7 @@ export default {
|
|
|
let res = await updataGroup(data);
|
|
|
|
|
|
if (res.code == 200) {
|
|
|
+ console.log(this.menuId, "11111");
|
|
|
let payLoad = {
|
|
|
menuId: this.menuId,
|
|
|
menuName: this.groupForm.groupName,
|
lph