初步完成农场分区、菜地划分模块。

This commit is contained in:
jlt
2022-03-29 15:58:36 +08:00
parent ca4d0db841
commit 3c83bf252c
31 changed files with 921 additions and 1902 deletions

View File

@ -10,9 +10,9 @@ export function listFarmzone(query) {
}
// 查询农场分区详细
export function getFarmzone(code) {
export function getFarmzone(id) {
return request({
url: '/csa/farmzone/' + code,
url: '/csa/farmzone/' + id,
method: 'get'
})
}
@ -36,9 +36,9 @@ export function updateFarmzone(data) {
}
// 删除农场分区
export function delFarmzone(code) {
export function delFarmzone(id) {
return request({
url: '/csa/farmzone/' + code,
url: '/csa/farmzone/' + id,
method: 'delete'
})
}

View File

@ -35,6 +35,16 @@ export function updateGarden(data) {
})
}
// 批量修改菜地划分状态
export function updateGardenStatus(data, id) {
return request({
url: '/csa/garden/' + id,
method: 'put',
data: data
})
}
// 删除菜地划分
export function delGarden(id) {
return request({

View File

@ -1,6 +1,16 @@
<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="type">
<el-select v-model="queryParams.type" placeholder="请选择分区类型" clearable>
<el-option
v-for="dict in dict.type.csa_zone_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="分区名称" prop="name">
<el-input
v-model="queryParams.name"
@ -9,6 +19,16 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</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>
@ -63,10 +83,17 @@
<el-table v-loading="loading" :data="farmzoneList" @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="type" />
<el-table-column label="分区类型" align="center" prop="type">
<template slot-scope="scope">
<dict-tag :options="dict.type.csa_zone_type" :value="scope.row.type"/>
</template>
</el-table-column>
<el-table-column label="分区名称" align="center" prop="name" />
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@ -87,7 +114,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -97,16 +124,32 @@
/>
<!-- 添加或修改农场分区对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="400px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="分区类型" prop="type">
<el-select v-model="form.type" placeholder="请选择分区类型">
<el-option
v-for="dict in dict.type.csa_zone_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</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="delFlag">
<el-input v-model="form.delFlag" placeholder="请输入删除标志" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
<el-input v-model="form.remark" type="textarea" rows="3" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="状态">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -118,153 +161,156 @@
</template>
<script>
import { listFarmzone, getFarmzone, delFarmzone, addFarmzone, updateFarmzone } from "@/api/csa/farmzone";
import { listFarmzone, getFarmzone, delFarmzone, addFarmzone, updateFarmzone } from "@/api/csa/farmzone";
export default {
name: "Farmzone",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 农场分区表格数据
farmzoneList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
type: null,
name: null,
status: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
type: [
{ required: true, message: "分区类型不能为空", trigger: "change" }
],
name: [
{ required: true, message: "分区名称不能为空", trigger: "blur" }
],
}
};
},
created() {
this.getList();
},
methods: {
/** 查询农场分区列表 */
getList() {
this.loading = true;
listFarmzone(this.queryParams).then(response => {
this.farmzoneList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
code: null,
type: null,
name: null,
status: "0",
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
remark: null
export default {
name: "Farmzone",
dicts: ['csa_zone_type', 'sys_normal_disable'],
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 农场分区表格数据
farmzoneList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
code: null,
type: null,
name: null,
status: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
type: [
{ required: true, message: "分区类型不能为空", trigger: "change" }
],
name: [
{ required: true, message: "分区名称不能为空", trigger: "blur" }
],
}
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
created() {
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.open = true;
this.title = "添加农场分区";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const code = row.code || this.ids
getFarmzone(code).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改农场分区";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.code != null) {
updateFarmzone(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addFarmzone(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 delFarmzone(codes);
}).then(() => {
methods: {
/** 查询农场分区列表 */
getList() {
this.loading = true;
listFarmzone(this.queryParams).then(response => {
this.farmzoneList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
type: null,
name: null,
status: "0",
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
remark: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('csa/farmzone/export', {
...this.queryParams
}, `farmzone_${new Date().getTime()}.xlsx`)
},
/** 重置按钮操作 */
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
getFarmzone(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) {
updateFarmzone(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addFarmzone(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
const itemName = row.name;
this.$modal.confirm('是否确认删除【' + itemName + '】?').then(function() {
return delFarmzone(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('csa/farmzone/export', {
...this.queryParams
}, `farmzone_${new Date().getTime()}.xlsx`)
}
}
}
};
};
</script>

View File

@ -1,7 +1,17 @@
<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-form-item label="农场分区" prop="zoneId">
<el-select v-model="queryParams.zoneId" placeholder="请选择农场分区" clearable>
<el-option
v-for="zone in farmzoneList"
:key="zone.id"
:label="zone.name"
:value="zone.id"
/>
</el-select>
</el-form-item>
<el-form-item label="菜地编号" prop="code">
<el-input
v-model="queryParams.code"
placeholder="请输入菜地编号"
@ -9,29 +19,15 @@
@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 label="竣工" prop="isCompleted">
<el-select v-model="queryParams.isCompleted" placeholder="请选择竣工" clearable>
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@ -82,16 +78,55 @@
v-hasPermi="['csa:garden:export']"
>导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-finished"
size="mini"
@click="handleComplete"
v-hasPermi="['csa:garden:edit']"
>竣工</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="zoneId" />
<el-table-column label="菜地编号" align="center" prop="code">
<template slot-scope="scope">
<el-tag
:key="scope.row.code"
:type="scope.row.isCompleted == 'Y' ? 'success' : 'warning'" effect="plain">
{{ scope.row.code }}
</el-tag>
</template>
</el-table-column>
<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="memberId" />
<el-table-column label="管理员" align="center" prop="managerId" />
<el-table-column label="耕作" align="center" prop="isFarming">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isFarming"/>
</template>
</el-table-column>
<el-table-column label="售出" align="center" prop="isSelled">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isSelled"/>
</template>
</el-table-column>
<el-table-column label="竣工" align="center" prop="isCompleted">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isCompleted"/>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@ -99,6 +134,7 @@
size="mini"
type="text"
icon="el-icon-edit"
:disabled="scope.row.isCompleted == 'Y'"
@click="handleUpdate(scope.row)"
v-hasPermi="['csa:garden:edit']"
>修改</el-button>
@ -106,6 +142,7 @@
size="mini"
type="text"
icon="el-icon-delete"
:disabled="scope.row.isCompleted == 'Y'"
@click="handleDelete(scope.row)"
v-hasPermi="['csa:garden:remove']"
>删除</el-button>
@ -124,20 +161,24 @@
<!-- 添加或修改菜地划分对话框 -->
<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="zoneId">
<el-select v-model="form.zoneId" placeholder="请选择农场分区" clearable>
<el-option
v-for="zone in farmzoneList"
:key="zone.id"
:label="zone.name"
:value="zone.id"
/>
</el-select>
</el-form-item>
<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-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -149,175 +190,175 @@
</template>
<script>
import { listGarden, getGarden, delGarden, addGarden, updateGarden } from "@/api/csa/garden";
import { listFarmzone } from "@/api/csa/farmzone";
import { listGarden, getGarden, delGarden, addGarden, updateGarden, updateGardenStatus } 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
export default {
name: "Garden",
dicts: ['sys_normal_disable', 'sys_yes_no'],
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 农场分区列表
farmzoneList: [],
// 菜地划分表格数据
gardenList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
zoneId: null,
code: null,
isCompleted: null
},
// 表单参数
form: {},
// 表单校验
rules: {
zoneId: [
{ required: true, message: "农场分区不能为空", trigger: "blur" }
],
code: [
{ required: true, message: "菜地编号不能为空", trigger: "blur" }
],
m2: [
{ required: true, message: "平方米不能为空", trigger: "blur" }
]
}
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
created() {
this.getZoneList();
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(() => {
methods: {
/** 查询农场分区列表 */
getZoneList() {
this.loading = true;
listFarmzone(null).then(response => {
this.farmzoneList = response.rows;
this.loading = false;
});
},
/** 查询菜地划分列表 */
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,
zoneId: null,
code: null,
m2: null,
isCompleted: "N",
remark: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('csa/garden/export', {
...this.queryParams
}, `garden_${new Date().getTime()}.xlsx`)
},
/** 重置按钮操作 */
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('是否确认删除选择的菜地?').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`)
},
/** 设为竣工 */
handleComplete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('竣工后分区、编号和面积将不可更改!是否要将选择的菜地设为竣工状态?').then(function() {
return updateGardenStatus({isCompleted: 'Y'}, ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("竣工设置成功");
}).catch(() => {});
}
}
}
};
};
</script>