java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

修改订单显示

dev-warehouse
caoyizhong 2 years ago
parent
3ec2694302
commit
e3fb510156
5 changed files with 747 additions and 64 deletions
Split View
  1. 162
      src/views/distribution/inventory/delivery/distributionStockArticle.vue
  2. 190
      src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
  3. 190
      src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
  4. 207
      src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
  5. 62
      src/views/distribution/inventory/distributionStockList.vue

162
src/views/distribution/inventory/delivery/distributionStockArticle.vue
Unescape View File

@ -439,6 +439,24 @@ export default {
sortable: true,
},
{
prop: 'consigneeUnit',
label: '收货单位',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'consigneePerson',
label: '收货人',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'handQuantity',
label: '在库件数',
type: 1,
@ -447,8 +465,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
},
{
}, {
prop: 'availableQuantity',
label: '可用数量',
type: 2,
@ -458,6 +475,109 @@ export default {
fixed: false,
sortable: true,
},
{
prop: 'handQuantity',
label: '未入库数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'sortingQuantity',
label: '分拣数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'deliveryQuantity',
label: '配送数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'transferQuantity',
label: '中转数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'signinQuantity',
label: '签收数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},{
prop: 'handQuantity',
label: '上架状态',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},{
prop: 'allocation',
label: '货区-货位-货架',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},{
prop: 'resource',
label: '订单来源',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'trays',
label: '所在托盘',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'freeze_status',
label: '冻结状态',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'state',
label: '状态',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'completeSetName',
label: '是否齐套',
@ -536,6 +656,42 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'createUser',
label: '创建人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'createTime',
label: '创建时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'inventoryDate',
label: '最新盘点时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'inventoryPerson',
label: '盘点人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: '',
@ -946,7 +1102,7 @@ export default {
this.height = this.setPx(document.body.clientHeight - 340);
getDictionaryBiz('distribution_type').then(res => {
this.distributionType = res.data.data;
this.columnList[12].checkarr =res.data.data.map(item=>{
this.columnList[13].checkarr =res.data.data.map(item=>{
item.value=item.dictKey
item.label=item.dictValue
return item

190
src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
Unescape View File

@ -440,6 +440,24 @@ export default {
sortable: true,
},
{
prop: 'consigneeUnit',
label: '收货单位',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'consigneePerson',
label: '收货人',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'handQuantity',
label: '在库件数',
type: 1,
@ -448,6 +466,118 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'availableQuantity',
label: '可用数量',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'handQuantity',
label: '未入库数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'sortingQuantity',
label: '分拣数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'deliveryQuantity',
label: '配送数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'transferQuantity',
label: '中转数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'signinQuantity',
label: '签收数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},{
prop: 'handQuantity',
label: '上架状态',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},{
prop: 'allocation',
label: '货区-货位-货架',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},{
prop: 'resource',
label: '订单来源',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'trays',
label: '所在托盘',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'freeze_status',
label: '冻结状态',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'state',
label: '状态',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'completeSetName',
@ -468,20 +598,20 @@ export default {
fixed: false,
sortable: true,
},
// {
// prop: 'brand',
// label: '品牌',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'brand',
label: '品牌',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'typeService',
prop: 'typeName',
label: '服务类型',
type: 1,
type: 3,
values: '',
width: '150',
checkarr: [],
@ -527,6 +657,42 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'createUser',
label: '创建人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'createTime',
label: '创建时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'inventoryDate',
label: '最新盘点时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'inventoryPerson',
label: '盘点人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: '',

190
src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
Unescape View File

@ -440,6 +440,24 @@ export default {
sortable: true,
},
{
prop: 'consigneeUnit',
label: '收货单位',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'consigneePerson',
label: '收货人',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'handQuantity',
label: '在库件数',
type: 1,
@ -448,6 +466,118 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'availableQuantity',
label: '可用数量',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'handQuantity',
label: '未入库数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'sortingQuantity',
label: '分拣数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'deliveryQuantity',
label: '配送数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'transferQuantity',
label: '中转数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'signinQuantity',
label: '签收数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},{
prop: 'handQuantity',
label: '上架状态',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},{
prop: 'allocation',
label: '货区-货位-货架',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},{
prop: 'resource',
label: '订单来源',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'trays',
label: '所在托盘',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'freeze_status',
label: '冻结状态',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'state',
label: '状态',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'completeSetName',
@ -468,20 +598,20 @@ export default {
fixed: false,
sortable: true,
},
// {
// prop: 'brand',
// label: '品牌',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'brand',
label: '品牌',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'typeService',
prop: 'typeName',
label: '服务类型',
type: 1,
type: 3,
values: '',
width: '150',
checkarr: [],
@ -527,6 +657,42 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'createUser',
label: '创建人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'createTime',
label: '创建时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'inventoryDate',
label: '最新盘点时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'inventoryPerson',
label: '盘点人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: '',

207
src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
Unescape View File

@ -441,6 +441,24 @@ export default {
sortable: true,
},
{
prop: 'consigneeUnit',
label: '收货单位',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'consigneePerson',
label: '收货人',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'handQuantity',
label: '在库件数',
type: 1,
@ -449,6 +467,118 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'availableQuantity',
label: '可用数量',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'handQuantity',
label: '未入库数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'sortingQuantity',
label: '分拣数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'deliveryQuantity',
label: '配送数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'transferQuantity',
label: '中转数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'signinQuantity',
label: '签收数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},{
prop: 'handQuantity',
label: '上架状态',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},{
prop: 'allocation',
label: '货区-货位-货架',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},{
prop: 'resource',
label: '订单来源',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'trays',
label: '所在托盘',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'freeze_status',
label: '冻结状态',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'state',
label: '状态',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'completeSetName',
@ -469,10 +599,20 @@ export default {
fixed: false,
sortable: true,
},
// {
// prop: 'brand',
// label: '品牌',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'brand',
label: '品牌',
type: 2,
prop: 'typeName',
label: '服务类型',
type: 3,
values: '',
width: '150',
checkarr: [],
@ -480,12 +620,21 @@ export default {
sortable: true,
},
{
prop: 'typeService',
label: '服务类型',
type: 1,
prop: 'notification',
label: '通知状态',
type: 3,
values: '',
width: '150',
checkarr: [],
checkarr: [
{
value: '2',
label: '已通知',
},
{
value: '1',
label: '未通知',
},
],
fixed: false,
sortable: true,
},
@ -528,6 +677,42 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'createUser',
label: '创建人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'createTime',
label: '创建时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'inventoryDate',
label: '最新盘点时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'inventoryPerson',
label: '盘点人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: '',
@ -542,6 +727,7 @@ export default {
// 更多列的配置...
],
columnListedit: [],
drawerShow: false,
height: 0,
// 弹框标题
@ -1128,6 +1314,13 @@ export default {
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
data.records.some(i =>{
if(i.notification == '1'){
i.notification = '未通知'
}else{
i.notification = '已通知'
}
});
this.data = data.records;
this.loading = false;
this.selectionClear();

62
src/views/distribution/inventory/distributionStockList.vue
Unescape View File

@ -251,16 +251,16 @@ export default {
// fixed: false,
// sortable: true,
// },
{
prop: 'marketName',
label: '商场',
type: 2,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// prop: 'marketName',
// label: '商场',
// type: 2,
// values: '',
// width: '180',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'descriptionGoods',
label: '货物名称',
@ -290,16 +290,16 @@ export default {
// fixed: false,
// sortable: true,
// },
{
prop: 'storeName',
label: '门店',
type: 2,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// prop: 'storeName',
// label: '门店',
// type: 2,
// values: '',
// width: '180',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
/* {
prop: 'storageLocation',
label: '库位信息',
@ -310,16 +310,17 @@ export default {
fixed: false,
sortable: true,
},*/
// {
// prop: 'mallName',
// label: '商城名称',
// type: 2,
// values: '',
// width: '180',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'mallName',
label: '商城名称',
type: 2,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},{
prop: 'quantityStock',
label: '库存数量',
type: 1,
@ -433,7 +434,8 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
},{
},
{
prop: 'shoppingMall',
label: '所属商场',
type: 2,

Write Preview
Loading…
Cancel
Save