前端

src/api/V2/taskspost/index.js

@@ -56,4 +56,6 @@ export const API_GET_SOURCEGOOD = 'warehousingOrder/getSourceOfGoodsList'
 // 退库货源列表
 export const API_GET_SOURCEOFGOODS = '/warehousingOrder/getSourceOfGoodsList'
 // 矫正
-export const API_SET_CORRECT= '/inOutWarehouseTask/api/correct'
+export const API_SET_CORRECT= '/inOutWarehouseTask/api/correct'
+// 出库货源列表
+export const API_GET_GOODSOURCEINFO= '/warehousingOrder/selectGoodSourceInfo'

src/model/tasksport/index.js

@@ -29,7 +29,8 @@ import {
     API_EDIT_SOURCEOFGOODS,
     API_GET_SOURCEGOOD,
     API_SET_CORRECT,
-    API_GET_SOURCEOFGOODS
+    API_GET_SOURCEOFGOODS,
+    API_GET_GOODSOURCEINFO
 } from '@/api/V2/taskspost'
 //运输任务列表
 export const gain = appRx.get(API_GET_TRAN_LIST, errorCatcher, errorHandle, filter)
@@ -86,4 +87,6 @@ export const getSourceOfGoods = appRx.get(API_GET_SOURCEGOOD, errorCatcher, erro
 // 退库货源列表
 export const getSourceOfGoodslist = appRx.get(API_GET_SOURCEOFGOODS, errorCatcher, errorHandle, filter)
 //矫正
-export const setcorrect = appRx.get(API_SET_CORRECT, errorCatcher, errorHandle, filter)
+export const setcorrect = appRx.get(API_SET_CORRECT, errorCatcher, errorHandle, filter)
+//出库货源列表
+export const getSourceOfGoodsinfo = appRx.get(API_GET_GOODSOURCEINFO, errorCatcher, errorHandle, filter)

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -426,6 +426,7 @@
           tare: 0,
           buckleMiscellaneous: 0,
           netWeight: 0,
+          
           receivableWeighingFee: '',
           qualityInspectionManagement: {
             boxNo: '暂无',
@@ -1342,6 +1343,13 @@
         if (this.reader) {
           this.reader.cancel()
         }
+        if(!this.weighingList.id){
+          this.$message({
+            message: '请选择一条已经质检过的数据',
+            type: 'warning',
+          })
+          return
+        }
         if (!this.weighingList.grossWeight) {
           this.$message({
             message: '毛重不能为空',
@@ -1523,6 +1531,7 @@
 
                               })
                           } else { //收购入库
+                          
                             grossWeight(this.weighingList)
                               .toPromise()
                               .then((response) => {

src/views/taskManagement/outsupplyofgoodslook.vue

@@ -39,8 +39,8 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
+      <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination> -->
   </div>
 </template>
 <script>
@@ -187,21 +187,23 @@
       },
       
       getList() {
-        getSourceOfGoods({
-            compId: localStorage.getItem('ws-pf_compId'),
-            currentPage: this.currentPage,
-            pageSize: this.pageSize,
-            searchType: this.searchType,
-            searchKeyWord: this.searchKeyWord,
-            inOutType:this.inOutType
-          })
-          .toPromise()
-          .then((response) => {
-            this.gainList = response
-            this.currentPage = response.current
-            this.pageSize = response.size
-            this.deptBudgetTotal = response.total
-          })
+        this.gainList = JSON.parse(this.$route.query.list)
+        this.deptBudgetTotal = this.gainList.length
+        // getSourceOfGoods({
+        //     compId: localStorage.getItem('ws-pf_compId'),
+        //     currentPage: this.currentPage,
+        //     pageSize: this.pageSize,
+        //     searchType: this.searchType,
+        //     searchKeyWord: this.searchKeyWord,
+        //     inOutType:this.inOutType
+        //   })
+        //   .toPromise()
+        //   .then((response) => {
+        //     this.gainList = response
+        //     this.currentPage = response.current
+        //     this.pageSize = response.size
+        //     this.deptBudgetTotal = response.total
+        //   })
       },
      
       dateFormat(fmt, date) {

src/views/taskManagement/supplyofgoods.vue

@@ -20,11 +20,11 @@
         </el-date-picker>
   
           </div>
-        <ws-button :type="type==0?'primary':''" @click="costsort(0)" v-hasPermission="
+        <ws-button :type="flag==0?'primary':''" @click="costsort(0)" v-hasPermission="
             `warehouseManagement.warehouse.warehouseInfoTask.add`
           ">按日期排序
         </ws-button>
-        <ws-button :type="type==1?'primary':''" @click="costsort(1)" v-hasPermission="
+        <ws-button :type="flag==1?'primary':''" @click="costsort(1)" v-hasPermission="
             `warehouseManagement.warehouse.warehouseInfoTask.add`
           ">按成本排序
         </ws-button>
@@ -58,7 +58,7 @@
         </ws-button>
         </el-col>
     </el-row>   
-      <el-table class="wenzi" :data="gainList" style="width: 100%"  @selection-change="handleSelectionChange" height="calc(100% - 110px)">
+      <el-table ref='multipleTable' class="wenzi" :data="gainList" style="width: 100%"  @selection-change="handleSelectionChange" height="calc(100% - 110px)">
           <el-table-column
       type="selection"
       width="55">
@@ -87,7 +87,8 @@
 </template>
 <script>
   import {
-    editSourceOfGoods
+    editSourceOfGoods,
+    getSourceOfGoodsinfo
   } from '@/model/tasksport/index'
   import {
     downloadFile
@@ -133,6 +134,7 @@
         year: '',
         gainList: [],
         gainList1:[],
+        flag:0,
         currentPage: 1,
         primary: '1',
                 pickerOptions: {
@@ -225,7 +227,8 @@
       },
       preview(){
         this.gainList=this.multipleSelection
-         this.deptBudgetTotal=this.multipleSelection.length
+        this.toggleSelection(this.gainList)
+        this.deptBudgetTotal=this.multipleSelection.length
       },
       cancelpreview(){
         this.getList()
@@ -258,6 +261,9 @@
           for (let q = 0; q < this.multipleSelection1.length; q++) {
             this.content=this.content+this.multipleSelection1[q].goodsName+(this.multipleSelection1[q].estimateOutWarehouseWeight?this.multipleSelection1[q].estimateOutWarehouseWeight:0)+'吨，'
           }
+        for (let i = 0; i < val.length; i++) {
+          val[i].select=true
+        }
         this.multipleSelection = val;
       },
       //添加
@@ -272,17 +278,8 @@
         this.getList()
       },
       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)   //从小到大排序
-          })
-        }
-          
-      
+        this.flag=status
+        this.getList()
       },
       outweightchange(e){
          this.num=0
@@ -313,21 +310,47 @@
           }
       },
       getList() {
-         getwarehousingorder({
+         getSourceOfGoodsinfo({
             compId: localStorage.getItem('ws-pf_compId'),
             currentPage: this.currentPage,
             pageSize: this.pageSize,
             searchType: this.searchType,
             searchKeyWord: this.searchKeyWord,
-            inOutType:this.inOutType,
-            baseId:this.baseId
+            // inOutType:this.inOutType,
+            baseId:this.baseId,
+            flag:this.flag
           })
           .toPromise()
           .then((response) => {
-            this.gainList = response.records
+            var arr = response.records
+
+            if(this.multipleSelection.length>0){
+              for (let i = 0; i < arr.length; i++) {
+                for (let q = 0; q < this.multipleSelection.length; q++) {
+                  if(arr[i].id==this.multipleSelection[q].id){
+                    arr[i]=this.multipleSelection[q]
+                  }
+                }
+              }
+
+            }
+            this.gainList = arr
+            this.toggleSelection(this.gainList)
             this.deptBudgetTotal = response.total
           })
       },
+      toggleSelection(rows) {
+        
+      if (rows) {
+        rows.forEach(row => {
+          if(row.select){console.log(111111)
+            this.$refs.multipleTable.toggleRowSelection(row,true);
+          }
+        });
+      } else {
+        this.$refs.multipleTable.clearSelection();
+      }
+    },
       submit(){
         for (let i = 0; i < this.multipleSelection.length; i++) {
           if(!this.multipleSelection[i].estimateOutWarehouseWeight){
@@ -344,7 +367,7 @@
               type: 'error'
               });
               return
-          }   
+          }
           if(this.multipleSelection[i].estimateOutWarehouseWeight.indexOf('.')!=-1&&this.multipleSelection[i].estimateOutWarehouseWeight.substring(this.multipleSelection[i].estimateOutWarehouseWeight.indexOf('.')+1, this.multipleSelection[i].estimateOutWarehouseWeight.length).length>3){
             this.$message({
               message: '预计出库重量输入错误',

src/views/warehousenew/inventoryCheck.vue

@@ -44,7 +44,7 @@
     <div v-for='(item,index) in gainList' style='margin:10px;border:1px solid #ccc;padding:10px;'>
       <div style='width:100%;justify-content:space-between;align-items:center;margin-bottom:10px;' class="flex">
         <div>2022-10-22</div>
-        <div>{{item.warehouseName}}</div>
+        <div>{{item.warehouseName}}入库单<span v-if='item.warehouseType==2'>（临）</span></div>
         <div>
           <ws-button type="primary" @click="profit(item.warehouseName)" v-hasPermission="
             `warehouseManagement.warehousingOrder.surplus`
@@ -56,7 +56,7 @@
         </ws-button>
         </div>
       </div>
-      <el-table class="wenzi" :data="item.goodssourcelist" style="width: 100%"   >
+      <el-table class="wenzi" :data="item.warehousingOrderList" style="width: 100%"   >
         <el-table-column  width="40">
           <template scope="scope">
             <img v-if="!scope.row.select" style='width:15px;vertical-align: text-top;' @click='radiochange(index,scope.row)' src="../../../public/img/wxz.png" alt="">
@@ -76,7 +76,7 @@
         <el-table-column prop="goodsName" label="货名" width="80">
         </el-table-column>
         <el-table-column prop="inWarehouseWeight"  width="130" class="table_td" label="入库重量（吨）"></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="盈亏（吨）">
            <template slot-scope="scope">
            <span>{{scope.row.profitAndLoss}}</span>
@@ -105,7 +105,7 @@
       </el-table>
     </div>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-size="pageSize" layout="total, prev, pager, next" :total="deptBudgetTotal"></el-pagination>
+        :page-size="pageSize"  layout="total,  prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
         <el-dialog
         :title="title"
         :visible.sync="aduitshow"
@@ -136,7 +136,7 @@
           <div class="audit_left">
             <span class="audit_name">{{item.dealMsg}}</span>
           </div>
-          <span class="audit_date">{{item.verifyRemark}}</span>
+          <span class="audit_date"><span v-if='item.verifyRemark>0'>+</span>{{item.verifyRemark}}吨</span>
         </div>
         <div class="audit_item">
           <div class="audit_left">
@@ -269,6 +269,7 @@
         currectflag:'',
         startDate:'',
         endDate:'',
+        profitAndLoss:0,
         warehouseName: '',
         deptBudgetTotal: 0,
         compId: localStorage.getItem('ws-pf_compId'),
@@ -332,7 +333,7 @@
       },
       radiochange(index,row){
         console.log(index,row)
-        var data=this.gainList[index].goodssourcelist
+        var data=this.gainList[index].warehousingOrderList
         for (let i = 0; i < data.length; i++) {
           data[i].select=false
         }
@@ -345,65 +346,76 @@
         this.currentRow = val;
       },
       aduit(row){
-        this.aduitList=row
-        this.form.id=row.id
-        this.form.surplusWeight=row.surplusWeight
-        this.form.profitAndLoss=row.profitAndLoss
-        this.form.num=row.surplusWeight+row.plValue
-        this.form.plValue=row.plValue
-        this.title='审核'
-        this.currectflag=row.operationFlag
-        this.aduitshow=true
-        this.disabled=true
+        if(localStorage.getItem('ws-pf_staffName')=='吕波'){
+          this.aduitList=row
+          this.form.id=row.id
+          this.form.surplusWeight=row.surplusWeight
+          this.form.profitAndLoss=row.profitAndLoss
+          this.form.num=row.surplusWeight+row.plValue
+          this.form.plValue=row.plValue
+          this.title='审核'
+          this.currectflag=row.operationFlag
+          this.aduitshow=true
+          this.disabled=true
+        }else{
+          this.$notify.warning({
+            title: '警告',
+            message: '暂无审核权限',
+          })
+        }
       },
       lose(ware){
-        if(this.multipleSelection[ware]){
+        if(localStorage.getItem('ws-pf_roleName')=='销售内勤'||localStorage.getItem('ws-pf_roleName')=='采购内勤'){
+          if(this.multipleSelection[ware]){
+            this.form.id=this.multipleSelection[ware].id
+            this.form.workflowId=this.multipleSelection[ware].workflowId
+            this.form.surplusWeight=this.multipleSelection[ware].surplusWeight
+            this.form.profitAndLoss=this.multipleSelection[ware].profitAndLoss
+            this.title='盘亏'
+            this.slecetwarehouseName=''
+            if(this.multipleSelection[ware].approveStatus){
+            this.$notify.warning({
+              title: '警告',
+              message: '未选择要盘点的入库记录',
+            })
+            return
+          }
+            this.aduitshow=true
+            this.disabled=false
+          }else{
+            this.$notify.warning({
+              title: '警告',
+              message: '未选择要盘点的入库记录',
+            })
+          }
+        }
+      },
+      profit(ware){
+        if(localStorage.getItem('ws-pf_roleName')=='销售内勤'||localStorage.getItem('ws-pf_roleName')=='采购内勤'){
+          if(this.multipleSelection[ware]){
           this.form.id=this.multipleSelection[ware].id
           this.form.workflowId=this.multipleSelection[ware].workflowId
           this.form.surplusWeight=this.multipleSelection[ware].surplusWeight
           this.form.profitAndLoss=this.multipleSelection[ware].profitAndLoss
-          this.title='盘亏'
-          this.slecetwarehouseName=''
+          this.title='盘盈'
           if(this.multipleSelection[ware].approveStatus){
-           this.$notify.warning({
-            title: '警告',
-            message: '未选择要盘点的入库记录',
-          })
-          return
-        }
+            this.$notify.warning({
+              title: '警告',
+              message: '未选择要盘点的入库记录',
+            })
+            return
+          }
           this.aduitshow=true
           this.disabled=false
-        }else{
-          this.$notify.warning({
-            title: '警告',
-            message: '未选择要盘点的入库记录',
-          })
+          }else{
+            this.$notify.warning({
+              title: '警告',
+              message: '未选择要盘点的入库记录',
+            })
+          }
         }
         
       },
-      profit(ware){
-        if(this.multipleSelection[ware]){
-        this.form.id=this.multipleSelection[ware].id
-        this.form.workflowId=this.multipleSelection[ware].workflowId
-        this.form.surplusWeight=this.multipleSelection[ware].surplusWeight
-        this.form.profitAndLoss=this.multipleSelection[ware].profitAndLoss
-        this.title='盘盈'
-        if(this.multipleSelection[ware].approveStatus){
-           this.$notify.warning({
-            title: '警告',
-            message: '未选择要盘点的入库记录',
-          })
-          return
-        }
-        this.aduitshow=true
-        this.disabled=false
-        }else{
-          this.$notify.warning({
-            title: '警告',
-            message: '未选择要盘点的入库记录',
-          })
-        }
-      },
       loseprofit(){
         var title=''
         if(this.form.num<0){
@@ -468,7 +480,7 @@
             type: 'warning',
           })
           .then(() => {
-            if(this.currectflag==0){
+            if(this.currectflag=='盘盈'){
               this.form.flag=2
             }else{
               this.form.flag=3
@@ -507,7 +519,7 @@
             type: 'warning',
           })
           .then(() => {
-            if(this.currectflag==1){
+            if(this.currectflag=='盘盈'){
               this.form.flag=4
             }else{
               this.form.flag=5
@@ -570,7 +582,7 @@
         getwarehousingorder({
             compId: localStorage.getItem('ws-pf_compId'),
             currentPage: this.currentPage,
-            pageSize: 9999,
+            pageSize: this.pageSize,
             startDate:this.startDate,
             endDate:this.endDate,
             searchType: this.searchType,
@@ -580,27 +592,25 @@
           })
           .toPromise()
           .then((response) => {
-            var arr=this.copare(response.records)
             for (let i = 0; i < response.records.length; i++) {
-              response.records[i].surplusWeight=response.records[i].inWarehouseWeight-response.records[i].outWarehouseWeight+response.records[i].profitAndLoss
-              response.records[i].select=''
+              response.records[i].payshow=true
+              var data=response.records[i].warehousingOrderList
+              for (let q = 0; q < data.length; q++) {
+                if(data[q].inType=='收购入库'){
+                  data[q].inWarehouseWeight=Number((data[q].inWarehouseWeight/1000).toFixed(3))
+                }
+                data[q].select=false
+                data[q].surplusWeight=data[q].inWarehouseWeight-data[q].outWarehouseWeight+data[q].profitAndLoss
+                data[q].weightedit=false
+                data[q].warehouseType=response.records[i].warehouseType
+              }
               
             }
-            for (let i = 0; i < arr.length; i++) {
-              // if(arr[i].warehouseName){
-                var arr1=response.records.filter(function(item,index){
-                  return arr[i].warehouseName==item.warehouseName
-                })
-                arr[i].goodssourcelist=JSON.parse(JSON.stringify(arr1))
-                console.log(arr1)
-              // }
-            }
-
-            this.gainList = arr
+             this.gainList = response.records
             // this.currentPage = response.current
             // this.pageSize = response.size
-            console.log(arr)
-            this.deptBudgetTotal = arr.length
+            // console.log(arr)
+            this.deptBudgetTotal = response.total
           })
       },
       //编辑

src/views/warehousenew/warehousingOrder.vue

@@ -43,9 +43,9 @@
     <div v-for="item in gainList" style='margin:10px;border:1px solid #ccc;padding:10px;'>
       <div style='width:100%;justify-content:space-between;align-items:center;margin-bottom:10px;' class="flex">
         <div>{{item.issuingTime}}</div>
-        <div>{{item.warehouseName}}入库单</div>
+        <div>{{item.warehouseName}}入库单<span v-if='item.warehouseType==2'>（临）</span></div>
         <div>
-          <ws-button v-if='item.payshow' type="primary" @click="payout(item)" v-hasPermission="
+            <ws-button v-if='item.payshow' type="primary" @click="payout(item)" v-hasPermission="
             `warehouseManagement.warehousingOrder.appl`
           ">请款
         </ws-button>
@@ -67,7 +67,7 @@
         </ws-button>
         </div>
       </div>
-      <el-table class="wenzi" :data="item.goodssourcelist" style="width: 100%"  @selection-change="handleSelectionChange" >
+      <el-table class="wenzi" :data="item.warehousingOrderList" style="width: 100%"  @selection-change="handleSelectionChange" >
           <el-table-column
           :selectable='selectInit'
       type="selection"
@@ -85,8 +85,8 @@
         </el-table-column>
         <el-table-column prop="inWarehouseWeight"  width="200" class="table_td" label="入库重量（吨）">
           <template scope="scope">
-            <span v-if='!scope.row.weightedit&&scope.row.weightshow'>{{scope.row.inWarehouseWeight}}</span>
-            <el-input style='width:80%;' v-if='scope.row.weightedit&&scope.row.weightshow' v-model='scope.row.inWarehouseWeight'></el-input>
+            <span v-if='!scope.row.weightedit&&scope.row.warehouseType==2||scope.row.warehouseType==1'>{{scope.row.inWarehouseWeight}}</span>
+            <el-input style='width:80%;' v-if='scope.row.weightedit&&scope.row.warehouseType==2' v-model='scope.row.inWarehouseWeight'></el-input>
             <i @click="changeWeight(scope.row)" v-if="
                 scope.row.weightedit&&scope.row.weightshow" class="iconfont icon-dui"></i>
             <img v-if="!scope.row.weightedit&&scope.row.weightshow" width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
@@ -126,7 +126,7 @@
       </el-table>
     </div>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-size="pageSize" layout="total, prev, pager, next" :total="deptBudgetTotal"></el-pagination>
+        :page-size="pageSize" layout="total,  prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
         <el-dialog
         title="付款"
         :visible.sync="aduitshow"
@@ -305,7 +305,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
         value1: '',
         value:'',
         value2: '',
-        pageSize: 9999,
+        pageSize: 10,
         searchType: '',
         searchTypeText: '待审核',
         searchKeyWord: '',
@@ -700,34 +700,40 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
           .toPromise()
           .then((response) => {
             for (let i = 0; i < response.records.length; i++) {
-              response.records[i].select=false
-              response.records[i].surplusWeight=response.records[i].inWarehouseWeight-response.records[i].outWarehouseWeight+response.records[i].profitAndLoss
-              response.records[i].weightedit=false
-              if(response.records[i].warehouseName.indexOf('临')!=-1){
-                response.records[i].weightshow=true
-              }else{
-                response.records[i].weightshow=false
+              response.records[i].payshow=true
+              var data=response.records[i].warehousingOrderList
+              for (let q = 0; q < data.length; q++) {
+                if(data[q].inType=='收购入库'){
+                  data[q].inWarehouseWeight=Number((data[q].inWarehouseWeight/1000).toFixed(3))
+                }
+                data[q].select=false
+                data[q].surplusWeight=data[q].inWarehouseWeight-data[q].outWarehouseWeight+data[q].profitAndLoss
+                data[q].weightedit=false
+                data[q].warehouseType=response.records[i].warehouseType
               }
+              
             }
-            var arr=this.copare(response.records)
-            for (let i = 0; i < arr.length; i++) {
-              arr[i].payshow=true
-              // if(arr[i].warehouseName){
-                var arr1=response.records.filter(function(item,index){
-                  return arr[i].warehouseName==item.warehouseName
-                })
-                arr[i].goodssourcelist=JSON.parse(JSON.stringify(arr1))
-                console.log(arr1)
-              // }
-            }
-
-            this.gainList = arr
+            
+            this.gainList = response.records
             // this.currentPage = response.current
             // this.pageSize = response.size
-            console.log(arr)
-            this.deptBudgetTotal = arr.length
+            // console.log(arr)
+            this.deptBudgetTotal = response.total
           })
       },
+      
+multiFilter(array, filters) {
+  const filterKeys = Object.keys(filters)
+  // filters all elements passing the criteria
+  return array.filter((item) => {
+    // dynamically validate all filter criteria
+    return filterKeys.every(key => {
+        //ignore when the filter is empty Anne
+      if(!filters[key].length) return true
+      return !!~filters[key].indexOf(item[key])
+    })
+  })
+},
       copare(arr){
         // 缓存用于记录
         const newArr = [];
@@ -736,25 +742,19 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
           if (
             newArr.find(
               (c) =>
-                c.warehouseName === t.warehouseName 
+                c.issuingTime === t.issuingTime 
             )
           ) {
             // 已经存在说明以前记录过，现在这个就是多余的，直接忽略
             continue;
           }
+          console.log(t)
           // 不存在就说明以前没遇到过，把它记录下来
           newArr.push(t);
         }
-        var results=this.makeGroupData(newArr,function (item) { return [item.issuingTime]; }); console.log(results)
+        // var results=this.makeGroupData(newArr,function (item) { return [item.issuingTime]; }); console.log(results)
         // 记录结果就是过滤后的结果
-        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]; })
+        return newArr;
       },
       filtertask(arr){
         const newArr = [];