|
|
|
|
@ -134,7 +134,7 @@
|
|
|
|
|
:columnList="columnList" |
|
|
|
|
:tableData="data" |
|
|
|
|
:loading="loading" |
|
|
|
|
@inputTxt="inputsc" |
|
|
|
|
@inputTxt="inputscClient" |
|
|
|
|
@timeCheck="timesc" |
|
|
|
|
@btnCheck="btnsc" |
|
|
|
|
@selectCheck="selectsc" |
|
|
|
|
@ -197,11 +197,7 @@
|
|
|
|
|
:columnList="ordoptioncolumn" |
|
|
|
|
:tableData="orddata" |
|
|
|
|
:loading="loading" |
|
|
|
|
@inputTxt="inputsc" |
|
|
|
|
@timeCheck="timesc" |
|
|
|
|
@btnCheck="btnsc" |
|
|
|
|
@selectCheck="selectsc" |
|
|
|
|
@selection="selectionChange" |
|
|
|
|
@inputTxt="inputscOrder" |
|
|
|
|
> |
|
|
|
|
<template #default="slotProps"> </template> |
|
|
|
|
</tablecmt> |
|
|
|
|
@ -212,7 +208,7 @@
|
|
|
|
|
:columnList="wrapoptioncolumn" |
|
|
|
|
:tableData="packdata" |
|
|
|
|
:loading="loading" |
|
|
|
|
@inputTxt="inputsc" |
|
|
|
|
@inputTxt="inputscPackage" |
|
|
|
|
@timeCheck="timesc" |
|
|
|
|
@btnCheck="btnsc" |
|
|
|
|
@selectCheck="selectsc" |
|
|
|
|
@ -272,7 +268,7 @@
|
|
|
|
|
:columnList="inventoryoptioncolumn" |
|
|
|
|
:tableData="inventorydata" |
|
|
|
|
:loading="loading" |
|
|
|
|
@inputTxt="inputsc" |
|
|
|
|
@inputTxt="inputscInventory" |
|
|
|
|
@timeCheck="timesc" |
|
|
|
|
@btnCheck="btnsc" |
|
|
|
|
@selectCheck="selectsc" |
|
|
|
|
@ -613,18 +609,18 @@
|
|
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
<script> |
|
|
|
|
import { |
|
|
|
|
getList, |
|
|
|
|
getDetail, |
|
|
|
|
add, |
|
|
|
|
update, |
|
|
|
|
remove, |
|
|
|
|
getOneclick, |
|
|
|
|
getorddetail, |
|
|
|
|
getWrapdetail, |
|
|
|
|
getpackdetail, |
|
|
|
|
getinventorydetail, |
|
|
|
|
} from '@/api/distribution/distributionDeliveryList'; |
|
|
|
|
import { |
|
|
|
|
getList, |
|
|
|
|
getDetail, |
|
|
|
|
add, |
|
|
|
|
update, |
|
|
|
|
remove, |
|
|
|
|
getOneclick, |
|
|
|
|
getorddetail, |
|
|
|
|
getWrapdetail, |
|
|
|
|
getpackdetail, |
|
|
|
|
getinventorydetail, getClientDetail |
|
|
|
|
} 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'; |
|
|
|
|
@ -669,6 +665,17 @@ export default {
|
|
|
|
|
reservationId: null, //当前行的ID |
|
|
|
|
windowHeight: null, |
|
|
|
|
columnList: [ |
|
|
|
|
{ |
|
|
|
|
prop: 'trainNumber', |
|
|
|
|
label: '配送车次号', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'reservationCode', |
|
|
|
|
label: '预约单号', |
|
|
|
|
@ -681,8 +688,8 @@ export default {
|
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'trainNumber', |
|
|
|
|
label: '配送车次号', |
|
|
|
|
prop: 'waybillNo', |
|
|
|
|
label: '运单号', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
@ -725,7 +732,7 @@ export default {
|
|
|
|
|
{ |
|
|
|
|
prop: 'deliveryAddress', |
|
|
|
|
label: '收货地址', |
|
|
|
|
type: 3, |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -767,7 +774,7 @@ export default {
|
|
|
|
|
{ |
|
|
|
|
prop: 'reservationStockListNum', |
|
|
|
|
label: '计划库存品数', |
|
|
|
|
type: 2, |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -1093,8 +1100,8 @@ export default {
|
|
|
|
|
], |
|
|
|
|
ordoptioncolumn: [ |
|
|
|
|
{ |
|
|
|
|
prop: 'orderCode', |
|
|
|
|
label: '订单自编号', |
|
|
|
|
prop: 'waybillNumber', |
|
|
|
|
label: '运单号', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
@ -1104,8 +1111,8 @@ export default {
|
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'descriptionGoods', |
|
|
|
|
label: '货物名称', |
|
|
|
|
prop: 'serviceNumber', |
|
|
|
|
label: '服务号', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
@ -1114,6 +1121,28 @@ export default {
|
|
|
|
|
sortable: true, |
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'orderCode', |
|
|
|
|
label: '订单自编号', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
// { |
|
|
|
|
// prop: 'descriptionGoods', |
|
|
|
|
// label: '货物名称', |
|
|
|
|
// type: 2, |
|
|
|
|
// values: '', |
|
|
|
|
// width: '150', |
|
|
|
|
// checkarr: [], |
|
|
|
|
// fixed: false, |
|
|
|
|
// sortable: true, |
|
|
|
|
// head: false, |
|
|
|
|
// }, |
|
|
|
|
{ |
|
|
|
|
prop: 'materialName', |
|
|
|
|
label: '物料名称', |
|
|
|
|
@ -1128,7 +1157,7 @@ export default {
|
|
|
|
|
{ |
|
|
|
|
prop: 'totalNumber', |
|
|
|
|
label: '包件总数', |
|
|
|
|
type: 2, |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '180', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -1138,7 +1167,7 @@ export default {
|
|
|
|
|
{ |
|
|
|
|
prop: 'handQuantity', |
|
|
|
|
label: '在库数量', |
|
|
|
|
type: 2, |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '180', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -1148,7 +1177,7 @@ export default {
|
|
|
|
|
{ |
|
|
|
|
prop: 'deliveryNumber', |
|
|
|
|
label: '计划数量', |
|
|
|
|
type: 2, |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '180', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -1158,7 +1187,7 @@ export default {
|
|
|
|
|
{ |
|
|
|
|
prop: 'stockupNumber', |
|
|
|
|
label: '已备数量', |
|
|
|
|
type: 2, |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '180', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -1168,7 +1197,7 @@ export default {
|
|
|
|
|
{ |
|
|
|
|
prop: 'loadingNumber', |
|
|
|
|
label: '装车数量', |
|
|
|
|
type: 3, |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -1211,7 +1240,7 @@ export default {
|
|
|
|
|
{ |
|
|
|
|
prop: 'consigneeUnit', |
|
|
|
|
label: '收货单位', |
|
|
|
|
type: 1, |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '180', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -1221,7 +1250,7 @@ export default {
|
|
|
|
|
{ |
|
|
|
|
prop: 'consigneePerson', |
|
|
|
|
label: '运单收货人', |
|
|
|
|
type: 1, |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '180', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -1231,7 +1260,7 @@ export default {
|
|
|
|
|
{ |
|
|
|
|
prop: 'consigneeAddress', |
|
|
|
|
label: '运单收货地址', |
|
|
|
|
type: 1, |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '180', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -1241,7 +1270,7 @@ export default {
|
|
|
|
|
{ |
|
|
|
|
prop: 'consigneeMobile', |
|
|
|
|
label: '运单收货电话', |
|
|
|
|
type: 1, |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '180', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -1251,7 +1280,7 @@ export default {
|
|
|
|
|
{ |
|
|
|
|
prop: 'customerName', |
|
|
|
|
label: '终端收货人', |
|
|
|
|
type: 1, |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '180', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -1261,7 +1290,7 @@ export default {
|
|
|
|
|
{ |
|
|
|
|
prop: 'customerAddress', |
|
|
|
|
label: '终端收货地址', |
|
|
|
|
type: 1, |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -1271,7 +1300,7 @@ export default {
|
|
|
|
|
{ |
|
|
|
|
prop: 'customerTelephone', |
|
|
|
|
label: '终端收货电话', |
|
|
|
|
type: 1, |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -1359,7 +1388,7 @@ export default {
|
|
|
|
|
{ |
|
|
|
|
prop: 'sendWarehouseName', |
|
|
|
|
label: '发站仓', |
|
|
|
|
type: 3, |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -1377,32 +1406,31 @@ export default {
|
|
|
|
|
sortable: true, |
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
{ |
|
|
|
|
prop: 'fahuoTime', |
|
|
|
|
label: '发货时间', |
|
|
|
|
prop: 'trainNumber', |
|
|
|
|
label: '入库车次', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
width: '180', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'warehouseEntryTimeEnd', |
|
|
|
|
label: '入库时间', |
|
|
|
|
prop: 'firsts', |
|
|
|
|
label: '一级品类', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
width: '180', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'trainNumber', |
|
|
|
|
label: '入库车次', |
|
|
|
|
type: 1, |
|
|
|
|
prop: 'second', |
|
|
|
|
label: '二级品类', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '180', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -1410,9 +1438,9 @@ export default {
|
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'firsts', |
|
|
|
|
label: '一级品类', |
|
|
|
|
type: 1, |
|
|
|
|
prop: 'thirdProduct', |
|
|
|
|
label: '三级品类', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '180', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -1420,24 +1448,26 @@ export default {
|
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'second', |
|
|
|
|
label: '二级品类', |
|
|
|
|
prop: 'fahuoTime', |
|
|
|
|
label: '发货时间', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '180', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'thirdProduct', |
|
|
|
|
label: '三级品类', |
|
|
|
|
prop: 'warehouseEntryTimeEnd', |
|
|
|
|
label: '入库时间', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '180', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'orderPackageStatusName', |
|
|
|
|
@ -1517,7 +1547,7 @@ export default {
|
|
|
|
|
{ |
|
|
|
|
prop: 'quantity', |
|
|
|
|
label: '包件数量', |
|
|
|
|
type: 2, |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '180', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -1528,7 +1558,7 @@ export default {
|
|
|
|
|
{ |
|
|
|
|
prop: 'reservationNum', |
|
|
|
|
label: '计划数量', |
|
|
|
|
type: 2, |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '180', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -1538,7 +1568,7 @@ export default {
|
|
|
|
|
{ |
|
|
|
|
prop: 'loadingNub', |
|
|
|
|
label: '装车数量', |
|
|
|
|
type: 2, |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '180', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -1548,7 +1578,7 @@ export default {
|
|
|
|
|
{ |
|
|
|
|
prop: 'signingNub', |
|
|
|
|
label: '签收数量', |
|
|
|
|
type: 2, |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '180', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -1633,17 +1663,17 @@ export default {
|
|
|
|
|
sortable: true, |
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'serviceNumber', |
|
|
|
|
label: '服务号', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
// { |
|
|
|
|
// prop: 'serviceNumber', |
|
|
|
|
// label: '服务号', |
|
|
|
|
// type: 2, |
|
|
|
|
// values: '', |
|
|
|
|
// width: '150', |
|
|
|
|
// checkarr: [], |
|
|
|
|
// fixed: false, |
|
|
|
|
// sortable: true, |
|
|
|
|
// head: false, |
|
|
|
|
// }, |
|
|
|
|
{ |
|
|
|
|
prop: 'marketName', |
|
|
|
|
label: '商场名称', |
|
|
|
|
@ -1921,6 +1951,10 @@ export default {
|
|
|
|
|
dialogFormCustomer: false, |
|
|
|
|
// 查询信息 |
|
|
|
|
query: {}, |
|
|
|
|
orderQuery: {}, |
|
|
|
|
clientQuery: {}, |
|
|
|
|
inventoryQuery: {}, |
|
|
|
|
packageQuery: {}, |
|
|
|
|
formCustomer: {}, |
|
|
|
|
formCustomerRolus: { |
|
|
|
|
consignee: [{ required: true, message: '请输入姓名', trigger: 'blur' }], |
|
|
|
|
@ -2852,17 +2886,31 @@ export default {
|
|
|
|
|
let tabName = tab.paneName; |
|
|
|
|
switch (tabName) { |
|
|
|
|
case 'tab1': |
|
|
|
|
//客户列表 |
|
|
|
|
this.handleClient(this.page); |
|
|
|
|
console.log('ssss'); |
|
|
|
|
break; |
|
|
|
|
case 'tab2': |
|
|
|
|
//订单列表 |
|
|
|
|
this.handleOrder(this.page); |
|
|
|
|
console.log('ssss'); |
|
|
|
|
break; |
|
|
|
|
case 'tab3': |
|
|
|
|
//包件列表 |
|
|
|
|
this.handlePackage(this.page); |
|
|
|
|
console.log('ssss'); |
|
|
|
|
break; |
|
|
|
|
case 'tab4': |
|
|
|
|
//库存品列表 |
|
|
|
|
this.handleInventory(this.page); |
|
|
|
|
console.log('ssss'); |
|
|
|
|
break; |
|
|
|
|
default: |
|
|
|
|
this.clientQuery ={}; |
|
|
|
|
this.orderQuery ={}; |
|
|
|
|
this.packageQuery ={}; |
|
|
|
|
this.inventoryQuery ={}; |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
searchHide() { |
|
|
|
|
@ -2878,6 +2926,36 @@ export default {
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
inputsc() {}, |
|
|
|
|
inputscOrder(index, row) { |
|
|
|
|
console.log('index',index); |
|
|
|
|
console.log('row',row); |
|
|
|
|
this.orderQuery[row.prop] = index; |
|
|
|
|
if (!index) delete this.orderQuery[row.prop]; |
|
|
|
|
this.handleOrder(this.page); |
|
|
|
|
}, |
|
|
|
|
inputscPackage(index, row) { |
|
|
|
|
console.log('index',index); |
|
|
|
|
console.log('row',row); |
|
|
|
|
this.packageQuery[row.prop] = index; |
|
|
|
|
if (!index) delete this.packageQuery[row.prop]; |
|
|
|
|
this.handlePackage(this.page); |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
inputscClient(index, row) { |
|
|
|
|
console.log('index',index); |
|
|
|
|
console.log('row',row); |
|
|
|
|
this.clientQuery[row.prop] = index; |
|
|
|
|
if (!index) delete this.clientQuery[row.prop]; |
|
|
|
|
this.handleClient(this.page); |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
inputscInventory(index, row) { |
|
|
|
|
console.log('index',index); |
|
|
|
|
console.log('row',row); |
|
|
|
|
this.inventoryQuery[row.prop] = index; |
|
|
|
|
if (!index) delete this.inventoryQuery[row.prop]; |
|
|
|
|
this.handleInventory(this.page); |
|
|
|
|
}, |
|
|
|
|
timesc() {}, |
|
|
|
|
btnsc() {}, |
|
|
|
|
selectsc() {}, |
|
|
|
|
@ -3154,12 +3232,23 @@ export default {
|
|
|
|
|
this.ord = false; |
|
|
|
|
this.inventory = false; |
|
|
|
|
}, |
|
|
|
|
//客户列表 |
|
|
|
|
handleClient(page) { |
|
|
|
|
let params = {}; |
|
|
|
|
console.log(); |
|
|
|
|
params.deliveryId = this.deliverydata.id; |
|
|
|
|
getClientDetail(page.currentPage, page.pageSize, Object.assign(params, this.clientQuery)).then(res => { |
|
|
|
|
console.log('查看>>>>>订单>>', res.data.data); |
|
|
|
|
const data = res.data.data; |
|
|
|
|
this.data = data.records; |
|
|
|
|
this.ordpage.total = data.total; |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
//订单列表 |
|
|
|
|
handleOrder(page) { |
|
|
|
|
let params = {}; |
|
|
|
|
params.deliveryId = this.deliverydata.id; |
|
|
|
|
|
|
|
|
|
getorddetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
|
getorddetail(page.currentPage, page.pageSize, Object.assign(params, this.orderQuery)).then(res => { |
|
|
|
|
console.log('查看>>>>>订单>>', res.data.data); |
|
|
|
|
const data = res.data.data; |
|
|
|
|
this.orddata = data.records; |
|
|
|
|
@ -3170,7 +3259,7 @@ export default {
|
|
|
|
|
handlePackage(page) { |
|
|
|
|
let params = {}; |
|
|
|
|
params.deliveryId = this.deliverydata.id; |
|
|
|
|
getpackdetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( |
|
|
|
|
getpackdetail(page.currentPage, page.pageSize, Object.assign(params, this.packageQuery)).then( |
|
|
|
|
res => { |
|
|
|
|
console.log('查看>>>>>包间>>', res.data.data); |
|
|
|
|
const data = res.data.data; |
|
|
|
|
@ -3183,7 +3272,7 @@ export default {
|
|
|
|
|
handleInventory(page) { |
|
|
|
|
let params = {}; |
|
|
|
|
params.deliveryId = this.deliverydata.id; |
|
|
|
|
getinventorydetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( |
|
|
|
|
getinventorydetail(page.currentPage, page.pageSize, Object.assign(params, this.inventoryQuery)).then( |
|
|
|
|
res => { |
|
|
|
|
console.log('查看>>>>>库存>>', res.data.data); |
|
|
|
|
const data = res.data.data; |
|
|
|
|
@ -3421,16 +3510,16 @@ export default {
|
|
|
|
|
this.deliverydata.deliveryNumber = packNum; |
|
|
|
|
this.deliverydata.inventoryNub = invenNum; |
|
|
|
|
this.deliverydata.signingNumber = signNum; |
|
|
|
|
console.log('---------------------------->a', a); |
|
|
|
|
console.log('---------------------------->packNum', packNum); |
|
|
|
|
console.log('---------------------------->invenNum', invenNum); |
|
|
|
|
console.log('---------------------------->signNum', signNum); |
|
|
|
|
this.handleOrder(this.packpage); |
|
|
|
|
this.handlePackage(this.packpage); |
|
|
|
|
console.log('--------->deliveryType', this.deliverydata); |
|
|
|
|
if (this.deliverydata.deliveryType !== '商配') { |
|
|
|
|
this.handleInventory(this.packpage); |
|
|
|
|
} |
|
|
|
|
// console.log('---------------------------->a', a); |
|
|
|
|
// console.log('---------------------------->packNum', packNum); |
|
|
|
|
// console.log('---------------------------->invenNum', invenNum); |
|
|
|
|
// console.log('---------------------------->signNum', signNum); |
|
|
|
|
// this.handleOrder(this.packpage); |
|
|
|
|
// this.handlePackage(this.packpage); |
|
|
|
|
// console.log('--------->deliveryType', this.deliverydata); |
|
|
|
|
// if (this.deliverydata.deliveryType !== '商配') { |
|
|
|
|
// this.handleInventory(this.packpage); |
|
|
|
|
// } |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
this.loading = false; |
|
|
|
|
|
