This commit is contained in:
linfso 2024-06-27 12:42:35 +08:00
parent 07085e9406
commit 88591455e1
9 changed files with 31 additions and 23 deletions

View File

@ -36,9 +36,10 @@
<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-if="scope.row.dealResult=='1'" style="background-color: #f0e68c;">处理中</span>
<span v-else-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>
<span v-else-if="scope.row.dealResult=='0' && 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" />

View File

@ -105,7 +105,7 @@ export default {
/** 查询运单列表列表 */
getList() {
this.resetRefreshId="tracing-"+this.getUUID();
this.resetRefreshId="tracing-"+Math.random().toString(36).substring(3,10);
this.loading = true;
if(!this.queryParams.billCode){

View File

@ -2,6 +2,14 @@
<div class="app-container">
<el-row :gutter="0">
<el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px">
<el-col :span="8">
<el-form-item :label="$t('派件员')" prop="dispatchOrSendManCode">
<span slot="label">
<span style="color: red">{{ $t('派件员') }}</span>
</span>
<EmisUserSimplePicker v-model="form.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect" ></EmisUserSimplePicker>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="扫描单号" prop="billCode" label-width="70px">
<span slot="label">
@ -12,14 +20,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('派件员')" prop="dispatchOrSendManCode">
<span slot="label">
<span style="color: red">{{ $t('派件员') }}</span>
</span>
<EmisUserSimplePicker v-model="form.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect" ></EmisUserSimplePicker>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="重量" prop="scanWeight" label-width="60px">
<el-input v-model="form.scanWeight" placeholder="扫描重量" >

View File

@ -74,8 +74,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="录单重量" prop="volumeWeight" label-width="80px">
<el-input v-model="record.volumeWeight" placeholder="" disabled >
<el-form-item label="实际重量" prop="volumeWeight" label-width="80px">
<el-input v-model="record.billWeight" placeholder="" disabled >
<span slot="suffix">KG</span>
</el-input>
</el-form-item>
@ -166,7 +166,7 @@
</template>
</el-table-column>
<el-table-column :label="$t('派件网点')" align="center" prop="dispatchSiteName" 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" />
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
<el-table-column :label="$t('签收图片')" align="center" min-width="100">
<el-table-column :label="$t('上传图片')" align="center" prop="picUrls" width="200" >

View File

@ -571,7 +571,7 @@
<el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="100%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<TraceWaybillDetailView :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
<TraceWaybillDetailView :key="currentTraceBillCode" :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
</el-dialog>
<!--
<el-dialog title="查看运单" :visible.sync="openView" width="100%" :destroy-on-close="true" :close-on-click-modal="false" v-dialogDrag append-to-body>

View File

@ -571,7 +571,7 @@
<el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="100%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<TraceWaybillDetailView :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
<TraceWaybillDetailView :key="resetRefreshId" :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
</el-dialog>
<!--
<el-dialog title="查看运单" :visible.sync="openView" width="100%" :destroy-on-close="true" :close-on-click-modal="false" v-dialogDrag append-to-body>
@ -662,6 +662,8 @@ export default {
],
data() {
return {
resetRefreshId:null,
tableHeight: 200,
// 遮罩层
@ -897,6 +899,7 @@ export default {
return '';
},
handleShowTraceInfo(row){
this.resetRefreshId="tracing-"+Math.random().toString(36).substring(3,10);
this.currentTraceBillCode=row.billCode;
this.currentTraceBillItem=row;
this.openTraceInfo=true;

View File

@ -185,9 +185,10 @@
<el-table-column :label="$t('回复网点')" align="center" prop="reversionManCode" min-width="100" />
<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-if="scope.row.dealResult=='1'" style="background-color: #f0e68c;">处理中</span>
<span v-else-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>
<span v-else-if="scope.row.dealResult=='0' && scope.row.blSee == '1'" style="background-color: #dcdcdc;">已查看未处理</span>
</template>
</el-table-column>
<el-table-column :label="$t('是否查看')" align="center" prop="blSee" min-width="100">
@ -820,7 +821,7 @@ export default {
.isSeeNoDeal{
background-color: rgb(220, 220, 220);
}
:deep .el-table .disabled-row .el-checkbox__inner {
display: none; /* 隐藏checkbox */
}

View File

@ -176,9 +176,10 @@
<el-table-column :label="$t('回复网点')" align="center" prop="reversionSiteName" min-width="100" />
<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-if="scope.row.dealResult=='1'" style="background-color: #f0e68c;">处理中</span>
<span v-else-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>
<span v-else-if="scope.row.dealResult=='0' && scope.row.blSee == '1'" style="background-color: #dcdcdc;">已查看未处理</span>
</template>
</el-table-column>
<el-table-column :label="$t('是否查看')" align="center" prop="blSee" min-width="100">

View File

@ -163,9 +163,10 @@
<el-table-column :label="$t('回复网点')" align="center" prop="reversionManCode" min-width="100" />
<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-if="scope.row.dealResult=='1'" style="background-color: #f0e68c;">处理中</span>
<span v-else-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>
<span v-else-if="scope.row.dealResult=='0' && scope.row.blSee == '1'" style="background-color: #dcdcdc;">已查看未处理</span>
</template>
</el-table-column>
<el-table-column :label="$t('是否查看')" align="center" prop="blSee" min-width="100">