From 404cb4c7a6c8ef6c8ad53893e92b623e4e5e6ed3 Mon Sep 17 00:00:00 2001
From: konbai <1527468660@qq.com>
Date: 星期日, 16 一月 2022 01:06:51 +0800
Subject: [PATCH] fix 重命名通用 数据权限 服务接口类名称，与其他服务接口风格统一
---
ruoyi-ui/src/views/tool/gen/editTable.vue | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/ruoyi-ui/src/views/tool/gen/editTable.vue b/ruoyi-ui/src/views/tool/gen/editTable.vue
index 94d0ef3..8c67dc2 100644
--- a/ruoyi-ui/src/views/tool/gen/editTable.vue
+++ b/ruoyi-ui/src/views/tool/gen/editTable.vue
@@ -4,8 +4,8 @@
<el-tab-pane label="鍩烘湰淇℃伅" name="basic">
<basic-info-form ref="basicInfo" :info="info" />
</el-tab-pane>
- <el-tab-pane label="瀛楁淇℃伅" name="cloum">
- <el-table ref="dragTable" :data="cloumns" row-key="columnId" :max-height="tableHeight">
+ <el-tab-pane label="瀛楁淇℃伅" name="columnInfo">
+ <el-table ref="dragTable" :data="columns" row-key="columnId" :max-height="tableHeight">
<el-table-column label="搴忓彿" type="index" min-width="5%" class-name="allowDrag" />
<el-table-column
label="瀛楁鍒楀悕"
@@ -33,6 +33,7 @@
<el-option label="Double" value="Double" />
<el-option label="BigDecimal" value="BigDecimal" />
<el-option label="Date" value="Date" />
+ <el-option label="Boolean" value="Boolean" />
</el-select>
</template>
</el-table-column>
@@ -68,9 +69,9 @@
<el-option label="=" value="EQ" />
<el-option label="!=" value="NE" />
<el-option label=">" value="GT" />
- <el-option label=">=" value="GTE" />
+ <el-option label=">=" value="GE" />
<el-option label="<" value="LT" />
- <el-option label="<=" value="LTE" />
+ <el-option label="<=" value="LE" />
<el-option label="LIKE" value="LIKE" />
<el-option label="BETWEEN" value="BETWEEN" />
</el-select>
@@ -124,6 +125,7 @@
</el-form>
</el-card>
</template>
+
<script>
import { getGenTable, updateGenTable } from "@/api/tool/gen";
import { optionselect as getDictOptionselect } from "@/api/system/dict/type";
@@ -141,13 +143,13 @@
data() {
return {
// 閫変腑閫夐」鍗＄殑 name
- activeName: "cloum",
+ activeName: "columnInfo",
// 琛ㄦ牸鐨勯珮搴�
tableHeight: document.documentElement.scrollHeight - 245 + "px",
// 琛ㄤ俊鎭�
tables: [],
// 琛ㄥ垪淇℃伅
- cloumns: [],
+ columns: [],
// 瀛楀吀淇℃伅
dictOptions: [],
// 鑿滃崟淇℃伅
@@ -157,11 +159,11 @@
};
},
created() {
- const tableId = this.$route.params && this.$route.params.tableId;
+ const tableId = this.$route.query && this.$route.query.tableId;
if (tableId) {
// 鑾峰彇琛ㄨ缁嗕俊鎭�
getGenTable(tableId).then(res => {
- this.cloumns = res.data.rows;
+ this.columns = res.data.rows;
this.info = res.data.info;
this.tables = res.data.tables;
});
@@ -184,7 +186,7 @@
const validateResult = res.every(item => !!item);
if (validateResult) {
const genTable = Object.assign({}, basicForm.model, genForm.model);
- genTable.columns = this.cloumns;
+ genTable.columns = this.columns;
genTable.params = {
treeCode: genTable.treeCode,
treeName: genTable.treeName,
@@ -192,13 +194,13 @@
parentMenuId: genTable.parentMenuId
};
updateGenTable(genTable).then(res => {
- this.msgSuccess(res.msg);
+ this.$modal.msgSuccess(res.msg);
if (res.code === 200) {
this.close();
}
});
} else {
- this.msgError("琛ㄥ崟鏍￠獙鏈�氳繃锛岃閲嶆柊妫�鏌ユ彁浜ゅ唴瀹�");
+ this.$modal.msgError("琛ㄥ崟鏍￠獙鏈�氳繃锛岃閲嶆柊妫�鏌ユ彁浜ゅ唴瀹�");
}
});
},
@@ -211,8 +213,8 @@
},
/** 鍏抽棴鎸夐挳 */
close() {
- this.$store.dispatch("tagsView/delView", this.$route);
- this.$router.push({ path: "/tool/gen", query: { t: Date.now()}})
+ const obj = { path: "/tool/gen", query: { t: Date.now(), pageNum: this.$route.query.pageNum } };
+ this.$tab.closeOpenPage(obj);
}
},
mounted() {
@@ -220,10 +222,10 @@
const sortable = Sortable.create(el, {
handle: ".allowDrag",
onEnd: evt => {
- const targetRow = this.cloumns.splice(evt.oldIndex, 1)[0];
- this.cloumns.splice(evt.newIndex, 0, targetRow);
- for (let index in this.cloumns) {
- this.cloumns[index].sort = parseInt(index) + 1;
+ const targetRow = this.columns.splice(evt.oldIndex, 1)[0];
+ this.columns.splice(evt.newIndex, 0, targetRow);
+ for (let index in this.columns) {
+ this.columns[index].sort = parseInt(index) + 1;
}
}
});
--
Gitblit v1.9.3