From 04fa66265592427f4b6f612b4f739107bd662a39 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 09 Sep 2022 10:24:51 +0800
Subject: [PATCH] 溯源地块筛选为当前农场采收地块

---
 src/views/traceability/addTraceability.vue |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/views/traceability/addTraceability.vue b/src/views/traceability/addTraceability.vue
index 807500e..c9be7e9 100644
--- a/src/views/traceability/addTraceability.vue
+++ b/src/views/traceability/addTraceability.vue
@@ -208,7 +208,7 @@
 import { save } from "@/api/traceability/traceability";
 import { getList } from "@/api/farmplant/recovery";
 import { getStrainList } from "@/api/farmplant/strain";
-import { getLandList } from "@/api/land/land";
+import { getLandList,selectRecoveryLandList } from "@/api/land/land";
 export default {
   data() {
     return {
@@ -295,11 +295,16 @@
         column: [
           {
             label: "采收品种",
+            prop: "strainName",
+          },
+          {
+            label: "采收品种",
             prop: "strainId",
             search: true,
             searchSpan: 4,
             span: 12,
             type: "tree",
+            hide:true,
             dicData: [],
             props: {
               label: "strainName",
@@ -375,10 +380,15 @@
             ],
           },
           {
+            label:"操作人",
+            prop:"realName"
+          },
+          {
             label: "操作人",
             prop: "operator",
             type: "tree",
             dicData: [],
+            hide:true,
             props: {
               label: "realName",
               value: "id",
@@ -592,7 +602,7 @@
       //     }
       // })
       //获取农地数据
-      getLandList(this.$farmId).then((res)=>{
+      selectRecoveryLandList(this.$farmId).then((res)=>{
           if(res.data.code==200){
               var landIdcolumn = that.findObject(that.option.column,"landId");
               that.landList = res.data.data;
@@ -664,6 +674,7 @@
         page.pageSize,
         Object.assign(params, this.query)
       ).then((res) => {
+        console.log(res)
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;

--
Gitblit v1.9.3