|
@@ -21,7 +21,7 @@
|
|
|
|
|
|
</el-col>
|
|
|
<el-col style="text-align:right;" :span="10">
|
|
|
- <el-button style="margin-right:10px" @click="addlist" type="primary">批量打印</el-button>
|
|
|
+ <el-button style="margin-right:10px" @click="printlist" type="primary">批量打印</el-button>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<div class="fromdata">
|
|
@@ -74,7 +74,8 @@ import {
|
|
|
printworkflow,
|
|
|
printgethis,
|
|
|
printgetfile,
|
|
|
- printgetdata
|
|
|
+ printgetdata,
|
|
|
+ printgetout
|
|
|
} from '@/model/universalityAudit/index'
|
|
|
import {lookexenseinfo, getAuditRecord,} from '@/model/profitable/index'
|
|
|
import { seeCat } from '@/model/transport/index'
|
|
@@ -84,6 +85,9 @@ import {
|
|
|
import {
|
|
|
purchasePriceLook,
|
|
|
} from '@/model/houseSelfCollect/index'
|
|
|
+ import {
|
|
|
+ outexamine,
|
|
|
+} from '@/model/tasksport/index'
|
|
|
import WsUpload from '@/components/WsUpload'
|
|
|
import {
|
|
|
woekflowhandle
|
|
@@ -145,6 +149,195 @@ export default {
|
|
|
this.getList()
|
|
|
},
|
|
|
methods: {
|
|
|
+ async printlist(){
|
|
|
+ for (let m = 0; m < this.multipleSelection.length; m++) {
|
|
|
+ if(this.multipleSelection[m].type=='费用审核'||this.multipleSelection[m].type=='运费结算'){
|
|
|
+ this.deptBudgetList[m]=await lookexenseinfo({id:this.multipleSelection[m].id}).toPromise()
|
|
|
+ this.deptBudgetList[m].currectstatus=this.multipleSelection[m].status
|
|
|
+ if(this.deptBudgetList[m].addressUrl){
|
|
|
+ var arr1=await printgetfile({appendixIds:this.deptBudgetList[m].addressUrl}).toPromise()
|
|
|
+ this.deptBudgetList[m].addressUrlArray=this.imagefilter(arr1)
|
|
|
+ this.deptBudgetList[m].addressUrlArrayImage=this.imagefilter(arr1)
|
|
|
+ this.deptBudgetList[m].addressUrlArrayFilelen=arr1.length-this.deptBudgetList[m].addressUrlArrayImage.length
|
|
|
+ }else{
|
|
|
+ this.deptBudgetList[m].addressUrlArray=[]
|
|
|
+ this.deptBudgetList[m].addressUrlArrayImage=[]
|
|
|
+ this.deptBudgetList[m].addressUrlArrayFilelen=0
|
|
|
+ }
|
|
|
+ if(this.deptBudgetList[m].expensesType!=1){
|
|
|
+ if(this.multipleSelection[m].type=='费用审核'){
|
|
|
+ this.deptBudgetList[m].printType=1
|
|
|
+ }else if(this.multipleSelection[m].type=='运费结算'){
|
|
|
+ this.deptBudgetList[m].printType=7
|
|
|
+ if (this.deptBudgetList[m].tranTaskInfoList.length > 0) {
|
|
|
+ var num = 0
|
|
|
+ for (var i = 0; i < this.deptBudgetList[m].tranTaskInfoList.length; i++) {
|
|
|
+ if (this.deptBudgetList[m].tranTaskInfoList[i].tranSettlementReportList) {
|
|
|
+ var data = this.deptBudgetList[m].tranTaskInfoList[i].tranSettlementReportList
|
|
|
+ for (var q = 0; q < data.length; q++) {
|
|
|
+ if (data[q].totalPayable) {
|
|
|
+ this.num += data[q].totalPayable
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.deptBudgetList[m].num=num.toFixed(2)
|
|
|
+ }
|
|
|
+ var workflow=await printworkflow({businessCode:this.multipleSelection[m].businessCode,tmpCompId:localStorage.getItem('ws-pf_compId')}).toPromise()
|
|
|
+ this.deptBudgetList[m].aduitInfo=await printgethis({workflowId:workflow[0].id,businessKey:this.multipleSelection[m].id,branch:this.deptBudgetList[m].jointVentureParties?this.deptBudgetList[m].jointVentureParties:'zt'}).toPromise()
|
|
|
+ for (let i = 0; i < this.deptBudgetList[m].aduitInfo.length; i++) {
|
|
|
+ var arr=this.deptBudgetList[m].aduitInfo[i]
|
|
|
+ if(arr.workflowHistoricTasks&&arr.workflowHistoricTasks.length>0){
|
|
|
+ console.log(arr.workflowHistoricTasks)
|
|
|
+ var len =arr.workflowHistoricTasks.length-1
|
|
|
+ if(arr.workflowHistoricTasks[len].approved){
|
|
|
+ this.$set(arr,'status','success')
|
|
|
+ }else{
|
|
|
+ this.$set(arr,'status','error')
|
|
|
+ }
|
|
|
+ arr.operatorName=arr.workflowHistoricTasks[len].operatorName
|
|
|
+ arr.updateDate=arr.workflowHistoricTasks[len].claimTime
|
|
|
+ if (arr.workflowHistoricTasks[len].auditMind && arr.workflowHistoricTasks[len].auditMind.indexOf("##") !=-1) {
|
|
|
+ arr.auditMind = arr.workflowHistoricTasks[len].auditMind.split("##")[0]
|
|
|
+ arr.fileUrls = arr.workflowHistoricTasks[len].auditMind.split("##")[1].split(",")
|
|
|
+ for (let q = 0; q < arr.fileUrls.length; q++) {
|
|
|
+ this.deptBudgetList[m].addressUrlArrayImage.push({appendixPath:arr.fileUrls[q]})
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ arr.auditMind = arr.workflowHistoricTasks[len].auditMind
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ this.$set(arr,'status','question')
|
|
|
+ arr.operatorName=arr.desc
|
|
|
+ arr.updateDate=arr.updateDate
|
|
|
+ arr.auditMind =''
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.deptBudgetList[m].aduitInfo.unshift({
|
|
|
+ operatorName:this.multipleSelection[m].creater,
|
|
|
+ updateDate:this.multipleSelection[m].createDate,
|
|
|
+ auditMind:'',
|
|
|
+ desc:'发起',
|
|
|
+ workflowHistoricTasks:[],
|
|
|
+ status:'success'
|
|
|
+ })
|
|
|
+ }else{
|
|
|
+ this.deptBudgetList[m].printType=2
|
|
|
+ this.deptBudgetList[m].aduitInfo=await getAuditRecord({id:this.multipleSelection[m].id}).toPromise()
|
|
|
+ }
|
|
|
+ }else if(this.multipleSelection[m].type=='入库单请款'||this.multipleSelection[m].type=='运价审核'||this.multipleSelection[m].type=='通用审核'||this.multipleSelection[m].type=='合同审核'||this.multipleSelection[m].type=='仓库设置'||this.multipleSelection[m].type=='出入库任务'){
|
|
|
+ if(this.multipleSelection[m].type=='入库单请款'){
|
|
|
+ this.deptBudgetList[m]=await printgetdata({batchId:this.multipleSelection[m].id}).toPromise()
|
|
|
+ this.deptBudgetList[m].printType=3
|
|
|
+ }else if(this.multipleSelection[m].type=='运价审核'){
|
|
|
+ this.deptBudgetList[m]=await seeCat({id:this.multipleSelection[m].id}).toPromise()
|
|
|
+ this.deptBudgetList[m].printType=4
|
|
|
+ }else if(this.multipleSelection[m].type=='通用审核'){
|
|
|
+ this.deptBudgetList[m]=await getaduitinfo({id:this.multipleSelection[m].id}).toPromise()
|
|
|
+ this.deptBudgetList[m].printType=5
|
|
|
+ }else if(this.multipleSelection[m].type=='合同审核'){
|
|
|
+ this.deptBudgetList[m]=await examineList({id:this.multipleSelection[m].id}).toPromise()
|
|
|
+ this.deptBudgetList[m].printType=6
|
|
|
+ }else if(this.multipleSelection[m].type=='仓库设置'){
|
|
|
+ this.deptBudgetList[m]=await purchasePriceLook({id:this.multipleSelection[m].id}).toPromise()
|
|
|
+ this.deptBudgetList[m].printType=8
|
|
|
+ }else if(this.multipleSelection[m].type=='出入库任务'){
|
|
|
+ var relevance=await printgetout({id:this.multipleSelection[m].id}).toPromise()
|
|
|
+ this.deptBudgetList[m]={data:await outexamine({relevanceId:relevance.relevanceId}).toPromise()}
|
|
|
+ for (let i = 0; i < this.deptBudgetList[m].data.length; i++) {
|
|
|
+ this.deptBudgetList[m].inOutTypeKey=this.deptBudgetList[m].data[i].inOutTypeKey
|
|
|
+ if (this.deptBudgetList[m].data[i].inOutType == "移库出库" ||
|
|
|
+ this.deptBudgetList[m].data[i].inOutType == "贸易服务出库" ||
|
|
|
+ this.deptBudgetList[m].data[i].inOutType == "销售出库" ||
|
|
|
+ this.deptBudgetList[m].data[i].inOutType == "暂存出库") {
|
|
|
+ this.deptBudgetList[m].OutList = this.deptBudgetList[m].data[i]
|
|
|
+ } else if (this.deptBudgetList[m].data[i].inOutType == "移库入库" ||
|
|
|
+ this.deptBudgetList[m].data[i].inOutType == "暂存入库" ||
|
|
|
+ this.deptBudgetList[m].data[i].inOutType == "采购入库" ||
|
|
|
+ this.deptBudgetList[m].data[i].inOutType =="贸易服务入库"||
|
|
|
+ this.deptBudgetList[m].data[i].inOutType =="收购入库") {
|
|
|
+ this.deptBudgetList[m].EnterList = this.deptBudgetList[m].data[i]
|
|
|
+ } else if (this.deptBudgetList[m].data[i].inOutType == "退库") {
|
|
|
+ this.deptBudgetList[m].retreatList = this.deptBudgetList[m].data[i]
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.deptBudgetList[m].printType=9
|
|
|
+ }
|
|
|
+ if(this.deptBudgetList[m].addressUrl){
|
|
|
+ var arr1=await printgetfile({appendixIds:this.deptBudgetList[m].addressUrl}).toPromise()
|
|
|
+ this.deptBudgetList[m].addressUrlArray=this.imagefilter(arr1)
|
|
|
+ this.deptBudgetList[m].addressUrlArrayImage=this.imagefilter(arr1)
|
|
|
+ this.deptBudgetList[m].addressUrlArrayFilelen=arr1.length-this.deptBudgetList[m].addressUrlArrayImage.length
|
|
|
+ }else{
|
|
|
+ this.deptBudgetList[m].addressUrlArray=[]
|
|
|
+ this.deptBudgetList[m].addressUrlArrayImage=[]
|
|
|
+ this.deptBudgetList[m].addressUrlArrayFilelen=0
|
|
|
+ }
|
|
|
+ this.deptBudgetList[m].currectstatus=this.deptBudgetList[m].status
|
|
|
+ var workflow=await printworkflow({businessCode:this.multipleSelection[m].businessCode,tmpCompId:localStorage.getItem('ws-pf_compId')}).toPromise()
|
|
|
+ if(this.deptBudgetList[m].type=='通用审核') {
|
|
|
+ this.deptBudgetList[m].aduitInfo=await printgethis({workflowId:workflow[0].id,businessKey:this.multipleSelection[m].id,branch:this.deptBudgetList[m].businessType?this.deptBudgetList[m].businessType:'zt'}).toPromise()
|
|
|
+ }else{
|
|
|
+ this.deptBudgetList[m].aduitInfo=await printgethis({workflowId:workflow[0].id,businessKey:this.multipleSelection[m].id,branch:this.deptBudgetList[m].jointVentureParties?this.deptBudgetList[m].jointVentureParties:'zt'}).toPromise()
|
|
|
+ }
|
|
|
+ for (let i = 0; i < this.deptBudgetList[m].aduitInfo.length; i++) {
|
|
|
+ var arr=this.deptBudgetList[m].aduitInfo[i]
|
|
|
+ if(arr.workflowHistoricTasks&&arr.workflowHistoricTasks.length>0){
|
|
|
+ var len =arr.workflowHistoricTasks.length-1
|
|
|
+ if(arr.workflowHistoricTasks[len].approved){
|
|
|
+ this.$set(arr,'status','success')
|
|
|
+ }else{
|
|
|
+ this.$set(arr,'status','error')
|
|
|
+ }
|
|
|
+ arr.operatorName=arr.workflowHistoricTasks[len].operatorName
|
|
|
+ arr.updateDate=arr.workflowHistoricTasks[len].claimTime
|
|
|
+ if (arr.workflowHistoricTasks[len].auditMind && arr.workflowHistoricTasks[len].auditMind.indexOf("##") !=-1) {
|
|
|
+ arr.auditMind = arr.workflowHistoricTasks[len].auditMind.split("##")[0]
|
|
|
+ arr.fileUrls = arr.workflowHistoricTasks[len].auditMind.split("##")[1].split(",")
|
|
|
+ for (let q = 0; q < arr.fileUrls.length; q++) {
|
|
|
+ this.deptBudgetList[m].addressUrlArrayImage.push({appendixPath:arr.fileUrls[q]})
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ arr.auditMind = arr.workflowHistoricTasks[len].auditMind
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ this.$set(arr,'status','question')
|
|
|
+ arr.operatorName=arr.desc
|
|
|
+ arr.updateDate=arr.updateDate
|
|
|
+ arr.auditMind =''
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.deptBudgetList[m].aduitInfo.unshift({
|
|
|
+ operatorName:this.multipleSelection[m].creater,
|
|
|
+ updateDate:this.multipleSelection[m].createDate,
|
|
|
+ auditMind:'',
|
|
|
+ desc:'发起',
|
|
|
+ workflowHistoricTasks:[],
|
|
|
+ status:'success'
|
|
|
+ })
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ }
|
|
|
+ localStorage.setItem('aduitprintdata',JSON.stringify(this.deptBudgetList))
|
|
|
+ window.open('../../../static/aduitprint.html')
|
|
|
+ },
|
|
|
+ getImageSize(url) {
|
|
|
+ return new Promise((resolve) => {
|
|
|
+ const img = new Image()
|
|
|
+ img.src = url
|
|
|
+ if (img.complete) {
|
|
|
+ // 如果图片被缓存,则直接返回缓存数据
|
|
|
+ resolve({ width: img.width, height: img.height })
|
|
|
+ } else {
|
|
|
+ img.onload = () => {
|
|
|
+ resolve({ width: img.width, height: img.height })
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
async printItem(row){
|
|
|
if(row.type=='费用审核'||row.type=='运费结算'){
|
|
|
this.deptBudgetList=[await lookexenseinfo({id:row.id}).toPromise()]
|
|
@@ -153,11 +346,11 @@ export default {
|
|
|
var arr1=await printgetfile({appendixIds:this.deptBudgetList[0].addressUrl}).toPromise()
|
|
|
this.deptBudgetList[0].addressUrlArray=this.imagefilter(arr1)
|
|
|
this.deptBudgetList[0].addressUrlArrayImage=this.imagefilter(arr1)
|
|
|
- this.deptBudgetList[0].addressUrlArrayFilelen=arr1.length-this.deptBudgetList[0].addressUrlArray.length
|
|
|
+ this.deptBudgetList[0].addressUrlArrayFilelen=arr1.length-this.deptBudgetList[0].addressUrlArrayImage.length
|
|
|
}else{
|
|
|
this.deptBudgetList[0].addressUrlArray=[]
|
|
|
this.deptBudgetList[0].addressUrlArrayImage=[]
|
|
|
- this.deptBudgetList[0].addressUrlArrayFilelen==0
|
|
|
+ this.deptBudgetList[0].addressUrlArrayFilelen=0
|
|
|
}
|
|
|
if(this.deptBudgetList[0].expensesType!=1){
|
|
|
if(row.type=='费用审核'){
|
|
@@ -195,7 +388,10 @@ export default {
|
|
|
arr.updateDate=arr.workflowHistoricTasks[len].claimTime
|
|
|
if (arr.workflowHistoricTasks[len].auditMind && arr.workflowHistoricTasks[len].auditMind.indexOf("##") !=-1) {
|
|
|
arr.auditMind = arr.workflowHistoricTasks[len].auditMind.split("##")[0]
|
|
|
- arr.fileUrl = arr.workflowHistoricTasks[len].auditMind.split("##")[1].split(",")
|
|
|
+ arr.fileUrls = arr.workflowHistoricTasks[len].auditMind.split("##")[1].split(",")
|
|
|
+ for (let q = 0; q < arr.fileUrls.length; q++) {
|
|
|
+ this.deptBudgetList[0].addressUrlArrayImage.push({appendixPath:arr.fileUrls[q]})
|
|
|
+ }
|
|
|
}else{
|
|
|
arr.auditMind = arr.workflowHistoricTasks[len].auditMind
|
|
|
}
|
|
@@ -218,7 +414,7 @@ export default {
|
|
|
this.deptBudgetList[0].printType=2
|
|
|
this.deptBudgetList[0].aduitInfo=await getAuditRecord({id:row.id}).toPromise()
|
|
|
}
|
|
|
- }else if(row.type=='入库单请款'||row.type=='运价审核'||row.type=='通用审核'||row.type=='合同审核'||row.type=='仓库设置'){
|
|
|
+ }else if(row.type=='入库单请款'||row.type=='运价审核'||row.type=='通用审核'||row.type=='合同审核'||row.type=='仓库设置'||row.type=='出入库任务'){
|
|
|
if(row.type=='入库单请款'){
|
|
|
this.deptBudgetList=[await printgetdata({batchId:row.id}).toPromise()]
|
|
|
this.deptBudgetList[0].printType=3
|
|
@@ -234,20 +430,45 @@ export default {
|
|
|
}else if(row.type=='仓库设置'){
|
|
|
this.deptBudgetList=[await purchasePriceLook({id:row.id}).toPromise()]
|
|
|
this.deptBudgetList[0].printType=8
|
|
|
+ }else if(row.type=='出入库任务'){
|
|
|
+ var relevance=await printgetout({id:row.id}).toPromise()
|
|
|
+ this.deptBudgetList=[{data:await outexamine({relevanceId:relevance.relevanceId}).toPromise()}]
|
|
|
+ for (let i = 0; i < this.deptBudgetList[0].data.length; i++) {
|
|
|
+ this.deptBudgetList[0].inOutTypeKey=this.deptBudgetList[0].data[i].inOutTypeKey
|
|
|
+ if (this.deptBudgetList[0].data[i].inOutType == "移库出库" ||
|
|
|
+ this.deptBudgetList[0].data[i].inOutType == "贸易服务出库" ||
|
|
|
+ this.deptBudgetList[0].data[i].inOutType == "销售出库" ||
|
|
|
+ this.deptBudgetList[0].data[i].inOutType == "暂存出库") {
|
|
|
+ this.deptBudgetList[0].OutList = this.deptBudgetList[0].data[i]
|
|
|
+ } else if (this.deptBudgetList[0].data[i].inOutType == "移库入库" ||
|
|
|
+ this.deptBudgetList[0].data[i].inOutType == "暂存入库" ||
|
|
|
+ this.deptBudgetList[0].data[i].inOutType == "采购入库" ||
|
|
|
+ this.deptBudgetList[0].data[i].inOutType =="贸易服务入库"||
|
|
|
+ this.deptBudgetList[0].data[i].inOutType =="收购入库") {
|
|
|
+ this.deptBudgetList[0].EnterList = this.deptBudgetList[0].data[i]
|
|
|
+ } else if (this.deptBudgetList[0].data[i].inOutType == "退库") {
|
|
|
+ this.deptBudgetList[0].retreatList = this.deptBudgetList[0].data[i]
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.deptBudgetList[0].printType=9
|
|
|
}
|
|
|
if(this.deptBudgetList[0].addressUrl){
|
|
|
var arr1=await printgetfile({appendixIds:this.deptBudgetList[0].addressUrl}).toPromise()
|
|
|
this.deptBudgetList[0].addressUrlArray=this.imagefilter(arr1)
|
|
|
this.deptBudgetList[0].addressUrlArrayImage=this.imagefilter(arr1)
|
|
|
- this.deptBudgetList[0].addressUrlArrayFilelen=arr1.length-this.deptBudgetList[0].addressUrlArray.length
|
|
|
+ this.deptBudgetList[0].addressUrlArrayFilelen=arr1.length-this.deptBudgetList[0].addressUrlArrayImage.length
|
|
|
}else{
|
|
|
this.deptBudgetList[0].addressUrlArray=[]
|
|
|
this.deptBudgetList[0].addressUrlArrayImage=[]
|
|
|
- this.deptBudgetList[0].addressUrlArrayFilelen==0
|
|
|
+ this.deptBudgetList[0].addressUrlArrayFilelen=0
|
|
|
}
|
|
|
this.deptBudgetList[0].currectstatus=row.status
|
|
|
var workflow=await printworkflow({businessCode:row.businessCode,tmpCompId:localStorage.getItem('ws-pf_compId')}).toPromise()
|
|
|
- this.deptBudgetList[0].aduitInfo=await printgethis({workflowId:workflow[0].id,businessKey:row.id,branch:this.deptBudgetList[0].jointVentureParties?this.deptBudgetList[0].jointVentureParties:'zt'}).toPromise()
|
|
|
+ if(row.type=='通用审核') {
|
|
|
+ this.deptBudgetList[0].aduitInfo=await printgethis({workflowId:workflow[0].id,businessKey:row.id,branch:this.deptBudgetList[0].businessType?this.deptBudgetList[0].businessType:'zt'}).toPromise()
|
|
|
+ }else{
|
|
|
+ this.deptBudgetList[0].aduitInfo=await printgethis({workflowId:workflow[0].id,businessKey:row.id,branch:this.deptBudgetList[0].jointVentureParties?this.deptBudgetList[0].jointVentureParties:'zt'}).toPromise()
|
|
|
+ }
|
|
|
for (let i = 0; i < this.deptBudgetList[0].aduitInfo.length; i++) {
|
|
|
var arr=this.deptBudgetList[0].aduitInfo[i]
|
|
|
if(arr.workflowHistoricTasks&&arr.workflowHistoricTasks.length>0){
|
|
@@ -262,11 +483,9 @@ export default {
|
|
|
if (arr.workflowHistoricTasks[len].auditMind && arr.workflowHistoricTasks[len].auditMind.indexOf("##") !=-1) {
|
|
|
arr.auditMind = arr.workflowHistoricTasks[len].auditMind.split("##")[0]
|
|
|
arr.fileUrls = arr.workflowHistoricTasks[len].auditMind.split("##")[1].split(",")
|
|
|
- var arr1=[]
|
|
|
for (let q = 0; q < arr.fileUrls.length; q++) {
|
|
|
- arr1.push({appendixPath:arr.fileUrls[q]})
|
|
|
+ this.deptBudgetList[0].addressUrlArrayImage.push({appendixPath:arr.fileUrls[q]})
|
|
|
}
|
|
|
- this.deptBudgetList[0].addressUrlArrayImage.push(...arr1)
|
|
|
}else{
|
|
|
arr.auditMind = arr.workflowHistoricTasks[len].auditMind
|
|
|
}
|
|
@@ -293,9 +512,12 @@ export default {
|
|
|
imagefilter(arr){
|
|
|
var arr1=[]
|
|
|
for (let i = 0; i < arr.length; i++) {
|
|
|
+ // var value=await this.getImageSize(arr[i].appendixPath)
|
|
|
+ // arr[i].width=value.width
|
|
|
+ // arr[i].height=value.height
|
|
|
if(arr[i].appendixName.indexOf('jpg')!=-1||arr[i].appendixName.indexOf('jpeg')!=-1||arr[i].appendixName.indexOf('png')!=-1){
|
|
|
arr1.push(arr[i])
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
return arr1
|
|
|
},
|