java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge remote-tracking branch 'origin/dev' into dev

test
0.0 2 years ago
parent
78ac6d7d72 20ae3f676f
commit
4b680e1538
2 changed files with 128 additions and 116 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/api/basic/basicTenantCode.js
  2. 242
      src/views/basic/coderule/basicTenantCode.vue

2
src/api/basic/basicTenantCode.js
Unescape View File

@ -1,4 +1,4 @@
import request from '@/router/axios';
import request from '@/axios';
export const getList = (current, size, params) => {
return request({

242
src/views/basic/coderule/basicTenantCode.vue
Unescape View File

@ -1,62 +1,61 @@
<template>
<basic-container>
<div class="avue-crud">
<el-row :hidden="!search" style="padding:5px">
<el-row :hidden="!search" style="padding:6px 18px">
<!-- 查询模块 -->
<el-form :inline="true" :size="option.size" :model="query">
<template>
<el-form-item label="编码类型">
<el-select type="text" v-model="query.input" placeholder="请选择编码类型" >
<el-option
v-for="item in codeType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.sort">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="展示类型" style="margin-left: 5px">
<el-select type="text" v-model="query.type" placeholder="请选择展示类型">
<el-option
v-for="item in showType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.sort">
</el-option>
</el-select>
</el-form-item>
</template>
<el-form :inline="true" :model="query">
<el-form-item label="编码类型">
<el-select type="text" v-model="query.input" placeholder="请选择编码类型" >
<el-option
v-for="item in codeType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.sort">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="展示类型" style="margin-left: 5px">
<el-select type="text" v-model="query.type" placeholder="请选择展示类型">
<el-option
v-for="item in showType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.sort">
</el-option>
</el-select>
</el-form-item>
<!-- 查询按钮 -->
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="searchChange" style="margin-left: 20px" >搜索</el-button>
<el-button icon="el-icon-delete" @click="searchReset()">清空</el-button>
<el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
<el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
</el-form-item>
</el-form>
</el-row>
<el-row>
<div class="avue-crud__menu">
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button :size="option.size" type="primary" icon="el-icon-plus" @click="handleAdd" style="margin-left: 10px">新增</el-button>
<el-button :size="option.size" type="danger" icon="el-icon-delete" @click="handleDelete" plain>删除
</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button :size="option.size" icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button :size="option.size" icon="el-icon-search" @click="searchHide" circle></el-button>
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="el-icon-search" @click="searchHide" circle></el-button>
</div>
</div>
</el-row>
<el-row>
<!-- 列表模块 -->
<el-table ref="table" v-loading="loading" :size="option.size" @selection-change="selectionChange" :data="data"
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="data"
:height="height"
style="width: 100%"
:border="option.border">
<el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
<el-table-column v-if="option.index" label="编号" type="index" width="50" align="center">
<el-table-column v-if="option.index" label="编号" type="index" width="100" align="center">
</el-table-column>
<template v-for="(item,index) in option.column">
<!-- table字段 -->
@ -68,76 +67,99 @@
</el-table-column>
</template>
<!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="180" align="center">
<template slot-scope="{row}">
<el-button :size="option.size" type="text" icon="el-icon-view" @click="handleView(row)">查看</el-button>
<el-button :size="option.size" type="text" icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
<el-button :size="option.size" type="text" icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}">
<el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
<el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
<el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-row>
<el-row>
<!-- 分页模块 -->
<el-pagination
align="right" background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[10, 20, 30, 40, 50, 100]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total">
</el-pagination>
<div class="avue-crud__pagination" style="width:100%">
<!-- 分页模块 -->
<el-pagination align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[10, 20, 30, 40, 50, 100]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total">
</el-pagination>
</div>
</el-row>
<!-- 表单模块 -->
<el-dialog :title="title" :visible.sync="box" width="50%" :before-close="beforeClose" append-to-body>
<el-form :disabled="view" :size="option.size" ref="form" :model="form" label-width="80px">
<el-dialog :title="title"
v-model="box"
width="50%"
:before-close="beforeClose"
append-to-body>
<el-form :disabled="view" ref="form" :model="form" label-width="80px">
<!-- 表单字段 -->
<el-form-item label="编码类型:" prop="codeType" >
<el-select v-model="form.codeType" clearable placeholder="请选择状态">
<el-option
v-for="item in codeType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.sort">
v-for="item in codeType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.sort">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="展示类型:" prop="showType" >
<el-select v-model="form.showType" clearable placeholder="请选择状态">
<el-option
v-for="item in showType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.sort">
v-for="item in showType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.sort">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="租户编码:" prop="code">
<el-input v-model="form.code"/>
</el-form-item>
<!-- <el-form-item label="预留1" prop="reserve1">-->
<!-- <el-input v-model="form.reserve1" placeholder="请输入预留1"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="预留2" prop="reserve2">-->
<!-- <el-input v-model="form.reserve2" placeholder="请输入预留2"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="预留3" prop="reserve3">-->
<!-- <el-input v-model="form.reserve3" placeholder="请输入预留3"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="预留4" prop="reserve4">-->
<!-- <el-input v-model="form.reserve4" placeholder="请输入预留4"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="预留5" prop="reserve5">-->
<!-- <el-input v-model="form.reserve5" placeholder="请输入预留5"/>-->
<!-- </el-form-item>-->
</el-form>
<!-- 表单按钮 -->
<span v-if="!view" slot="footer" class="dialog-footer">
<el-button type="primary" icon="el-icon-circle-check" :size="option.size" @click="handleSubmit">提 交</el-button>
<el-button icon="el-icon-circle-close" :size="option.size" @click="box = false">取 消</el-button>
</span>
<template #footer>
<span v-if="!view" class="dialog-footer">
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>
<el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
</span>
</template>
</el-dialog>
</div>
</basic-container>
</template>
<script>
import {getList, getDetail, add, update, remove} from "@/api/basic/basicTenantCode";
import option from "@/option/basic/basicTenantCode";
import {mapGetters} from "vuex";
// import {getDictionaryBiz} from '@/api/system/dict'
import { getList, getDetail, add, update, remove } from "@/api/basic/basicTenantCode";
import option from "@/option/basic/basicTenantCode";
import { mapGetters } from "vuex";
import {getDictionaryBiz} from '@/api/system/dict';
export default {
data() {
data () {
return {
height: 0,
// 弹框标题
title: '',
// 是否展示弹框
@ -169,19 +191,18 @@ export default {
data: [],
codeType: [],
showType: [],
}
},
created() {
this.onLoad(this.page);
this.onLoad(this.page)
},
mounted() {
mounted () {
this.init();
this.onLoad(this.page);
},
computed: {
...mapGetters(["permission"]),
ids() {
ids () {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
@ -190,7 +211,7 @@ export default {
}
},
methods: {
init() {
init () {
getDictionaryBiz("basic_tenant_code").then(res=>{
this.codeType = res.data.data
console.log(res.data.data)
@ -199,19 +220,20 @@ export default {
this.showType = res.data.data
console.log(res.data.data)
})
this.height = this.setPx(document.body.clientHeight - 340);
},
searchHide() {
searchHide () {
this.search = !this.search;
},
searchChange() {
searchChange () {
this.onLoad(this.page);
},
searchReset() {
searchReset () {
this.query = {};
this.page.currentPage = 1;
this.onLoad(this.page);
},
handleSubmit() {
handleSubmit () {
if (!this.form.id) {
add(this.form).then(() => {
this.box = false;
@ -232,23 +254,21 @@ export default {
})
}
},
handleAdd() {
handleAdd () {
this.title = '新增'
this.form = {}
this.box = true
},
handleEdit(row) {
handleEdit (row) {
this.title = '编辑'
this.box = true
getDetail(row.id).then(res => {
this.form = res.data.data;
console.log(res.data.data.codeType)
// res.data.data.codeType = parseInt(res.data.data.codeType);
// res.data.data.showType = parseInt(res.data.data.showType);
res.data.data.codeType = parseInt(res.data.data.codeType);
res.data.data.showType = parseInt(res.data.data.showType);
this.form = res.data.data;
});
},
handleView(row) {
handleView (row) {
this.title = '查看'
this.view = true;
this.box = true;
@ -256,11 +276,9 @@ export default {
res.data.data.codeType = parseInt(res.data.data.codeType);
res.data.data.showType = parseInt(res.data.data.showType);
this.form = res.data.data;
});
},
handleDelete() {
handleDelete () {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
@ -282,7 +300,7 @@ export default {
});
});
},
rowDel(row) {
rowDel (row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@ -299,59 +317,53 @@ export default {
});
});
},
beforeClose(done) {
beforeClose (done) {
done()
this.form = {};
this.view = false;
},
selectionChange(list) {
selectionChange (list) {
this.selectionList = list;
},
selectionClear() {
selectionClear () {
this.selectionList = [];
this.$refs.table.clearSelection();
},
currentChange(currentPage) {
currentChange (currentPage) {
this.page.currentPage = currentPage;
this.onLoad(this.page);
},
sizeChange(pageSize) {
sizeChange (pageSize) {
this.page.pageSize = pageSize;
this.onLoad(this.page);
},
onLoad(page, params = {}) {
onLoad (page, params = {}) {
this.loading = true;
console.log(this.query)
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
console.log(data);
//编码类型数据回显
this.codeType.forEach(item=>{
data.records.forEach(code=>{
if (item.dictKey === code.codeType){
code.codeType = item.dictValue;
}
})
if (item.dictKey===code.codeType){
code.codeType = item.dictValue;
}
})
})
//展示类型数据回显
this.showType.forEach(item=>{
data.records.forEach(show=>{
if (item.dictKey === show.showType){
show.showType = item.dictValue;
data.records.forEach(code=>{
if (item.dictKey===code.showType){
code.showType = item.dictValue;
}
})
})
this.page.total = data.total;
this.data = data.records;
this.loading = false;
this.selectionClear();
});
},
}
}
};
</script>
<style lang="scss" scoped>
.el-pagination {
margin-top: 20px;
}
</style>

Write Preview
Loading…
Cancel
Save