From 757b6076319f5d8d1a1837fbedc398afe95e2de8 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 May 2022 15:52:53 +0800
Subject: [PATCH] 首页圈地，农事操作，农产品操作等提交数据页面优化，操作记录页面优化
---
src/views/wel/farming.vue | 5
src/views/wel/index.vue | 14 ++
src/views/wel/land.vue | 7
src/views/farm/farmingrecord.vue | 32 ++++-
src/views/wel/recovery.vue | 2
src/views/wel/stock.vue | 5
src/views/farmplant/farmplant.vue | 256 ++++++++++++++++++++++--------------------
src/views/wel/plant.vue | 5
src/views/recovery/recovery.vue | 12 +
src/views/wel/farmDetail.vue | 15 ++
10 files changed, 209 insertions(+), 144 deletions(-)
diff --git a/src/views/farm/farmingrecord.vue b/src/views/farm/farmingrecord.vue
index 3cfba95..416a1c3 100644
--- a/src/views/farm/farmingrecord.vue
+++ b/src/views/farm/farmingrecord.vue
@@ -47,6 +47,9 @@
import { selectStockFa } from "@/api/stockfactory/stockfactory";
import { mapGetters } from "vuex";
export default {
+ props:[
+ "type","activeName"
+ ],
data() {
return {
visible: true,
@@ -73,12 +76,19 @@
selection: true,
searchShow: true,
searchMenuSpan: 6,
+ indexFixed: false,
+ selectionFixed: false,
+ expandFixed: false,
+ menuFixed: false,
column: [
{
label: "农事类型",
prop: "type",
type: "select",
+ search: true,
+ searchSpan: 4,
labelWidth: 110,
+ searchValue:this.getType(),
dicUrl: "/api/blade-system/dict-biz/dictionary?code=farmingType",
props: {
label: "dictValue",
@@ -121,8 +131,6 @@
{
label: "农资",
prop: "stockId",
- searchSpan: 4,
- search: true,
type: "tree",
// hide:true,
dicData: [],
@@ -143,8 +151,6 @@
{
label: "作业方式",
prop: "jobWay",
- search: true,
- searchSpan: 4,
labelWidth: 110,
type: "select",
dicData: [
@@ -183,8 +189,6 @@
{
label: "操作人",
prop: "operator",
- searchSpan: 4,
- search: true,
type: "tree",
hide: true,
dicData: [],
@@ -253,6 +257,16 @@
},
immediate: true,
},
+ activeName:{
+ handler(val) {
+ console.log(val,99999999);
+ if(this.activeName =="tab2"){
+ this.option.height = 520;
+ }
+ },
+ deep: true,
+ immediate: true,
+ }
},
created() {
this.initData();
@@ -275,8 +289,12 @@
return ids.join(",");
},
},
- mounted() {},
+ mounted() {
+ },
methods: {
+ getType(){
+ return this.type;
+ },
//初始化数据
initData() {
var that = this;
diff --git a/src/views/farmplant/farmplant.vue b/src/views/farmplant/farmplant.vue
index 0d42e43..b02e1ba 100644
--- a/src/views/farmplant/farmplant.vue
+++ b/src/views/farmplant/farmplant.vue
@@ -40,6 +40,9 @@
import { getLandList } from "@/api/land/land";
import { mapGetters } from "vuex";
export default {
+ props:[
+ "type","activeName"
+ ],
data() {
return {
visible: true,
@@ -56,7 +59,7 @@
landList:[],
option: {
tip: false,
- height: "auto",
+ height: 520,
editBtn: true,
delBtn: true,
viewBtn: true,
@@ -66,6 +69,10 @@
selection: true,
searchShow: true,
searchMenuSpan: 6,
+ indexFixed: false,
+ selectionFixed: false,
+ expandFixed: false,
+ menuFixed: false,
column: [
// {
// label: "类型",
@@ -173,8 +180,8 @@
{
label: "种植标准",
prop: "plant",
- search:true,
- searchSpan:4,
+ // search:true,
+ // searchSpan:4,
labelWidth:110,
type: "select",
dicData:[
@@ -207,8 +214,8 @@
{
label: "种植方式",
prop: "plantingWay",
- search:true,
- searchSpan:4,
+ // search:true,
+ // searchSpan:4,
type: "select",
labelWidth:110,
dicData:[
@@ -233,8 +240,8 @@
{
label: "作业方式",
prop: "jobWay",
- search:true,
- searchSpan:4,
+ // search:true,
+ // searchSpan:4,
labelWidth:110,
type: "select",
dicData:[
@@ -390,121 +397,126 @@
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
+ // },
+ },
+ mounted(){
+ if(this.activeName =="tab1"){
+ this.option.height = 520;
+ }
+ },
created() {
this.initData();
},
diff --git a/src/views/recovery/recovery.vue b/src/views/recovery/recovery.vue
index da0ba4f..f899a08 100644
--- a/src/views/recovery/recovery.vue
+++ b/src/views/recovery/recovery.vue
@@ -41,6 +41,9 @@
import { getUserList } from "@/api/system/user";
import { mapGetters } from "vuex";
export default {
+ props:[
+ "type","activeName"
+ ],
data() {
return {
visible: true,
@@ -57,7 +60,7 @@
landList:[],
option: {
tip: false,
- height: "auto",
+ height: 520,
editBtn: false,
delBtn: true,
viewBtn: false,
@@ -68,6 +71,10 @@
selection: true,
searchShow: true,
searchMenuSpan: 6,
+ indexFixed: false,
+ selectionFixed: false,
+ expandFixed: false,
+ menuFixed: false,
column: [
{
label: "采收品种",
@@ -256,6 +263,9 @@
},
created() {
this.initData();
+ if(this.activeName =="tab3"){
+ this.option.height = 520;
+ }
},
computed: {
...mapGetters(["permission", "userInfo"]),
diff --git a/src/views/wel/farmDetail.vue b/src/views/wel/farmDetail.vue
index a0e0114..d108a9d 100644
--- a/src/views/wel/farmDetail.vue
+++ b/src/views/wel/farmDetail.vue
@@ -2,17 +2,17 @@
<el-tabs v-model="activeName" @tab-click="handleClick">
<!-- 种植记录 -->
<el-tab-pane label="种养品种" name="tab1">
- <farmplant
+ <farmplant :activeName="activeName"
></farmplant>
</el-tab-pane>
<!-- 农事记录 -->
<el-tab-pane label="农事记录" name="tab2">
- <farming
+ <farming :type="type" :activeName="activeName"
></farming>
</el-tab-pane>
<!-- 采收记录 -->
<el-tab-pane label="采收记录" name="tab3">
- <recovery
+ <recovery :activeName="activeName"
></recovery>
</el-tab-pane>
</el-tabs>
@@ -33,6 +33,7 @@
data() {
return {
farmId:"",
+ type:"",
activeName: "tab1",
};
},
@@ -41,8 +42,16 @@
},
created(){
this.activeName = this.$route.query.activeName;
+ if(this.activeName=="tab2"){
+ this.type = this.$route.query.type;
+ console.log(this.type,3333333);
+ }
+
},
methods: {
+ handleClick(data){
+ this.activeName = data.name;
+ },
},
watch: {},
};
diff --git a/src/views/wel/farming.vue b/src/views/wel/farming.vue
index 91491e7..6ddd0fc 100644
--- a/src/views/wel/farming.vue
+++ b/src/views/wel/farming.vue
@@ -258,7 +258,7 @@
});
},
// 表单提交
- submit(row,loading) {
+ submit(row,done) {
var that = this;
save(row).then(
() => {
@@ -268,9 +268,10 @@
type: "success",
message: "操作成功!",
});
+ done();
},
(error) => {
- loading();
+ done();
window.console.log(error);
}
);
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 96d977e..3a2e4df 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -128,7 +128,7 @@
<el-divider></el-divider>
</div>
<div class="farming-details" :v-if="isFarmingDetail">
- <div class="detail" v-for="(item, index) in farmingList" :key="index">
+ <div class="detail" v-for="(item, index) in farmingList" :key="index" @click="farmPlantDetails(item)">
<div class="detail-title">{{ item.name }}</div>
<div class="detail-number">
<span>{{ item.value }}</span
@@ -325,6 +325,18 @@
query: data,
});
},
+ //本年农事操作明细--有参
+ farmPlantDetails(item) {
+ console.log(item,11111);
+ const data = {
+ type:item.value,
+ activeName: "tab2",
+ };
+ this.$router.push({
+ path: `/farmDetail`,
+ query: data,
+ });
+ },
//采收记录
recoveryDetail() {
const data = {
diff --git a/src/views/wel/land.vue b/src/views/wel/land.vue
index 8edaa6c..848753e 100644
--- a/src/views/wel/land.vue
+++ b/src/views/wel/land.vue
@@ -100,12 +100,12 @@
this.visible = true;
},
// 表单提交
- submit(row,loading) {
+ submit(row,done) {
var that = this;
if (this.polygons.length == 0) {
//没有面的数据
this.$refs.getMapData.isCheck = true;
- loading();
+ done();
} else {
//如果有值，空间坐标转换
let pol = this.polygons;
@@ -128,8 +128,9 @@
type: "success",
message: "操作成功!"
});
+ done();
}, error => {
- loading();
+ done();
window.console.log(error);
});
},
diff --git a/src/views/wel/plant.vue b/src/views/wel/plant.vue
index cd25766..b16818e 100644
--- a/src/views/wel/plant.vue
+++ b/src/views/wel/plant.vue
@@ -299,7 +299,7 @@
})
},
// 表单提交
- submit(row,loading) {
+ submit(row,done) {
var that = this;
row['farmType'] = 0;
row['createUser'] = this.userInfo.user_id;
@@ -312,9 +312,10 @@
type: "success",
message: "操作成功!",
});
+ done();
},
(error) => {
- loading();
+ done();
window.console.log(error);
}
);
diff --git a/src/views/wel/recovery.vue b/src/views/wel/recovery.vue
index 34994ea..8a996a1 100644
--- a/src/views/wel/recovery.vue
+++ b/src/views/wel/recovery.vue
@@ -298,7 +298,7 @@
})
},
// 表单提交
- submit(row,loading,done) {
+ submit(row,done) {
var that = this;
row.time = row.time + ":00";
save(row).then(
diff --git a/src/views/wel/stock.vue b/src/views/wel/stock.vue
index 9b1020c..df78261 100644
--- a/src/views/wel/stock.vue
+++ b/src/views/wel/stock.vue
@@ -191,7 +191,7 @@
this.getNowTime();
},
// 表单提交
- submit(row,loading) {
+ submit(row,done) {
var that = this;
add(row).then(
() => {
@@ -201,9 +201,10 @@
type: "success",
message: "操作成功!",
});
+ done();
},
(error) => {
- loading();
+ done();
window.console.log(error);
}
);
--
Gitblit v1.9.3