Shan9312 1 неделя назад
Родитель
Сommit
dff8a059bd

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/index.html


+ 13 - 0
src/views/custom/purchase/index.vue

@@ -3132,6 +3132,19 @@ export default {
         this.percentage = this.percentage
       }, 1000)
       this.downloadListParm3.name = this.getdataListParm3.name
+
+         // 对于多选的牧场,根据数组的名称来转换 pastureArr =》 pastureId TODO:
+      if (this.getdataListParm3.parammaps.pastureArr && this.getdataListParm3.parammaps.pastureArr.length > 0) {
+        const arr = this.findAllPasture.filter((item) => {
+          if (this.getdataListParm3.parammaps.pastureArr.includes(item.name)) {
+            return item
+          }
+        })
+        const ids = arr.map((child) => { return child.id })
+        console.log(arr,ids,'999999')
+        this.getdataListParm3.parammaps.pastureId = ids.toString();
+      }
+
       this.downloadListParm3.parammaps = this.getdataListParm3.parammaps
       GetAccount(this.downloadListParm3).then(response => {
         if (response.data.list !== '') {

+ 14 - 0
src/views/custom/receive/index.vue

@@ -1425,7 +1425,21 @@ export default {
         this.percentage = this.percentage
       }, 1000)
       this.downloadParam.name = 'downloadpartapply'
+
+        // 对于多选的牧场,根据数组的名称来转换 pastureArr =》 pastureId TODO:
+      if (this.getdataListParm.parammaps.pastureArr && this.getdataListParm.parammaps.pastureArr.length > 0) {
+        const arr = this.findAllPasture.filter((item) => {
+          if (this.getdataListParm.parammaps.pastureArr.includes(item.name)) {
+            return item
+          }
+        })
+        const ids = arr.map((child) => { return child.id })
+        console.log(arr,ids,'999999')
+        this.getdataListParm.parammaps.pastureId = ids.toString();
+      }
+
       this.downloadParam.parammaps = this.getdataListParm.parammaps
+
       GetAccount(this.downloadParam).then(response => {
         if (response.data.list !== null) {
           this.percentage = 99

+ 14 - 0
src/views/custom/storage/index.vue

@@ -2315,6 +2315,20 @@ export default {
       this.requestParam.parammaps.laidType = this.getdataListParm.parammaps.laidType
       this.requestParam.parammaps.startTime = this.getdataListParm.parammaps.startTime
       this.requestParam.parammaps.stopTime = this.getdataListParm.parammaps.stopTime
+
+       // 对于多选的牧场,根据数组的名称来转换 pastureArr =》 pastureId TODO:
+      if (this.getdataListParm.parammaps.pastureArr && this.getdataListParm.parammaps.pastureArr.length > 0) {
+        const arr = this.findAllPasture.filter((item) => {
+          if (this.getdataListParm.parammaps.pastureArr.includes(item.name)) {
+            return item
+          }
+        })
+        const ids = arr.map((child) => { return child.id })
+        console.log(arr,ids,'999999')
+        this.getdataListParm.parammaps.pastureId = ids.toString();
+      }
+      this.requestParam.parammaps.pastureId = this.getdataListParm.parammaps.pastureId
+
       GetAccount(this.requestParam).then(response => {
         if (response.data.list !== '') {
           this.percentage = 99

+ 13 - 0
src/views/custom/subscribe/index.vue

@@ -5791,6 +5791,19 @@ export default {
         this.percentage = this.percentage
       }, 1000)
       this.downloadParam.name = 'downloadPartpurchaseList'
+
+         // 对于多选的牧场,根据数组的名称来转换 pastureArr =》 pastureId TODO:
+      if (this.getdataListParm.parammaps.pastureArr && this.getdataListParm.parammaps.pastureArr.length > 0) {
+        const arr = this.findAllPasture.filter((item) => {
+          if (this.getdataListParm.parammaps.pastureArr.includes(item.name)) {
+            return item
+          }
+        })
+        const ids = arr.map((child) => { return child.id })
+        console.log(arr,ids,'999999')
+        this.getdataListParm.parammaps.pastureId = ids.toString();
+      }
+
       this.downloadParam.parammaps = this.getdataListParm.parammaps
       GetAccount(this.downloadParam).then((response) => {
         if (response.data.list !== '') {

Некоторые файлы не были показаны из-за большого количества измененных файлов