From 54176bbfbad076367c5bc785f22a69e4e2fdb955 Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Fri, 26 Aug 2022 14:40:23 +0800
Subject: [PATCH] 经营概况农事记录、农资出入库记录增加按时间筛选

---
 src/views/manage/index.vue |   53 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/src/views/manage/index.vue b/src/views/manage/index.vue
index d0ef447..3a5b3a2 100644
--- a/src/views/manage/index.vue
+++ b/src/views/manage/index.vue
@@ -367,7 +367,7 @@
                     </div>
                     <div class="date">
                         <el-date-picker
-                            v-model="scSelectTime"
+                            v-model="nzSelectTime"
                             type="daterange"
                             value-format="yyyy-MM-dd"
                             range-separator="至"
@@ -541,7 +541,7 @@
                     </div>
                     <div class="date">
                         <el-date-picker
-                            v-model="scSelectTime"
+                            v-model="nsSelectTime"
                             type="daterange"
                             value-format="yyyy-MM-dd"
                             range-separator="至"
@@ -619,6 +619,7 @@
 } from "@/api/farm/farmingrecord"
 
 import publicjs from '@/utils/public'
+import dateUtilsJs from '@/utils/dateUtils'
 
 export default {
     data () {
@@ -697,6 +698,8 @@
             inputNZ_nzname: "",
             inputTRP_nzname: "",
             inputNCP_nzname: "",
+            nsSelectTime: [dateUtilsJs.getSpecifyDayDate(30),dateUtilsJs.getToDay()],
+            nzSelectTime: [dateUtilsJs.getSpecifyDayDate(30),dateUtilsJs.getToDay()]
         }
     },
     created () {
@@ -773,7 +776,12 @@
             if (this.nsjlOrnz == "nsjl") {
                 this.getFarmingStatis()
                 this.getLandList()
-                getFarmingRecordList({ type: item.type, landId: item.landId }).then(
+                var params = { type: item.type, landId: item.landId }
+                if (this.nsSelectTime) {
+                    params.startTime = this.nsSelectTime[0]
+                    params.endTime = this.nsSelectTime[1]
+                }
+                getFarmingRecordList(params).then(
                     (res) => {
                         this.farmOperList = res.data.data
                         this.nsjlPopupFlag = true
@@ -785,6 +793,10 @@
                 params.farmId = this.farmValue
                 params.current = "1"
                 params.size = "999"
+                if (this.nzSelectTime) {
+                    params.startTime = this.nzSelectTime[0]
+                    params.endTime = this.nzSelectTime[1]
+                }
                 pageCountNzCrk(Object.assign(params)).then((res) => {
                     this.nzcrPopupFlag = true
                     this.stockrecordAll = res.data.data.records
@@ -793,16 +805,29 @@
         },
         // 农事操作搜索
         farmSelectList () {
-            this.farmOperClick({ type: this.farmOperType, landId: this.farmPlotId })
+            var params = {
+                type: this.farmOperType,
+                landId: this.farmPlotId,
+            }
+            if (this.nsSelectTime) {
+                params.startTime = this.nsSelectTime[0]
+                params.endTime = this.nsSelectTime[1]
+            }
+            this.farmOperClick(params)
         },
         // 农事操作重置
         farmResetList () {
-            this.farmOperType = ""
-            this.farmPlotId = ""
+            var params = {
+                type: '',
+                landId: '',
+            }
+            this.nsSelectTime = []
+            params.startTime = ''
+            params.endTime = ''
             this.farmOperClick({ type: this.farmOperType, landId: this.farmPlotId })
         },
         farmOperClick (item) {
-            getFarmingRecordList({ type: item.type, landId: item.landId }).then(
+            getFarmingRecordList(item).then(
                 (res) => {
                     this.farmOperList = res.data.data
                     this.farmOperPopup = true
@@ -837,6 +862,10 @@
             params.agrname = this.inputNZ_nzname
             params.current = "1"
             params.size = "999"
+            if (this.nzSelectTime) {
+                params.startTime = this.nzSelectTime[0]
+                params.endTime = this.nzSelectTime[1]
+            }
             pageCountNzCrk(Object.assign(params)).then((res) => {
                 this.nzcrPopupFlag = true
                 this.stockrecordAll = res.data.data.records
@@ -850,6 +879,10 @@
             params.farmId = this.farmValue
             params.current = "1"
             params.size = "999"
+            if (this.nzSelectTime) {
+                params.startTime = this.nzSelectTime[0]
+                params.endTime = this.nzSelectTime[1]
+            }
             pageCountNzCrk(Object.assign(params)).then((res) => {
                 this.nzcrPopupFlag = true
                 this.stockrecordAll = res.data.data.records
@@ -1513,7 +1546,11 @@
             params.codes = "000000"
             params.farmId = this.farmValue
             params.current = "1"
-            params.size = "3"
+            params.size = "999"
+            if (this.nzSelectTime) {
+                params.startTime = this.nzSelectTime[0]
+                params.endTime = this.nzSelectTime[1]
+            }
             pageCountNzCrk(Object.assign(params)).then((res) => {
                 this.stockrecordList = res.data.data.records
             })

--
Gitblit v1.9.3