新增：作物、作物出入记录

src/api/farm/crop.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 创建
+export function createCrop(data) {
+  return request({
+    url: '/farm/crop/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新
+export function updateCrop(data) {
+  return request({
+    url: '/farm/crop/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除
+export function deleteCrop(id) {
+  return request({
+    url: '/farm/crop/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得
+export function getCrop(id) {
+  return request({
+    url: '/farm/crop/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得分页
+export function getCropPage(query) {
+  return request({
+    url: '/farm/crop/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出 Excel
+export function exportCropExcel(query) {
+  return request({
+    url: '/farm/crop/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/farm/cropRecord.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 创建
+export function createCropRecord(data) {
+  return request({
+    url: '/farm/crop-record/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新
+export function updateCropRecord(data) {
+  return request({
+    url: '/farm/crop-record/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除
+export function deleteCropRecord(id) {
+  return request({
+    url: '/farm/crop-record/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得
+export function getCropRecord(id) {
+  return request({
+    url: '/farm/crop-record/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得分页
+export function getCropRecordPage(query) {
+  return request({
+    url: '/farm/crop-record/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出 Excel
+export function exportCropRecordExcel(query) {
+  return request({
+    url: '/farm/crop-record/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/views/farm/crop/index.vue

@@ -0,0 +1,240 @@
+<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="name">
+        <el-input v-model="queryParams.name" placeholder="请输入物料名" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @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="['farm:crop:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['farm:crop:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="物料id" align="center" prop="id" />
+      <el-table-column label="物料名" align="center" prop="name" />
+      <el-table-column label="物料图片" align="center" prop="images" >
+        <template slot-scope="scope">
+           <el-image 
+            style=""
+            :src="scope.row.images.split(',')[0]" 
+            :preview-src-list="scope.row.images.split(',')">
+          </el-image>
+        </template>
+      </el-table-column>
+      <el-table-column label="当前库存" align="center" prop="stock" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <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="['farm:crop:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['farm:crop:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="物料名" prop="name">
+          <el-input v-model="form.name" placeholder="请输入物料名" />
+        </el-form-item>
+        <el-form-item label="图片：">
+          <imageUpload v-model="form.images"/>
+        </el-form-item>
+        <el-form-item label="当前库存" prop="stock">
+          <el-input v-model="form.stock" 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 { createCrop, updateCrop, deleteCrop, getCrop, getCropPage, exportCropExcel } from "@/api/farm/crop";
+import ImageUpload from '@/components/ImageUpload';
+import Editor from '@/components/Editor';
+
+export default {
+  name: "Crop",
+  components: {
+    ImageUpload,
+    Editor
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      dateRangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        name: null,
+        images: null,
+        stock: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [{ required: true, message: "物料名不能为空", trigger: "blur" }],
+        stock: [{ required: true, message: "当前库存不能为空", trigger: "blur" }],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 处理查询参数
+      let params = {...this.queryParams};
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行查询
+      getCropPage(params).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        name: undefined,
+        images: undefined,
+        stock: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRangeCreateTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getCrop(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        // 修改的提交
+        if (this.form.id != null) {
+          updateCrop(this.form).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        createCrop(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除编号为"' + id + '"的数据项?').then(function() {
+          return deleteCrop(id);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = {...this.queryParams};
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行导出
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+          this.exportLoading = true;
+          return exportCropExcel(params);
+        }).then(response => {
+          this.$download.excel(response, '${table.classComment}.xls');
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/farm/cropRecord/index.vue

@@ -0,0 +1,277 @@
+<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="cropId">
+        <el-input v-model="queryParams.cropId" placeholder="请输入物料id" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="操作类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择出入库" clearable size="small">
+          <el-option label="出库" value="0" />
+          <el-option label="入库" value="1" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="操作时间">
+        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @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="['farm:crop-record:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['farm:crop-record:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="序列号" align="center" prop="id" />
+      <el-table-column label="作物名" align="center" prop="resourceType" >
+        <template slot-scope="scope">
+          <span> {{cropList.find(t=>t.id == scope.row.cropId ).name}}  </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="出入库" align="center" prop="type" />
+      <el-table-column label="操作数量" align="center" prop="stock" />
+      <el-table-column label="剩余数量" align="center" prop="afterStock" />
+      <el-table-column label="操作时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <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="['farm:crop-record:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['farm:crop-record:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :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="作物选择">
+          <el-select  v-model="form.cropId" placeholder="请选择">
+            <el-option v-for="item in cropList" :key="item.id" :label="item.name" :value="item.id"> {{item.name}}
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="操作类型" prop="type">
+          <el-radio-group v-model="form.type">
+            <el-radio label="false">出库</el-radio>
+            <el-radio label="true">入库</el-radio>
+        </el-radio-group>
+        </el-form-item>
+        <el-form-item label="操作数量" prop="stock">
+          <el-input v-model="form.stock" placeholder="请输入操作数量" />
+        </el-form-item>
+        <el-form-item label="剩余数量" prop="afterStock">
+          <el-input v-model="form.afterStock" 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 { createCropRecord, updateCropRecord, deleteCropRecord, getCropRecord, getCropRecordPage, exportCropRecordExcel } from "@/api/farm/cropRecord";
+import Editor from '@/components/Editor';
+import { getCropPage } from "@/api/farm/crop";
+import elementIcons from '../../bxg/components/icons/element-icons';
+
+export default {
+  name: "CropRecord",
+  components: {
+    Editor
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      dateRangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        cropId: null,
+        type: null,
+        stock: null,
+        afterStock: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        stock: [{ required: true, message: "操作数量不能为空", trigger: "blur" }],
+        afterStock: [{ required: true, message: "剩余数量不能为空", trigger: "blur" }],
+      },
+      cropList:[]   //作物List
+      
+    };
+  },
+  created() {
+    this.getCrop();
+    this.getList();
+  },
+  methods: {
+    /**查询作物名 */
+    getCrop(){
+      getCropPage({
+        pageNo: 1,
+        pageSize: 100,
+        name: null
+      }).then(res=>{
+        this.cropList = res.data.list;
+      })
+    },
+
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 处理查询参数
+      let params = {...this.queryParams};
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行查询
+      getCropRecordPage(params).then(response => {
+        response.data.list.forEach(item =>{
+          item.type = item.type ? "入库" : "出库";
+        })
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        cropId: undefined,
+        type: undefined,
+        stock: undefined,
+        afterStock: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRangeCreateTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.form.type  =  "true";
+      this.open = true;
+      this.title = "添加";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getCropRecord(id).then(response => {
+        this.form = response.data;
+                console.log("111111111111", this.form.type);
+                 console.log("111111111111", response.data.type);
+        this.open = true;
+        this.title = "修改";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+
+      console.log("11111", this.form.type);
+
+        // 修改的提交
+        if (this.form.id != null) {
+          updateCropRecord(this.form).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        createCropRecord(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除编号为"' + id + '"的数据项?').then(function() {
+          return deleteCropRecord(id);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = {...this.queryParams};
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行导出
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+          this.exportLoading = true;
+          return exportCropRecordExcel(params);
+        }).then(response => {
+          this.$download.excel(response, '${table.classComment}.xls');
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>