From de951f2ffc00664a4af840944b9c239a6c5f09f7 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 16 Jul 2022 08:47:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhny-dsjdp

---
 src/api/farm/farmingrecord.js |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/api/farm/farmingrecord.js b/src/api/farm/farmingrecord.js
index 7a38bfa..d4d9aba 100644
--- a/src/api/farm/farmingrecord.js
+++ b/src/api/farm/farmingrecord.js
@@ -126,12 +126,12 @@
     })
 }
 
-export const getStockCount = (deptId) => {
+export const getStockCount = (farmId) => {
     return request({
         url: '/farmingRecord/getStockCount',
         method: 'get',
         params: {
-            deptId
+            farmId
         }
     })
 }
@@ -168,6 +168,15 @@
 export const productsSupervise = (params) => {
     return request({
         url: '/farmProductStock/productsSupervise',
+        method: 'get',
+        params: {
+            ...params
+        }
+    })
+}
+export const productsSuperviseList = (params) => {
+    return request({
+        url: '/recovery/page',
         method: 'get',
         params: {
             ...params
@@ -252,7 +261,7 @@
 
 export const farmingRecords = (params) => {
     return request({
-        url: '/farmingRecord/page',
+        url: '/farmingRecord/getFarmingRecordList',
         method: 'get',
         params: {
             ...params
@@ -278,3 +287,12 @@
         }
     })
 }
+export const farmSelectQuery = (params) => {
+    return request({
+        url: '/farm/page',
+        method: 'get',
+        params: {
+            ...params
+        }
+    })
+}

--
Gitblit v1.9.3