From 042582c65ca44752c1812d95469fa2e593747ca2 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 14 May 2022 09:19:39 +0800
Subject: [PATCH] 种植记录修改，农产品修改，去除种养品类型
---
src/views/farmplant/farmplant.vue | 366 ++++++++++---------
src/views/farmplant/farmplant copy.vue | 652 ++++++++++++++++++++++++++++++++++++
src/views/farmplant/strain.vue | 43 +-
src/api/farmplant/strain.js | 10
4 files changed, 871 insertions(+), 200 deletions(-)
diff --git a/src/api/farmplant/strain.js b/src/api/farmplant/strain.js
index 18295ee..05e8125 100644
--- a/src/api/farmplant/strain.js
+++ b/src/api/farmplant/strain.js
@@ -45,4 +45,14 @@
id
}
})
+}
+
+export const getStrainList = (strainType) => {
+ return request({
+ url: '/api/strain/strain-tree',
+ method: 'get',
+ params: {
+ strainType
+ }
+ })
}
\ No newline at end of file
diff --git a/src/views/farmplant/farmplant copy.vue b/src/views/farmplant/farmplant copy.vue
new file mode 100644
index 0000000..bd86f3a
--- /dev/null
+++ b/src/views/farmplant/farmplant copy.vue
@@ -0,0 +1,652 @@
+<template>
+ <basic-container>
+ <avue-crud
+ :option="option"
+ :table-loading="loading"
+ :data="data"
+ :page.sync="page"
+ :permission="permissionList"
+ :before-open="beforeOpen"
+ v-model="form"
+ ref="crud"
+ @row-update="rowUpdate"
+ @row-save="rowSave"
+ @row-del="rowDel"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ >
+ <template slot="menuLeft">
+ <el-button
+ type="danger"
+ size="small"
+ icon="el-icon-delete"
+ plain
+ @click="handleDelete"
+ >删 除
+ </el-button>
+ </template>
+ </avue-crud>
+ </basic-container>
+</template>
+
+<script>
+import { getDetail, getList, update, remove, save } from "@/api/farmplant/farmplant";
+import { getLandList } from "@/api/land/land";
+import { mapGetters } from "vuex";
+export default {
+ data() {
+ return {
+ visible: true,
+ form: {},
+ query: {},
+ loading: true,
+ excelBox: false,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ selectionList: [],
+ landList:[],
+ option: {
+ tip: false,
+ height: "auto",
+ editBtn: true,
+ delBtn: true,
+ viewBtn: true,
+ menuWidth: 200,
+ menuAlign: "center",
+ align: "center",
+ selection: true,
+ searchShow: true,
+ searchMenuSpan: 6,
+ column: [
+ {
+ label: "类型",
+ prop: "farmType",
+ type: "select",
+ labelWidth:110,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=strainType",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ cascader: ["strainId"],
+ rules: [
+ {
+ required: true,
+ message: "请输入类型",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "种养品",
+ prop: "strainId",
+ hide:true,
+ labelWidth:110,
+ type:"tree",
+ dicUrl: `/api/strain/strain-tree?strainType={{key}}`,
+ dicData: [],
+ props: {
+ label: "strainName",
+ value: "id"
+ },
+ rules: [
+ {
+ required: true,
+ message: "请输入种养品",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "种养品名称",
+ prop: "strainName",
+ search:true,
+ searchSpan:5,
+ searchLabelWidth:110,
+ addDisplay:false,
+ viewDisplay:false,
+ editDisplay:false,
+ rules: [
+ {
+ required: true,
+ message: "请输入种养品",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "品种",
+ prop: "varieties",
+ // search:true,
+ // searchSpan:5,
+ labelWidth:110,
+ rules: [
+ {
+ required: true,
+ message: "请输入种养品名称",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "种养品图片",
+ prop: "url",
+ type: "upload",
+ listType: "picture-img",
+ width: 100,
+ labelWidth:110,
+ display:false,
+ },
+ {
+ label: "所属地块",
+ prop: "landName",
+ display:false,
+ },
+ {
+ label: "所属地块",
+ prop: "landId",
+ searchSpan:4,
+ search:true,
+ type:"tree",
+ hide:true,
+ dicData: [],
+ props: {
+ label: "landName",
+ value: "id"
+ },
+ labelWidth:110,
+ rules: [
+ {
+ required: true,
+ message: "请选择所属地块",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "种植标准",
+ prop: "plant",
+ search:true,
+ searchSpan:3,
+ labelWidth:110,
+ type: "select",
+ dicData:[
+ {
+ label:"有机",
+ value:"0"
+ },
+ {
+ label:"绿色",
+ value:"1"
+ },
+ {
+ label:"无公害",
+ value:"2"
+ },
+ {
+ label:"普通",
+ value:"3"
+ },
+ ],
+ rules: [
+ {
+ required: true,
+ message: "请选择种植标准",
+ trigger: "blur",
+ },
+ ],
+ display:false,
+ },
+ {
+ label: "种植方式",
+ prop: "plantingWay",
+ search:true,
+ searchSpan:3,
+ type: "select",
+ labelWidth:110,
+ dicData:[
+ {
+ label:"移栽",
+ value:"0"
+ },
+ {
+ label:"直播",
+ value:"1"
+ },
+ ],
+ rules: [
+ {
+ required: true,
+ message: "请选择种植方式",
+ trigger: "blur",
+ },
+ ],
+ display:false,
+ },
+ {
+ label: "作业方式",
+ prop: "jobWay",
+ search:true,
+ searchSpan:3,
+ labelWidth:110,
+ type: "select",
+ dicData:[
+ {
+ label:"人工",
+ value:"0"
+ },
+ {
+ label:"机械",
+ value:"1"
+ },
+ ],
+ rules: [
+ {
+ required: true,
+ message: "请输入作业方式",
+ trigger: "blur",
+ },
+ ],
+ display:false,
+ },
+ {
+ label: "移栽时间",
+ prop: "transplanTime",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ labelWidth:110,
+ rules: [
+ {
+ required: true,
+ message: "请选择移栽时间",
+ trigger: "blur",
+ },
+ ],
+ display:false,
+ },
+ {
+ label: "预计采收时间",
+ prop: "recoveryTime",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ hide:true,
+ labelWidth:110,
+ rules: [
+ {
+ required: false,
+ message: "请选预计采收时间",
+ trigger: "blur",
+ },
+ ],
+ display:false,
+ },
+ {
+ label: "预计亩产",
+ prop: "per",
+ labelWidth:110,
+ hide:true,
+ type:"number",
+ rules: [
+ {
+ required: false,
+ message: "请输入预计亩产",
+ trigger: "blur",
+ },
+ ],
+ display:false,
+ },
+ {
+ label: "株数",
+ prop: "plantNumber",
+ labelWidth:110,
+ type:"number",
+ hide:true,
+ rules: [
+ {
+ required: false,
+ message: "请输入株数",
+ trigger: "blur",
+ },
+ ],
+ display:false,
+ },
+ {
+ label: "株间距",
+ prop: "plantSpacing",
+ labelWidth:110,
+ type:"number",
+ hide:true,
+ rules: [
+ {
+ required: false,
+ message: "请输入株间距",
+ trigger: "blur",
+ },
+ ],
+ display:false,
+ },
+ {
+ label: "投苗时间",
+ prop: "seedingTime",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ labelWidth:110,
+ hide:true,
+ rules: [
+ {
+ required: true,
+ message: "请选择投苗时间",
+ trigger: "blur",
+ },
+ ],
+ display:false,
+ },
+ {
+ label: "养殖数量",
+ prop: "breed",
+ labelWidth:110,
+ type:"number",
+ hide:true,
+ rules: [
+ {
+ required: true,
+ message: "请输入养殖数量",
+ trigger: "blur",
+ },
+ ],
+ display:false,
+ },
+ ],
+ },
+ data: [],
+ };
+ },
+ watch: {
+ "form.farmType": {
+ handler(val) {
+ var splantcolumn = this.findObject(this.option.column,"plant");
+ var plantingWaycolumn = this.findObject(this.option.column, "plantingWay");
+ var jobWaycolumn = this.findObject(this.option.column, "jobWay");
+ var transplanTimecolumn = this.findObject(this.option.column, "transplanTime");
+ var recoveryTimecolumn = this.findObject(this.option.column, "recoveryTime");
+ var percolumn = this.findObject(this.option.column, "per");
+ var plantNumbercolumn = this.findObject(this.option.column, "plantNumber");
+ var plantSpacingcolumn = this.findObject(this.option.column, "plantSpacing");
+ var seedingTimecolumn = this.findObject(this.option.column, "seedingTime");
+ var breedcolumn = this.findObject(this.option.column, "breed");
+ // var landIdcolumn = this.findObject(this.option.column, "landId");
+ // landIdcolumn.dicData = this.landList;
+ if (val === '0') {
+ //种职业
+ splantcolumn.display = true;
+ splantcolumn.label = "种植标准";
+ plantingWaycolumn.display = true;
+ plantingWaycolumn.label = "种植方式";
+ plantingWaycolumn.dicData=[
+ {
+ label:"移栽",
+ value:"0"
+ },
+ {
+ label:"直播",
+ value:"1"
+ },
+ ]
+ jobWaycolumn.display = true;
+ transplanTimecolumn.display = true;
+ transplanTimecolumn.label="移栽时间";
+ recoveryTimecolumn.display = true;
+ recoveryTimecolumn.label="预计采收时间";
+ percolumn.display = true;
+ percolumn.label = "预计亩产";
+ percolumn.rules=[
+ {
+ required: false,
+ message: "请输入预计亩产",
+ trigger: "blur",
+ },
+ ],
+ plantNumbercolumn.display = true;
+ plantSpacingcolumn.display = true;
+ seedingTimecolumn.display = false;
+ breedcolumn.display = false;
+ } else if(val ==1){
+ //水产业
+ splantcolumn.display = false;
+ plantingWaycolumn.display = false;
+ jobWaycolumn.display = true;
+ transplanTimecolumn.display = false;
+ recoveryTimecolumn.display = false;
+ percolumn.display = false;
+ plantNumbercolumn.display = false;
+ plantSpacingcolumn.display = false;
+ seedingTimecolumn.display = true;
+ breedcolumn.display = true;
+ }else if(val ==2){
+ //禽畜业
+ splantcolumn.display = true;
+ splantcolumn.label = "养殖标准";
+ plantingWaycolumn.display = true;
+ plantingWaycolumn.label = "养殖方式";
+ plantingWaycolumn.dicData=[
+ {
+ label:"放养",
+ value:"0"
+ },
+ {
+ label:"圈养",
+ value:"1"
+ },
+ {
+ label:"放养+圈养",
+ value:"2"
+ },
+ ]
+ jobWaycolumn.display = true;
+ transplanTimecolumn.display = true;
+ transplanTimecolumn.label="养殖开始时间";
+ recoveryTimecolumn.display = true;
+ recoveryTimecolumn.label="预计出栏时间";
+ percolumn.display = true;
+ percolumn.label = "养殖数量";
+ percolumn.rules=[
+ {
+ required: true,
+ message: "请输入养殖数量",
+ trigger: "blur",
+ },
+ ],
+ plantNumbercolumn.display = false;
+ plantSpacingcolumn.display = false;
+ seedingTimecolumn.display = false;
+ breedcolumn.display = false;
+ }else{
+ splantcolumn.display = false;
+ plantingWaycolumn.display = false;
+ jobWaycolumn.display = false;
+ transplanTimecolumn.display = false;
+ recoveryTimecolumn.display = false;
+ percolumn.display = false;
+ plantNumbercolumn.display = false;
+ plantSpacingcolumn.display = false;
+ seedingTimecolumn.display = false;
+ breedcolumn.display = false;
+ }
+ },
+ immediate: true
+ },
+ },
+ created() {
+ this.initData();
+ },
+ computed: {
+ ...mapGetters(["permission", "userInfo"]),
+ // permissionList() {
+ // return {
+ // addBtn: this.vaildData(this.permission.social_add, true),
+ // viewBtn: this.vaildData(this.permission.social_view, false),
+ // delBtn: this.vaildData(this.permission.social_delete, false),
+ // editBtn: this.vaildData(this.permission.social_edit, false),
+ // };
+ // },
+ ids() {
+ let ids = [];
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id);
+ });
+ return ids.join(",");
+ },
+ },
+ mounted() {},
+ methods: {
+ //初始化数据
+ initData(){
+ var that = this;
+ //获取农地数据
+ getLandList(this.userInfo.user_id).then((res)=>{
+ if(res.data.code==200){
+ var landIdcolumn = that.findObject(that.option.column,"landId");
+ that.landList = res.data.data;
+ landIdcolumn.dicData = res.data.data;
+ }
+ })
+ },
+ //新增
+ rowSave(row, done, loading) {
+ save(row).then(
+ () => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ },
+ (error) => {
+ loading();
+ window.console.log(error);
+ }
+ );
+ },
+ //修改
+ rowUpdate(row, index, done, loading) {
+ update(row).then(
+ () => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ },
+ (error) => {
+ loading();
+ console.log(error);
+ }
+ );
+ },
+ //删除
+ rowDel(row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(row.id);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ });
+ },
+ handleDelete() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(this.ids);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ this.$refs.crud.toggleSelection();
+ });
+ },
+ beforeOpen(done, type) {
+ if (["edit", "view"].includes(type)) {
+ getDetail(this.form.id).then((res) => {
+ this.form = res.data.data;
+ });
+ }
+ done();
+ },
+ searchReset() {
+ this.query = {};
+ this.onLoad(this.page);
+ },
+ searchChange(params, done) {
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
+ done();
+ },
+ selectionChange(list) {
+ this.selectionList = list;
+ },
+ selectionClear() {
+ this.selectionList = [];
+ this.$refs.crud.toggleSelection();
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad(page, params = {}) {
+ this.loading = true;
+ getList(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.query)
+ ).then((res) => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ this.loading = false;
+ this.selectionClear();
+ });
+ },
+ },
+};
+</script>
+
+<style>
+</style>
diff --git a/src/views/farmplant/farmplant.vue b/src/views/farmplant/farmplant.vue
index bd86f3a..b0ecf77 100644
--- a/src/views/farmplant/farmplant.vue
+++ b/src/views/farmplant/farmplant.vue
@@ -36,6 +36,7 @@
<script>
import { getDetail, getList, update, remove, save } from "@/api/farmplant/farmplant";
+import { getStrainList } from "@/api/farmplant/strain";
import { getLandList } from "@/api/land/land";
import { mapGetters } from "vuex";
export default {
@@ -66,32 +67,32 @@
searchShow: true,
searchMenuSpan: 6,
column: [
- {
- label: "类型",
- prop: "farmType",
- type: "select",
- labelWidth:110,
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=strainType",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- cascader: ["strainId"],
- rules: [
- {
- required: true,
- message: "请输入类型",
- trigger: "blur",
- },
- ],
- },
+ // {
+ // label: "类型",
+ // prop: "farmType",
+ // type: "select",
+ // labelWidth:110,
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=strainType",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey"
+ // },
+ // cascader: ["strainId"],
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入类型",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
{
label: "种养品",
prop: "strainId",
hide:true,
labelWidth:110,
type:"tree",
- dicUrl: `/api/strain/strain-tree?strainType={{key}}`,
+ // dicUrl: `/api/strain/strain-tree?strainType=0`,
dicData: [],
props: {
label: "strainName",
@@ -100,7 +101,7 @@
rules: [
{
required: true,
- message: "请输入种养品",
+ message: "请选择种养品",
trigger: "blur",
},
],
@@ -111,9 +112,7 @@
search:true,
searchSpan:5,
searchLabelWidth:110,
- addDisplay:false,
- viewDisplay:false,
- editDisplay:false,
+ display:false,
rules: [
{
required: true,
@@ -203,7 +202,7 @@
trigger: "blur",
},
],
- display:false,
+ // display:false,
},
{
label: "种植方式",
@@ -229,7 +228,7 @@
trigger: "blur",
},
],
- display:false,
+ // display:false,
},
{
label: "作业方式",
@@ -255,7 +254,7 @@
trigger: "blur",
},
],
- display:false,
+ // display:false,
},
{
label: "移栽时间",
@@ -271,7 +270,7 @@
trigger: "blur",
},
],
- display:false,
+ // display:false,
},
{
label: "预计采收时间",
@@ -288,7 +287,7 @@
trigger: "blur",
},
],
- display:false,
+ // display:false,
},
{
label: "预计亩产",
@@ -303,7 +302,7 @@
trigger: "blur",
},
],
- display:false,
+ // display:false,
},
{
label: "株数",
@@ -318,7 +317,7 @@
trigger: "blur",
},
],
- display:false,
+ // display:false,
},
{
label: "株间距",
@@ -333,160 +332,160 @@
trigger: "blur",
},
],
- display:false,
+ // display:false,
},
- {
- label: "投苗时间",
- prop: "seedingTime",
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- labelWidth:110,
- hide:true,
- rules: [
- {
- required: true,
- message: "请选择投苗时间",
- trigger: "blur",
- },
- ],
- display:false,
- },
- {
- label: "养殖数量",
- prop: "breed",
- labelWidth:110,
- type:"number",
- hide:true,
- rules: [
- {
- required: true,
- message: "请输入养殖数量",
- trigger: "blur",
- },
- ],
- display:false,
- },
+ // {
+ // label: "投苗时间",
+ // prop: "seedingTime",
+ // type: "date",
+ // format: "yyyy-MM-dd",
+ // valueFormat: "yyyy-MM-dd",
+ // labelWidth:110,
+ // hide:true,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请选择投苗时间",
+ // trigger: "blur",
+ // },
+ // ],
+ // display:false,
+ // },
+ // {
+ // label: "养殖数量",
+ // prop: "breed",
+ // labelWidth:110,
+ // type:"number",
+ // hide:true,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入养殖数量",
+ // trigger: "blur",
+ // },
+ // ],
+ // display:false,
+ // },
],
},
data: [],
};
},
- watch: {
- "form.farmType": {
- handler(val) {
- var splantcolumn = this.findObject(this.option.column,"plant");
- var plantingWaycolumn = this.findObject(this.option.column, "plantingWay");
- var jobWaycolumn = this.findObject(this.option.column, "jobWay");
- var transplanTimecolumn = this.findObject(this.option.column, "transplanTime");
- var recoveryTimecolumn = this.findObject(this.option.column, "recoveryTime");
- var percolumn = this.findObject(this.option.column, "per");
- var plantNumbercolumn = this.findObject(this.option.column, "plantNumber");
- var plantSpacingcolumn = this.findObject(this.option.column, "plantSpacing");
- var seedingTimecolumn = this.findObject(this.option.column, "seedingTime");
- var breedcolumn = this.findObject(this.option.column, "breed");
- // var landIdcolumn = this.findObject(this.option.column, "landId");
- // landIdcolumn.dicData = this.landList;
- if (val === '0') {
- //种职业
- splantcolumn.display = true;
- splantcolumn.label = "种植标准";
- plantingWaycolumn.display = true;
- plantingWaycolumn.label = "种植方式";
- plantingWaycolumn.dicData=[
- {
- label:"移栽",
- value:"0"
- },
- {
- label:"直播",
- value:"1"
- },
- ]
- jobWaycolumn.display = true;
- transplanTimecolumn.display = true;
- transplanTimecolumn.label="移栽时间";
- recoveryTimecolumn.display = true;
- recoveryTimecolumn.label="预计采收时间";
- percolumn.display = true;
- percolumn.label = "预计亩产";
- percolumn.rules=[
- {
- required: false,
- message: "请输入预计亩产",
- trigger: "blur",
- },
- ],
- plantNumbercolumn.display = true;
- plantSpacingcolumn.display = true;
- seedingTimecolumn.display = false;
- breedcolumn.display = false;
- } else if(val ==1){
- //水产业
- splantcolumn.display = false;
- plantingWaycolumn.display = false;
- jobWaycolumn.display = true;
- transplanTimecolumn.display = false;
- recoveryTimecolumn.display = false;
- percolumn.display = false;
- plantNumbercolumn.display = false;
- plantSpacingcolumn.display = false;
- seedingTimecolumn.display = true;
- breedcolumn.display = true;
- }else if(val ==2){
- //禽畜业
- splantcolumn.display = true;
- splantcolumn.label = "养殖标准";
- plantingWaycolumn.display = true;
- plantingWaycolumn.label = "养殖方式";
- plantingWaycolumn.dicData=[
- {
- label:"放养",
- value:"0"
- },
- {
- label:"圈养",
- value:"1"
- },
- {
- label:"放养+圈养",
- value:"2"
- },
- ]
- jobWaycolumn.display = true;
- transplanTimecolumn.display = true;
- transplanTimecolumn.label="养殖开始时间";
- recoveryTimecolumn.display = true;
- recoveryTimecolumn.label="预计出栏时间";
- percolumn.display = true;
- percolumn.label = "养殖数量";
- percolumn.rules=[
- {
- required: true,
- message: "请输入养殖数量",
- trigger: "blur",
- },
- ],
- plantNumbercolumn.display = false;
- plantSpacingcolumn.display = false;
- seedingTimecolumn.display = false;
- breedcolumn.display = false;
- }else{
- splantcolumn.display = false;
- plantingWaycolumn.display = false;
- jobWaycolumn.display = false;
- transplanTimecolumn.display = false;
- recoveryTimecolumn.display = false;
- percolumn.display = false;
- plantNumbercolumn.display = false;
- plantSpacingcolumn.display = false;
- seedingTimecolumn.display = false;
- breedcolumn.display = false;
- }
- },
- immediate: true
- },
- },
+ // watch: {
+ // "form.farmType": {
+ // handler(val) {
+ // var splantcolumn = this.findObject(this.option.column,"plant");
+ // var plantingWaycolumn = this.findObject(this.option.column, "plantingWay");
+ // var jobWaycolumn = this.findObject(this.option.column, "jobWay");
+ // var transplanTimecolumn = this.findObject(this.option.column, "transplanTime");
+ // var recoveryTimecolumn = this.findObject(this.option.column, "recoveryTime");
+ // var percolumn = this.findObject(this.option.column, "per");
+ // var plantNumbercolumn = this.findObject(this.option.column, "plantNumber");
+ // var plantSpacingcolumn = this.findObject(this.option.column, "plantSpacing");
+ // var seedingTimecolumn = this.findObject(this.option.column, "seedingTime");
+ // var breedcolumn = this.findObject(this.option.column, "breed");
+ // // var landIdcolumn = this.findObject(this.option.column, "landId");
+ // // landIdcolumn.dicData = this.landList;
+ // if (val === '0') {
+ // //种职业
+ // splantcolumn.display = true;
+ // splantcolumn.label = "种植标准";
+ // plantingWaycolumn.display = true;
+ // plantingWaycolumn.label = "种植方式";
+ // plantingWaycolumn.dicData=[
+ // {
+ // label:"移栽",
+ // value:"0"
+ // },
+ // {
+ // label:"直播",
+ // value:"1"
+ // },
+ // ]
+ // jobWaycolumn.display = true;
+ // transplanTimecolumn.display = true;
+ // transplanTimecolumn.label="移栽时间";
+ // recoveryTimecolumn.display = true;
+ // recoveryTimecolumn.label="预计采收时间";
+ // percolumn.display = true;
+ // percolumn.label = "预计亩产";
+ // percolumn.rules=[
+ // {
+ // required: false,
+ // message: "请输入预计亩产",
+ // trigger: "blur",
+ // },
+ // ],
+ // plantNumbercolumn.display = true;
+ // plantSpacingcolumn.display = true;
+ // seedingTimecolumn.display = false;
+ // breedcolumn.display = false;
+ // } else if(val ==1){
+ // //水产业
+ // splantcolumn.display = false;
+ // plantingWaycolumn.display = false;
+ // jobWaycolumn.display = true;
+ // transplanTimecolumn.display = false;
+ // recoveryTimecolumn.display = false;
+ // percolumn.display = false;
+ // plantNumbercolumn.display = false;
+ // plantSpacingcolumn.display = false;
+ // seedingTimecolumn.display = true;
+ // breedcolumn.display = true;
+ // }else if(val ==2){
+ // //禽畜业
+ // splantcolumn.display = true;
+ // splantcolumn.label = "养殖标准";
+ // plantingWaycolumn.display = true;
+ // plantingWaycolumn.label = "养殖方式";
+ // plantingWaycolumn.dicData=[
+ // {
+ // label:"放养",
+ // value:"0"
+ // },
+ // {
+ // label:"圈养",
+ // value:"1"
+ // },
+ // {
+ // label:"放养+圈养",
+ // value:"2"
+ // },
+ // ]
+ // jobWaycolumn.display = true;
+ // transplanTimecolumn.display = true;
+ // transplanTimecolumn.label="养殖开始时间";
+ // recoveryTimecolumn.display = true;
+ // recoveryTimecolumn.label="预计出栏时间";
+ // percolumn.display = true;
+ // percolumn.label = "养殖数量";
+ // percolumn.rules=[
+ // {
+ // required: true,
+ // message: "请输入养殖数量",
+ // trigger: "blur",
+ // },
+ // ],
+ // plantNumbercolumn.display = false;
+ // plantSpacingcolumn.display = false;
+ // seedingTimecolumn.display = false;
+ // breedcolumn.display = false;
+ // }else{
+ // splantcolumn.display = false;
+ // plantingWaycolumn.display = false;
+ // jobWaycolumn.display = false;
+ // transplanTimecolumn.display = false;
+ // recoveryTimecolumn.display = false;
+ // percolumn.display = false;
+ // plantNumbercolumn.display = false;
+ // plantSpacingcolumn.display = false;
+ // seedingTimecolumn.display = false;
+ // breedcolumn.display = false;
+ // }
+ // },
+ // immediate: true
+ // },
+ // },
created() {
this.initData();
},
@@ -521,9 +520,18 @@
landIdcolumn.dicData = res.data.data;
}
})
+ //获取农产品数据
+ getStrainList(0).then((res)=>{
+ if(res.data.code==200){
+ var strainId = that.findObject(that.option.column,"strainId");
+ strainId.dicData = res.data.data;
+ }
+ })
+
},
//新增
rowSave(row, done, loading) {
+ row['farmType'] = 0;
save(row).then(
() => {
this.onLoad(this.page);
diff --git a/src/views/farmplant/strain.vue b/src/views/farmplant/strain.vue
index f71938a..b86a9c9 100644
--- a/src/views/farmplant/strain.vue
+++ b/src/views/farmplant/strain.vue
@@ -85,27 +85,27 @@
},
],
},
- {
- label: "类型",
- prop: "strainType",
- type: "select",
- labelWidth: 110,
- search: true,
- searchSpan: 4,
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=strainType",
- props: {
- label: "dictValue",
- value: "dictKey",
- },
- dataType: "string",
- rules: [
- {
- required: true,
- message: "请输入类型",
- trigger: "blur",
- },
- ],
- },
+ // {
+ // label: "类型",
+ // prop: "strainType",
+ // type: "select",
+ // labelWidth: 110,
+ // search: true,
+ // searchSpan: 4,
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=strainType",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey",
+ // },
+ // dataType: "string",
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入类型",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
{
label: "别名",
prop: "alias",
@@ -171,6 +171,7 @@
methods: {
//新增
rowSave(row, done, loading) {
+ row['strainType'] =0;
save(row).then(
() => {
this.onLoad(this.page);
--
Gitblit v1.9.3