From 04fa66265592427f4b6f612b4f739107bd662a39 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 09 Sep 2022 10:24:51 +0800
Subject: [PATCH] 溯源地块筛选为当前农场采收地块
---
src/store/modules/user.js | 2 +-
src/views/traceability/addTraceability.vue | 15 +++++++++++++--
src/api/land/land.js | 10 ++++++++++
3 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/api/land/land.js b/src/api/land/land.js
index c316e40..9783bde 100644
--- a/src/api/land/land.js
+++ b/src/api/land/land.js
@@ -76,6 +76,16 @@
})
}
+export const selectRecoveryLandList = (farmId) => {
+ return request({
+ url: '/api/land/land/selectRecoveryLandList',
+ method: 'get',
+ params: {
+ farmId
+ }
+ })
+}
+
export const selectCount = (farmId) => {
return request({
url: '/api/land/land/selectCount',
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 86565d3..a14735d 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -52,7 +52,7 @@
token: getStore({name: 'token'}) || '',
refreshToken: getStore({name: 'refreshToken'}) || '',
$farmId: 0,
- drawMapUrlBase: 'http://182.106.212.58:8013'
+ drawMapUrlBase: 'https://dev.jxpskj.com:8013'
},
actions: {
loginInfoByToken({commit}) {
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