前端

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -1232,7 +1232,12 @@
         this.getList()
       },
       add() {
-        this.outType = ''
+        if(this.serviceManagementType == 3){
+          this.outType = '他运'
+        }else{
+          this.outType = ''
+        }
+        
         this.deptBudgetList = {
           type: '',
           freight: 0,
@@ -1323,6 +1328,397 @@
       },
       //确认初检信息
       checkOk() {
+        if (!this.deptBudgetList.binNumber) {
+          this.$message({
+            message: '请选择仓位号',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.goodsName) {
+          this.$message({
+            message: '货名不能为空',
+            type: 'warning',
+          })
+          return
+        }
+        if (!String(this.deptBudgetList.deductionAmount) && this.statusTypetext != '复检') {
+          this.$message({
+            message: '扣款不能为空',
+            type: 'warning',
+          })
+          return
+        }
+        if (!String(this.deptBudgetList.reDeductionAmount) && this.statusTypetext == '复检') {
+          this.$message({
+            message: '复检扣款不能为空',
+            type: 'warning',
+          })
+          return
+        }
+        // if (
+        //   this.deptBudgetList.deductionAmount < 0 ||
+        //   this.deptBudgetList.deductionAmount > 10000 ||
+        //   (String(this.deptBudgetList.deductionAmount).indexOf('.') != -1 &&
+        //     String(this.deptBudgetList.deductionAmount).length -
+        //     (String(this.deptBudgetList.deductionAmount).indexOf('.') + 1) >
+        //     2)
+        // ) {
+        //   this.$message({
+        //     message: '扣款输入错误',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        console.log(this.serviceManagementType)
+        if (this.serviceManagementType == 1) {
+          if (!this.deptBudgetList.cost) {
+            this.$message({
+              message: '未获取到成本，请编辑后提交',
+              type: 'warning',
+            })
+            return
+          }
+          this.deptBudgetList.dryGrainPrice = parseFloat(this.deptBudgetList.cost / 1000).toFixed(3)
+          if (
+            this.deptBudgetList.cost < 0 ||
+            this.deptBudgetList.cost > 20000 ||
+            (String(this.deptBudgetList.cost).indexOf('.') != -1 &&
+              String(this.deptBudgetList.cost).length -
+              (String(this.deptBudgetList.cost).indexOf('.') + 1) >
+              2)
+          ) {
+            this.$message({
+              message: '成本输入错误',
+              type: 'warning',
+            })
+            return
+          }
+          if (!String(this.deptBudgetList.freight)) {
+            this.$message({
+              message: '运费不能为空',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            this.deptBudgetList.freight < 0 ||
+            this.deptBudgetList.freight > 100000 ||
+            (String(this.deptBudgetList.freight).indexOf('.') != -1 &&
+              String(this.deptBudgetList.freight).length -
+              (String(this.deptBudgetList.freight).indexOf('.') + 1) >
+              2)
+          ) {
+            this.$message({
+              message: '运费输入错误',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.deptBudgetList.inOutDate) {
+            this.$message({
+              message: '入库日期不能为空！',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.deptBudgetList.inOutType) {
+            this.$message({
+              message: '入库类型不能为空！',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        if (this.serviceManagementType == 3) {
+
+          if (!this.deptBudgetList.customerName) {
+            this.$message({
+              message: '客户不能为空',
+              type: 'warning',
+            })
+            return
+          }
+
+          if (!this.outType) {
+            this.$message({
+              message: '请选择运输方式！',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        this.deptBudgetList.warehouseInOutDetail.reGrade = this.deptBudgetList.reGrade
+        if (!this.deptBudgetList.reGrade && this.statusTypetext == '复检') {
+          this.$message({
+            message: '复检等级不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.carNo) {
+          this.$message({
+            message: '车牌号不能为空',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.carNo.length > 7) {
+          this.$message({
+            message: '车牌号输入错误,请输入7个字符之内',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.directselling) {
+          if (!this.deptBudgetList.boxNo) {
+            this.$message({
+              message: '箱号-1不能为空',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.deptBudgetList.titleNo) {
+            this.$message({
+              message: '封号-1不能为空',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        if (this.deptBudgetList.boxNo && !this.deptBudgetList.titleNo) {
+          this.$message({
+            message: '封号-1不能为空',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.boxNoOther && !this.deptBudgetList.titleNoOther) {
+          this.$message({
+            message: '封号-2不能为空',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.boxNo && this.deptBudgetList.boxNo.length > 20) {
+          this.$message({
+            message: '箱号-1输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (
+          this.deptBudgetList.boxNoOther &&
+          this.deptBudgetList.boxNoOther.length > 20
+        ) {
+          this.$message({
+            message: '箱号-2输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (
+          this.deptBudgetList.titleNo &&
+          this.deptBudgetList.titleNo.length > 20
+        ) {
+          this.$message({
+            message: '封号-1输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (
+          this.deptBudgetList.titleNoOther &&
+          this.deptBudgetList.titleNoOther.length > 20
+        ) {
+          this.$message({
+            message: '封号-2输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.serviceManagementType == 1 || this.serviceManagementType == 3 && this.deptBudgetList.outType == '自运') {
+          if (!this.deptBudgetList.contractNo) {
+            this.$message({
+              message: '合同编号不能为空',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        if (this.deptBudgetList.reWaterContent) {
+          if (isNaN(this.deptBudgetList.reWaterContent)) {
+            this.$message({
+              message: '复检水分（%）非数字!',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            this.deptBudgetList.reWaterContent < 0 ||
+            this.deptBudgetList.reWaterContent > 40 ||
+            (String(this.deptBudgetList.reWaterContent).indexOf('.') != -1 &&
+              String(this.deptBudgetList.reWaterContent)
+              .length -
+              (String(
+                  this.deptBudgetList.reWaterContent
+                ).indexOf('.') +
+                1) >
+              2)
+          ) {
+            this.$message({
+              message: '复检水分（%）输入错误! 取值范围0-40之间且可以保留2小数',
+              type: 'warning',
+            })
+            return
+          }
+        }
+
+        this.deptBudgetList.warehouseInOutDetail.reImpurity = this.deptBudgetList.reImpurity
+        if (this.deptBudgetList.reImpurity) {
+          if (isNaN(this.deptBudgetList.reImpurity)) {
+            this.$message({
+              message: '复检杂质（%）非数字!',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            this.deptBudgetList.reImpurity < 0 ||
+            this.deptBudgetList.reImpurity > 40 ||
+            (String(this.deptBudgetList.reImpurity).indexOf('.') != -1 &&
+              String(this.deptBudgetList.reImpurity).length -
+              (String(this.deptBudgetList.reImpurity).indexOf('.') + 1) > 2)
+          ) {
+            this.$message({
+              message: '复检杂质（%）输入错误! 取值范围0-40之间且可以保留2小数',
+              type: 'warning',
+            })
+            return
+          }
+        }
+
+        this.deptBudgetList.warehouseInOutDetail.reMildewGrain = this.deptBudgetList.reMildewGrain
+        if (this.deptBudgetList.reMildewGrain) {
+          if (isNaN(this.deptBudgetList.reMildewGrain)) {
+            this.$message({
+              message: '复检霉变粒（%）非数字!',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            this.deptBudgetList.reMildewGrain < 0 ||
+            this.deptBudgetList.reMildewGrain > 40 ||
+            (String(this.deptBudgetList.reMildewGrain).indexOf(
+                '.'
+              ) != -1 &&
+              String(this.deptBudgetList.reMildewGrain)
+              .length -
+              (String(
+                  this.deptBudgetList.reMildewGrain
+                ).indexOf('.') +
+                1) >
+              2)
+          ) {
+            this.$message({
+              message: '复检霉变粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        this.deptBudgetList.warehouseInOutDetail.reJiaorenli = this.deptBudgetList.reJiaorenli
+        if (this.deptBudgetList.reJiaorenli) {
+          if (isNaN(this.deptBudgetList.reJiaorenli)) {
+            this.$message({
+              message: '复检热损伤（%）非数字!',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            this.deptBudgetList.reJiaorenli < 0 ||
+            this.deptBudgetList.reJiaorenli > 40 ||
+            (String(this.deptBudgetList.reJiaorenli).indexOf(
+                '.'
+              ) != -1 &&
+              String(this.deptBudgetList.reJiaorenli).length -
+              (String(
+                  this.deptBudgetList.reJiaorenli
+                ).indexOf('.') +
+                1) >
+              2)
+          ) {
+            this.$message({
+              message: '复检热损伤（%）输入错误! 取值范围0-40之间且可以保留2小数',
+              type: 'warning',
+            })
+            return
+          }
+        }
+
+        this.deptBudgetList.warehouseInOutDetail.reImperfectGrain = this.deptBudgetList.reImperfectGrain
+        if (this.deptBudgetList.reImperfectGrain) {
+          if (isNaN(this.deptBudgetList.reImperfectGrain)) {
+            this.$message({
+              message: '复检不完善粒（%）非数字!',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            this.deptBudgetList.reImperfectGrain < 0 ||
+            this.deptBudgetList.reImperfectGrain > 40 ||
+            (String(
+                this.deptBudgetList.reImperfectGrain
+              ).indexOf('.') != -1 &&
+              String(this.deptBudgetList.reImperfectGrain)
+              .length -
+              (String(
+                  this.deptBudgetList.reImperfectGrain
+                ).indexOf('.') +
+                1) >
+              2)
+          ) {
+            this.$message({
+              message: '复检不完善粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        this.deptBudgetList.warehouseInOutDetail.reBulkDensity = this.deptBudgetList.reBulkDensity
+        if (this.deptBudgetList.reBulkDensity) {
+          if (isNaN(this.deptBudgetList.reBulkDensity)) {
+            this.$message({
+              message: '复检容重(克/升)非数字!',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            (this.deptBudgetList.reBulkDensity &&
+              String(
+                this.deptBudgetList.reBulkDensity
+              ).indexOf('.') != -1 &&
+              String(this.deptBudgetList.reBulkDensity)
+              .length -
+              (String(
+                  this.deptBudgetList.reBulkDensity
+                ).indexOf('.') +
+                1) >
+              2) ||
+            this.deptBudgetList.reBulkDensity > 1000 ||
+            this.deptBudgetList.reBulkDensity < 0
+          ) {
+            this.$message({
+              message: '复检容重输入错误',
+              type: 'warning',
+            })
+            return
+          }
+        }
         this.$confirm('确定初检信息后，初检员不需要再次确认质检信息，是否确认提交', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
@@ -2074,19 +2470,17 @@
         // deptBudgetList.qualityNo//业务编号改为后端生成
         delete this.deptBudgetList.qualityNo
         if(this.serviceManagementType == 1){
-            if(this.deptBudgetList.inOutType == '移库入库'){
-              this.deptBudgetList.numberLetter = "YKRK"
+          if(this.deptBudgetList.inOutType == '移库入库'){
+            this.deptBudgetList.numberLetter = "YKRK"
           }else{
-              this.deptBudgetList.numberLetter = "CGRK"
+            this.deptBudgetList.numberLetter = "CGRK"
           }
         }else{
            this.deptBudgetList.numberLetter = "SGRK"
         }
-        
         this.deptBudgetList.warehouseNo = this.warehouseNo
         console.log(this.deptBudgetList, '入库对象')
         // return
-
         this.$confirm(`确定提交入库信息`, {
             cancelButtonText: '取消',
             confirmButtonText: '确定',
@@ -2419,13 +2813,12 @@
       },
       warehousetypechange(status) {
         this.serviceManagementType = status
-        // if (status == 3) {
+        if (status == 3) {
         //   //解决冲突别解决没了（注意）
-        //   this.outType = '他运'
-        //   this.warehouseCount = '000' + Number(this.warehouseCount + 1)
-        //   this.deptBudgetList.qualityNo = 'SGRK' + this.getTime() + this.warehouseNo + this.warehouseCount.substring(
-        //     this.warehouseCount.length - 4)
-        // }
+          this.outType = '他运'
+        }else{
+          this.outType = ''
+        }
         this.getList()
       },
       // 默认按钮暂时不用

src/views/houseSelfCollect/settlement.vue

@@ -556,6 +556,7 @@
         return chineseStr;
       },
       print() {
+        delete this.paymentList.status
         if (this.paymentList.type == '潮粮' && this.paymentList.qualityInspectionManagement.paramType != 1) {
           if (!this.paymentList.buckleWeightRatio) {
             this.$message({

src/views/outboundManagement/weighingManagementNew.vue

@@ -148,8 +148,8 @@
                       weighingList.outType == '汽运' ||
                       weighingList.outType == '集装箱船'
                     ">
-                        <ws-input v-if="!carstatus || carjudge" v-model="weighingList.carNo" placeholder="请输入车牌号"
-                          maxlength="7" size="small" />
+                        <el-input v-if="!carstatus || carjudge" v-model="weighingList.carNo" placeholder="请输入车牌号"
+                           size="small" />
                         <el-select v-else filterable clearable v-model="weighingList.carNo" placeholder="请选择车牌号"
                           class="typeselect" @change="carChange">
                           <el-option v-for="item in options2" :key="item.constKey"
@@ -404,6 +404,7 @@
           netWeight: 0,
           weight: '',
           tips: '',
+          carNo:'1231321',
           // contractNo:'',
           // inOutTaskNo:'',
           receivableWeighingFee: '',
@@ -818,13 +819,10 @@
           .toPromise()
           .then((response) => {
             this.weighingList = response
-            // this.weighingList.grossWeight = this.weighingList.grossWeight * 1000
-            // this.weighingList.tare = this.weighingList.tare * 1000
-            // this.weighingList.netWeight = this.weighingList.netWeight * 1000
-            // this.weighingList.buckleMiscellaneous =
-            //   this.weighingList.buckleMiscellaneous * 1000
-            this.weighingList.carNo =
-              response.qualityInspectionManagement.carNumber
+            this.carstatus=false
+            // this.weighingList.carNo =
+              // response.qualityInspectionManagement.carNumber
+        this.$set(this.weighingList,'carNo', response.qualityInspectionManagement.carNumber)
             this.weighingList.boxNo = response.boxNo
             this.weighingList.boxNoOther = response.boxNoOther
             this.weighingList.titleNo = response.titleNo
@@ -923,6 +921,8 @@
         }
       },
       print() {
+        this.carjudge=false
+        this.carChange1 = '手动填写'
         // if(this.tpyeNo==2){
         //   if(this.weighingList.qualityInspectionManagement.status != '已质检'){
         //     this.$message.error("该条信息未质检！")
@@ -1628,6 +1628,7 @@
           }
         }
       },
+ 
       // 获取当前年月日
       getTime() {
         var date = new Date()
@@ -1642,6 +1643,33 @@
         return date.getFullYear() + mouth + day
       },
       contractNoChange(e) {
+        this.weighingList={
+          grossWeight: 0,
+          tare: 0,
+          buckleMiscellaneous: 0,
+          netWeight: 0,
+          weight: '',
+          tips: '',
+          carNo:'',
+          // contractNo:'',
+          // inOutTaskNo:'',
+          receivableWeighingFee: '',
+          warehouseInOutDetail: {
+            grade: '',
+            imperfectGrain: '',
+            impurity: '',
+            jiaorenli: '',
+            bulkDensity: '',
+            mildewGrain: '',
+          },
+          qualityInspectionManagement: {
+            boxNo: '暂无',
+            boxNoOther: '暂无',
+            titleNo: '暂无',
+            titleNoOther: '暂无',
+          },
+          inOutDate: ''
+        }
         this.warehouseCount = this.warehouseCount1
         for (let i = 0; i < this.taskNolist.length; i++) {
           if (this.taskNolist[i].inOutTaskNo == e) {
@@ -1668,6 +1696,7 @@
             } else {
               this.weighingList.type = '干粮'
             }
+            console.log(this.outContractNo[i],12222)
             // this.weighingList.contractPrice = this.outContractNo[i].unitContractPrice
             this.$set(this.weighingList,'contractPrice',this.outContractNo[i].unitContractPrice)
             this.$set(this.weighingList,'customer',this.outContractNo[i].buyer)

src/views/taskManagement/supplyofgoods.vue

@@ -20,11 +20,11 @@
         </el-date-picker>
   
           </div>
-        <ws-button type="primary" @click="getList()" v-hasPermission="
+        <ws-button :type="type==0?'primary':''" @click="costsort(0)" v-hasPermission="
             `warehouseManagement.warehouse.warehouseInfoTask.add`
           ">按日期排序
         </ws-button>
-        <ws-button type="primary" @click="costsort()" v-hasPermission="
+        <ws-button :type="type==1?'primary':''" @click="costsort(1)" v-hasPermission="
             `warehouseManagement.warehouse.warehouseInfoTask.add`
           ">按成本排序
         </ws-button>
@@ -74,7 +74,7 @@
         </el-table-column>
         <el-table-column prop="surplusWeight" class="table_td" label="剩余重量（吨）"></el-table-column>
         <el-table-column prop="avgCost" class="table_td" label="平均成本（吨）"></el-table-column>
-        <el-table-column prop="goodsName" class="table_td" label="入库单日期"></el-table-column>
+        <el-table-column prop="issuingTime" class="table_td" label="入库单日期"></el-table-column>
         <el-table-column prop="outWeight" class="table_td" label="预计出库重量（吨）">
             <template slot-scope="scope">
                 <el-input @input='outweightchange' v-model="scope.row.estimateOutWarehouseWeight" placeholder="输入本次出库重量"></el-input>
@@ -195,6 +195,7 @@
         submitType: true,
         size: 10,
         spanArr: [],
+        type:0,
         warehouseName: '',
         baseId:'',
         deptBudgetTotal: 0,
@@ -255,7 +256,7 @@
          }
          console.log(this.multipleSelection1)
           for (let q = 0; q < this.multipleSelection1.length; q++) {
-            this.content=this.content+this.multipleSelection1[q].goodsName+this.multipleSelection1[q].estimateOutWarehouseWeight+'吨，'
+            this.content=this.content+this.multipleSelection1[q].goodsName+(this.multipleSelection1[q].estimateOutWarehouseWeight?this.multipleSelection1[q].estimateOutWarehouseWeight:0)+'吨，'
           }
         this.multipleSelection = val;
       },
@@ -270,12 +271,17 @@
         this.currentPage = 1
         this.getList()
       },
-      costsort(){
+      costsort(status){
+        if(status==0){
+          this.getList()
+        }else{
           this.gainList.sort(function(a,b){
               var x = a['avgCost'];
               var y = b[avgCost];
               return ((y<x)?-1:(x>y)?1:0)   //从小到大排序
           })
+        }
+          
       
       },
       outweightchange(e){
@@ -303,7 +309,7 @@
           
          }
           for (let q = 0; q < this.multipleSelection1.length; q++) {
-            this.content=this.content+this.multipleSelection1[q].goodsName+this.multipleSelection1[q].estimateOutWarehouseWeight+'吨，'
+            this.content=this.content+this.multipleSelection1[q].goodsName+(this.multipleSelection1[q].estimateOutWarehouseWeight?this.multipleSelection1[q].estimateOutWarehouseWeight:0)+'吨，'
           }
       },
       getList() {
@@ -332,7 +338,7 @@
               return
 
           }
-          if(this.multipleSelection[i].outWeight>this.multipleSelection[i].surplusWeight){
+          if(this.multipleSelection[i].estimateOutWarehouseWeight>this.multipleSelection[i].surplusWeight){
             this.$message({
               message: '预计出库重量不能超过剩余重量',
               type: 'error'

src/views/taskManagement/supplyofgoodsedit.vue

@@ -62,7 +62,7 @@
         </el-table-column>
         <el-table-column prop="surplusWeight" class="table_td" label="剩余重量（吨）"></el-table-column>
         <el-table-column prop="avgCost" class="table_td" label="平均成本（吨）"></el-table-column>
-        <el-table-column prop="goodsName" class="table_td" label="入库单日期"></el-table-column>
+        <el-table-column prop="issuingTime" class="table_td" label="入库单日期"></el-table-column>
         <el-table-column prop="outWeight" class="table_td" label="预计出库重量（吨）">
             <template slot-scope="scope">
                 <el-input  @input='outweightchange' v-model="scope.row.estimateOutWarehouseWeight" placeholder="输入本次出库重量"></el-input>

src/views/taskManagement/supplyofgoodslook.vue

@@ -29,7 +29,7 @@
         </el-table-column>
         <el-table-column prop="surplusWeight" class="table_td" label="剩余重量（吨）"></el-table-column>
         <el-table-column prop="avgCost" class="table_td" label="平均成本（吨）"></el-table-column>
-        <el-table-column prop="goodsName" class="table_td" label="入库单日期"></el-table-column>
+        <el-table-column prop="issuingTime" class="table_td" label="入库单日期"></el-table-column>
         <el-table-column prop="estimateOutWarehouseWeight" class="table_td" label="预计出库重量（吨）">
             <template slot-scope="scope">
                 <el-input disabled v-model="scope.row.estimateOutWarehouseWeight" placeholder="输入本次出库重量"></el-input>

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -651,6 +651,8 @@
 			weightchange(e) {
 				if (this.dataList.taskTypeKey == 4) {
 					this.$set(this.dataList, 'weight', e)
+				}else if (this.dataList.taskTypeKey == 2) {
+					this.$set(this.dataList1, 'weight', e)
 				}
 			},
 			weightchange1(e) {

src/views/warehousenew/warehousingOrder.vue

@@ -93,7 +93,7 @@
               src="../../../public/img/edit.png" @click="editWeight(scope.row)" alt="" />
           </template>
         </el-table-column>
-        <el-table-column prop="outWarehouseWOOeight"  width="130" class="table_td" label="出库重量（吨）"></el-table-column>
+        <el-table-column prop="outWarehouseWeight"  width="130" class="table_td" label="出库重量（吨）"></el-table-column>
         <el-table-column prop="profitAndLoss" class="table_td" label="盈亏（吨）"></el-table-column>
         <el-table-column prop="surplusWeight" width="130" class="table_td" label="剩余重量（吨）"></el-table-column>
         <el-table-column prop="grainFund"  width="130" class="table_td" label="粮款（元）"></el-table-column>
@@ -745,9 +745,16 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
           // 不存在就说明以前没遇到过，把它记录下来
           newArr.push(t);
         }
-
+        var results=this.makeGroupData(newArr,function (item) { return [item.issuingTime]; }); console.log(results)
         // 记录结果就是过滤后的结果
-        return newArr;
+        return results;
+      },
+      makeGroupData(array,fn){ 
+        const groups = {}; 
+        array.forEach(function (item) { const group = JSON.stringify(fn(item));
+         groups[group] = groups[group] || []; groups.push(item); 
+         });
+          return Object.keys(groups).map(function (group) { return groups[group]; })
       },
       filtertask(arr){
         const newArr = [];