|
|
|
@ -128,7 +128,8 @@ |
|
|
|
<!-- </div>--> |
|
|
|
<!-- </div>--> |
|
|
|
<!-- </div>--> |
|
|
|
<!-- </div>--> |
|
|
|
<!-- </el-row>--> |
|
|
|
<!-- </el-row>--> |
|
|
|
<el-tabs type="border-card" v-model="activeTab" @tab-click="handleTabClick"> |
|
|
|
<el-tabs type="border-card" v-model="activeTab" @tab-click="handleTabClick" v-loading="checkloading" |
|
|
|
|
|
|
|
element-loading-text="正在复核签收处理中..."> |
|
|
|
<el-tab-pane label="客 户 列 表" name="tab1"> |
|
|
|
<el-tab-pane label="客 户 列 表" name="tab1"> |
|
|
|
<tablecmt |
|
|
|
<tablecmt |
|
|
|
class="tableNode" |
|
|
|
class="tableNode" |
|
|
|
@ -187,6 +188,7 @@ |
|
|
|
slotProps.scope.row.driverSigning == '未签收' |
|
|
|
slotProps.scope.row.driverSigning == '未签收' |
|
|
|
" |
|
|
|
" |
|
|
|
>一键签收 |
|
|
|
>一键签收 |
|
|
|
|
|
|
|
|
|
|
|
</el-text> |
|
|
|
</el-text> |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
</tablecmt> |
|
|
|
</tablecmt> |
|
|
|
@ -394,7 +396,7 @@ |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
</el-dialog> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
|
|
|
<!-- 表单模块 --> |
|
|
|
|
|
|
|
<el-dialog |
|
|
|
<el-dialog |
|
|
|
:title="title" |
|
|
|
:title="title" |
|
|
|
v-model="box" |
|
|
|
v-model="box" |
|
|
|
@ -456,20 +458,32 @@ |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table-column> |
|
|
|
</el-table> --> |
|
|
|
</el-table> --> |
|
|
|
|
|
|
|
<!-- 客户包件 --> |
|
|
|
<tablecmt |
|
|
|
<tablecmt |
|
|
|
:columnList="wrapoption.column" |
|
|
|
:columnList="wrapoption.column" |
|
|
|
:tableData="wrapdata" |
|
|
|
:tableData="wrapdata" |
|
|
|
:loading="loading" |
|
|
|
:loading="loading" |
|
|
|
@inputTxt="winputsc" |
|
|
|
@inputTxt="inputscReservationPackage" |
|
|
|
@timeCheck="timesc" |
|
|
|
@timeCheck="timescReservationPackage" |
|
|
|
@selectCheck="selectsc" |
|
|
|
@selectCheck="selectscReservationPackage" |
|
|
|
ref="wtableBox" |
|
|
|
ref="wtableBox" |
|
|
|
@selection="selectionChange" |
|
|
|
@selection="selectionChange" |
|
|
|
> |
|
|
|
> |
|
|
|
<template #default="slotProps"> |
|
|
|
<template #default="slotProps"> |
|
|
|
<template v-if="slotProps.scope.column.label === '操作'"> |
|
|
|
<template v-if="slotProps.scope.column.label === '操作'"> |
|
|
|
<el-button text size="small" @click="handleQRCode(scope.row)">查看二维码</el-button> |
|
|
|
<el-text size="small" @click="handleQRCode(slotProps.scope.row)">查看二维码</el-text> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-text v-if="slotProps.scope.row.orderPackageLoadingStatus === '10' |
|
|
|
|
|
|
|
|| slotProps.scope.row.orderPackageLoadingStatusName === '待装车' |
|
|
|
|
|
|
|
|| slotProps.scope.row.orderPackageStatus !== '70' |
|
|
|
|
|
|
|
|| slotProps.scope.row.orderPackageStatusName !== '已签收'" |
|
|
|
|
|
|
|
size="small" |
|
|
|
|
|
|
|
@click="cancelReservationPackage(slotProps.scope.row)">计划取消</el-text> |
|
|
|
|
|
|
|
<el-text v-if="slotProps.scope.row.orderPackageLoadingStatus === '10' |
|
|
|
|
|
|
|
|| slotProps.scope.row.orderPackageLoadingStatusName === '待装车' |
|
|
|
|
|
|
|
" |
|
|
|
|
|
|
|
size="small" |
|
|
|
|
|
|
|
@click="signingReservationPackage(slotProps.scope.row)">签收</el-text> |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
</tablecmt> |
|
|
|
</tablecmt> |
|
|
|
@ -515,7 +529,8 @@ |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div>------------------------------</div> --> |
|
|
|
<div>------------------------------</div> --> |
|
|
|
<div class="TcFrom"> |
|
|
|
<div class="TcFrom" |
|
|
|
|
|
|
|
> |
|
|
|
<el-form :model="TcForm" label-width="120px"> |
|
|
|
<el-form :model="TcForm" label-width="120px"> |
|
|
|
<el-form-item label="收货人姓名"> |
|
|
|
<el-form-item label="收货人姓名"> |
|
|
|
<el-input disabled v-model="TcForm.consignee" placeholder="暂无收货人姓名" /> |
|
|
|
<el-input disabled v-model="TcForm.consignee" placeholder="暂无收货人姓名" /> |
|
|
|
@ -550,7 +565,13 @@ |
|
|
|
:on-remove="handleRemove" |
|
|
|
:on-remove="handleRemove" |
|
|
|
:on-success="ImgSuccessA" |
|
|
|
:on-success="ImgSuccessA" |
|
|
|
:headers="headers" |
|
|
|
:headers="headers" |
|
|
|
|
|
|
|
multiple |
|
|
|
> |
|
|
|
> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-icon><Plus /></el-icon> |
|
|
|
<el-icon><Plus /></el-icon> |
|
|
|
</el-upload> |
|
|
|
</el-upload> |
|
|
|
<el-dialog v-model="dialogVisibleA"> |
|
|
|
<el-dialog v-model="dialogVisibleA"> |
|
|
|
@ -568,6 +589,7 @@ |
|
|
|
:on-remove="handleRemove" |
|
|
|
:on-remove="handleRemove" |
|
|
|
:on-success="ImgSuccessB" |
|
|
|
:on-success="ImgSuccessB" |
|
|
|
:headers="headers" |
|
|
|
:headers="headers" |
|
|
|
|
|
|
|
multiple |
|
|
|
> |
|
|
|
> |
|
|
|
<el-icon><Plus /></el-icon> |
|
|
|
<el-icon><Plus /></el-icon> |
|
|
|
</el-upload> |
|
|
|
</el-upload> |
|
|
|
@ -576,6 +598,9 @@ |
|
|
|
</el-dialog> |
|
|
|
</el-dialog> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div class="imgName"> |
|
|
|
<div class="imgName"> |
|
|
|
<span>易碎照</span> |
|
|
|
<span>易碎照</span> |
|
|
|
<el-upload |
|
|
|
<el-upload |
|
|
|
@ -586,6 +611,7 @@ |
|
|
|
:on-remove="handleRemove" |
|
|
|
:on-remove="handleRemove" |
|
|
|
:on-success="ImgSuccessC" |
|
|
|
:on-success="ImgSuccessC" |
|
|
|
:headers="headers" |
|
|
|
:headers="headers" |
|
|
|
|
|
|
|
multiple |
|
|
|
> |
|
|
|
> |
|
|
|
<el-icon><Plus /></el-icon> |
|
|
|
<el-icon><Plus /></el-icon> |
|
|
|
</el-upload> |
|
|
|
</el-upload> |
|
|
|
@ -594,6 +620,8 @@ |
|
|
|
</el-dialog> |
|
|
|
</el-dialog> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div class="imgName"> |
|
|
|
<div class="imgName"> |
|
|
|
<span>家配照</span> |
|
|
|
<span>家配照</span> |
|
|
|
<el-upload |
|
|
|
<el-upload |
|
|
|
@ -604,6 +632,7 @@ |
|
|
|
:on-remove="handleRemove" |
|
|
|
:on-remove="handleRemove" |
|
|
|
:on-success="ImgSuccessD" |
|
|
|
:on-success="ImgSuccessD" |
|
|
|
:headers="headers" |
|
|
|
:headers="headers" |
|
|
|
|
|
|
|
multiple |
|
|
|
> |
|
|
|
> |
|
|
|
<el-icon><Plus /></el-icon> |
|
|
|
<el-icon><Plus /></el-icon> |
|
|
|
</el-upload> |
|
|
|
</el-upload> |
|
|
|
@ -612,6 +641,7 @@ |
|
|
|
</el-dialog> |
|
|
|
</el-dialog> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div class="imgName"> |
|
|
|
<div class="imgName"> |
|
|
|
<span>签收照</span> |
|
|
|
<span>签收照</span> |
|
|
|
<el-upload |
|
|
|
<el-upload |
|
|
|
@ -622,6 +652,7 @@ |
|
|
|
:on-remove="handleRemove" |
|
|
|
:on-remove="handleRemove" |
|
|
|
:on-success="ImgSuccessE" |
|
|
|
:on-success="ImgSuccessE" |
|
|
|
:headers="headers" |
|
|
|
:headers="headers" |
|
|
|
|
|
|
|
multiple |
|
|
|
> |
|
|
|
> |
|
|
|
<el-icon><Plus /></el-icon> |
|
|
|
<el-icon><Plus /></el-icon> |
|
|
|
</el-upload> |
|
|
|
</el-upload> |
|
|
|
@ -685,6 +716,7 @@ export default { |
|
|
|
data() { |
|
|
|
data() { |
|
|
|
return { |
|
|
|
return { |
|
|
|
html: '', |
|
|
|
html: '', |
|
|
|
|
|
|
|
checkloading:false,//复核签收加载 |
|
|
|
dialogImageUrl: '', //图片放大地址 |
|
|
|
dialogImageUrl: '', //图片放大地址 |
|
|
|
dialogVisible: false, //图片状态 |
|
|
|
dialogVisible: false, //图片状态 |
|
|
|
dialogImageUrlA: '', |
|
|
|
dialogImageUrlA: '', |
|
|
|
@ -714,6 +746,7 @@ export default { |
|
|
|
SignForPhotos: [], |
|
|
|
SignForPhotos: [], |
|
|
|
reservationId: null, //当前行的ID |
|
|
|
reservationId: null, //当前行的ID |
|
|
|
windowHeight: null, |
|
|
|
windowHeight: null, |
|
|
|
|
|
|
|
CheckStore:null, |
|
|
|
columnList: [ |
|
|
|
columnList: [ |
|
|
|
{ |
|
|
|
{ |
|
|
|
prop: 'trainNumber', |
|
|
|
prop: 'trainNumber', |
|
|
|
@ -1254,6 +1287,16 @@ export default { |
|
|
|
fixed: false, |
|
|
|
fixed: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
prop: 'signingNumber', |
|
|
|
|
|
|
|
label: '签收数量', |
|
|
|
|
|
|
|
type: 1, |
|
|
|
|
|
|
|
values: '', |
|
|
|
|
|
|
|
width: '150', |
|
|
|
|
|
|
|
checkarr: [], |
|
|
|
|
|
|
|
fixed: false, |
|
|
|
|
|
|
|
sortable: true, |
|
|
|
|
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
prop: 'orderStatusName', |
|
|
|
prop: 'orderStatusName', |
|
|
|
label: '订单状态', |
|
|
|
label: '订单状态', |
|
|
|
@ -1668,6 +1711,17 @@ export default { |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
head: false, |
|
|
|
head: false, |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
prop: 'signingUser', |
|
|
|
|
|
|
|
label: '签收人', |
|
|
|
|
|
|
|
type: 1, |
|
|
|
|
|
|
|
values: '', |
|
|
|
|
|
|
|
width: '150', |
|
|
|
|
|
|
|
checkarr: [], |
|
|
|
|
|
|
|
fixed: false, |
|
|
|
|
|
|
|
sortable: true, |
|
|
|
|
|
|
|
head: false, |
|
|
|
|
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
prop: 'signingTime', |
|
|
|
prop: 'signingTime', |
|
|
|
label: '签收扫描时间', |
|
|
|
label: '签收扫描时间', |
|
|
|
@ -2428,46 +2482,46 @@ export default { |
|
|
|
fixed: false, |
|
|
|
fixed: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
// { |
|
|
|
label: '发站仓', |
|
|
|
// label: '发站仓', |
|
|
|
prop: 'sendWarehouseName', |
|
|
|
// prop: 'sendWarehouseName', |
|
|
|
type: 2, |
|
|
|
// type: 2, |
|
|
|
values: '', |
|
|
|
// values: '', |
|
|
|
width: '130', |
|
|
|
// width: '130', |
|
|
|
checkarr: [], |
|
|
|
// checkarr: [], |
|
|
|
fixed: false, |
|
|
|
// fixed: false, |
|
|
|
sortable: true, |
|
|
|
// sortable: true, |
|
|
|
}, |
|
|
|
// }, |
|
|
|
{ |
|
|
|
// { |
|
|
|
label: '目的仓', |
|
|
|
// label: '目的仓', |
|
|
|
prop: 'acceptWarehouseName', |
|
|
|
// prop: 'acceptWarehouseName', |
|
|
|
type: 2, |
|
|
|
// type: 2, |
|
|
|
values: '', |
|
|
|
// values: '', |
|
|
|
width: '130', |
|
|
|
// width: '130', |
|
|
|
checkarr: [], |
|
|
|
// checkarr: [], |
|
|
|
fixed: false, |
|
|
|
// fixed: false, |
|
|
|
sortable: true, |
|
|
|
// sortable: true, |
|
|
|
}, |
|
|
|
// }, |
|
|
|
{ |
|
|
|
// { |
|
|
|
label: '发货时间', |
|
|
|
// label: '发货时间', |
|
|
|
prop: 'waybillNumber', |
|
|
|
// prop: 'waybillNumber', |
|
|
|
type: 2, |
|
|
|
// type: 2, |
|
|
|
values: '', |
|
|
|
// values: '', |
|
|
|
width: '130', |
|
|
|
// width: '130', |
|
|
|
checkarr: [], |
|
|
|
// checkarr: [], |
|
|
|
fixed: false, |
|
|
|
// fixed: false, |
|
|
|
sortable: true, |
|
|
|
// sortable: true, |
|
|
|
}, |
|
|
|
// }, |
|
|
|
{ |
|
|
|
// { |
|
|
|
label: '入库时间', |
|
|
|
// label: '入库时间', |
|
|
|
prop: 'warehouseEntryTimeEnd', |
|
|
|
// prop: 'warehouseEntryTimeEnd', |
|
|
|
type: 2, |
|
|
|
// type: 2, |
|
|
|
values: '', |
|
|
|
// values: '', |
|
|
|
width: '130', |
|
|
|
// width: '130', |
|
|
|
checkarr: [], |
|
|
|
// checkarr: [], |
|
|
|
fixed: false, |
|
|
|
// fixed: false, |
|
|
|
sortable: true, |
|
|
|
// sortable: true, |
|
|
|
}, |
|
|
|
// }, |
|
|
|
// { |
|
|
|
// { |
|
|
|
// label: '客户车次号', |
|
|
|
// label: '客户车次号', |
|
|
|
// prop: 'trainNumber', |
|
|
|
// prop: 'trainNumber', |
|
|
|
@ -2536,67 +2590,103 @@ export default { |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: '包件状态', |
|
|
|
label: '包件状态', |
|
|
|
prop: 'orderPackageStatusName', |
|
|
|
prop: 'orderPackageStatusName', |
|
|
|
type: 2, |
|
|
|
type: 3, |
|
|
|
values: '', |
|
|
|
|
|
|
|
width: '130', |
|
|
|
|
|
|
|
checkarr: [], |
|
|
|
|
|
|
|
fixed: false, |
|
|
|
|
|
|
|
sortable: true, |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '冻结状态', |
|
|
|
|
|
|
|
prop: 'orderPackageFreezeStatusName', |
|
|
|
|
|
|
|
type: 2, |
|
|
|
|
|
|
|
values: '', |
|
|
|
|
|
|
|
width: '130', |
|
|
|
|
|
|
|
checkarr: [], |
|
|
|
|
|
|
|
fixed: false, |
|
|
|
|
|
|
|
sortable: true, |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '上架状态', |
|
|
|
|
|
|
|
prop: 'orderPackageGroundingStatusName', |
|
|
|
|
|
|
|
type: 2, |
|
|
|
|
|
|
|
values: '', |
|
|
|
values: '', |
|
|
|
width: '130', |
|
|
|
width: '130', |
|
|
|
checkarr: [], |
|
|
|
checkarr: [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '未签收', |
|
|
|
|
|
|
|
value: '10' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '已签收', |
|
|
|
|
|
|
|
value: '70' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
], |
|
|
|
fixed: false, |
|
|
|
fixed: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
// { |
|
|
|
|
|
|
|
// label: '冻结状态', |
|
|
|
|
|
|
|
// prop: 'orderPackageFreezeStatusName', |
|
|
|
|
|
|
|
// type: 2, |
|
|
|
|
|
|
|
// values: '', |
|
|
|
|
|
|
|
// width: '130', |
|
|
|
|
|
|
|
// checkarr: [], |
|
|
|
|
|
|
|
// fixed: false, |
|
|
|
|
|
|
|
// sortable: true, |
|
|
|
|
|
|
|
// }, |
|
|
|
|
|
|
|
// { |
|
|
|
|
|
|
|
// label: '上架状态', |
|
|
|
|
|
|
|
// prop: 'orderPackageGroundingStatusName', |
|
|
|
|
|
|
|
// type: 2, |
|
|
|
|
|
|
|
// values: '', |
|
|
|
|
|
|
|
// width: '130', |
|
|
|
|
|
|
|
// checkarr: [], |
|
|
|
|
|
|
|
// fixed: false, |
|
|
|
|
|
|
|
// sortable: true, |
|
|
|
|
|
|
|
// }, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: '备货状态', |
|
|
|
label: '备货状态', |
|
|
|
prop: 'orderPackageStockupStatusName', |
|
|
|
prop: 'orderPackageStockupStatusName', |
|
|
|
type: 2, |
|
|
|
type: 3, |
|
|
|
values: '', |
|
|
|
values: '', |
|
|
|
width: '130', |
|
|
|
width: '130', |
|
|
|
checkarr: [], |
|
|
|
checkarr: [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '待备货', |
|
|
|
|
|
|
|
value: '10' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '已备货', |
|
|
|
|
|
|
|
value: '20' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
], |
|
|
|
fixed: false, |
|
|
|
fixed: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: '预约状态', |
|
|
|
label: '预约状态', |
|
|
|
prop: 'orderPackageReservationStatusName', |
|
|
|
prop: 'orderPackageReservationStatusName', |
|
|
|
type: 2, |
|
|
|
type: 3, |
|
|
|
values: '', |
|
|
|
values: '', |
|
|
|
width: '130', |
|
|
|
width: '130', |
|
|
|
checkarr: [], |
|
|
|
checkarr: [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '待预约', |
|
|
|
|
|
|
|
value: '10' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '已预约', |
|
|
|
|
|
|
|
value: '20' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
], |
|
|
|
fixed: false, |
|
|
|
fixed: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: '装车状态', |
|
|
|
label: '装车状态', |
|
|
|
prop: 'orderPackageLoadingStatusName', |
|
|
|
prop: 'orderPackageLoadingStatusName', |
|
|
|
type: 2, |
|
|
|
type: 3, |
|
|
|
values: '', |
|
|
|
values: '', |
|
|
|
width: '130', |
|
|
|
width: '130', |
|
|
|
checkarr: [], |
|
|
|
checkarr: [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '待装车', |
|
|
|
|
|
|
|
value: '10' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '已装车', |
|
|
|
|
|
|
|
value: '20' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
], |
|
|
|
fixed: false, |
|
|
|
fixed: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: '装车时间', |
|
|
|
label: '装车时间', |
|
|
|
prop: 'loadingTime', |
|
|
|
prop: 'loadingTime', |
|
|
|
type: 2, |
|
|
|
type: 4, |
|
|
|
values: '', |
|
|
|
values: '', |
|
|
|
width: '130', |
|
|
|
width: '130', |
|
|
|
checkarr: [], |
|
|
|
checkarr: [], |
|
|
|
@ -2618,10 +2708,27 @@ export default { |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: '装车方式', |
|
|
|
label: '装车方式', |
|
|
|
prop: 'scanStatus', |
|
|
|
prop: 'scanStatus', |
|
|
|
type: 2, |
|
|
|
type: 3, |
|
|
|
values: '', |
|
|
|
values: '', |
|
|
|
width: '130', |
|
|
|
width: '130', |
|
|
|
checkarr: [], |
|
|
|
checkarr: [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '扫描', |
|
|
|
|
|
|
|
value: '2' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '订单', |
|
|
|
|
|
|
|
value: '3' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '一键装车', |
|
|
|
|
|
|
|
value: '4' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '补录', |
|
|
|
|
|
|
|
value: '5' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
], |
|
|
|
fixed: false, |
|
|
|
fixed: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
}, |
|
|
|
}, |
|
|
|
@ -2634,7 +2741,7 @@ export default { |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: '计划装车人', |
|
|
|
label: '计划装车人', |
|
|
|
prop: 'driverName', |
|
|
|
prop: 'driverName', |
|
|
|
type: 2, |
|
|
|
type: 1, |
|
|
|
values: '', |
|
|
|
values: '', |
|
|
|
width: '130', |
|
|
|
width: '130', |
|
|
|
checkarr: [], |
|
|
|
checkarr: [], |
|
|
|
@ -2654,7 +2761,7 @@ export default { |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: '签收扫描时间', |
|
|
|
label: '签收扫描时间', |
|
|
|
prop: 'signingTime', |
|
|
|
prop: 'signingTime', |
|
|
|
type: 2, |
|
|
|
type: 4, |
|
|
|
values: '', |
|
|
|
values: '', |
|
|
|
width: '130', |
|
|
|
width: '130', |
|
|
|
checkarr: [], |
|
|
|
checkarr: [], |
|
|
|
@ -3138,6 +3245,39 @@ export default { |
|
|
|
if (!index) delete this.inventoryQuery[row.prop]; |
|
|
|
if (!index) delete this.inventoryQuery[row.prop]; |
|
|
|
this.handleInventory(this.page); |
|
|
|
this.handleInventory(this.page); |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
inputscReservationPackage(index, row) { |
|
|
|
|
|
|
|
console.log('index', index); |
|
|
|
|
|
|
|
console.log('row', row); |
|
|
|
|
|
|
|
this.wrapoption.query[row.prop] = index; |
|
|
|
|
|
|
|
if (!index) delete this.inventoryQuery[row.prop]; |
|
|
|
|
|
|
|
this.getWrapdetails(this.page); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
timescReservationPackage(index, row) { |
|
|
|
|
|
|
|
if (!!index) { |
|
|
|
|
|
|
|
index = dayjs(index).format('YYYY-MM-DD'); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
this.wrapoption.query[row.prop] = index; |
|
|
|
|
|
|
|
if (!index) { |
|
|
|
|
|
|
|
delete this.wrapoption.query[row.prop]; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
this.getWrapdetails(this.page); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
selectscReservationPackage(index, row) { |
|
|
|
|
|
|
|
console.log(index, row); |
|
|
|
|
|
|
|
if (row.prop === 'orderPackageStatusName') { |
|
|
|
|
|
|
|
this.wrapoption.query['orderPackageStatus'] = index; |
|
|
|
|
|
|
|
} else if (row.prop === 'orderPackageStockupStatusName') { |
|
|
|
|
|
|
|
this.wrapoption.query['orderPackageStockupStatus'] = index; |
|
|
|
|
|
|
|
} else if (row.prop === 'orderPackageReservationStatusName') { |
|
|
|
|
|
|
|
this.wrapoption.query['orderPackageReservationStatus'] = index; |
|
|
|
|
|
|
|
} else if (row.prop === 'orderPackageLoadingStatusName') { |
|
|
|
|
|
|
|
this.wrapoption.query['orderPackageLoadingStatus'] = index; |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
this.wrapoption.query[row.prop] = index; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
this.getWrapdetails(this.page); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
timesc() {}, |
|
|
|
timesc() {}, |
|
|
|
btnsc() {}, |
|
|
|
btnsc() {}, |
|
|
|
selectsc() {}, |
|
|
|
selectsc() {}, |
|
|
|
@ -3178,6 +3318,17 @@ export default { |
|
|
|
|
|
|
|
|
|
|
|
this.dialogVisibleF = true; |
|
|
|
this.dialogVisibleF = true; |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
cancelReservationPackage(row){ |
|
|
|
|
|
|
|
console.log("row",row); |
|
|
|
|
|
|
|
this.$message.warning("功能维护中..."); |
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
signingReservationPackage(row){ |
|
|
|
|
|
|
|
console.log("row",row); |
|
|
|
|
|
|
|
this.$message.warning("功能维护中..."); |
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
}, |
|
|
|
/** |
|
|
|
/** |
|
|
|
* 打印 |
|
|
|
* 打印 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@ -3284,8 +3435,12 @@ export default { |
|
|
|
this.dialogImageUrlE = uploadFile.url; |
|
|
|
this.dialogImageUrlE = uploadFile.url; |
|
|
|
this.dialogVisibleE = true; |
|
|
|
this.dialogVisibleE = true; |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
// 复核签收确认弹窗 |
|
|
|
submitForm() { |
|
|
|
submitForm() { |
|
|
|
|
|
|
|
console.log(this.reservationId); |
|
|
|
|
|
|
|
console.log(this.CheckStore,'要处理的值'); |
|
|
|
|
|
|
|
this.checkloading=true;//开启复核签收加载效果 |
|
|
|
|
|
|
|
// this.signBox = false; |
|
|
|
// console.log('--------------->this.signtitle', this.signtitle); |
|
|
|
// console.log('--------------->this.signtitle', this.signtitle); |
|
|
|
// console.log('--------------->this.signtitle', this.submitForm); |
|
|
|
// console.log('--------------->this.signtitle', this.submitForm); |
|
|
|
let row = {}; |
|
|
|
let row = {}; |
|
|
|
@ -3298,6 +3453,7 @@ export default { |
|
|
|
}; |
|
|
|
}; |
|
|
|
// 提交图片处理 |
|
|
|
// 提交图片处理 |
|
|
|
//最后提交 |
|
|
|
//最后提交 |
|
|
|
|
|
|
|
|
|
|
|
row.reservationId = this.reservationId; |
|
|
|
row.reservationId = this.reservationId; |
|
|
|
// row.clerkSignPictures = this.signform.clerkSignPictures; |
|
|
|
// row.clerkSignPictures = this.signform.clerkSignPictures; |
|
|
|
row.clerkSignRemarks = this.TcForm.clerkSignRemarks; //备注 |
|
|
|
row.clerkSignRemarks = this.TcForm.clerkSignRemarks; //备注 |
|
|
|
@ -3316,26 +3472,26 @@ export default { |
|
|
|
// } |
|
|
|
// } |
|
|
|
|
|
|
|
|
|
|
|
const pushPhotoToRow = (photoArray, photoType) => { |
|
|
|
const pushPhotoToRow = (photoArray, photoType) => { |
|
|
|
|
|
|
|
|
|
|
|
photoArray.forEach(item => { |
|
|
|
photoArray.forEach(item => { |
|
|
|
row.map[photoType].push({ |
|
|
|
row.map[photoType].push({ |
|
|
|
name: item.response.data.originalName, |
|
|
|
name: item.response && item.response.data ? item.response.data.originalName : '', |
|
|
|
reservationId: this.reservationId, |
|
|
|
reservationId: this.reservationId, |
|
|
|
type: photoType, |
|
|
|
type: photoType, |
|
|
|
urlRoute: item.response.data.link, |
|
|
|
urlRoute: item.response && item.response.data ? item.response.data.link : item.url, |
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
pushPhotoToRow(this.DoorstepPhoto, 'photo_1'); |
|
|
|
pushPhotoToRow(this.DoorstepPhoto, 'photo_1'); |
|
|
|
pushPhotoToRow(this.StackingPhoto, 'photo_2'); |
|
|
|
pushPhotoToRow(this.StackingPhoto, 'photo_2'); |
|
|
|
pushPhotoToRow(this.FragilePhotos, 'photo_3'); |
|
|
|
pushPhotoToRow(this.FragilePhotos, 'photo_3'); |
|
|
|
pushPhotoToRow(this.HomePhotos, 'photo_4'); |
|
|
|
pushPhotoToRow(this.HomePhotos, 'photo_4'); |
|
|
|
pushPhotoToRow(this.SignForPhotos, 'photo_5'); |
|
|
|
pushPhotoToRow(this.SignForPhotos, 'photo_5'); |
|
|
|
console.log(row, '准备提交的参数'); |
|
|
|
|
|
|
|
this.TCloading = true; //禁止确定 |
|
|
|
this.TCloading = true; //禁止确定 |
|
|
|
this.signBox = false; |
|
|
|
this.signBox = false; |
|
|
|
getOneclickq(row) |
|
|
|
getOneclickq(row) |
|
|
|
.then(res => { |
|
|
|
.then(res => { |
|
|
|
|
|
|
|
this.checkloading=false;//关闭复核签收加载效果 |
|
|
|
if (res.data.code == 200) { |
|
|
|
if (res.data.code == 200) { |
|
|
|
this.TCloading = false; //取消限制 |
|
|
|
this.TCloading = false; //取消限制 |
|
|
|
ElMessage({ |
|
|
|
ElMessage({ |
|
|
|
@ -3522,14 +3678,52 @@ export default { |
|
|
|
}, |
|
|
|
}, |
|
|
|
handleSign(row) { |
|
|
|
handleSign(row) { |
|
|
|
console.log('签收>>>>>>>>>>', row); |
|
|
|
console.log('签收>>>>>>>>>>', row); |
|
|
|
console.log(row.id, '复合签收'); |
|
|
|
console.log(row.signId, '复合签收'); |
|
|
|
$_getDetail({ id: row.id }).then(res => { |
|
|
|
this.reservationId =row.id |
|
|
|
|
|
|
|
$_getDetail({ id: row.signId }).then(res => { |
|
|
|
console.log(res, '复合返回值'); |
|
|
|
console.log(res, '复合返回值'); |
|
|
|
|
|
|
|
if(res.data.data){ |
|
|
|
|
|
|
|
this.CheckStore=res.data.data |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(res.data.data.printVOList){ |
|
|
|
|
|
|
|
// DoorstepPhoto 上门照片 |
|
|
|
|
|
|
|
// StackingPhoto 堆码照片 |
|
|
|
|
|
|
|
// FragilePhotos 易碎照 |
|
|
|
|
|
|
|
// HomePhotos 家配照 |
|
|
|
|
|
|
|
// SignForPhotos 签收照 |
|
|
|
|
|
|
|
this.DoorstepPhoto=[] |
|
|
|
|
|
|
|
this.StackingPhoto=[] |
|
|
|
|
|
|
|
this.FragilePhotos=[] |
|
|
|
|
|
|
|
this.HomePhotos=[] |
|
|
|
|
|
|
|
this.SignForPhotos=[] |
|
|
|
|
|
|
|
res.data.data.printVOList.forEach(item=>{ |
|
|
|
|
|
|
|
if(item.type =='photo_1'){ |
|
|
|
|
|
|
|
this.DoorstepPhoto.push({name:'',url:item.urlRoute}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if(item.type =='photo_2'){ |
|
|
|
|
|
|
|
this.StackingPhoto.push({name:'',url:item.urlRoute}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if(item.type =='photo_3'){ |
|
|
|
|
|
|
|
this.FragilePhotos.push({name:'',url:item.urlRoute}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if(item.type =='photo_4'){ |
|
|
|
|
|
|
|
this.HomePhotos.push({name:'',url:item.urlRoute}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if(item.type =='photo_5'){ |
|
|
|
|
|
|
|
this.SignForPhotos.push({name:'',url:item.urlRoute}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
console.log(this.CheckStore,'data'); |
|
|
|
|
|
|
|
console.log(res.data.data,'res'); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
|
}); |
|
|
|
this.signtitle = '复核签收'; |
|
|
|
this.signtitle = '复核签收'; |
|
|
|
// this.view = true; |
|
|
|
// this.view = true; |
|
|
|
this.signform = row; |
|
|
|
this.signform = row; |
|
|
|
this.signBox = true; |
|
|
|
this.signBox = true;//开启复合弹窗 |
|
|
|
// this.wid= row.id |
|
|
|
// this.wid= row.id |
|
|
|
// this.getWrapdetails(this.wpage) |
|
|
|
// this.getWrapdetails(this.wpage) |
|
|
|
}, |
|
|
|
}, |
|
|
|
@ -3554,6 +3748,12 @@ export default { |
|
|
|
}, |
|
|
|
}, |
|
|
|
//一键签收 |
|
|
|
//一键签收 |
|
|
|
handleSignone(row) { |
|
|
|
handleSignone(row) { |
|
|
|
|
|
|
|
// 清空图片缓存 |
|
|
|
|
|
|
|
this.DoorstepPhoto=[] |
|
|
|
|
|
|
|
this.StackingPhoto=[] |
|
|
|
|
|
|
|
this.FragilePhotos=[] |
|
|
|
|
|
|
|
this.HomePhotos=[] |
|
|
|
|
|
|
|
this.SignForPhotos=[] |
|
|
|
console.log('一键签收222>>>>>>>>>>', row); |
|
|
|
console.log('一键签收222>>>>>>>>>>', row); |
|
|
|
if (row.loadingStatus != '已装车') { |
|
|
|
if (row.loadingStatus != '已装车') { |
|
|
|
ElMessage({ |
|
|
|
ElMessage({ |
|
|
|
@ -3563,10 +3763,10 @@ export default { |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
this.reservationId = row.reservationId; //存储当前行的ID |
|
|
|
this.reservationId = row.reservationId; //存储当前行的ID |
|
|
|
|
|
|
|
console.log(row,'当前行数据'); |
|
|
|
this.signtitle = '一键签收'; |
|
|
|
this.signtitle = '一键签收'; |
|
|
|
this.signform = row; |
|
|
|
this.signform = row; |
|
|
|
this.TcForm = row; |
|
|
|
this.TcForm = row; |
|
|
|
|
|
|
|
|
|
|
|
this.signBox = true; |
|
|
|
this.signBox = true; |
|
|
|
}, |
|
|
|
}, |
|
|
|
inventoryDetail(row) { |
|
|
|
inventoryDetail(row) { |
|
|
|
|
