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

md

Browse Source
This commit is contained in:
linfso 2024-06-27 11:15:31 +08:00
parent 87e2469077
commit 07085e9406
5 changed files with 79 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/PdfViewer/viewer.vue
View File

@ -100,8 +100,8 @@ export default {
cacheA4FileList:[], cacheA4FileList:[],
thisPageCount:1, thisPageCount:1,
scale: 30, scale: 25,
preScale: 30, preScale: 25,
pdfUtils:new PdfUtils(), pdfUtils:new PdfUtils(),
@ -130,7 +130,7 @@ export default {
if(this.isA4){ if(this.isA4){
this.doScale(75); this.doScale(75);
}else{ }else{
this.doScale(30); this.doScale(25);
} }
}, },
isLoadComplete(newVal,oldVal){ isLoadComplete(newVal,oldVal){
@ -187,8 +187,8 @@ export default {
this.pageCount=this.cacheA4FileList.length; this.pageCount=this.cacheA4FileList.length;
setTimeout( this.showA4Page(this.cacheA4FileList.length),3000); setTimeout( this.showA4Page(this.cacheA4FileList.length),3000);
}else{ }else{
this.scale=30; this.scale=25;
this.preScale=30; this.preScale=25;
this.pageCount=this.cacheFileList.length; this.pageCount=this.cacheFileList.length;
setTimeout( this.showSinglePage(1),2000); setTimeout( this.showSinglePage(1),2000);
} }

42
src/views/emis/customerService/problemList.vue
View File

@ -1,16 +1,12 @@
<template> <template>
<div class=""> <div class="">
<xd-table v-loading="loading" <el-table v-loading="loading"
border border
size="mini" size="mini"
height="300px" height="300px"
:data="dataList" :data="dataList"
:queryParams="queryParams" :queryParams="queryParams"
:total="total" :total="total"
@queryTable="getList"
:showRightButton="false"
:showPagination="false"
:showOperateButton="false"
> >
<el-table-column label="序号" align="center" min-width="60"> <el-table-column label="序号" align="center" min-width="60">
<template slot-scope="scope"> <template slot-scope="scope">
@ -22,36 +18,37 @@
<span>{{ parseTime(scope.row.registerDate) }}</span> <span>{{ parseTime(scope.row.registerDate) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('问题描述')" align="center" prop="problemCause" min-width="150"> <el-table-column :label="$t('问题件类型')" align="center" prop="problemTypeName" min-width="100" />
<template slot-scope="scope"> <el-table-column :label="$t('问题原因')" align="center" prop="problemCause" min-width="150"/>
<span class="ellipsis">{{scope.row.problemTypeName}}-{{ scope.row.problemCause }}</span> <!-- <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="150">
</template>
</el-table-column>
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="ellipsis">{{ scope.row.remark }}</span> <span class="ellipsis">{{ scope.row.remark }}</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column :label="$t('扫描类型')" align="center" prop="scanType" min-width="100" > <!-- <el-table-column :label="$t('扫描类型')" align="center" prop="scanType" min-width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<span>问题件</span> <span>问题件</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column :label="$t('扫描网点')" align="center" prop="registerSiteName" min-width="100" /> <el-table-column :label="$t('登记网点')" align="center" prop="registerSiteName" min-width="100" />
<el-table-column :label="$t('通知网点')" align="center" prop="sendSiteName" min-width="100" /> <el-table-column :label="$t('通知网点')" align="center" prop="sendSiteName" min-width="100" />
<el-table-column :label="$t('问题件类型')" align="center" prop="problemTypeName" min-width="100" /> <!-- <el-table-column :label="$t('问题件原因')" align="center" prop="problemCause" min-width="100" /> -->
<el-table-column :label="$t('处理状态')" align="center" prop="dealResult" min-width="100" />
<el-table-column :label="$t('问题件原因')" align="center" prop="problemCause" min-width="100" />
<el-table-column :label="$t('问题件回复内容')" align="center" prop="reversionStr" min-width="150" /> <el-table-column :label="$t('问题件回复内容')" align="center" prop="reversionStr" min-width="150" />
<el-table-column :label="$t('处理状态')" align="center" prop="dealResult" min-width="100">
<template slot-scope="scope">
<span v-if="scope.row.dealResult=='2'" style="background-color: #f0e68c;">处理完毕</span>
<span v-else-if="scope.row.dealResult=='0' && scope.row.blSee != '1'">未处理</span>
<span v-else-if="scope.row.blSee=='1'" style="background-color: #dcdcdc;">已查看未处理</span>
</template>
</el-table-column>
<el-table-column :label="$t('回复人')" align="center" prop="reversionManName" min-width="150" /> <el-table-column :label="$t('回复人')" align="center" prop="reversionManName" min-width="150" />
<el-table-column :label="$t('回复网点')" align="center" prop="reversionSiteName" min-width="100" /> <el-table-column :label="$t('回复网点')" align="center" prop="reversionSiteName" min-width="100" />
<el-table-column :label="$t('操作人')" align="center" prop="createByName" min-width="100" /> <el-table-column :label="$t('操作人')" align="center" prop="createByName" min-width="100" />
<el-table-column :label="$t('重量')" align="center" prop="billWeight" min-width="100" > <!-- <el-table-column :label="$t('重量')" align="center" prop="billWeight" min-width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<span></span> <span></span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column :label="$t('回复时间')" align="center" prop="reversionDate" min-width="170"> <el-table-column :label="$t('回复时间')" align="center" prop="reversionDate" min-width="170">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.reversionDate }}</span> <span>{{ scope.row.reversionDate }}</span>
@ -104,8 +101,7 @@
<span class="ellipsis">{{ scope.row.remark }}</span> <span class="ellipsis">{{ scope.row.remark }}</span>
</template> </template>
</el-table-column> --> </el-table-column> -->
</el-table>
</xd-table>
</div> </div>
</template> </template>

17
src/views/emis/customerService/traceRecordList.vue
View File

@ -24,11 +24,12 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('描述')" align="left" prop="desc" min-width="300" :show-overflow-tooltip="true"> <el-table-column :label="$t('描述')" align="left" prop="desc" min-width="320" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="color: #C53144;" v-html="cvtScanRecordToTraceStr(scope.row)"></span> <span style="color: #C53144;" v-html="cvtScanRecordToTraceStr(scope.row)"></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('扫描类型')" align="center" prop="scanType" min-width="80" > <el-table-column :label="$t('扫描类型')" align="center" prop="scanType" min-width="80" >
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.emis_scan_type" :value="scope.row.scanType"/> <dict-tag :options="dict.type.emis_scan_type" :value="scope.row.scanType"/>
@ -37,7 +38,8 @@
<el-table-column :label="$t('扫描网点')" align="center" prop="scanSite" min-width="120" /> <el-table-column :label="$t('扫描网点')" align="center" prop="scanSite" min-width="120" />
<el-table-column :label="$t('操作人')" align="center" prop="scanMan" min-width="80" /> <el-table-column :label="$t('操作人')" align="center" prop="scanMan" min-width="80" />
<!-- <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" /> --> <!-- <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" /> -->
<el-table-column :label="$t('扫描重量')" align="center" prop="scanWeight" min-width="80" />
<!-- <el-table-column :label="$t('扫描重量')" align="center" prop="scanWeight" min-width="80" /> -->
<el-table-column :label="$t('上传时间')" align="center" prop="createTime" min-width="170" > <el-table-column :label="$t('上传时间')" align="center" prop="createTime" min-width="170" >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
@ -73,7 +75,9 @@ export default {
scanRecordList: [], scanRecordList: [],
total:0, total:0,
queryParams:{ queryParams:{
pageNum:1,
pageSize:1000,
billCode:this.billCode
} }
}; };
}, },
@ -96,11 +100,6 @@ export default {
}, },
getList() { getList() {
this.loading = true; this.loading = true;
this.queryParams={
pageNum:1,
pageSize:1000,
billCode:this.billCode
}
getTraceListByBillCode(this.queryParams).then(response => { getTraceListByBillCode(this.queryParams).then(response => {
this.scanRecordList = response.rows; this.scanRecordList = response.rows;
this.total=response.total; this.total=response.total;
@ -198,7 +197,7 @@ export default {
} }
// 问题件 // 问题件
else if(scanType=="-1"){ else if(scanType=="-1"){
content='已登记问题件,登记网点【<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>,登记人<span class="siteOrManHighlight" >['+scanRecord.scanMan+']</span>'; content='问题件, 登记网点【<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>,登记人<span class="siteOrManHighlight" >['+scanRecord.scanMan+']</span> ,'+scanRecord.remark;
} }
// 报关扫描 // 报关扫描
else if(scanType=="700"){ else if(scanType=="700"){

87
src/views/emis/customerService/traceWaybillDetailView.vue
View File

@ -14,7 +14,7 @@
<el-steps :active="active" align-center finish-status="finish"> <el-steps :active="active" align-center finish-status="finish">
<el-step > <el-step >
<template slot="title"> <template slot="title">
收件(<span >{{billDetail.sendCountryName}}</span>) 收件(<span >{{billDetail.sender.countryName}}</span>)
</template> </template>
<span class="icon iconfont" slot="icon">&#xe7b0;</span> <span class="icon iconfont" slot="icon">&#xe7b0;</span>
</el-step> </el-step>
@ -29,25 +29,26 @@
</el-step> </el-step>
<el-step > <el-step >
<template slot="title"> <template slot="title">
签收(<span >{{billDetail.receiveCountryName}}</span>) 签收(<span >{{billDetail.reciever.countryName}}</span>)
</template> </template>
<span class="icon iconfont" slot="icon">&#xe819;</span> <span class="icon iconfont" slot="icon">&#xe819;</span>
</el-step> </el-step>
</el-steps> </el-steps>
</div> </div>
<div style="width:20%;border: 1px solid #eeeeee;font-size: 11px;color: gray; padding: 0px 10px;"> <div style="width:20%;font-size: 11px;color: gray; padding: 0px 10px;display: inline-flex;">
<!-- <div> <div>
<el-button <!-- <el-button
type="primary" type="primary"
@click="showGotRmk" @click="showGotRmk"
>揽收底单</el-button> >揽收底单</el-button> -->
</div> --> </div>
<div> <div>
<div> <div style="text-align: center;">
签收底单 <ImagePreview height="50px" v-for="pic in (billDetail.billPicDispatchRmk||'').split(',')" :key="pic" :src="pic" ></ImagePreview>
</div> </div>
<div> <div style="text-align: center;">
<ImagePreview height="20px" v-for="pic in (billDetail.billPicDispatchRmk||'').split(',')" :key="pic" :src="pic" ></ImagePreview> 签收底单
</div> </div>
</div> </div>
</div> </div>
@ -57,17 +58,17 @@
<TraceRecordList :billCode="scanBillCode"></TraceRecordList> <TraceRecordList :billCode="scanBillCode"></TraceRecordList>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="运单信息" > <el-tab-pane label="运单信息" >
<WaybillDetailReadOnly :billCode="billDetail.billCode"></WaybillDetailReadOnly> <WaybillDetailReadOnly :billCode="scanBillCode"></WaybillDetailReadOnly>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="查看图片" > <el-tab-pane label="查看图片" >
<BillPicList :billCode="billDetail.billCode"></BillPicList> <BillPicList :billCode="scanBillCode"></BillPicList>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="日志记录" > <el-tab-pane label="日志记录" >
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="问题件" > <el-tab-pane label="问题件" >
<ProblemList :billCode="billDetail.billCode"></ProblemList> <ProblemList :billCode="scanBillCode"></ProblemList>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
@ -79,18 +80,19 @@ import ProblemList from './problemList.vue';
import BillPicList from './billPicList.vue'; import BillPicList from './billPicList.vue';
import WaybillDetailReadOnly from '@/views/emis/emisWaybill/waybillDetailReadOnly.vue'; import WaybillDetailReadOnly from '@/views/emis/emisWaybill/waybillDetailReadOnly.vue';
import { getWaybillDetail } from "@/api/emis/emisWaybill";
import {timeDiffTime,timeFormat} from '@/utils/dateUtils' import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
export default { export default {
name: "TraceWaybillDetailView.vue", name: "TraceWaybillDetailView",
props:{ props:{
billDetail: {
type: Object
},
scanBillCode:{ scanBillCode:{
type: String type: String
} },
// billDetail: {
// type: Object
// },
}, },
components: { components: {
TraceRecordList, TraceRecordList,
@ -104,31 +106,13 @@ export default {
active:1, active:1,
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 地球洲表格数据 billDetail:{},
traceInfoList: [] traceInfoList: []
}; };
}, },
created() { created() {
this.initData();
if(this.billDetail.waybillStatus=='10'){
this.active=1;
}
else if(this.billDetail.waybillStatus=='20'){
this.active=2;
}
else if(this.billDetail.waybillStatus=='30'){
this.active=3;
}
else if(this.billDetail.waybillStatus=='40'){
this.active=4;
}
else if(this.billDetail.waybillStatus=='50'){
this.active=5;
}else{
this.active=2;
}
}, },
watch: { watch: {
"billCode": { "billCode": {
@ -138,11 +122,32 @@ export default {
} }
}, },
methods: { methods: {
showGotRmk(){
initData(){
getWaybillDetail(this.scanBillCode).then(response => {
this.billDetail = Object.assign({},response.data);
console.log("===>",this.billDetail);
if(this.billDetail.waybillStatus=='10'){
this.active=1;
}
else if(this.billDetail.waybillStatus=='20'){
this.active=2;
}
else if(this.billDetail.waybillStatus=='30'){
this.active=3;
}
else if(this.billDetail.waybillStatus=='40'){
this.active=4;
}
else if(this.billDetail.waybillStatus=='50'){
this.active=5;
}else{
this.active=2;
}
});
}, },
showGotRmk(){
showGotRmk(){
}, },
calcDeliveryTime(startData,endDate){ calcDeliveryTime(startData,endDate){
return timeDiffTime(startData,endDate) return timeDiffTime(startData,endDate)

2
src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
View File

@ -152,7 +152,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('所属业务员')" align="center" prop="salesmen" min-width="150" /> <el-table-column :label="$t('所属业务员')" align="center" prop="salesmen" min-width="150" />
<el-table-column :label="$t('业务员编号')" align="center" prop="xxx" min-width="150" /> <!-- <el-table-column :label="$t('业务员编号')" align="center" prop="xxx" min-width="150" /> -->
<el-table-column :label="$t('问题件回复')" align="center" prop="reversionStr" min-width="150" /> <el-table-column :label="$t('问题件回复')" align="center" prop="reversionStr" min-width="150" />
<el-table-column :label="$t('回复人')" align="center" prop="reversionMan" min-width="150" /> <el-table-column :label="$t('回复人')" align="center" prop="reversionMan" min-width="150" />
<el-table-column :label="$t('回复日期')" align="center" prop="reversionDate" min-width="170"> <el-table-column :label="$t('回复日期')" align="center" prop="reversionDate" min-width="170">