|
@@ -1419,7 +1419,7 @@ export default {
|
|
|
} else {
|
|
|
// tempFieldName = temp.fieldName;
|
|
|
tempFieldName = temp.tableName + "_" + temp.fieldName;
|
|
|
- exportFieldName = temp.fieldName;
|
|
|
+ exportFieldName = temp.tableName + "_" + temp.fieldName;
|
|
|
}
|
|
|
if (temp.isShow) {
|
|
|
let tempObj = {};
|
|
@@ -1924,6 +1924,7 @@ export default {
|
|
|
|
|
|
// 获取按钮组数据
|
|
|
async getBtnList() {
|
|
|
+ console.log("aaaaaaa");
|
|
|
let res = await listBtn({ isEnablePaging: false, btnParentId: 0 });
|
|
|
this.btnGroupOptions = res.rows.filter((item) => !item.whetherBind);
|
|
|
},
|
|
@@ -1932,7 +1933,7 @@ export default {
|
|
|
async mounted() {
|
|
|
this.getAllTable();
|
|
|
this.initDragTable();
|
|
|
- this.getBtnList();
|
|
|
+ await this.getBtnList();
|
|
|
await this.getMenuList();
|
|
|
if (this.$route.query.tId) {
|
|
|
this.tId = this.$route.query.tId;
|