Commit 3a0fa14c authored by lc@weface.com.cn's avatar lc@weface.com.cn

message

parent e8b78088
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
<el-table-column <el-table-column
prop="id" header-align="center" align="center" width="80" label="ID"> prop="id" header-align="center" align="center" width="80" label="ID">
</el-table-column> </el-table-column>
<table-tree-column <table-tree-column
prop="name" header-align="center" treeKey="id" width="150" label="名称"> prop="name" header-align="center" treeKey="id" width="150" label="名称">
</table-tree-column> </table-tree-column>
<el-table-column <el-table-column
prop="parentName" header-align="center" align="center" width="120" label="上级机构"> prop="parentName" header-align="center" align="center" width="120" label="上级机构">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -45,14 +45,14 @@ ...@@ -45,14 +45,14 @@
</el-table> </el-table>
<!-- 新增修改界面 --> <!-- 新增修改界面 -->
<el-dialog :title="!dataForm.id ? '新增' : '修改'" width="40%" :visible.sync="dialogVisible" :close-on-click-modal="false"> <el-dialog :title="!dataForm.id ? '新增' : '修改'" width="40%" :visible.sync="dialogVisible" :close-on-click-modal="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="submitForm()" <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="submitForm()"
label-width="80px" :size="size" style="text-align:left;"> label-width="80px" :size="size" style="text-align:left;">
<el-form-item label="名称" prop="name"> <el-form-item label="名称" prop="name">
<el-input v-model="dataForm.name" placeholder="名称"></el-input> <el-input v-model="dataForm.name" placeholder="名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上级机构" prop="parentName"> <el-form-item label="上级机构" prop="parentName">
<popup-tree-input <popup-tree-input
:data="popupTreeData" :props="popupTreeProps" :prop="dataForm.parentName==null?'顶级菜单':dataForm.parentName" :data="popupTreeData" :props="popupTreeProps" :prop="dataForm.parentName==null?'顶级菜单':dataForm.parentName"
:nodeKey="''+dataForm.parentId" :currentChangeHandle="handleTreeSelectChange"> :nodeKey="''+dataForm.parentId" :currentChangeHandle="handleTreeSelectChange">
</popup-tree-input> </popup-tree-input>
</el-form-item> </el-form-item>
...@@ -188,7 +188,7 @@ export default { ...@@ -188,7 +188,7 @@ export default {
this.dialogVisible = false this.dialogVisible = false
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
} else { } else {
this.$message({message: '操作失败, ' + res.msg, type: 'error'}) this.$message({message: '操作失败, ' + res.message, type: 'error'})
} }
this.findTreeData() this.findTreeData()
}) })
...@@ -200,7 +200,7 @@ export default { ...@@ -200,7 +200,7 @@ export default {
dateFormat: function (row, column, cellValue, index){ dateFormat: function (row, column, cellValue, index){
return format(row[column.property]) return format(row[column.property])
} }
}, },
mounted() { mounted() {
this.findTreeData() this.findTreeData()
...@@ -210,4 +210,4 @@ export default { ...@@ -210,4 +210,4 @@ export default {
<style scoped> <style scoped>
</style> </style>
\ No newline at end of file
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</div> </div>
<!--表格内容栏--> <!--表格内容栏-->
<kt-table :height="350" permsEdit="sys:dict:edit" permsDelete="sys:dict:delete" <kt-table :height="350" permsEdit="sys:dict:edit" permsDelete="sys:dict:delete"
:data="pageResult" :columns="columns" :data="pageResult" :columns="columns"
@findPage="findPage" @handleEdit="handleEdit" @handleDelete="handleDelete"> @findPage="findPage" @handleEdit="handleEdit" @handleDelete="handleDelete">
</kt-table> </kt-table>
<!--新增编辑界面--> <!--新增编辑界面-->
...@@ -149,7 +149,7 @@ export default { ...@@ -149,7 +149,7 @@ export default {
if(res.code == 200) { if(res.code == 200) {
this.$message({ message: '操作成功', type: 'success' }) this.$message({ message: '操作成功', type: 'success' })
} else { } else {
this.$message({message: '操作失败, ' + res.msg, type: 'error'}) this.$message({message: '操作失败, ' + res.message, type: 'error'})
} }
this.editLoading = false this.editLoading = false
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
...@@ -172,4 +172,4 @@ export default { ...@@ -172,4 +172,4 @@ export default {
<style scoped> <style scoped>
</style> </style>
\ No newline at end of file
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<el-table-column <el-table-column
prop="id" header-align="center" align="center" width="80" label="ID"> prop="id" header-align="center" align="center" width="80" label="ID">
</el-table-column> </el-table-column>
<table-tree-column <table-tree-column
prop="name" header-align="center" treeKey="id" width="150" label="名称"> prop="name" header-align="center" treeKey="id" width="150" label="名称">
</table-tree-column> </table-tree-column>
<el-table-column header-align="center" align="center" label="图标"> <el-table-column header-align="center" align="center" label="图标">
...@@ -35,15 +35,15 @@ ...@@ -35,15 +35,15 @@
<el-tag v-else-if="scope.row.type === 2" size="small" type="info">按钮</el-tag> <el-tag v-else-if="scope.row.type === 2" size="small" type="info">按钮</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="parentName" header-align="center" align="center" width="120" label="上级菜单"> prop="parentName" header-align="center" align="center" width="120" label="上级菜单">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="url" header-align="center" align="center" width="150" prop="url" header-align="center" align="center" width="150"
:show-overflow-tooltip="true" label="菜单URL"> :show-overflow-tooltip="true" label="菜单URL">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="perms" header-align="center" align="center" width="150" prop="perms" header-align="center" align="center" width="150"
:show-overflow-tooltip="true" label="授权标识"> :show-overflow-tooltip="true" label="授权标识">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</el-table> </el-table>
<!-- 新增修改界面 --> <!-- 新增修改界面 -->
<el-dialog :title="!dataForm.id ? '新增' : '修改'" width="40%" :visible.sync="dialogVisible" :close-on-click-modal="false"> <el-dialog :title="!dataForm.id ? '新增' : '修改'" width="40%" :visible.sync="dialogVisible" :close-on-click-modal="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="submitForm()" <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="submitForm()"
label-width="80px" :size="size" style="text-align:left;"> label-width="80px" :size="size" style="text-align:left;">
<el-form-item label="菜单类型" prop="type"> <el-form-item label="菜单类型" prop="type">
<el-radio-group v-model="dataForm.type"> <el-radio-group v-model="dataForm.type">
...@@ -70,8 +70,8 @@ ...@@ -70,8 +70,8 @@
<el-input v-model="dataForm.name" :placeholder="menuTypeList[dataForm.type] + '名称'"></el-input> <el-input v-model="dataForm.name" :placeholder="menuTypeList[dataForm.type] + '名称'"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上级菜单" prop="parentName"> <el-form-item label="上级菜单" prop="parentName">
<popup-tree-input <popup-tree-input
:data="popupTreeData" :props="popupTreeProps" :prop="dataForm.parentName==null||dataForm.parentName==''?'顶级菜单':dataForm.parentName" :data="popupTreeData" :props="popupTreeProps" :prop="dataForm.parentName==null||dataForm.parentName==''?'顶级菜单':dataForm.parentName"
:nodeKey="''+dataForm.parentId" :currentChangeHandle="handleTreeSelectChange"> :nodeKey="''+dataForm.parentId" :currentChangeHandle="handleTreeSelectChange">
</popup-tree-input> </popup-tree-input>
</el-form-item> </el-form-item>
...@@ -263,7 +263,7 @@ export default { ...@@ -263,7 +263,7 @@ export default {
this.dialogVisible = false; this.dialogVisible = false;
} else { } else {
this.$message({ this.$message({
message: "操作失败, " + res.msg, message: "操作失败, " + res.message,
type: "error" type: "error"
}); });
} }
...@@ -281,4 +281,4 @@ export default { ...@@ -281,4 +281,4 @@ export default {
</script> </script>
<style scoped> <style scoped>
</style> </style>
\ No newline at end of file
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<el-form-item label="备注 " prop="remark"> <el-form-item label="备注 " prop="remark">
<el-input v-model="dataForm.remark" auto-complete="off" type="textarea"></el-input> <el-input v-model="dataForm.remark" auto-complete="off" type="textarea"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button :size="size" @click.native="dialogVisible = false">{{$t('action.cancel')}}</el-button> <el-button :size="size" @click.native="dialogVisible = false">{{$t('action.cancel')}}</el-button>
...@@ -53,9 +53,9 @@ ...@@ -53,9 +53,9 @@
<el-checkbox v-model="checkAll" @change="handleCheckAll" :disabled="this.selectRole.id == null"><b>全选</b></el-checkbox> <el-checkbox v-model="checkAll" @change="handleCheckAll" :disabled="this.selectRole.id == null"><b>全选</b></el-checkbox>
</div> </div>
<div style="float:right;padding-right:15px;padding-top:4px;padding-bottom:4px;"> <div style="float:right;padding-right:15px;padding-top:4px;padding-bottom:4px;">
<kt-button :label="$t('action.reset')" perms="sys:role:edit" type="primary" @click="resetSelection" <kt-button :label="$t('action.reset')" perms="sys:role:edit" type="primary" @click="resetSelection"
:disabled="this.selectRole.id == null"/> :disabled="this.selectRole.id == null"/>
<kt-button :label="$t('action.submit')" perms="sys:role:edit" type="primary" @click="submitAuthForm" <kt-button :label="$t('action.submit')" perms="sys:role:edit" type="primary" @click="submitAuthForm"
:disabled="this.selectRole.id == null" :loading="authLoading"/> :disabled="this.selectRole.id == null" :loading="authLoading"/>
</div> </div>
</div> </div>
...@@ -164,7 +164,7 @@ export default { ...@@ -164,7 +164,7 @@ export default {
this.dialogVisible = false this.dialogVisible = false
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
} else { } else {
this.$message({message: '操作失败, ' + res.msg, type: 'error'}) this.$message({message: '操作失败, ' + res.message, type: 'error'})
} }
this.findPage(null) this.findPage(null)
}) })
...@@ -248,7 +248,7 @@ export default { ...@@ -248,7 +248,7 @@ export default {
if(res.code == 200) { if(res.code == 200) {
this.$message({ message: '操作成功', type: 'success' }) this.$message({ message: '操作成功', type: 'success' })
} else { } else {
this.$message({message: '操作失败, ' + res.msg, type: 'error'}) this.$message({message: '操作失败, ' + res.message, type: 'error'})
} }
this.authLoading = false this.authLoading = false
}) })
...@@ -271,7 +271,7 @@ export default { ...@@ -271,7 +271,7 @@ export default {
       dateFormat: function (row, column, cellValue, index){        dateFormat: function (row, column, cellValue, index){
           return format(row[column.property])            return format(row[column.property])
       }        }
}, },
mounted() { mounted() {
} }
...@@ -287,6 +287,6 @@ export default { ...@@ -287,6 +287,6 @@ export default {
text-align: left; text-align: left;
font-size: 16px; font-size: 16px;
color: rgb(20, 89, 121); color: rgb(20, 89, 121);
} }
</style> </style>
\ No newline at end of file
...@@ -229,7 +229,7 @@ export default { ...@@ -229,7 +229,7 @@ export default {
this.dialogVisible = false this.dialogVisible = false
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
} else { } else {
this.$message({message: '操作失败, ' + res.msg, type: 'error'}) this.$message({message: '操作失败, ' + res.message, type: 'error'})
} }
this.findPage(null) this.findPage(null)
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment