diff --git a/src/views/emis/emisWaybill/batchWaybillRecord.vue b/src/views/emis/emisWaybill/batchWaybillRecord.vue index 917b46ff..d023ccc0 100644 --- a/src/views/emis/emisWaybill/batchWaybillRecord.vue +++ b/src/views/emis/emisWaybill/batchWaybillRecord.vue @@ -182,6 +182,8 @@ export default { orderList: [], tmpDataList: [], selectionList:[], + selectionIndexList: [], + form:{}, rules:{}, @@ -374,28 +376,19 @@ export default { return timeDiffTime(startData,endDate) }, //标红table指定行 - tableRowClassName({row, rowIndex}) { - - if (row.blSign=='1') { + tableRowClassName(row, index) { + row.row.index = row.rowIndex; + if (row.uploadStatus=='1') { return 'success-row'; } - else if (row.blIsQuestion=='1') { + else if (row.uploadStatus=='-1') { return 'warning-row'; } - return ''; }, /** 查询运单列表列表 */ getList() { this.loading = true; - - // this.emisWaybillList = response.rows; - // this.total = response.total; - // this.loading = false; - - // listEmisWaybill(this.queryParams).then(response => { - - // }); }, fileChange(file, fileList) { this.fileList = fileList; @@ -509,14 +502,9 @@ export default { this.tmpDataList.push(orderData); } - - console.log(this.tmpDataList) - - this.uploadExcelDataInfo="总共 " + this.tmpDataList.length +" 条数据。"; loadingInstance.close() - // this.handleQuery(); }, handleRealUploadAll(){ if (this.ids && this.ids.length>0) { @@ -531,15 +519,8 @@ export default { if(this.selectionList&&this.selectionList.length>0){ for(let i=0;ixxx=>0:",orderItem); - - console.log("===>waybillOrder=>1:",orderItem); - let res=await draftSubmitOrder(orderItem) - console.log("===>xxx=>1:",res); - - let rstData=res.data; if(rstData.result=='success'){ orderItem.uploadStatus=1; @@ -554,11 +535,7 @@ export default { } this.$modal.msgSuccess("上传成功"); - }else{ - } - - }); } @@ -590,11 +567,8 @@ export default { }, // 多选框选中数据 handleSelectionChange(selection) { - // if(selection!=null){ - // this.billCode=selection[0].billCode; - // } - this.selectionList=selection; + this.selectionList=selection; this.ids = selection.map(item => item.id) this.single = selection.length!==1 this.multiple = !selection.length @@ -612,59 +586,21 @@ export default { /** 删除按钮操作 */ handleDelete(row) { const ids = row.id || this.ids; + let that=this; this.$modal.confirm('是否确认删除').then(function() { - this.$refs.multipleTable.clearSelection(); + that.selectionList.forEach((item,index) =>{ + that.orderList.forEach((v,i)=>{ + if(item.index === v.index){ + that.orderList.splice(i,1) + } + }) + }) + that.$refs.multipleTable.clearSelection(); }).then(() => { this.$modal.msgSuccess("删除成功"); }).catch(() => {}); }, - /** 导出按钮操作 */ - handleExport() { - // this.download('emis/emisWaybill/export', { - // ...this.queryParams - // }, `emisWaybill_${new Date().getTime()}.xlsx`) - const loadingInstance = this.$loading({ - text: '正在导出...' - }) - var qParam = {...this.queryParams}; - qParam.pageNum=1; - qParam.pageSize=5000; - listEmisWaybill(this.addDateRange(qParam, this.dateTimeRange)).then(response => { - this.downloadLoading = false - if (response.code === 200) { - const curList = response.rows - import('@/vendor/Export2Excel').then(excel => { - const tHeader = ['id','订单号','客户单号，合同号','运单号','子单号,逗号隔开','订单状态','运单状态','订单类型','下单时间','客户ID','客户编号2502021','客户名称','收件客户编号2502021','收件客户客户名称','第三方客户客户编号','第三方客户客户名称','wx','收货人名','收货公司','收货人手机号','收货人电话','收货人国家','省','市','区','县','收货地址','邮编','寄件人省市区名称，逗号分隔','寄件人名','寄件公司','寄件人手机号','寄件人电话','寄件人国家','寄件省','寄件市','寄件区','寄件县','寄件地址','寄件邮编','发件人省市区名称，逗号分隔','支付方式','计费方式','支付月结编号','快递线路','快递产品类型','时效','计泡比例','清关方式','报关方式','预计到达时间','包装类型','派件方式:1-送货上门','取件方式:1-上门取件','预计上门取件开始时间','预计上门取件结束时间','取货失败原因','入仓代码','入仓名称','入仓地址','入仓联系人','入仓联系人电话','入仓单号','实际进仓单关联','客户发货开始时间','客户发货截止时间','货物大类','货物描述','货物图片，逗号隔开','预入仓代垫运费','预入仓代垫运费','预入仓实际运费','预入仓快递公司','预入仓快递单号','预入仓自定义标识','预入仓供应商','总重量','总体积','件数','实际重量','体积重量','费用币种','结算重量','计费重量','运费','是否超长','是否出账','账单备注','是否超重','超重重量','费用备注','三段码','实际货值','是否投保','投保货值','投保货值币种','保费币种','保费','保险备注','保险站点代码','投保日期','是否打印','打印人编号','打印站点','打印时间','打印次数','是否同行转单','转单代码','转单单号','转单时间','转单原因','当前网点编号','下一网点编号','上一网点点号','寄件站点代码','寄件日期','寄件人编号','取件员代码','发件网点代码','发货时间','派件人代码','派件时间','派件网点代码','生成账单时间','生成账单站点代码','生成账单人代码','目的地编号','目的省','目的城市','目的国家','目的地网点代码','目的地财务中心代码','业务人代码','销售回款人','销售联系人','操作员代码','是否问题件','问题件类型','问题件原因','问题件延期天数','是否备注消息','是否发送收件人短信','是否生成子单','签收人','签收人代码','签收站点代码','签收时间','揽收图片备注','签收底单图片','时区偏差','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','备注','创建网点','更新网点',]; - const filterVal = ['id','orderSn','custOrderId','billCode','billCodeSub','orderStatus','waybillStatus','orderType','orderDate','userId','customerCode','customerName','receiveCustomerCode','receiveCustomerName','thirdCustomerCode','thirdCustomerName','openId','receiveName','receiveCompany','receiveMobile','receiveTel','receiveCountry','receiveProvince','receiveCity','receiveCounty','receiveTown','receiveAddress','receivePostcode','receivePcd','sendName','sendCompany','sendMobile','sendTel','sendCountry','sendProvince','sendCity','sendCounty','sendTown','sendAddress','sendPostcode','sendPcd','paymentType','calcFeeType','custNo','transLineType','productType','timeType','meterType','customsClear','customsEclaration','estimateDate','packType','dispatchMethod','pickupMethod','pickStartDate','pickFinishDate','pickFailReason','intoWarehouseCode','intoWarehouseName','intoWarehouseAddress','intoWarehouseContact','intoWarehousePhone','intoWarehouseBillCode','warehouseInNo','customerDeliveryBeginTime','customerDeliveryEndTime','goodsType','goodsInfo','goodsPics','blPrepareInFreight','prepareInEstFee','prepareInRealFee','prepareInExpress','prepareInBillCode','prepareInRemark','prepareInSupplier','totalWeight','totalVolume','parcelQty','billWeight','volumeWeight','currency','settlementWeight','feeWeight','freight','blOverLong','blBill','blBillText','blOverWeight','overWeightNumber','feeRemark','thirdCode','realValue','blInsure','insureValue','insureValueCurrency','insureFeeCurrency','insureFee','insureRemark','insureSiteCode','insureDate','blPrint','printManCode','printSite','printDate','printCount','blDispFd','transferCode','transferBillcode','dispFdDate','dispFdReason','currentSiteCode','nextSiteCode','lastSiteCode','registerSiteCode','registerDate','registerManCode','takePieceEmployeeCode','sendSiteCode','sendDate','dispatchManCode','dispatchDate','dispatchSiteCode','produceBillDate','produceBillSiteCode','produceBillManCode','destinationCode','destinationProvince','destinationCity','destinationCounty','dispatchUnderlingSiteCode','destinationCenterCode','marketManCode','payee','salesmen','operateEmployeeCode','blIsQuestion','problemType','problemCause','problemDelayDays','blMessage','blAcceptMessage','blGenSubbill','signMan','signManCode','signSiteCode','signDate','billPicSendRmk','billPicDispatchRmk','timezoneOffset','delFlag','createBy','createTime','updateBy','updateTime','remark','createSite','updateSite',]; - const data = this.formatJson(filterVal, curList, response.rows) - excel.export_json_to_excel({ - header: tHeader, - data, - filename: '运单列表', - autoWidth: true - }) - loadingInstance.close() - }) - } - }); - }, - formatJson(filterVal, jsonData, resData) { - let index = 0 - return jsonData.map(v => filterVal.map(j => { - if (j === 'index') { - return ++index - } - if (j === 'status') { - var statusStr='xxx' - if(v[j] == 10){ - statusStr='xxx' - } - return statusStr; - } - return v[j] - })) - }, /** 列索引函数 */ getIndex($index) { return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1