cms + gen code

src/api/syscategory.js

@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+// 查询SysCategory列表
+export function listSysCategory(query) {
+  return request({
+    url: '/api/v1/syscategoryList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询SysCategory详细
+export function getSysCategory(id) {
+  return request({
+    url: '/api/v1/syscategory/' + id,
+    method: 'get'
+  })
+}
+
+// 新增SysCategory
+export function addSysCategory(data) {
+  return request({
+    url: '/api/v1/syscategory',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改SysCategory
+export function updateSysCategory(data) {
+  return request({
+    url: '/api/v1/syscategory',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除SysCategory
+export function delSysCategory(id) {
+  return request({
+    url: '/api/v1/syscategory/' + id,
+    method: 'delete'
+  })
+}
+

src/api/syscontent.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 查询SysContent列表
+export function listSysContent(query) {
+return request({
+url: '/api/v1/syscontentList',
+method: 'get',
+params: query
+})
+}
+
+// 查询SysContent详细
+export function getSysContent (id) {
+return request({
+url: '/api/v1/syscontent/' + id,
+method: 'get'
+})
+}
+
+
+// 新增SysContent
+export function addSysContent(data) {
+return request({
+url: '/api/v1/syscontent',
+method: 'post',
+data: data
+})
+}
+
+// 修改SysContent
+export function updateSysContent(data) {
+return request({
+url: '/api/v1/syscontent',
+method: 'put',
+data: data
+})
+}
+
+// 删除SysContent
+export function delSysContent(id) {
+return request({
+url: '/api/v1/syscontent/' + id,
+method: 'delete'
+})
+}
+

src/api/tools/gen.js

@@ -25,6 +25,13 @@ export function getGenTable(tableId) {
   })
 }
 
+export function getGenTableInfo(tablename) {
+  return request({
+    url: '/api/v1/sys/tables?tableName=' + tablename,
+    method: 'get'
+  })
+}
+
 // 修改代码生成信息
 export function updateGenTable(data) {
   return request({

src/main.js

@@ -18,7 +18,7 @@ import permission from './directive/permission'
 import { getDicts } from '@/api/system/dict/data'
 import { getItems, setItems } from '@/api/table'
 import { getConfigKey } from '@/api/system/config'
-import { parseTime, resetForm, addDateRange, selectDictLabel, download } from '@/utils/costum'
+import { parseTime, resetForm, addDateRange, selectDictLabel, download, selectItemsLabel } from '@/utils/costum'
 
 import './icons' // icon
 import './permission' // permission control
@@ -46,6 +46,7 @@ Vue.prototype.parseTime = parseTime
 Vue.prototype.resetForm = resetForm
 Vue.prototype.addDateRange = addDateRange
 Vue.prototype.selectDictLabel = selectDictLabel
+Vue.prototype.selectItemsLabel = selectItemsLabel
 Vue.prototype.download = download
 
 // 全局组件挂载

src/utils/costum.js

@@ -69,6 +69,17 @@ export function selectDictLabel(datas, value) {
   return actions.join('')
 }
 
+export function selectItemsLabel(datas, value) {
+  var actions = []
+  Object.keys(datas).map((key) => {
+    if (datas[key].key === ('' + value)) {
+      actions.push(datas[key].value)
+      return false
+    }
+  })
+  return actions.join('')
+}
+
 // 字符串格式化(%s )
 export function sprintf(str) {
   var args = arguments; var flag = true; var i = 1

src/views/syscategory/index.vue

@@ -0,0 +1,353 @@
+
+<template>
+  <BasicLayout>
+    <template #wrapper>
+      <el-card class="box-card">
+        <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
+          <el-form-item label="名称" prop="name">
+            <el-input
+              v-model="queryParams.name"
+              placeholder="请输入名称"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-select
+              v-model="queryParams.status"
+              placeholder="分类状态"
+              clearable
+              size="small"
+            >
+              <el-option
+                v-for="dict in statusOptions"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              v-permisaction="['syscategory:syscategory:add']"
+              type="primary"
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+            >新增
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              v-permisaction="['syscategory:syscategory:edit']"
+              type="success"
+              icon="el-icon-edit"
+              size="mini"
+              :disabled="single"
+              @click="handleUpdate"
+            >修改
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              v-permisaction="['syscategory:syscategory:remove']"
+              type="danger"
+              icon="el-icon-delete"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDelete"
+            >删除
+            </el-button>
+          </el-col>
+        </el-row>
+
+        <el-table v-loading="loading" :data="syscategoryList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" /><el-table-column
+            label="名称"
+            align="center"
+            prop="name"
+            :show-overflow-tooltip="true"
+          /><el-table-column
+            label="排序"
+            align="center"
+            prop="sort"
+            :show-overflow-tooltip="true"
+          /><el-table-column
+            label="状态"
+            align="center"
+            prop="status"
+            :formatter="statusFormat"
+            width="100"
+          >
+            <template slot-scope="scope">
+              {{ statusFormat(scope.row) }}
+            </template>
+          </el-table-column><el-table-column
+            label="创建时间"
+            align="center"
+            prop="createdAt"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button
+                v-permisaction="['syscategory:syscategory:edit']"
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+              >修改
+              </el-button>
+              <el-button
+                v-permisaction="['syscategory:syscategory:remove']"
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+              >删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageIndex"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+
+        <!-- 添加或修改对话框 -->
+        <el-dialog :title="title" :visible.sync="open" width="500px">
+          <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+
+            <el-form-item label="名称" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder="名称"
+              />
+            </el-form-item>
+            <el-form-item label="图片" prop="img">
+              <el-input
+                v-model="form.img"
+                placeholder="图片"
+              />
+            </el-form-item>
+            <el-form-item label="排序" prop="sort">
+              <el-input
+                v-model="form.sort"
+                placeholder="排序"
+              />
+            </el-form-item>
+            <el-form-item label="状态" prop="status">
+              <el-select
+                v-model="form.status"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="dict in statusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="备注" prop="remark">
+              <el-input
+                v-model="form.remark"
+                placeholder="备注"
+              />
+            </el-form-item>
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="submitForm">确 定</el-button>
+            <el-button @click="cancel">取 消</el-button>
+          </div>
+        </el-dialog>
+      </el-card>
+    </template>
+  </BasicLayout>
+</template>
+
+<script>
+import { addSysCategory, delSysCategory, getSysCategory, listSysCategory, updateSysCategory } from '@/api/syscategory'
+
+export default {
+  name: 'Config',
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 总条数
+      total: 0,
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      isEdit: false,
+      // 类型数据字典
+      typeOptions: [],
+      syscategoryList: [],
+      statusOptions: [],
+      // 查询参数
+      queryParams: {
+        pageIndex: 1,
+        pageSize: 10,
+        name:
+            undefined,
+        status:
+            undefined
+
+      },
+      // 表单参数
+      form: {
+      },
+      // 表单校验
+      rules: { name:
+                [
+                  { required: true, message: '名称不能为空', trigger: 'blur' }
+                ],
+      status:
+                [
+                  { required: true, message: '状态不能为空', trigger: 'blur' }
+                ]
+      }
+    }
+  },
+  created() {
+    this.getList()
+    this.getDicts('sys_category').then(response => {
+      this.statusOptions = response.data
+    })
+  },
+  methods: {
+    /** 查询参数列表 */
+    getList() {
+      this.loading = true
+      listSysCategory(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.syscategoryList = response.data.list
+        this.total = response.data.count
+        this.loading = false
+      }
+      )
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+
+        id: undefined,
+        name: undefined,
+        img: undefined,
+        sort: undefined,
+        status: undefined,
+        remark: undefined
+      }
+      this.resetForm('form')
+    },
+    statusFormat(row) {
+      return this.selectDictLabel(this.statusOptions, row.status)
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageIndex = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = []
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加分类'
+      this.isEdit = false
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const id =
+                row.id || this.ids
+      getSysCategory(id).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改分类'
+        this.isEdit = true
+      })
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.id !== undefined) {
+            updateSysCategory(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess('修改成功')
+                this.open = false
+                this.getList()
+              } else {
+                this.msgError(response.msg)
+              }
+            })
+          } else {
+            addSysCategory(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess('新增成功')
+                this.open = false
+                this.getList()
+              } else {
+                this.msgError(response.msg)
+              }
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const Ids = row.id || this.ids
+      this.$confirm('是否确认删除编号为"' + Ids + '"的数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        return delSysCategory(Ids)
+      }).then(() => {
+        this.getList()
+        this.msgSuccess('删除成功')
+      }).catch(function() {
+      })
+    }
+  }
+}
+</script>

src/views/syscontent/index.vue

@@ -0,0 +1,401 @@
+<template>
+  <BasicLayout>
+    <template #wrapper>
+      <el-card class="box-card">
+        <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
+          <el-form-item label="分类id" prop="cateId"><el-select
+            v-model="form.cateId"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="dict in cateIdOptions"
+              :key="dict.key"
+              :label="dict.value"
+              :value="dict.key"
+            />
+          </el-select>
+          </el-form-item>
+          <el-form-item label="名称" prop="name"><el-input
+            v-model="queryParams.name"
+            placeholder="请输入名称"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+          </el-form-item>
+          <el-form-item label="状态" prop="status"><el-select
+            v-model="queryParams.status"
+            placeholder="内容管理状态"
+            clearable
+            size="small"
+          >
+            <el-option
+              v-for="dict in statusOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              v-permisaction="['syscontent:syscontent:add']"
+              type="primary"
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+            >新增
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              v-permisaction="['syscontent:syscontent:edit']"
+              type="success"
+              icon="el-icon-edit"
+              size="mini"
+              :disabled="single"
+              @click="handleUpdate"
+            >修改
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              v-permisaction="['syscontent:syscontent:remove']"
+              type="danger"
+              icon="el-icon-delete"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDelete"
+            >删除
+            </el-button>
+          </el-col>
+        </el-row>
+
+        <el-table v-loading="loading" :data="syscontentList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" /><el-table-column label="分类id" align="center" prop="cateId" :formatter="cateIdFormat" width="100">
+            <template slot-scope="scope">
+              {{ cateIdFormat(scope.row) }}
+            </template>
+          </el-table-column><el-table-column
+            label="名称"
+            align="center"
+            prop="name"
+            :show-overflow-tooltip="true"
+          /><el-table-column
+            label="状态"
+            align="center"
+            prop="status"
+            :formatter="statusFormat"
+            width="100"
+          >
+            <template slot-scope="scope">
+              {{ statusFormat(scope.row) }}
+            </template>
+          </el-table-column><el-table-column
+            label="创建时间"
+            align="center"
+            prop="createdAt"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button
+                v-permisaction="['syscontent:syscontent:edit']"
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+              >修改
+              </el-button>
+              <el-button
+                v-permisaction="['syscontent:syscontent:remove']"
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+              >删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageIndex"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+
+        <!-- 添加或修改对话框 -->
+        <el-dialog :title="title" :visible.sync="open" width="500px">
+          <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+
+            <el-form-item label="分类id" prop="cateId">
+              <el-select
+                v-model="form.cateId"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="dict in cateIdOptions"
+                  :key="dict.key"
+                  :label="dict.value"
+                  :value="dict.key"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="名称" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder="名称"
+              />
+            </el-form-item>
+            <el-form-item label="状态" prop="status">
+              <el-select
+                v-model="form.status"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="dict in statusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="图片" prop="img">
+              <el-input
+                v-model="form.img"
+                placeholder="图片"
+              />
+            </el-form-item>
+            <el-form-item label="内容" prop="content">
+              <el-input
+                v-model="form.content"
+                type="textarea"
+                :rows="2"
+                placeholder="请输入内容"
+              />
+            </el-form-item>
+            <el-form-item label="备注" prop="remark">
+              <el-input
+                v-model="form.remark"
+                placeholder="备注"
+              />
+            </el-form-item>
+            <el-form-item label="排序" prop="sort">
+              <el-input
+                v-model="form.sort"
+                placeholder="排序"
+              />
+            </el-form-item>
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="submitForm">确 定</el-button>
+            <el-button @click="cancel">取 消</el-button>
+          </div>
+        </el-dialog>
+      </el-card>
+    </template>
+  </BasicLayout>
+</template>
+
+<script>
+import { addSysContent, delSysContent, getSysContent, listSysContent, updateSysContent } from '@/api/syscontent'
+import { listSysCategory } from '@/api/syscategory'
+
+export default {
+  name: 'Config',
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 总条数
+      total: 0,
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      isEdit: false,
+      // 类型数据字典
+      typeOptions: [],
+      syscontentList: [],
+      statusOptions: [],
+      // 关系表类型
+      cateIdOptions: [],
+
+      // 查询参数
+      queryParams: {
+        pageIndex: 1,
+        pageSize: 10,
+        cateId: undefined,
+        name: undefined,
+        status: undefined
+
+      },
+      // 表单参数
+      form: {
+      },
+      // 表单校验
+      rules: { cateId:
+                [
+                  { required: true, message: '分类id不能为空', trigger: 'blur' }
+                ],
+      name:
+                [
+                  { required: true, message: '名称不能为空', trigger: 'blur' }
+                ],
+      status:
+                [
+                  { required: true, message: '状态不能为空', trigger: 'blur' }
+                ]
+      }
+    }
+  },
+  created() {
+    this.getList()
+    this.getSysCategoryItems()
+
+    this.getDicts('sys_content_status').then(response => {
+      this.statusOptions = response.data
+    })
+  },
+  methods: {
+    /** 查询参数列表 */
+    getList() {
+      this.loading = true
+      listSysContent(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.syscontentList = response.data.list
+        this.total = response.data.count
+        this.loading = false
+      }
+      )
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+
+        id: undefined,
+        cateId: undefined,
+        name: undefined,
+        status: undefined,
+        img: undefined,
+        content: undefined,
+        remark: undefined,
+        sort: undefined
+      }
+      this.resetForm('form')
+    },
+    cateIdFormat(row) {
+      return this.selectItemsLabel(this.cateIdOptions, row.cateId)
+    },
+    statusFormat(row) {
+      return this.selectDictLabel(this.statusOptions, row.status)
+    },
+    // 关系
+    getSysCategoryItems() {
+      this.getItems(listSysCategory, undefined).then(res => {
+        this.cateIdOptions = this.setItems(res, 'id', 'name')
+      })
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageIndex = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = []
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加内容管理'
+      this.isEdit = false
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const id =
+                row.id || this.ids
+      getSysContent(id).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改内容管理'
+        this.isEdit = true
+      })
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.id !== undefined) {
+            updateSysContent(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess('修改成功')
+                this.open = false
+                this.getList()
+              } else {
+                this.msgError(response.msg)
+              }
+            })
+          } else {
+            addSysContent(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess('新增成功')
+                this.open = false
+                this.getList()
+              } else {
+                this.msgError(response.msg)
+              }
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const Ids = row.id || this.ids
+      this.$confirm('是否确认删除编号为"' + Ids + '"的数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        return delSysContent(Ids)
+      }).then(() => {
+        this.getList()
+        this.msgSuccess('删除成功')
+      }).catch(function() {
+      })
+    }
+  }
+}
+</script>

src/views/tools/gen/editTable.vue

@@ -92,8 +92,9 @@
                 <el-option label="下拉框" value="select" />
                 <el-option label="单选框" value="radio" />
                 <!-- <el-option label="复选框" value="checkbox" />
+                <el-option label="日期控件" value="datetime" />-->
                 <el-option label="文本域" value="textarea" />
-                <el-option label="日期控件" value="datetime" /> -->
+
               </el-select>
             </template>
           </el-table-column>
@@ -117,9 +118,9 @@
               <el-select v-model="scope.row.fkTableName" clearable filterable placeholder="请选择" @change="handleChangeConfig(scope.row,scope.$index)">
                 <el-option
                   v-for="table in tableTree"
-                  :key="table.tableId"
+                  :key="table.tableName"
                   :label="table.tableName"
-                  :value="table.tableId"
+                  :value="table.tableName"
                 >
                   <span style="float: left">{{ table.tableName }}</span>
                   <span style="float: right; color: #8492a6; font-size: 13px">{{ table.tableComment }}</span>
@@ -129,12 +130,12 @@
           </el-table-column>
           <el-table-column label="关系表key" width="150">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.fkLableId" clearable filterable placeholder="请选择">
+              <el-select v-model="scope.row.fkLabelId" clearable filterable placeholder="请选择">
                 <el-option
                   v-for="column in scope.row.fkCol"
-                  :key="column.columnId"
+                  :key="column.columnName"
                   :label="column.columnName"
-                  :value="column.columnId"
+                  :value="column.columnName"
                 >
                   <span style="float: left">{{ column.columnName }}</span>
                   <span style="float: right; color: #8492a6; font-size: 13px">{{ column.columnComment }}</span>
@@ -144,7 +145,17 @@
           </el-table-column>
           <el-table-column label="关系表value" width="150">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.fkLableName" />
+              <el-select v-model="scope.row.fkLabelName" clearable filterable placeholder="请选择">
+                <el-option
+                  v-for="column in scope.row.fkCol"
+                  :key="column.columnName"
+                  :label="column.columnName"
+                  :value="column.columnName"
+                >
+                  <span style="float: left">{{ column.columnName }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ column.columnComment }}</span>
+                </el-option>
+              </el-select>
             </template>
           </el-table-column>
         </el-table>
@@ -210,6 +221,7 @@ export default {
           })
         })
       })
+
       /** 查询字典下拉列表 */
       getDictOptionselect().then(response => {
         this.dictOptions = response.data
@@ -221,7 +233,7 @@ export default {
       console.log(row)
       console.log(index)
       this.tableTree.filter(function(item) {
-        if (item.tableId === row.fkTableName) {
+        if (item.tableName === row.fkTableName) {
           row.fkCol = item.columns
           // row.fkCol.unshift({ columnId: 0, columnName: '请选择' })
         }

src/views/tools/gen/genInfoForm.vue

@@ -5,9 +5,9 @@
         <el-form-item prop="tplCategory">
           <span slot="label">生成模板</span>
           <el-select v-model="info.tplCategory">
-            <el-option label="单表（增删改查）" value="crud" />
-            <el-option label="关系表（增删改查）" value="mcrud" />
-            <!-- <el-option label="树表（增删改查）" value="tree" /> -->
+            <el-option label="关系表（增删改查）" value="crud" />
+            <!-- <el-option label="关系表（增删改查）" value="mcrud" />
+            <el-option label="树表（增删改查）" value="tree" /> -->
           </el-select>
         </el-form-item>
       </el-col>