备件采购加多牧场筛选

src/router/index.js

@@ -67,17 +67,17 @@ export const constantRoutes = [
     }]
   },
 
-  {
-    path: '/ranchAccompany',
-    component: Layout,
-    redirect: '/ranchAccompany',
-    children: [{
-      path: 'ranchAccompany',
-      name: 'ranchAccompany',
-      component: () => import('@/views/basic/ranchAccompany/index.vue'),
-      meta: { title: '主牧场配置', icon: '', affix: true }
-    }]
-  }
+  // {
+  //   path: '/ranchAccompany',
+  //   component: Layout,
+  //   redirect: '/ranchAccompany',
+  //   children: [{
+  //     path: 'ranchAccompany',
+  //     name: 'ranchAccompany',
+  //     component: () => import('@/views/basic/ranchAccompany/index.vue'),
+  //     meta: { title: '主牧场配置', icon: '', affix: true }
+  //   }]
+  // }
 
   // {
   //   path: '/vehiclRateTotal',

src/views/custom/purchase/index.vue

@@ -234,7 +234,8 @@
       <el-tab-pane v-if="isDistributionManagement" label="配单管理" name="fouth">
         <div class="DistributionManagement">
           <div class="filter-container">
-            <el-select v-model="getdataListParm4.parammaps.pastureName" style="width: 140px;" placeholder="牧场" class="filter-item">
+            <el-select v-model="getdataListParm4.parammaps.pastureArr" style="width: 210px;" placeholder="牧场" class="filter-item"  multiple
+        collapse-tags collapse-tags-tooltip  >
               <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
             <el-input v-model="getdataListParm4.parammaps.matchCode" placeholder="配单号" clearable style="width: 200px;" class="filter-item" />
@@ -591,7 +592,8 @@
       <el-tab-pane label="采购单管理" name="second">
         <div class="purchaseOrderManagement">
           <div class="filter-container">
-            <el-select v-model="getdataListParm2.parammaps.pastureName" style="width: 140px;" placeholder="牧场" class="filter-item">
+            <el-select v-model="getdataListParm2.parammaps.pastureArr" style="width: 210px;" placeholder="牧场" class="filter-item" multiple
+        collapse-tags collapse-tags-tooltip>
               <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
             <el-input v-model="getdataListParm2.parammaps.buyeCode" placeholder="采购单号" clearable style="width: 200px;" class="filter-item" />
@@ -859,7 +861,8 @@
       <el-tab-pane label="采购明细" name="third">
         <div class="procurementDetails">
           <div class="filter-container">
-            <el-select v-model="getdataListParm3.parammaps.pastureName" style="width: 140px;" placeholder="牧场" class="filter-item">
+            <el-select v-model="getdataListParm3.parammaps.pastureArr" style="width: 210px;" placeholder="牧场" class="filter-item"  multiple
+        collapse-tags collapse-tags-tooltip >
               <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
             <el-input v-model="getdataListParm3.parammaps.partCode" placeholder="备件编号" style="width: 200px;" class="filter-item" />
@@ -999,7 +1002,8 @@
       <el-tab-pane label="采购退货" name="fifth">
         <div class="procurementDetails">
           <div class="filter-container">
-            <el-select v-model="getdataListParm5.parammaps.pastureName" style="width: 140px;" placeholder="牧场" class="filter-item">
+            <el-select v-model="getdataListParm5.parammaps.pastureArr" style="width: 220px;" placeholder="牧场" class="filter-item"  multiple
+        collapse-tags collapse-tags-tooltip >
               <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
             <el-input v-model="getdataListParm5.parammaps.buyeCode" placeholder="采购单号" style="width: 140px;" class="filter-item" />
@@ -1265,14 +1269,14 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="供应商：" prop="providerId">
-                <el-select v-model="createTemp5.providerId" filterable placeholder="供应商" style="width:100%" @change="changeProvider5">
+                <el-select v-model="createTemp5.providerId" filterable placeholder="供应商" style="width: 220px;" @change="changeProvider5">
                   <el-option v-for="item in findAllProvider5" :key="item.id" clearable :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="牧场：" prop="pastureId">
-                <el-select v-model="createTemp5.pastureId" placeholder="牧场" class="filter-item" style="width:100%">
+                <el-select v-model="createTemp5.pastureId" placeholder="牧场" class="filter-item" style="width: 220px;">
                   <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
@@ -1281,7 +1285,7 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="录入人：" prop="employeId">
-                <el-select v-model="createTemp5.employeId" placeholder="录入人" class="filter-item" style="width:100%">
+                <el-select v-model="createTemp5.employeId" placeholder="录入人" class="filter-item" style="width: 220px;">
                   <el-option v-for="item in findAllEmploye" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
@@ -1504,7 +1508,7 @@ export default {
       requestParams: [
         { name: 'findAllEmploye', offset: 0, pagecount: 0, parammaps: { 'pastureId': Cookies.get('pastureid') }},
         { name: 'getDepartmentNY', offset: 0, pagecount: 0, parammaps: { 'pastureId': Cookies.get('pastureid') }},
-        { name: 'findAllPasture', offset: 0, pagecount: 0, returntype: 'Map', parammaps: { 'id': Cookies.get('pastureid') }},
+        { name: 'findAllMainPasture', offset: 0, pagecount: 0, returntype: 'Map', parammaps: { 'id': Cookies.get('pastureid') }},
         { name: 'findAllProvider', offset: 0, pagecount: 0, params: [] }
 
       ],
@@ -1555,6 +1559,7 @@ export default {
         pagecount: 10,
         returntype: 'Map',
         parammaps: {
+          pastureArr:[],
           providerName: '',
           buyeCode: '',
           inputDatetime: '',
@@ -1577,6 +1582,7 @@ export default {
         pagecount: 10,
         returntype: 'Map',
         parammaps: {
+          pastureArr:[],
           pastureName: Cookies.get('pasturename'),
           providerName: '',
           partCode: '',
@@ -1629,6 +1635,7 @@ export default {
         pagecount: 10,
         returntype: 'Map',
         parammaps: {
+          pastureArr:[],
           pastureName: Cookies.get('pasturename'),
           matchCode: '',
           statue: '',
@@ -1663,6 +1670,7 @@ export default {
         pagecount: 10,
         returntype: 'Map',
         parammaps: {
+          pastureArr:[],
           pastureName: Cookies.get('pasturename'),
           providerName: '',
           partCode: '',
@@ -2177,10 +2185,22 @@ export default {
     get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllEmploye = response.data.findAllEmploye.list
-        this.findAllPasture = response.data.findAllPasture.list
+        this.findAllPasture = response.data.findAllMainPasture.list
         this.deptNameList = response.data.getDepartmentNY.list
         this.findAllProvider5 = response.data.findAllProvider.list
         this.findAllProvider = response.data.findAllProvider.list
+        this.getdataListParm2.parammaps.pastureArr = this.findAllPasture.map(item => {
+          return item.name
+        })
+         this.getdataListParm3.parammaps.pastureArr = this.findAllPasture.map(item => {
+          return item.name
+        })
+         this.getdataListParm4.parammaps.pastureArr = this.findAllPasture.map(item => {
+          return item.name
+        })
+          this.getdataListParm5.parammaps.pastureArr = this.findAllPasture.map(item => {
+          return item.name
+        })
         console.log(this.deptNameList)
       })
     },
@@ -2201,6 +2221,19 @@ export default {
         console.log(response)
         this.partData = response.data.list
       })
+         // 对于多选的牧场,根据数组的名称来转换 pastureArr =》 pastureId TODO:
+      if (this.getdataListParm1.parammaps.pastureArr && this.getdataListParm1.parammaps.pastureArr.length > 0) {
+        const arr = this.findAllPasture.filter((item) => {
+          if (this.getdataListParm1.parammaps.pastureArr.includes(item.name)) {
+            return item
+          }
+        })
+        const ids = arr.map((child) => { return child.id })
+        console.log(arr,ids,'999999')
+        this.getdataListParm1.parammaps.pastureId = ids.toString();
+      }
+
+
       GetDataByName(this.getdataListParm1).then(response => {
         console.log('this.list1', response.data.list)
         if (response.data.list === null) {
@@ -2607,6 +2640,20 @@ export default {
         this.getdataListParm2.parammaps.startTime = ''
         this.getdataListParm2.parammaps.stopTime = ''
       }
+
+        // 对于多选的牧场,根据数组的名称来转换 pastureArr =》 pastureId TODO:
+      if (this.getdataListParm2.parammaps.pastureArr && this.getdataListParm2.parammaps.pastureArr.length > 0) {
+        const arr = this.findAllPasture.filter((item) => {
+          if (this.getdataListParm2.parammaps.pastureArr.includes(item.name)) {
+            return item
+          }
+        })
+        const ids = arr.map((child) => { return child.id })
+        console.log(arr,ids,'999999')
+        this.getdataListParm2.parammaps.pastureId = ids.toString();
+      }
+
+
       GetDataByName(this.getdataListParm2).then(response => {
         this.list2 = response.data.list
         this.pageNum2 = response.data.pageNum
@@ -3036,6 +3083,20 @@ export default {
         this.getdataListParm3.parammaps.startTime = ''
         this.getdataListParm3.parammaps.stopTime = ''
       }
+
+
+      // 对于多选的牧场,根据数组的名称来转换 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();
+      }
+
       GetDataByName(this.getdataListParm3).then(response => {
         this.list3 = response.data.list
         this.pageNum3 = response.data.pageNum
@@ -3104,6 +3165,19 @@ export default {
     get_table_data5() {
       this.listLoading5 = true
 
+        // 对于多选的牧场,根据数组的名称来转换 pastureArr =》 pastureId TODO:
+      if (this.getdataListParm5.parammaps.pastureArr && this.getdataListParm5.parammaps.pastureArr.length > 0) {
+        const arr = this.findAllPasture.filter((item) => {
+          if (this.getdataListParm5.parammaps.pastureArr.includes(item.name)) {
+            return item
+          }
+        })
+        const ids = arr.map((child) => { return child.id })
+        console.log(arr,ids,'999999')
+        this.getdataListParm5.parammaps.pastureId = ids.toString();
+      }
+
+
       GetDataByName(this.getdataListParm5).then(response => {
         this.list5 = response.data.list
         this.pageNum5 = response.data.pageNum
@@ -3133,6 +3207,20 @@ export default {
         this.getdataListParm4.parammaps.startTime = ''
         this.getdataListParm4.parammaps.stopTime = ''
       }
+
+        // 对于多选的牧场,根据数组的名称来转换 pastureArr =》 pastureId TODO:
+      if (this.getdataListParm4.parammaps.pastureArr && this.getdataListParm4.parammaps.pastureArr.length > 0) {
+        const arr = this.findAllPasture.filter((item) => {
+          if (this.getdataListParm4.parammaps.pastureArr.includes(item.name)) {
+            return item
+          }
+        })
+        const ids = arr.map((child) => { return child.id })
+        console.log(arr,ids,'999999')
+        this.getdataListParm4.parammaps.pastureId = ids.toString();
+      }
+
+
       GetDataByName(this.getdataListParm4).then(response => {
         this.list4 = response.data.list
         this.pageNum4 = response.data.pageNum