From a0159d094fb271a754540bcbb4f304a58aa53c6f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 28 Oct 2022 10:05:09 +0800
Subject: [PATCH] 从地块详情页面,种养品种,地块筛选去除

---
 src/views/farmplant/farmplant.vue |   20 +++++++++++++-------
 src/views/land/LandDetail.vue     |    2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/views/farmplant/farmplant.vue b/src/views/farmplant/farmplant.vue
index a536685..b614274 100644
--- a/src/views/farmplant/farmplant.vue
+++ b/src/views/farmplant/farmplant.vue
@@ -88,7 +88,7 @@
         detection
     },
     props: [
-        "type", "activeName"
+        "type", "activeName","isLandInfo"
     ],
     data () {
         return {
@@ -663,14 +663,20 @@
         //初始化数据
         initData () {
             var that = this
-            //获取农地数据
-            getLandList(this.$farmId).then((res) => {
+            var landIdcolumn = that.findObject(that.option.column, "landId")
+            if (this.isLandInfo){
+              //去除【所属地块】筛选条件
+              landIdcolumn.search = false
+            }else {
+              //获取农地数据
+              getLandList(this.$farmId).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
+
+                  that.landList = res.data.data
+                  landIdcolumn.dicData = res.data.data
                 }
-            })
+              })
+            }
             //获取农产品数据
             getStrainList(0).then((res) => {
                 if (res.data.code == 200) {
diff --git a/src/views/land/LandDetail.vue b/src/views/land/LandDetail.vue
index 1512e32..1496df8 100644
--- a/src/views/land/LandDetail.vue
+++ b/src/views/land/LandDetail.vue
@@ -34,7 +34,7 @@
         <el-tabs v-model="activeName" @tab-click="handleClick">
           <!-- 种植记录 -->
           <el-tab-pane label="种养品种" name="tab1">
-            <farmplant></farmplant>
+            <farmplant :is-land-info="true"></farmplant>
           </el-tab-pane>
           <!-- 农事记录 -->
           <el-tab-pane label="农事记录" name="tab2">

--
Gitblit v1.9.3