aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.xdadan.loc/tanex/emis-frontend

Browse Source
This commit is contained in:
linfso 2024-07-22 19:12:33 +08:00
commit 29e50cd2e8
4 changed files with 83 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/views/emis/emisTmsScanRecord/customsClearScan.vue
View File

@ -84,7 +84,7 @@
<!-- <el-table ref="multipleTable" border v-loading="loading" :data="emisTmsScanRecordList" @selection-change="handleSelectionChange"> -->
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('扫描单号')" align="center" prop="billCode" min-width="150" />
<el-table-column :label="$t('目的地网点')" align="center" prop="scanMan" min-width="150" />
<el-table-column :label="$t('目的地网点')" align="center" prop="dispatchUnderlingSiteName" min-width="150" />
<el-table-column :label="$t('扫描类型')" align="center" prop="scanType" min-width="100" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_scan_type" :value="scope.row.scanType"/>
@ -131,6 +131,7 @@
import { doScan } from "@/api/emis/emisTmsScanRecord";
import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
import { parseTime } from "@/utils/custom";
import { getWaybillDetail} from "@/api/emis/emisWaybill";
export default {
name: "CustomsClearScan",
@ -301,15 +302,29 @@ export default {
this.form.scanDate = new Date();
let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode;
console.log(record)
let indexBillCode=record.billCode;
this.dataMap[indexBillCode]=record;
this.emisTmsScanRecordList.push(record);
// console.log(record)
// let indexBillCode=record.billCode;
// this.dataMap[indexBillCode]=record;
// this.emisTmsScanRecordList.push(record);
this.addItem(record);
}
});
this.openBatch=false;
},
async addItem(item){
let res=await getWaybillDetail(item.billCode);
// this.loading = false;
if(res.code != 200){
this.$message.error(res.msg);
return;
}
item.dispatchUnderlingSiteName = res.data.dispatchUnderlingSiteName;
let indexBillCode=item.billCode;
this.dataMap[indexBillCode]=item;
this.emisTmsScanRecordList.push(item);
},
// 表单重置
reset() {
this.form = {
@ -466,10 +481,11 @@ export default {
this.form.scanDate = new Date();
let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode;
console.log(record)
let indexBillCode=record.billCode;
this.dataMap[indexBillCode]=record;
this.emisTmsScanRecordList.push(record);
// console.log(record)
// let indexBillCode=record.billCode;
// this.dataMap[indexBillCode]=record;
// this.emisTmsScanRecordList.push(record);
this.addItem(record);
});

33
src/views/emis/emisTmsScanRecord/customsDeclearScan.vue
View File

@ -82,7 +82,7 @@
<!-- <el-table ref="multipleTable" border v-loading="loading" :data="emisTmsScanRecordList" @selection-change="handleSelectionChange"> -->
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('扫描单号')" align="center" prop="billCode" min-width="150" />
<el-table-column :label="$t('目的地网点')" align="center" prop="scanMan" min-width="150" />
<el-table-column :label="$t('目的地网点')" align="center" prop="dispatchUnderlingSiteName" min-width="150" />
<el-table-column :label="$t('扫描类型')" align="center" prop="scanType" min-width="100" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_scan_type" :value="scope.row.scanType"/>
@ -129,6 +129,7 @@
import { doScan } from "@/api/emis/emisTmsScanRecord";
import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
import { parseTime } from "@/utils/custom";
import { getWaybillDetail} from "@/api/emis/emisWaybill";
export default {
name: "CustomsDeclearScan",
@ -304,15 +305,28 @@ export default {
this.form.scanDate = new Date();
let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode;
console.log(record)
let indexBillCode=record.billCode;
this.dataMap[indexBillCode]=record;
this.emisTmsScanRecordList.push(record);
// console.log(record)
// let indexBillCode=record.billCode;
// this.dataMap[indexBillCode]=record;
// this.emisTmsScanRecordList.push(record);
this.addItem(record);
}
});
this.openBatch=false;
},
async addItem(item){
let res=await getWaybillDetail(item.billCode);
// this.loading = false;
if(res.code != 200){
this.$message.error(res.msg);
return;
}
item.dispatchUnderlingSiteName = res.data.dispatchUnderlingSiteName;
let indexBillCode=item.billCode;
this.dataMap[indexBillCode]=item;
this.emisTmsScanRecordList.push(item);
},
// 表单重置
reset() {
this.form = {
@ -469,10 +483,11 @@ export default {
this.form.scanDate = new Date();
let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode;
console.log(record)
let indexBillCode=record.billCode;
this.dataMap[indexBillCode]=record;
this.emisTmsScanRecordList.push(record);
// console.log(record)
// let indexBillCode=record.billCode;
// this.dataMap[indexBillCode]=record;
// this.emisTmsScanRecordList.push(record);
this.addItem(record);
});

32
src/views/emis/emisTmsScanRecord/outgoingScan.vue
View File

@ -82,7 +82,7 @@
<!-- <el-table ref="multipleTable" border v-loading="loading" :data="emisTmsScanRecordList" @selection-change="handleSelectionChange"> -->
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('扫描单号')" align="center" prop="billCode" min-width="150" />
<el-table-column :label="$t('目的地网点')" align="center" prop="scanMan" min-width="150" />
<el-table-column :label="$t('目的地网点')" align="center" prop="dispatchUnderlingSiteName" min-width="150" />
<el-table-column :label="$t('扫描类型')" align="center" prop="scanType" min-width="100" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_scan_type" :value="scope.row.scanType"/>
@ -129,6 +129,7 @@
import { doScan } from "@/api/emis/emisTmsScanRecord";
import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
import { parseTime } from "@/utils/custom";
import { getWaybillDetail} from "@/api/emis/emisWaybill";
export default {
name: "OutgoingScan",
@ -303,15 +304,27 @@ export default {
this.form.scanDate = new Date();
let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode;
console.log(record)
let indexBillCode=record.billCode;
this.dataMap[indexBillCode]=record;
this.emisTmsScanRecordList.push(record);
// let indexBillCode=record.billCode;
// this.dataMap[indexBillCode]=record;
// this.emisTmsScanRecordList.push(record);
this.addItem(record);
}
});
this.openBatch=false;
},
async addItem(item){
let res=await getWaybillDetail(item.billCode);
// this.loading = false;
if(res.code != 200){
this.$message.error(res.msg);
return;
}
item.dispatchUnderlingSiteName = res.data.dispatchUnderlingSiteName;
let indexBillCode=item.billCode;
this.dataMap[indexBillCode]=item;
this.emisTmsScanRecordList.push(item);
},
// 表单重置
reset() {
this.form = {
@ -467,10 +480,11 @@ export default {
this.form.scanDate = new Date();
let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode;
console.log(record)
let indexBillCode=record.billCode;
this.dataMap[indexBillCode]=record;
this.emisTmsScanRecordList.push(record);
// console.log(record)
// let indexBillCode=record.billCode;
// this.dataMap[indexBillCode]=record;
// this.emisTmsScanRecordList.push(record);
this.addItem(record);
});

13
src/views/emis/emisWaybillProblemInfo/problemEntry.vue
View File

@ -699,8 +699,17 @@ export default {
let rsItem = rows[index];
console.log(rsItem);
let record =Object.assign({}, rsItem)
record.notifySiteCode = record.sendSiteCode;
record.notifySiteName = record.sendSiteName;
// record.notifySiteCode = record.sendSiteCode;
// record.notifySiteName = record.sendSiteName;
if(record.sendSiteCode == this.$store.getters.ownerSiteCode){
record.notifySiteCode = record.dispatchUnderlingSiteCode;
record.notifySiteName = record.dispatchUnderlingSiteName;
}else{
record.notifySiteCode = record.sendSiteCode;
record.notifySiteName = record.sendSiteName;
}
record.scanSiteCode=this.form.scanSiteCode;
record.scanSite=this.form.scanSite;
record.scanDate=scanDate;