|
|
|
@ -129,7 +129,6 @@
|
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- </el-row>--> |
|
|
|
|
<el-tabs |
|
|
|
|
type="border-card" |
|
|
|
|
v-model="activeTab" |
|
|
|
|
@tab-click="handleTabClick" |
|
|
|
|
v-loading="checkloading" |
|
|
|
@ -155,6 +154,13 @@
|
|
|
|
|
@click="handleView(slotProps.scope.row)" |
|
|
|
|
>查看 |
|
|
|
|
</el-text> |
|
|
|
|
<el-text |
|
|
|
|
type="primary" |
|
|
|
|
text |
|
|
|
|
icon="el-icon-view" |
|
|
|
|
@click="handlePrint(slotProps.scope.row)" |
|
|
|
|
>打印 |
|
|
|
|
</el-text> |
|
|
|
|
<el-text |
|
|
|
|
type="primary" |
|
|
|
|
text |
|
|
|
@ -168,9 +174,11 @@
|
|
|
|
|
text |
|
|
|
|
icon="el-icon-view" |
|
|
|
|
@click="handleOne(slotProps.scope.row)" |
|
|
|
|
v-if="slotProps.scope.row.loadingStatus !== '已装车' && |
|
|
|
|
(slotProps.scope.row.signingStatus !== '已审核' || |
|
|
|
|
slotProps.scope.row.driverSigning !== '已签收') " |
|
|
|
|
v-if=" |
|
|
|
|
slotProps.scope.row.loadingStatus !== '已装车' && |
|
|
|
|
(slotProps.scope.row.signingStatus !== '已审核' || |
|
|
|
|
slotProps.scope.row.driverSigning !== '已签收') |
|
|
|
|
" |
|
|
|
|
> |
|
|
|
|
一键装车 |
|
|
|
|
</el-text> |
|
|
|
@ -467,88 +475,97 @@
|
|
|
|
|
</el-table> --> |
|
|
|
|
<!-- 客户包件 --> |
|
|
|
|
|
|
|
|
|
<el-tabs v-model="reservationActiveName" @tab-click="reservationHandleClick"> |
|
|
|
|
<el-tabs v-model="reservationActiveName" @tab-click="reservationHandleClick"> |
|
|
|
|
<el-tab-pane label="客户包件" name="reservationPackage"> |
|
|
|
|
<el-button @click="Batchsigning" style="margin-bottom: 4px;" type="primary">批量签收</el-button> |
|
|
|
|
<el-button @click="Batchcancellation" style="margin-bottom: 4px;" type="primary">批量计划取消</el-button> |
|
|
|
|
<el-button @click="Batchsigning" style="margin-bottom: 4px" type="primary" |
|
|
|
|
>批量签收</el-button |
|
|
|
|
> |
|
|
|
|
<el-button @click="Batchcancellation" style="margin-bottom: 4px" type="primary" |
|
|
|
|
>批量计划取消</el-button |
|
|
|
|
> |
|
|
|
|
<tablecmt |
|
|
|
|
:columnList="wrapoption.column" |
|
|
|
|
:tableData="wrapdata" |
|
|
|
|
:loading="loading" |
|
|
|
|
@inputTxt="inputscReservationPackage" |
|
|
|
|
@timeCheck="timescReservationPackage" |
|
|
|
|
@selectCheck="selectscReservationPackage" |
|
|
|
|
ref="wtableBox" |
|
|
|
|
@selection="selectionChange" |
|
|
|
|
:columnList="wrapoption.column" |
|
|
|
|
:tableData="wrapdata" |
|
|
|
|
:loading="loading" |
|
|
|
|
@inputTxt="inputscReservationPackage" |
|
|
|
|
@timeCheck="timescReservationPackage" |
|
|
|
|
@selectCheck="selectscReservationPackage" |
|
|
|
|
ref="wtableBox" |
|
|
|
|
@selection="selectionChange" |
|
|
|
|
> |
|
|
|
|
<template #default="slotProps"> |
|
|
|
|
<template v-if="slotProps.scope.column.label === '操作'"> |
|
|
|
|
<el-text size="small" @click="handleQRCode(slotProps.scope.row)">查看二维码</el-text> |
|
|
|
|
<!-- slotProps.scope.row.orderPackageStatus !== '70' ||--> |
|
|
|
|
<!-- slotProps.scope.row.orderPackageStatusName !== '已签收'||--> |
|
|
|
|
<el-text size="small" @click="handleQRCode(slotProps.scope.row)" |
|
|
|
|
>查看二维码</el-text |
|
|
|
|
> |
|
|
|
|
<el-text |
|
|
|
|
v-if=" |
|
|
|
|
|
|
|
|
|
slotProps.scope.row.orderPackageLoadingStatus !== '20'|| |
|
|
|
|
slotProps.scope.row.orderPackageLoadingStatusName !== '已装车' |
|
|
|
|
" |
|
|
|
|
size="small" |
|
|
|
|
@click="cancelReservationPackage(slotProps.scope.row)" |
|
|
|
|
>计划取消</el-text |
|
|
|
|
v-if=" |
|
|
|
|
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.orderPackageStatus !== '70' || |
|
|
|
|
slotProps.scope.row.orderPackageStatusName !== '已签收' |
|
|
|
|
" |
|
|
|
|
size="small" |
|
|
|
|
@click="signingReservationPackage(slotProps.scope.row)" |
|
|
|
|
>PC签收</el-text |
|
|
|
|
v-if=" |
|
|
|
|
slotProps.scope.row.orderPackageLoadingStatus === '10' || |
|
|
|
|
slotProps.scope.row.orderPackageLoadingStatusName === '待装车' |
|
|
|
|
" |
|
|
|
|
size="small" |
|
|
|
|
@click="signingReservationPackage(slotProps.scope.row)" |
|
|
|
|
>PC签收</el-text |
|
|
|
|
> |
|
|
|
|
</template> |
|
|
|
|
</template> |
|
|
|
|
</tablecmt> |
|
|
|
|
</el-tab-pane> |
|
|
|
|
<el-tab-pane label="库存品包件" name="reservationInventoryPackage"> |
|
|
|
|
<el-button @click="Batchsigning" style="margin-bottom: 4px;" type="primary">批量签收</el-button> |
|
|
|
|
<el-button @click="Batchcancellation" style="margin-bottom: 4px;" type="primary">批量计划取消</el-button> |
|
|
|
|
<el-button @click="Batchsigning" style="margin-bottom: 4px" type="primary" |
|
|
|
|
>批量签收</el-button |
|
|
|
|
> |
|
|
|
|
<el-button @click="Batchcancellation" style="margin-bottom: 4px" type="primary" |
|
|
|
|
>批量计划取消</el-button |
|
|
|
|
> |
|
|
|
|
<tablecmt |
|
|
|
|
:columnList="wrapoption.reservationInventoryoptioncolumn" |
|
|
|
|
:tableData="reservationInventoryPackageData" |
|
|
|
|
:loading="loading" |
|
|
|
|
@inputTxt="inputscReservationInventoryPackage" |
|
|
|
|
@timeCheck="timescReservationInventoryPackage" |
|
|
|
|
@selectCheck="selectscReservationInventoryPackage" |
|
|
|
|
ref="wtableBox" |
|
|
|
|
@selection="selectionChange" |
|
|
|
|
:columnList="wrapoption.reservationInventoryoptioncolumn" |
|
|
|
|
:tableData="reservationInventoryPackageData" |
|
|
|
|
:loading="loading" |
|
|
|
|
@inputTxt="inputscReservationInventoryPackage" |
|
|
|
|
@timeCheck="timescReservationInventoryPackage" |
|
|
|
|
@selectCheck="selectscReservationInventoryPackage" |
|
|
|
|
ref="wtableBox" |
|
|
|
|
@selection="selectionChange" |
|
|
|
|
> |
|
|
|
|
<template #default="slotProps"> |
|
|
|
|
<template v-if="slotProps.scope.column.label === '操作'"> |
|
|
|
|
<el-text size="small" @click="handleQRCode(slotProps.scope.row)">查看二维码</el-text> |
|
|
|
|
<el-text size="small" @click="handleQRCode(slotProps.scope.row)" |
|
|
|
|
>查看二维码</el-text |
|
|
|
|
> |
|
|
|
|
<el-text |
|
|
|
|
v-if=" |
|
|
|
|
slotProps.scope.row.stockSignfoStatus === '10' || |
|
|
|
|
slotProps.scope.row.orderPackageStatusName === '未签收' |
|
|
|
|
" |
|
|
|
|
size="small" |
|
|
|
|
@click="cancelReservationInventoryPackage(slotProps.scope.row)" |
|
|
|
|
>计划取消</el-text |
|
|
|
|
v-if=" |
|
|
|
|
slotProps.scope.row.stockSignfoStatus === '10' || |
|
|
|
|
slotProps.scope.row.orderPackageStatusName === '未签收' |
|
|
|
|
" |
|
|
|
|
size="small" |
|
|
|
|
@click="cancelReservationInventoryPackage(slotProps.scope.row)" |
|
|
|
|
>计划取消</el-text |
|
|
|
|
> |
|
|
|
|
<el-text |
|
|
|
|
v-if=" |
|
|
|
|
slotProps.scope.row.stockSignfoStatus == '10' || |
|
|
|
|
slotProps.scope.row.stockSignfoStatusName == '未签收' |
|
|
|
|
" |
|
|
|
|
size="small" |
|
|
|
|
@click="signingReservationInventoryPackage(slotProps.scope.row)" |
|
|
|
|
>PC签收</el-text |
|
|
|
|
v-if=" |
|
|
|
|
slotProps.scope.row.stockSignfoStatus == '10' || |
|
|
|
|
slotProps.scope.row.stockSignfoStatusName == '未签收' |
|
|
|
|
" |
|
|
|
|
size="small" |
|
|
|
|
@click="signingReservationInventoryPackage(slotProps.scope.row)" |
|
|
|
|
>PC签收</el-text |
|
|
|
|
> |
|
|
|
|
</template> |
|
|
|
|
</template> |
|
|
|
|
</tablecmt> |
|
|
|
|
</el-tab-pane> |
|
|
|
|
<!-- <el-tab-pane label="角色管理" name="third">角色管理</el-tab-pane>--> |
|
|
|
|
<!-- <el-tab-pane label="定时任务补偿" name="fourth">定时任务补偿</el-tab-pane>--> |
|
|
|
|
<!-- <el-tab-pane label="角色管理" name="third">角色管理</el-tab-pane>--> |
|
|
|
|
<!-- <el-tab-pane label="定时任务补偿" name="fourth">定时任务补偿</el-tab-pane>--> |
|
|
|
|
</el-tabs> |
|
|
|
|
|
|
|
|
|
<div class="avue-crud__pagination" style="width: 100%"> |
|
|
|
@ -734,25 +751,41 @@
|
|
|
|
|
</span> |
|
|
|
|
</el-dialog> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<!-- 打印模块 --> |
|
|
|
|
<el-dialog title="二维码" :visible.sync="isShowPrint" width="780px" v-model="isShowPrint"> |
|
|
|
|
<div> |
|
|
|
|
<div v-html="html"></div> |
|
|
|
|
</div> |
|
|
|
|
<span slot="footer" class="dialog-footer"> |
|
|
|
|
<el-button type="primary" @click="printTemplate">打 印</el-button> |
|
|
|
|
<el-button type="primary" @click="isShowPrint = false">确 定</el-button> |
|
|
|
|
<el-button @click="isShowPrint = false">取 消</el-button> |
|
|
|
|
</span> |
|
|
|
|
</el-dialog> |
|
|
|
|
</basic-container> |
|
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
<script> |
|
|
|
|
import { |
|
|
|
|
getList, |
|
|
|
|
getDetail, |
|
|
|
|
add, |
|
|
|
|
update, |
|
|
|
|
remove, |
|
|
|
|
getOneclick, |
|
|
|
|
getorddetail, |
|
|
|
|
getWrapdetail, |
|
|
|
|
getpackdetail, |
|
|
|
|
getinventorydetail, |
|
|
|
|
getClientDetail, |
|
|
|
|
$_getDetail, |
|
|
|
|
$_isSignt, deliverySign, getReservationPackageList, deliveryInventorySign |
|
|
|
|
} from '@/api/distribution/distributionDeliveryList'; |
|
|
|
|
import { |
|
|
|
|
getList, |
|
|
|
|
getDetail, |
|
|
|
|
add, |
|
|
|
|
update, |
|
|
|
|
remove, |
|
|
|
|
getOneclick, |
|
|
|
|
getorddetail, |
|
|
|
|
getWrapdetail, |
|
|
|
|
getpackdetail, |
|
|
|
|
getinventorydetail, |
|
|
|
|
getClientDetail, |
|
|
|
|
$_getDetail, |
|
|
|
|
$_isSignt, |
|
|
|
|
deliverySign, |
|
|
|
|
getReservationPackageList, |
|
|
|
|
deliveryInventorySign, |
|
|
|
|
printBatch, |
|
|
|
|
} from '@/api/distribution/distributionDeliveryList'; |
|
|
|
|
import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle'; |
|
|
|
|
import { showInventoryPackgeCode } from '@/api/distribution/distributionStockList'; |
|
|
|
|
import { update as updatesign, getOneclickq } from '@/api/distribution/distributionSignfor'; |
|
|
|
@ -760,7 +793,10 @@ import option from '@/option/basic/basicPdarecords';
|
|
|
|
|
import { mapGetters } from 'vuex'; |
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
|
import dayjs from 'dayjs'; |
|
|
|
|
import { updateReservation,cancelReservationPackage } from '@/api/distribution/distributionReservation'; |
|
|
|
|
import { |
|
|
|
|
updateReservation, |
|
|
|
|
cancelReservationPackage, |
|
|
|
|
} from '@/api/distribution/distributionReservation'; |
|
|
|
|
import { ElMessage, ElMessageBox } from 'element-plus'; |
|
|
|
|
import { getToken } from '@/utils/auth'; |
|
|
|
|
import { setNodeHeight } from '@/utils/util.js'; |
|
|
|
@ -768,7 +804,7 @@ export default {
|
|
|
|
|
data() { |
|
|
|
|
return { |
|
|
|
|
html: '', |
|
|
|
|
reservationActiveName:'reservationPackage', |
|
|
|
|
reservationActiveName: 'reservationPackage', |
|
|
|
|
checkloading: false, //复核签收加载 |
|
|
|
|
dialogImageUrl: '', //图片放大地址 |
|
|
|
|
dialogVisible: false, //图片状态 |
|
|
|
@ -2166,7 +2202,6 @@ export default {
|
|
|
|
|
border: true, |
|
|
|
|
selection: true, |
|
|
|
|
column: [ |
|
|
|
|
|
|
|
|
|
{ |
|
|
|
|
label: '预约单号', |
|
|
|
|
prop: 'reservationCode', |
|
|
|
@ -2479,13 +2514,13 @@ export default {
|
|
|
|
|
//库存品搜索 |
|
|
|
|
inventoryQuery: {}, |
|
|
|
|
column: [ |
|
|
|
|
{ |
|
|
|
|
prop: '', |
|
|
|
|
label: '复选框', |
|
|
|
|
type: 0, |
|
|
|
|
width: 55, |
|
|
|
|
fixed: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: '', |
|
|
|
|
label: '复选框', |
|
|
|
|
type: 0, |
|
|
|
|
width: 55, |
|
|
|
|
fixed: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '序号', |
|
|
|
|
prop: '', |
|
|
|
@ -3207,7 +3242,6 @@ export default {
|
|
|
|
|
hide: true, |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
// 库存品表单配置 |
|
|
|
|
inventoryoption: { |
|
|
|
@ -3452,12 +3486,16 @@ export default {
|
|
|
|
|
reservationInventoryPackageData: [], |
|
|
|
|
//包条列表 |
|
|
|
|
packdata: [], |
|
|
|
|
loading:false, |
|
|
|
|
listloading:false,//列表模块 |
|
|
|
|
loading: false, |
|
|
|
|
listloading: false, //列表模块 |
|
|
|
|
//订单列表 |
|
|
|
|
orddata: [], |
|
|
|
|
//库存品列表 |
|
|
|
|
inventorydata: [], |
|
|
|
|
/** 是否显示打印模块 */ |
|
|
|
|
isShowPrint: false, |
|
|
|
|
/** 打印的Html */ |
|
|
|
|
html: '', |
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
watch: { |
|
|
|
@ -3475,7 +3513,6 @@ export default {
|
|
|
|
|
}, |
|
|
|
|
mounted() { |
|
|
|
|
this.init(); |
|
|
|
|
this.onLoad(); |
|
|
|
|
|
|
|
|
|
this.windowHeight = window.innerHeight * 0.8; |
|
|
|
|
console.log(`浏览器窗口的高度为:${this.windowHeight}px`); |
|
|
|
@ -3483,6 +3520,8 @@ export default {
|
|
|
|
|
this.setTableHeight(); |
|
|
|
|
}, |
|
|
|
|
created() { |
|
|
|
|
this.onLoad(); |
|
|
|
|
|
|
|
|
|
// //查询字典 |
|
|
|
|
// this.queryDictionary(); |
|
|
|
|
}, |
|
|
|
@ -3610,7 +3649,7 @@ export default {
|
|
|
|
|
break; |
|
|
|
|
case 'tab3': |
|
|
|
|
//包件列表 |
|
|
|
|
this.loading=true |
|
|
|
|
this.loading = true; |
|
|
|
|
this.handlePackage(this.page); |
|
|
|
|
console.log('ssss'); |
|
|
|
|
break; |
|
|
|
@ -3735,7 +3774,16 @@ export default {
|
|
|
|
|
timesc() {}, |
|
|
|
|
btnsc() {}, |
|
|
|
|
selectsc() {}, |
|
|
|
|
|
|
|
|
|
/** 打印配送单 */ |
|
|
|
|
handlePrint(row) { |
|
|
|
|
console.log('this.deliverydata.type :>> ', this.deliverydata.type); |
|
|
|
|
const submitData = { |
|
|
|
|
ids: row.id, |
|
|
|
|
type: this.deliverydata.type, |
|
|
|
|
}; |
|
|
|
|
printBatch(submitData); |
|
|
|
|
}, |
|
|
|
|
/** 打印库存存品 */ |
|
|
|
|
handleInventoryQRCode(row) { |
|
|
|
|
this.materialQRCode = row; |
|
|
|
|
console.log('row------------>', row); |
|
|
|
@ -3777,23 +3825,23 @@ export default {
|
|
|
|
|
console.log('deliveryId', this.deliveryId); |
|
|
|
|
console.log('reservationId', this.wid); |
|
|
|
|
let data = { |
|
|
|
|
deliveryId:this.deliveryId, |
|
|
|
|
reservationId:this.wid, |
|
|
|
|
type:1, |
|
|
|
|
packageIds:row.id |
|
|
|
|
} |
|
|
|
|
cancelReservationPackage(data).then(res=>{ |
|
|
|
|
if (res.data.code === 200){ |
|
|
|
|
deliveryId: this.deliveryId, |
|
|
|
|
reservationId: this.wid, |
|
|
|
|
type: 1, |
|
|
|
|
packageIds: row.id, |
|
|
|
|
}; |
|
|
|
|
cancelReservationPackage(data).then(res => { |
|
|
|
|
if (res.data.code === 200) { |
|
|
|
|
this.$message.success(res.data.msg); |
|
|
|
|
this.getWrapdetails(this.page); |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
cancelReservationInventoryPackage(row) { |
|
|
|
|
console.log('row', row); |
|
|
|
|
console.log('deliveryId', this.deliveryId); |
|
|
|
|
console.log('reservationId', this.wid); |
|
|
|
|
this.$message.warning("功能维护中..."); |
|
|
|
|
this.$message.warning('功能维护中...'); |
|
|
|
|
return; |
|
|
|
|
// let data = { |
|
|
|
|
// deliveryId:this.deliveryId, |
|
|
|
@ -3810,41 +3858,41 @@ export default {
|
|
|
|
|
}, |
|
|
|
|
signingReservationPackage(row) { |
|
|
|
|
console.log('row', row); |
|
|
|
|
console.log('wid',this.wid); |
|
|
|
|
console.log('deliveryId',this.deliveryId); |
|
|
|
|
console.log('wid', this.wid); |
|
|
|
|
console.log('deliveryId', this.deliveryId); |
|
|
|
|
let data = { |
|
|
|
|
deliveryId:this.deliveryId, |
|
|
|
|
reservationId:this.wid, |
|
|
|
|
barcodes:row.orderPackageCode |
|
|
|
|
} |
|
|
|
|
deliveryId: this.deliveryId, |
|
|
|
|
reservationId: this.wid, |
|
|
|
|
barcodes: row.orderPackageCode, |
|
|
|
|
}; |
|
|
|
|
//包件签收 |
|
|
|
|
deliverySign(data).then(res=>{ |
|
|
|
|
console.log('res>>>>>>>>>>>>>>>>>>>>>>>',res); |
|
|
|
|
if (res.data.code === 200){ |
|
|
|
|
deliverySign(data).then(res => { |
|
|
|
|
console.log('res>>>>>>>>>>>>>>>>>>>>>>>', res); |
|
|
|
|
if (res.data.code === 200) { |
|
|
|
|
this.$message.success(res.data.msg); |
|
|
|
|
this.getWrapdetails(this.page); |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}); |
|
|
|
|
// this.$message.warning('功能维护中...'); |
|
|
|
|
// return; |
|
|
|
|
}, |
|
|
|
|
signingReservationInventoryPackage(row) { |
|
|
|
|
console.log('row', row); |
|
|
|
|
console.log('wid',this.wid); |
|
|
|
|
console.log('deliveryId',this.deliveryId); |
|
|
|
|
console.log('wid', this.wid); |
|
|
|
|
console.log('deliveryId', this.deliveryId); |
|
|
|
|
let data = { |
|
|
|
|
deliveryId:this.deliveryId, |
|
|
|
|
reservationId:this.wid, |
|
|
|
|
barcodes:row.stockPackageCode |
|
|
|
|
} |
|
|
|
|
deliveryId: this.deliveryId, |
|
|
|
|
reservationId: this.wid, |
|
|
|
|
barcodes: row.stockPackageCode, |
|
|
|
|
}; |
|
|
|
|
//包件签收 |
|
|
|
|
deliveryInventorySign(data).then(res=>{ |
|
|
|
|
console.log('res>>>>>>>>>>>>>>>>>>>>>>>',res); |
|
|
|
|
if (res.data.code === 200){ |
|
|
|
|
deliveryInventorySign(data).then(res => { |
|
|
|
|
console.log('res>>>>>>>>>>>>>>>>>>>>>>>', res); |
|
|
|
|
if (res.data.code === 200) { |
|
|
|
|
this.$message.success(res.data.msg); |
|
|
|
|
this.getReservationInventoryPackageListInfo(this.page); |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}); |
|
|
|
|
// this.$message.warning('功能维护中...'); |
|
|
|
|
// return; |
|
|
|
|
}, |
|
|
|
@ -3852,64 +3900,64 @@ export default {
|
|
|
|
|
reservationHandleClick(tab, event) { |
|
|
|
|
console.log(tab, event); |
|
|
|
|
let tabName = tab.paneName; |
|
|
|
|
console.log("tabName",tabName); |
|
|
|
|
console.log('tabName', tabName); |
|
|
|
|
switch (tabName) { |
|
|
|
|
case "reservationPackage": |
|
|
|
|
case 'reservationPackage': |
|
|
|
|
this.getWrapdetails(this.page); |
|
|
|
|
break; |
|
|
|
|
case "reservationInventoryPackage": |
|
|
|
|
console.log("reservationInventoryPackage"); |
|
|
|
|
case 'reservationInventoryPackage': |
|
|
|
|
console.log('reservationInventoryPackage'); |
|
|
|
|
this.getReservationInventoryPackageListInfo(this.page); |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
// 批量签收 |
|
|
|
|
Batchsigning(){ |
|
|
|
|
console.log(this.selectionList,'this.selectionList'); |
|
|
|
|
// 批量签收 |
|
|
|
|
Batchsigning() { |
|
|
|
|
console.log(this.selectionList, 'this.selectionList'); |
|
|
|
|
|
|
|
|
|
let data = { |
|
|
|
|
deliveryId:this.deliveryId, |
|
|
|
|
reservationId:this.wid, |
|
|
|
|
barcodes:this.selectionList.map(item=>item.orderPackageCode).join(',') |
|
|
|
|
} |
|
|
|
|
this.loading=true, |
|
|
|
|
deliverySign(data).then(res=>{ |
|
|
|
|
console.log('res>>>>>>>>>>>>>>>>>>>>>>>',res); |
|
|
|
|
if (res.data.code === 200){ |
|
|
|
|
this.$message.success(res.data.msg); |
|
|
|
|
this.getWrapdetails(this.page); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
this.selectionList=[];//清空选择 |
|
|
|
|
this.loading=false; |
|
|
|
|
}).catch(res=>{ |
|
|
|
|
this.selectionList=[];//清空选择 |
|
|
|
|
this.loading=false; |
|
|
|
|
|
|
|
|
|
}) |
|
|
|
|
deliveryId: this.deliveryId, |
|
|
|
|
reservationId: this.wid, |
|
|
|
|
barcodes: this.selectionList.map(item => item.orderPackageCode).join(','), |
|
|
|
|
}; |
|
|
|
|
(this.loading = true), |
|
|
|
|
deliverySign(data) |
|
|
|
|
.then(res => { |
|
|
|
|
console.log('res>>>>>>>>>>>>>>>>>>>>>>>', res); |
|
|
|
|
if (res.data.code === 200) { |
|
|
|
|
this.$message.success(res.data.msg); |
|
|
|
|
this.getWrapdetails(this.page); |
|
|
|
|
} |
|
|
|
|
this.selectionList = []; //清空选择 |
|
|
|
|
this.loading = false; |
|
|
|
|
}) |
|
|
|
|
.catch(res => { |
|
|
|
|
this.selectionList = []; //清空选择 |
|
|
|
|
this.loading = false; |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
// 批量计划取消 |
|
|
|
|
Batchcancellation(){ |
|
|
|
|
Batchcancellation() { |
|
|
|
|
let data = { |
|
|
|
|
deliveryId:this.deliveryId, |
|
|
|
|
reservationId:this.wid, |
|
|
|
|
type:1, |
|
|
|
|
packageIds:this.selectionList.map(item=>item.id).join(',') |
|
|
|
|
} |
|
|
|
|
this.loading=true; |
|
|
|
|
cancelReservationPackage(data).then(res=>{ |
|
|
|
|
if (res.data.code === 200){ |
|
|
|
|
this.$message.success(res.data.msg); |
|
|
|
|
this.getWrapdetails(this.page); |
|
|
|
|
} |
|
|
|
|
this.selectionList=[];//清空选择 |
|
|
|
|
this.loading=false; |
|
|
|
|
|
|
|
|
|
}).catch(res=>{ |
|
|
|
|
this.selectionList=[];//清空选择 |
|
|
|
|
this.loading=false; |
|
|
|
|
|
|
|
|
|
}) |
|
|
|
|
deliveryId: this.deliveryId, |
|
|
|
|
reservationId: this.wid, |
|
|
|
|
type: 1, |
|
|
|
|
packageIds: this.selectionList.map(item => item.id).join(','), |
|
|
|
|
}; |
|
|
|
|
this.loading = true; |
|
|
|
|
cancelReservationPackage(data) |
|
|
|
|
.then(res => { |
|
|
|
|
if (res.data.code === 200) { |
|
|
|
|
this.$message.success(res.data.msg); |
|
|
|
|
this.getWrapdetails(this.page); |
|
|
|
|
} |
|
|
|
|
this.selectionList = []; //清空选择 |
|
|
|
|
this.loading = false; |
|
|
|
|
}) |
|
|
|
|
.catch(res => { |
|
|
|
|
this.selectionList = []; //清空选择 |
|
|
|
|
this.loading = false; |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
/** |
|
|
|
|
* 打印 |
|
|
|
@ -4159,34 +4207,31 @@ export default {
|
|
|
|
|
//客户列表 |
|
|
|
|
handleClient(page) { |
|
|
|
|
let params = {}; |
|
|
|
|
this.listloading=true |
|
|
|
|
this.listloading = true; |
|
|
|
|
console.log(); |
|
|
|
|
params.deliveryId = this.deliverydata.id; |
|
|
|
|
getClientDetail( |
|
|
|
|
page.currentPage, |
|
|
|
|
page.pageSize, |
|
|
|
|
Object.assign(params, this.clientQuery) |
|
|
|
|
).then(res => { |
|
|
|
|
this.listloading=false |
|
|
|
|
console.log('查看>>>>>订单>>', res.data.data); |
|
|
|
|
if(res.data.data){ |
|
|
|
|
const data = res.data.data; |
|
|
|
|
this.data = data.records; |
|
|
|
|
this.ordpage.total = data.total; |
|
|
|
|
} |
|
|
|
|
}).catch(res=>{ |
|
|
|
|
this.listloading=false |
|
|
|
|
}); |
|
|
|
|
getClientDetail(page.currentPage, page.pageSize, Object.assign(params, this.clientQuery)) |
|
|
|
|
.then(res => { |
|
|
|
|
this.listloading = false; |
|
|
|
|
console.log('查看>>>>>订单>>', res.data.data); |
|
|
|
|
if (res.data.data) { |
|
|
|
|
const data = res.data.data; |
|
|
|
|
this.data = data.records; |
|
|
|
|
this.ordpage.total = data.total; |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
.catch(res => { |
|
|
|
|
this.listloading = false; |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
//订单列表 |
|
|
|
|
handleOrder(page) { |
|
|
|
|
let params = {}; |
|
|
|
|
this.loading=true; |
|
|
|
|
this.loading = true; |
|
|
|
|
params.deliveryId = this.deliverydata.id; |
|
|
|
|
getorddetail(page.currentPage, page.pageSize, Object.assign(params, this.orderQuery)).then( |
|
|
|
|
res => { |
|
|
|
|
this.loading=false, |
|
|
|
|
console.log('查看>>>>>订单>>', res.data.data); |
|
|
|
|
(this.loading = false), console.log('查看>>>>>订单>>', res.data.data); |
|
|
|
|
const data = res.data.data; |
|
|
|
|
this.orddata = data.records; |
|
|
|
|
this.ordpage.total = data.total; |
|
|
|
@ -4196,33 +4241,32 @@ export default {
|
|
|
|
|
//包件列表 |
|
|
|
|
handlePackage(page) { |
|
|
|
|
let params = {}; |
|
|
|
|
this.loading=true |
|
|
|
|
console.log(this.loading,'this.loading'); |
|
|
|
|
this.loading = true; |
|
|
|
|
console.log(this.loading, 'this.loading'); |
|
|
|
|
params.deliveryId = this.deliverydata.id; |
|
|
|
|
getpackdetail(page.currentPage, page.pageSize, Object.assign(params, this.packageQuery)).then( |
|
|
|
|
res => { |
|
|
|
|
this.loading=false |
|
|
|
|
this.loading = false; |
|
|
|
|
console.log('查看>>>>>包间>>', res.data.data); |
|
|
|
|
if(res.data.data){ |
|
|
|
|
const data = res.data.data; |
|
|
|
|
this.packdata = data; |
|
|
|
|
this.packpage.total = data.total; |
|
|
|
|
if (res.data.data) { |
|
|
|
|
const data = res.data.data; |
|
|
|
|
this.packdata = data; |
|
|
|
|
this.packpage.total = data.total; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
); |
|
|
|
|
}, |
|
|
|
|
//库存列表 |
|
|
|
|
handleInventory(page) { |
|
|
|
|
let params = {}; |
|
|
|
|
this.loading=true |
|
|
|
|
this.loading = true; |
|
|
|
|
params.deliveryId = this.deliverydata.id; |
|
|
|
|
getinventorydetail( |
|
|
|
|
page.currentPage, |
|
|
|
|
page.pageSize, |
|
|
|
|
Object.assign(params, this.inventoryQuery) |
|
|
|
|
).then(res => { |
|
|
|
|
this.loading=false |
|
|
|
|
this.loading = false; |
|
|
|
|
console.log('查看>>>>>库存>>', res.data.data); |
|
|
|
|
const data = res.data.data; |
|
|
|
|
this.inventorydata = data; |
|
|
|
@ -4242,7 +4286,7 @@ export default {
|
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
async handleView(row) { |
|
|
|
|
this.loading=true;//开启加载 |
|
|
|
|
this.loading = true; //开启加载 |
|
|
|
|
console.log('查看>>>>>>>>>>', row); |
|
|
|
|
this.title = '客户包件'; |
|
|
|
|
this.view = true; |
|
|
|
@ -4277,14 +4321,14 @@ export default {
|
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
// 复核请求公共函数 |
|
|
|
|
// 复核请求公共函数 |
|
|
|
|
checkFn(row) { |
|
|
|
|
console.log('签收>>>>>>>>>>', row); |
|
|
|
|
// this.title = '查看'; |
|
|
|
|
// this.view = true; |
|
|
|
|
this.signform = row; |
|
|
|
|
this.signBox = true; |
|
|
|
|
$_getDetail({id:row.deliveryId}).then(res => { |
|
|
|
|
$_getDetail({ id: row.deliveryId }).then(res => { |
|
|
|
|
console.log(res, '点击复核的返回值'); |
|
|
|
|
this.form = res.data.data; |
|
|
|
|
this.TcForm = res.data.data; |
|
|
|
@ -4295,54 +4339,54 @@ export default {
|
|
|
|
|
this.HomePhotos = []; |
|
|
|
|
this.SignForPhotos = []; |
|
|
|
|
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 }); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
// 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('签收>>>>>>>>>>', row); |
|
|
|
|
console.log(row.signId, '复合签收'); |
|
|
|
|
this.signtitle = '复核签收'; |
|
|
|
|
// this.view = true; |
|
|
|
|
this.signform = row; |
|
|
|
|
this.signBox = true; //开启复合弹窗 |
|
|
|
|
// this.wid= row.id |
|
|
|
|
// this.getWrapdetails(this.wpage) |
|
|
|
|
console.log('签收>>>>>>>>>>', row); |
|
|
|
|
console.log(row.signId, '复合签收'); |
|
|
|
|
this.signtitle = '复核签收'; |
|
|
|
|
// this.view = true; |
|
|
|
|
this.signform = row; |
|
|
|
|
this.signBox = true; //开启复合弹窗 |
|
|
|
|
// this.wid= row.id |
|
|
|
|
// this.getWrapdetails(this.wpage) |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
handleSign(row) { |
|
|
|
|
console.log(row,'row'); |
|
|
|
|
console.log(row, 'row'); |
|
|
|
|
this.reservationId = row.id; |
|
|
|
|
let data={ |
|
|
|
|
signingId:row.signId, |
|
|
|
|
} |
|
|
|
|
$_isSignt(data).then(res=>{ |
|
|
|
|
console.log(res,'复核预请求'); |
|
|
|
|
let data = { |
|
|
|
|
signingId: row.signId, |
|
|
|
|
}; |
|
|
|
|
$_isSignt(data).then(res => { |
|
|
|
|
console.log(res, '复核预请求'); |
|
|
|
|
if (res.data.msg == '存在异常包件') { |
|
|
|
|
ElMessage({ |
|
|
|
|
message: res.data.msg, |
|
|
|
@ -4351,7 +4395,6 @@ export default {
|
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (res.data.msg == '此任务存在未完成包件,请确认') { |
|
|
|
|
ElMessageBox.confirm(res.data.msg, '提示', { |
|
|
|
|
confirmButtonText: '确定', |
|
|
|
@ -4370,12 +4413,7 @@ export default {
|
|
|
|
|
if (res.data.msg == '直接进行复核操作') { |
|
|
|
|
this.checkFn(row); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
handleOne(row) { |
|
|
|
|
console.log('签收>>>>>>>>>>', row); |
|
|
|
@ -4398,12 +4436,12 @@ export default {
|
|
|
|
|
}, |
|
|
|
|
//一键签收 |
|
|
|
|
handleSignone(row) { |
|
|
|
|
if(row.isHaveAbnormalPackage == 2){ |
|
|
|
|
if (row.isHaveAbnormalPackage == 2) { |
|
|
|
|
ElMessage({ |
|
|
|
|
message: '存在异常,请先进行审核', |
|
|
|
|
type: 'warning', |
|
|
|
|
}); |
|
|
|
|
return |
|
|
|
|
message: '存在异常,请先进行审核', |
|
|
|
|
type: 'warning', |
|
|
|
|
}); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
// 清空图片缓存 |
|
|
|
|
this.DoorstepPhoto = []; |
|
|
|
@ -4432,35 +4470,31 @@ export default {
|
|
|
|
|
getWrapdetails(page) { |
|
|
|
|
let params = {}; |
|
|
|
|
params.reservationId = this.wid; |
|
|
|
|
getWrapdetail( |
|
|
|
|
page.currentPage, |
|
|
|
|
page.pageSize, |
|
|
|
|
Object.assign(params, this.wrapoption.query) |
|
|
|
|
).then(res => { |
|
|
|
|
console.log('查看>>>>>>>', res.data.data); |
|
|
|
|
const data = res.data.data; |
|
|
|
|
this.wrapdata = data.records; |
|
|
|
|
this.wpage.total = data.total; |
|
|
|
|
this.loading=false;//关闭加载 |
|
|
|
|
}).catch(res=>{ |
|
|
|
|
this.loading=false;//关闭加载 |
|
|
|
|
}); |
|
|
|
|
getWrapdetail(page.currentPage, page.pageSize, Object.assign(params, this.wrapoption.query)) |
|
|
|
|
.then(res => { |
|
|
|
|
console.log('查看>>>>>>>', res.data.data); |
|
|
|
|
const data = res.data.data; |
|
|
|
|
this.wrapdata = data.records; |
|
|
|
|
this.wpage.total = data.total; |
|
|
|
|
this.loading = false; //关闭加载 |
|
|
|
|
}) |
|
|
|
|
.catch(res => { |
|
|
|
|
this.loading = false; //关闭加载 |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
getReservationInventoryPackageListInfo(page){ |
|
|
|
|
getReservationInventoryPackageListInfo(page) { |
|
|
|
|
let params = {}; |
|
|
|
|
params.reservationId = this.wid; |
|
|
|
|
getReservationPackageList( |
|
|
|
|
page.currentPage, |
|
|
|
|
page.pageSize, |
|
|
|
|
Object.assign(params, this.wrapoption.inventoryQuery) |
|
|
|
|
).then(res=>{ |
|
|
|
|
page.currentPage, |
|
|
|
|
page.pageSize, |
|
|
|
|
Object.assign(params, this.wrapoption.inventoryQuery) |
|
|
|
|
).then(res => { |
|
|
|
|
console.log('库存品包件>>>>>>>', res.data.data); |
|
|
|
|
const data = res.data.data; |
|
|
|
|
this.reservationInventoryPackageData = data.records; |
|
|
|
|
this.loading=false;//关闭加载 |
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.loading = false; //关闭加载 |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
handleDelete() { |
|
|
|
|
if (this.selectionList.length === 0) { |
|
|
|
|