设置顶部导航菜单、固定头部。

添加园区规划的农场分区、菜地划分,其中菜地划分暂未调通。
备份csa.sql开发数据库。
This commit is contained in:
jlt
2022-03-24 22:53:13 +08:00
parent d562c17efc
commit 3027dbb60e
18 changed files with 3044 additions and 44 deletions

View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询菜地划分列表
export function listGarden(query) {
return request({
url: '/csa/garden/list',
method: 'get',
params: query
})
}
// 查询菜地划分详细
export function getGarden(id) {
return request({
url: '/csa/garden/' + id,
method: 'get'
})
}
// 新增菜地划分
export function addGarden(data) {
return request({
url: '/csa/garden',
method: 'post',
data: data
})
}
// 修改菜地划分
export function updateGarden(data) {
return request({
url: '/csa/garden',
method: 'put',
data: data
})
}
// 删除菜地划分
export function delGarden(id) {
return request({
url: '/csa/garden/' + id,
method: 'delete'
})
}

View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询农场分区列表
export function listZone(query) {
return request({
url: '/csa/zone/list',
method: 'get',
params: query
})
}
// 查询农场分区详细
export function getZone(code) {
return request({
url: '/csa/zone/' + code,
method: 'get'
})
}
// 新增农场分区
export function addZone(data) {
return request({
url: '/csa/zone',
method: 'post',
data: data
})
}
// 修改农场分区
export function updateZone(data) {
return request({
url: '/csa/zone',
method: 'put',
data: data
})
}
// 删除农场分区
export function delZone(code) {
return request({
url: '/csa/zone/' + code,
method: 'delete'
})
}

View File

@ -1,44 +1,44 @@
module.exports = {
/**
* 侧边栏主题 深色主题theme-dark浅色主题theme-light
*/
sideTheme: 'theme-dark',
/**
* 是否系统布局配置
*/
showSettings: false,
/**
* 是否显示顶部导航
*/
topNav: false,
/**
* 是否显示 tagsView
*/
tagsView: true,
/**
* 是否固定头部
*/
fixedHeader: false,
/**
* 是否显示logo
*/
sidebarLogo: true,
/**
* 是否显示动态标题
*/
dynamicTitle: false,
/**
* @type {string | array} 'production' | ['production', 'development']
* @description Need show err logs component.
* The default is only used in the production env
* If you want to also use it in dev, you can pass ['production', 'development']
*/
errorLog: 'production'
}
module.exports = {
/**
* 侧边栏主题 深色主题theme-dark浅色主题theme-light
*/
sideTheme: 'theme-dark',
/**
* 是否系统布局配置
*/
showSettings: false,
/**
* 是否显示顶部导航
*/
topNav: true,
/**
* 是否显示 tagsView
*/
tagsView: true,
/**
* 是否固定头部
*/
fixedHeader: true,
/**
* 是否显示logo
*/
sidebarLogo: true,
/**
* 是否显示动态标题
*/
dynamicTitle: false,
/**
* @type {string | array} 'production' | ['production', 'development']
* @description Need show err logs component.
* The default is only used in the production env
* If you want to also use it in dev, you can pass ['production', 'development']
*/
errorLog: 'production'
}

View File

@ -0,0 +1,323 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="菜地编号" prop="code" label-width="100">
<el-input
v-model="queryParams.code"
placeholder="请输入菜地编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="分区代码" prop="zoneCode">
<el-input
v-model="queryParams.zoneCode"
placeholder="请输入分区代码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="菜地名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入菜地名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="竣工状态" prop="isCompleted">
<el-input
v-model="queryParams.isCompleted"
placeholder="请输入竣工状态"
clearable
@keyup.enter.native="handleQuery"
/>
</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
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['csa:garden:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['csa:garden:edit']"
>修改</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="['csa:garden:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['csa:garden:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="gardenList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="菜地编号" align="center" prop="code" />
<el-table-column label="分区代码" align="center" prop="zoneCode" />
<el-table-column label="菜地名称" align="center" prop="name" />
<el-table-column label="平方米" align="center" prop="m2" />
<el-table-column label="竣工状态" align="center" prop="isCompleted" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['csa:garden:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['csa:garden:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改菜地划分对话框 -->
<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-item label="菜地编号" prop="code">
<el-input v-model="form.code" placeholder="请输入菜地编号" />
</el-form-item>
<el-form-item label="农场分区" prop="zoneCode">
<el-input v-model="form.zoneCode" placeholder="请输入分区代码" />
</el-form-item>
<el-form-item label="菜地名称" prop="name">
<el-input v-model="form.name" placeholder="请输入菜地名称" />
</el-form-item>
<el-form-item label="平方米" prop="m2">
<el-input v-model="form.m2" placeholder="请输入平方米" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" 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>
</div>
</template>
<script>
import { listGarden, getGarden, delGarden, addGarden, updateGarden } from "@/api/csa/garden";
export default {
name: "Garden",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 菜地划分表格数据
gardenList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
code: null,
zoneCode: null,
name: null,
memberId: null,
managerId: null,
workerId: null,
contacterId: null,
isFarming: null,
isSelled: null,
isCompleted: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
code: [
{ required: true, message: "菜地编号不能为空", trigger: "blur" }
],
zoneCode: [
{ required: true, message: "分区代码不能为空", trigger: "blur" }
],
name: [
{ required: true, message: "菜地名称不能为空", trigger: "blur" }
],
m2: [
{ required: true, message: "平方米不能为空", trigger: "blur" }
],
coins: [
{ required: true, message: "金币不能为空", trigger: "blur" }
],
}
};
},
created() {
this.getList();
},
methods: {
/** 查询菜地划分列表 */
getList() {
this.loading = true;
listGarden(this.queryParams).then(response => {
this.gardenList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
code: null,
zoneCode: null,
name: null,
m2: null,
memberId: null,
managerId: null,
workerId: null,
contacterId: null,
coins: null,
isFarming: null,
isSelled: null,
isCompleted: null,
status: "0",
delFlag: null,
remark: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加菜地划分";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getGarden(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改菜地划分";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateGarden(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addGarden(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除菜地Id为"' + ids + '"的数据项?').then(function() {
return delGarden(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('csa/garden/export', {
...this.queryParams
}, `garden_${new Date().getTime()}.xlsx`)
}
}
};
</script>

View File

@ -0,0 +1,275 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="分区代码" prop="code">
<el-input
v-model="queryParams.code"
placeholder="请输入分区代码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="分区名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入分区名称"
clearable
@keyup.enter.native="handleQuery"
/>
</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
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['csa:zone:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['csa:zone:edit']"
>修改</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="['csa:zone:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['csa:zone:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="zoneList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="分区代码" align="center" prop="code" />
<el-table-column label="分区名称" align="center" prop="name" />
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['csa:zone:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['csa:zone:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改农场分区对话框 -->
<el-dialog :title="title" :visible.sync="open" width="350px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="分区代码" prop="name">
<el-input v-model="form.code" placeholder="请输入分区代码" />
</el-form-item>
<el-form-item label="分区名称" prop="name">
<el-input v-model="form.name" placeholder="请输入分区名称" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" 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>
</div>
</template>
<script>
import { listZone, getZone, delZone, addZone, updateZone } from "@/api/csa/zone";
export default {
name: "Zone",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 农场分区表格数据
zoneList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
code: null,
name: null,
},
// 是否新增
isAdd: false,
// 表单参数
form: {},
// 表单校验
rules: {
code: [
{ required: true, message: "分区代码不能为空", trigger: "blur" }
],
name: [
{ required: true, message: "分区名称不能为空", trigger: "blur" }
],
}
};
},
created() {
this.getList();
},
methods: {
/** 查询农场分区列表 */
getList() {
this.loading = true;
listZone(this.queryParams).then(response => {
this.zoneList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
code: null,
name: null,
status: "0",
delFlag: "0",
remark: ""
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.code)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.isAdd = true;
this.open = true;
this.title = "添加农场分区";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
this.isAdd = false;
const code = row.code || this.ids
getZone(code).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改农场分区";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (!this.isAdd) {
updateZone(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addZone(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const codes = row.code || this.ids;
this.$modal.confirm('是否确认删除农场分区编号为"' + codes + '"的数据项?').then(function() {
return delZone(codes);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('csa/zone/export', {
...this.queryParams
}, `zone_${new Date().getTime()}.xlsx`)
}
}
};
</script>