|
@@ -1,29 +1,40 @@
|
|
<template>
|
|
<template>
|
|
<el-card>
|
|
<el-card>
|
|
- <el-row type="flex" :gutter="10" class="mb8" justify="end">
|
|
|
|
|
|
+ <el-row>
|
|
<el-col :span="1.5">
|
|
<el-col :span="1.5">
|
|
- <el-button
|
|
|
|
- type="warning"
|
|
|
|
- plain
|
|
|
|
- icon="el-icon-plus"
|
|
|
|
- size="mini"
|
|
|
|
- @click="handleAdd"
|
|
|
|
- v-hasPermi="['system:post:add']"
|
|
|
|
- >新增</el-button>
|
|
|
|
|
|
+ <el-form label-width="100px">
|
|
|
|
+ <el-form-item style="text-align: center;margin-left:-100px;margin-top:10px;">
|
|
|
|
+ <el-button type="primary" @click="submitForm()">保存</el-button>
|
|
|
|
+ <el-button @click="close()">返回</el-button>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </el-form>
|
|
</el-col>
|
|
</el-col>
|
|
- <el-col :span="1.5">
|
|
|
|
- <el-button
|
|
|
|
- type="danger"
|
|
|
|
- plain
|
|
|
|
- icon="el-icon-delete"
|
|
|
|
- size="mini"
|
|
|
|
- :disabled="multiple"
|
|
|
|
- @click="handleDelete"
|
|
|
|
- v-hasPermi="['system:post:remove']"
|
|
|
|
- >删除</el-button>
|
|
|
|
- </el-col>
|
|
|
|
- <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
|
|
|
|
|
|
+ <el-row type="flex" :gutter="10" class="mb8" justify="end">
|
|
|
|
+ <el-col :span="1.5">
|
|
|
|
+ <el-button
|
|
|
|
+ type="warning"
|
|
|
|
+ plain
|
|
|
|
+ icon="el-icon-plus"
|
|
|
|
+ size="mini"
|
|
|
|
+ @click="handleAdd"
|
|
|
|
+ v-hasPermi="['system:post:add']"
|
|
|
|
+ >新增</el-button>
|
|
|
|
+ </el-col>
|
|
|
|
+ <el-col :span="1.5">
|
|
|
|
+ <el-button
|
|
|
|
+ type="danger"
|
|
|
|
+ plain
|
|
|
|
+ icon="el-icon-delete"
|
|
|
|
+ size="mini"
|
|
|
|
+ :disabled="multiple"
|
|
|
|
+ @click="handleDelete"
|
|
|
|
+ v-hasPermi="['system:post:remove']"
|
|
|
|
+ >删除</el-button>
|
|
|
|
+ </el-col>
|
|
|
|
+ <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
|
|
|
|
+ </el-row>
|
|
</el-row>
|
|
</el-row>
|
|
|
|
+
|
|
<el-tabs v-model="activeName">
|
|
<el-tabs v-model="activeName">
|
|
<el-tab-pane label="基本信息" name="basic">
|
|
<el-tab-pane label="基本信息" name="basic">
|
|
<basic-info-form ref="basicInfo" :info="info" />
|
|
<basic-info-form ref="basicInfo" :info="info" />
|
|
@@ -119,7 +130,7 @@
|
|
<el-button style="background-color: #FFD6B0;color: #EA551A;border: 1px solid #F4AD6B;">删除</el-button>
|
|
<el-button style="background-color: #FFD6B0;color: #EA551A;border: 1px solid #F4AD6B;">删除</el-button>
|
|
</el-col>
|
|
</el-col>
|
|
</el-row>
|
|
</el-row>
|
|
- <el-table ref="dragTable" :data="cloumns" row-key="columnId" :max-height="tableHeight">
|
|
|
|
|
|
+ <el-table :data="cloumns" row-key="columnId" :max-height="tableHeight">
|
|
<el-table-column label="序号" type="index" min-width="5%" class-name="allowDrag" />
|
|
<el-table-column label="序号" type="index" min-width="5%" class-name="allowDrag" />
|
|
<el-table-column label="可用" type="index" min-width="5%" class-name="allowDrag" />
|
|
<el-table-column label="可用" type="index" min-width="5%" class-name="allowDrag" />
|
|
<el-table-column label="序号" type="index" min-width="5%" class-name="allowDrag" />
|
|
<el-table-column label="序号" type="index" min-width="5%" class-name="allowDrag" />
|
|
@@ -148,12 +159,7 @@
|
|
</el-form>
|
|
</el-form>
|
|
</el-tab-pane>
|
|
</el-tab-pane>
|
|
</el-tabs>
|
|
</el-tabs>
|
|
- <el-form label-width="100px">
|
|
|
|
- <el-form-item style="text-align: center;margin-left:-100px;margin-top:10px;">
|
|
|
|
- <el-button type="primary" @click="submitForm()">提交</el-button>
|
|
|
|
- <el-button @click="close()">返回</el-button>
|
|
|
|
- </el-form-item>
|
|
|
|
- </el-form>
|
|
|
|
|
|
+
|
|
<!-- 添加或修改岗位对话框 -->
|
|
<!-- 添加或修改岗位对话框 -->
|
|
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
|
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
@@ -254,19 +260,19 @@ export default {
|
|
/** 提交按钮 */
|
|
/** 提交按钮 */
|
|
submitForm() {
|
|
submitForm() {
|
|
const basicForm = this.$refs.basicInfo.$refs.basicInfoForm;
|
|
const basicForm = this.$refs.basicInfo.$refs.basicInfoForm;
|
|
- const genForm = this.$refs.genInfo.$refs.genInfoForm;
|
|
|
|
|
|
+ // const genForm = this.$refs.genInfo.$refs.genInfoForm;
|
|
// console.log(basicForm)
|
|
// console.log(basicForm)
|
|
- Promise.all([basicForm, genForm].map(this.getFormPromise)).then(res => {
|
|
|
|
|
|
+ Promise.all([basicForm].map(this.getFormPromise)).then(res => {
|
|
const validateResult = res.every(item => !!item);
|
|
const validateResult = res.every(item => !!item);
|
|
if (validateResult) {
|
|
if (validateResult) {
|
|
- const genTable = Object.assign({}, basicForm.model, genForm.model);
|
|
|
|
|
|
+ const genTable = Object.assign({}, basicForm.model);
|
|
genTable.columns = this.cloumns;
|
|
genTable.columns = this.cloumns;
|
|
- genTable.params = {
|
|
|
|
- treeCode: genTable.treeCode,
|
|
|
|
- treeName: genTable.treeName,
|
|
|
|
- treeParentCode: genTable.treeParentCode,
|
|
|
|
- parentMenuId: genTable.parentMenuId
|
|
|
|
- };
|
|
|
|
|
|
+ // genTable.params = {
|
|
|
|
+ // treeCode: genTable.treeCode,
|
|
|
|
+ // treeName: genTable.treeName,
|
|
|
|
+ // treeParentCode: genTable.treeParentCode,
|
|
|
|
+ // parentMenuId: genTable.parentMenuId
|
|
|
|
+ // };
|
|
updateGenTable(genTable).then(res => {
|
|
updateGenTable(genTable).then(res => {
|
|
this.msgSuccess(res.msg);
|
|
this.msgSuccess(res.msg);
|
|
if (res.code === 200) {
|
|
if (res.code === 200) {
|