diff --git a/src/views/emis/emisTmsPack/packageManagement.vue b/src/views/emis/emisTmsPack/packageManagement.vue index 5abaa4fc..6ac8e58c 100644 --- a/src/views/emis/emisTmsPack/packageManagement.vue +++ b/src/views/emis/emisTmsPack/packageManagement.vue @@ -886,7 +886,7 @@ export default { this.coData.totalWaybillQty=this.emisCoPackDetail.length; this.coData.totalParcelQty=totalParcelQty; this.coData.totalWeight=totalWeight; - this.coData.totalVolume=totalVolume; + this.coData.totalVolume=parseFloat(totalVolume.toFixed(5)); }, // 排序 查询字段是表格中字段名字 动态取值排序顺序 handleSortChange(column) { diff --git a/src/views/emis/emisTmsScanRecord/signAndRecord.vue b/src/views/emis/emisTmsScanRecord/signAndRecord.vue index 975e6f81..570af854 100644 --- a/src/views/emis/emisTmsScanRecord/signAndRecord.vue +++ b/src/views/emis/emisTmsScanRecord/signAndRecord.vue @@ -11,7 +11,20 @@ - + + + {{ $t('签收人') }} + + + + + - + - - + + @@ -197,7 +211,7 @@ export default { id:undefined }, components: { EmisUserSimplePicker, CustomerSimplePicker }, - dicts: ['emis_scan_type'], + dicts: ['emis_scan_type', 'emis_signs_remark'], data() { return { // 选中数组 @@ -260,17 +274,17 @@ export default { handleInput(item){ this.form.picUrl = item; }, - onCustomerSelect(item){ - if(item != null){ - this.form.customerCode=item.customerCode; - this.form.customerName=item.customerName; - }else{ - this.form.customerCode=null; - this.form.customerName=null; - } - }, + // onCustomerSelect(item){ + // if(item != null){ + // this.form.customerCode=item.customerCode; + // this.form.customerName=item.customerName; + // }else{ + // this.form.customerCode=null; + // this.form.customerName=null; + // } + // }, onSendStaffSelect(item){ - // this.form.dispatchMan=item.empName || this.$store.getters.empName; + this.form.dispatchMan=item.empName; this.form.dispatchManCode=item.empCode; }, onSignStaffSelect(item){ @@ -484,20 +498,20 @@ export default { handleScanUpload(){ var selData = this.$refs.multipleTable.selection; console.log(selData); - + let newList = []; let scanData=[]; selData.forEach(item=>{ scanData.push( { billCode:item.billCode, signMan:item.signMan, - signManCode:item.signManCode, + // signManCode:item.signManCode, picUrl:item.picUrl, remark:item.remark, scanWeight:item.scanWeight, dispatchManCode:item.dispatchManCode, - customerCode:item.customerCode, - customerName:item.customerName, + // customerCode:item.customerCode, + // customerName:item.customerName, // dispatchOrSendManCode:item.dispatchOrSendManCode, // scanDate:item.scanDate scanDate:item.scanDate || new Date() @@ -518,6 +532,17 @@ export default { return; } + // 删除上传记录 + for(let sd=0;sd { + return this.emisTmsScanRecordList[sd].billCode == item.billCode + }).length == 0){ + newList.push(this.emisTmsScanRecordList[sd]) + } + } + this.emisTmsScanRecordList = newList + // 清空数据 + this.record={}; this.$modal.msgSuccess(scanRstItem.message); }); }, @@ -526,6 +551,10 @@ export default { this.$message.error("输入单号后回车"); return; } + if(!this.form.signMan){ + this.$message.error("请先选择签收人"); + return; + } if(this.dataMap[this.form.billCode]){ this.$message.error("重复扫描"); this.playNoticeTone(1); @@ -546,17 +575,22 @@ export default { this.$modal.msgError("已扫描"); return; } - let record =Object.assign({}, scanRstItem) + let record =Object.assign({}, scanRstItem); + record.dispatchMan = this.form.dispatchMan; record.dispatchManCode=this.form.dispatchManCode; record.signManCode=this.form.signManCode; record.signMan=this.form.signMan; - record.customerCode=this.form.customerCode; - record.customerName=this.form.customerName; - record.picUrl=this.form.picUrl; + // record.customerCode=this.form.customerCode; + // record.customerName=this.form.customerName; + record.picUrl=this.form.picUrl || ""; + record.picUrls=record.picUrl.split(","); + record.scanSite=this.form.scanSite; + record.scanMan=this.form.scanMan; let indexBillCode=record.billCode; this.dataMap[indexBillCode]=record; this.emisTmsScanRecordList.push(record); isBatch || this.emisTmsScanRecordList.length > 1 ? this.record = {} : this.record = record; + this.form.picUrl = ""; }); } } diff --git a/src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue b/src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue index 44092f9b..2ea5fa1f 100644 --- a/src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue +++ b/src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue @@ -108,7 +108,9 @@ - + + {{ $t("已签收") }} + /> @@ -116,40 +118,80 @@ {{ parseTime(scope.row.scanDate) }} - - + + + + + - - + + + + + + + + + + + + + + + + + - - - - - - + - - - - - - - + + + + + + - - - + + + + + + + + + @@ -265,6 +307,13 @@ export default { this.tableHeight = window.innerHeight - tableH; }); }, + mounted() { + const end = new Date() + const start = new Date() + start.setHours(0,0,0,0) + end.setHours(23,59,59,0) + this.dateTimeRange=[start,end]; + }, methods: { /** 查询扫描记录列表 */ getList() { @@ -272,11 +321,11 @@ export default { console.log("---->this.queryParams,", this.queryParams); let queryParams = Object.assign({},this.queryParams); if (null != this.dateTimeRange && '' != this.dateTimeRange) { - queryParams.params.beginSignDate = this.dateTimeRange[0]; - queryParams.params.endSignDate = this.dateTimeRange[1]; + queryParams.params.beginScanDate = this.dateTimeRange[0]; + queryParams.params.endScanDate = this.dateTimeRange[1]; }else{ - queryParams.params.beginSignDate = null; - queryParams.params.endSignDate = null; + queryParams.params.beginScanDate = null; + queryParams.params.endScanDate = null; } if(this.queryParams.params.queryOrderType == "1"){ queryParams.orderSN=null; diff --git a/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue b/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue index c206d516..3cf94afd 100644 --- a/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue +++ b/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue @@ -44,7 +44,7 @@ - + @@ -79,9 +79,6 @@ - {{ $t("已签收") }} /> @@ -93,7 +90,7 @@ @@ -138,12 +135,11 @@ - - - - - - + + + - + + + @@ -226,7 +226,7 @@ export default { // 查询参数 queryParams: { pageNum: 1, - pageSize: 20, + pageSize: 10, orderSN:null, billCode: null, scanType: null, @@ -298,11 +298,11 @@ export default { console.log("---->this.queryParams,", this.queryParams); let queryParams = Object.assign({},this.queryParams); if (null != this.dateTimeRange && '' != this.dateTimeRange) { - queryParams.params.beginSignDate = this.dateTimeRange[0]; - queryParams.params.endSignDate = this.dateTimeRange[1]; + queryParams.params.beginScanDate = this.dateTimeRange[0]; + queryParams.params.endScanDate = this.dateTimeRange[1]; }else{ - queryParams.params.beginSignDate = null; - queryParams.params.endSignDate = null; + queryParams.params.beginScanDate = null; + queryParams.params.endScanDate = null; } if(this.queryParams.params.queryOrderType == "1"){ queryParams.orderSN=null; @@ -336,8 +336,8 @@ export default { this.form.dispatchOrSendManCode=item.empCode || this.$store.getters.empCode; }, onCountrySelect(item){ - this.queryParams.params.countryName=item.name; - this.queryParams.params.countryCode=item.code; + this.queryParams.countryName=item.name; + this.queryParams.countryCode=item.code; // this.form.countryName=item.name; // this.form.countryCode=item.code; },