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

优化页面

fix_bug_pro20231227
pref_mail@163.com 1 year ago
parent
c798588e9f
commit
b40d265203
10 changed files with 287 additions and 340 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      src/views/distribution/deliverylist/distributionDeliveryListmar.vue
  2. 100
      src/views/distribution/inventory/delivery/distributionStockArticle.vue
  3. 100
      src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
  4. 81
      src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
  5. 89
      src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
  6. 42
      src/views/distribution/reservation/reservation.vue
  7. 10
      src/views/distribution/signfor/distributionSignfor.vue
  8. 2
      src/views/distribution/signfor/distributionSignfortreat.vue
  9. 72
      src/views/reservation/reservation_list.vue
  10. 93
      src/views/warehouse/parcelList/distributionParcelList.vue

38
src/views/distribution/deliverylist/distributionDeliveryListmar.vue
Unescape View File

@ -389,7 +389,7 @@ export default {
label: '车次',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: true,
sortable: true,
@ -400,7 +400,7 @@ export default {
label: '配送日期',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: true,
sortable: true,
@ -411,7 +411,7 @@ export default {
label: '仓库',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -421,7 +421,7 @@ export default {
label: '客户名称',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -431,7 +431,7 @@ export default {
label: '配送种类',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -441,7 +441,7 @@ export default {
label: '配送类型',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -451,7 +451,7 @@ export default {
label: '配送车辆',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -461,7 +461,7 @@ export default {
label: '配送司机',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -471,7 +471,7 @@ export default {
label: '配送公司',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -482,7 +482,7 @@ export default {
label: '配送状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -492,7 +492,7 @@ export default {
// label: '装车状态',
// type: 3,
// values: '',
// width: '130',
// width: '140',
// checkarr: [],
// fixed: false,
// sortable: true
@ -502,7 +502,7 @@ export default {
label: '配送客户数',
type: 1,
values: '',
width: '130',
width: '160',
checkarr: [],
fixed: false,
sortable: true,
@ -512,7 +512,7 @@ export default {
label: '配送价格',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -522,7 +522,7 @@ export default {
label: '增值服务',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -532,7 +532,7 @@ export default {
label: '订单总数',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -542,7 +542,7 @@ export default {
label: '配送件数',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -562,7 +562,7 @@ export default {
label: '扫描件数',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -572,7 +572,7 @@ export default {
label: '装车班组',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -582,7 +582,7 @@ export default {
label: '装车班组',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,

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

@ -470,23 +470,24 @@ export default {
checkarr: [],
fixed: true,
},
{
prop: 'serviceNumber',
label: '服务号',
prop: 'waybillNumber',
label: '运单号',
type: 2,
values: '',
width: '130',
width: '160',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
{
prop: 'waybillNumber',
label: '运单号',
prop: 'serviceNumber',
label: '服务号',
type: 2,
values: '',
width: '130',
width: '180',
checkarr: [],
fixed: true,
sortable: true,
@ -497,7 +498,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '130',
width: '260',
checkarr: [],
fixed: false,
sortable: true,
@ -507,7 +508,7 @@ export default {
label: '商场名称',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -517,7 +518,7 @@ export default {
label: '货物名称',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -527,7 +528,7 @@ export default {
label: '所在仓库',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -537,7 +538,7 @@ export default {
label: '入库时间',
type: 4,
values: '',
width: '130',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
@ -547,7 +548,7 @@ export default {
label: '最新入库时间',
type: 4,
values: '',
width: '130',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
@ -557,37 +558,38 @@ export default {
label: '在库时间',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'totalNumber',
label: '订单总件数',
prop: 'consigneeUnit',
label: '收货单位',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'consigneeUnit',
label: '收货单位',
type: 1,
prop: 'consigneePerson',
label: '收货人',
type: 2,
values: '',
width: '130',
width: '160',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'consigneePerson',
label: '收货人',
type: 2,
prop: 'totalNumber',
label: '订单总件数',
type: 1,
values: '',
width: '130',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -597,7 +599,7 @@ export default {
label: '在库件数',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -607,7 +609,7 @@ export default {
label: '可用数量',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -617,7 +619,7 @@ export default {
label: '未入库数量',
type: 1,
values: '',
width: '130',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -627,7 +629,7 @@ export default {
label: '分拣数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -637,7 +639,7 @@ export default {
label: '配送数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -647,7 +649,7 @@ export default {
label: '中转数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -657,7 +659,7 @@ export default {
label: '签收数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -667,7 +669,7 @@ export default {
label: '上架状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [
// {
// value: '0',
@ -690,10 +692,10 @@ export default {
},
{
prop: 'allocation',
label: '货区-货位-货架',
label: '货位信息',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -703,7 +705,7 @@ export default {
label: '订单来源',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -713,7 +715,7 @@ export default {
label: '所在托盘',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -723,7 +725,7 @@ export default {
label: '冻结状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [
// {
// value: '1',
@ -742,7 +744,7 @@ export default {
label: '订单状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -752,7 +754,7 @@ export default {
label: '预约状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -762,7 +764,7 @@ export default {
label: '备货状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -772,7 +774,7 @@ export default {
label: '入库状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -782,7 +784,7 @@ export default {
label: '是否齐套',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [
{
value: '2',
@ -811,7 +813,7 @@ export default {
label: '服务类型',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -821,7 +823,7 @@ export default {
label: '顾客名字',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -831,7 +833,7 @@ export default {
label: '顾客电话',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -841,7 +843,7 @@ export default {
label: '顾客地址',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -851,7 +853,7 @@ export default {
label: '增值服务',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -861,7 +863,7 @@ export default {
label: '创建人',
type: 1,
values: '',
width: '130',
width: '160',
checkarr: [],
fixed: false,
sortable: true,
@ -871,7 +873,7 @@ export default {
label: '创建时间',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,

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

@ -403,33 +403,34 @@ export default {
fixed: true,
},
{
prop: 'serviceNumber',
label: '服务号',
prop: 'waybillNumber',
label: '运单号',
type: 2,
values: '',
width: '130',
width: '160',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
{
prop: 'waybillNumber',
label: '运单号',
prop: 'serviceNumber',
label: '服务号',
type: 2,
values: '',
width: '130',
width: '180',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
{
prop: 'orderCode',
label: '订单自编号',
type: 2,
values: '',
width: '130',
width: '260',
checkarr: [],
fixed: false,
sortable: true,
@ -439,7 +440,7 @@ export default {
label: '商场名称',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -449,7 +450,7 @@ export default {
label: '货物名称',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -459,7 +460,7 @@ export default {
label: '所在仓库',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -469,7 +470,7 @@ export default {
label: '入库时间',
type: 4,
values: '',
width: '130',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
@ -479,7 +480,7 @@ export default {
label: '最新入库时间',
type: 4,
values: '',
width: '130',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
@ -489,27 +490,18 @@ export default {
label: '在库时间',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'totalNumber',
label: '订单总件数',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'consigneeUnit',
label: '收货单位',
type: 1,
values: '',
width: '130',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -519,7 +511,17 @@ export default {
label: '收货人',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'totalNumber',
label: '订单总件数',
type: 1,
values: '',
width: '160',
checkarr: [],
fixed: false,
sortable: true,
@ -529,7 +531,7 @@ export default {
label: '在库件数',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -539,7 +541,7 @@ export default {
label: '可用数量',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -549,7 +551,7 @@ export default {
label: '未入库数量',
type: 1,
values: '',
width: '130',
width: '160',
checkarr: [],
fixed: false,
sortable: true,
@ -559,7 +561,7 @@ export default {
label: '分拣数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -569,7 +571,7 @@ export default {
label: '配送数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -579,7 +581,7 @@ export default {
label: '中转数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -589,7 +591,7 @@ export default {
label: '签收数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -599,17 +601,17 @@ export default {
label: '上架状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'allocation',
label: '货区-货位-货架',
label: '货位信息',
type: 1,
values: '',
width: '150',
width: '220',
checkarr: [],
fixed: false,
sortable: true,
@ -619,7 +621,7 @@ export default {
label: '订单来源',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -629,7 +631,7 @@ export default {
label: '所在托盘',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -639,7 +641,7 @@ export default {
label: '冻结状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -649,7 +651,7 @@ export default {
label: '订单状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -659,7 +661,7 @@ export default {
label: '预约状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -669,7 +671,7 @@ export default {
label: '备货状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -679,7 +681,7 @@ export default {
label: '入库状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -689,7 +691,7 @@ export default {
label: '是否齐套',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [
{
value: '2',
@ -728,7 +730,7 @@ export default {
label: '顾客名字',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -738,7 +740,7 @@ export default {
label: '顾客电话',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -748,7 +750,7 @@ export default {
label: '顾客地址',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -758,7 +760,7 @@ export default {
label: '增值服务',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -768,7 +770,7 @@ export default {
label: '创建人',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -778,7 +780,7 @@ export default {
label: '创建时间',
type: 4,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,

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

@ -421,33 +421,34 @@ export default {
fixed: true,
},
{
prop: 'serviceNumber',
label: '服务号',
prop: 'waybillNumber',
label: '运单号',
type: 2,
values: '',
width: '130',
width: '160',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
{
prop: 'waybillNumber',
label: '运单号',
prop: 'serviceNumber',
label: '服务号',
type: 2,
values: '',
width: '130',
width: '180',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
{
prop: 'orderCode',
label: '订单自编号',
type: 2,
values: '',
width: '130',
width: '260',
checkarr: [],
fixed: false,
sortable: true,
@ -457,7 +458,7 @@ export default {
label: '商场名称',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -467,7 +468,7 @@ export default {
label: '货物名称',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -477,7 +478,7 @@ export default {
label: '所在仓库',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -487,7 +488,7 @@ export default {
label: '最新入库时间',
type: 4,
values: '',
width: '130',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
@ -497,7 +498,7 @@ export default {
label: '入库时间',
type: 4,
values: '',
width: '130',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
@ -507,7 +508,7 @@ export default {
label: '在库时间',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -517,7 +518,7 @@ export default {
label: '订单总件数',
type: 1,
values: '',
width: '130',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -527,7 +528,7 @@ export default {
label: '收货单位',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -537,7 +538,7 @@ export default {
label: '收货人',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -547,7 +548,7 @@ export default {
label: '在库件数',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -557,7 +558,7 @@ export default {
label: '可用数量',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -567,7 +568,7 @@ export default {
label: '未入库数量',
type: 1,
values: '',
width: '130',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -577,7 +578,7 @@ export default {
label: '分拣数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -587,7 +588,7 @@ export default {
label: '配送数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -597,7 +598,7 @@ export default {
label: '中转数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -607,7 +608,7 @@ export default {
label: '签收数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -617,17 +618,17 @@ export default {
label: '上架状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'allocation',
label: '货区-货位-货架',
label: '货位信息',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -637,7 +638,7 @@ export default {
label: '订单来源',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -647,7 +648,7 @@ export default {
label: '所在托盘',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -657,7 +658,7 @@ export default {
label: '冻结状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -668,7 +669,7 @@ export default {
label: '预约状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -678,7 +679,7 @@ export default {
label: '订单状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -688,7 +689,7 @@ export default {
label: '备货状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -698,7 +699,7 @@ export default {
label: '入库状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -708,7 +709,7 @@ export default {
label: '是否齐套',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [
{
value: '2',
@ -747,7 +748,7 @@ export default {
label: '顾客名字',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -757,7 +758,7 @@ export default {
label: '顾客电话',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -767,7 +768,7 @@ export default {
label: '顾客地址',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -777,7 +778,7 @@ export default {
label: '增值服务',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -787,7 +788,7 @@ export default {
label: '创建人',
type: 1,
values: '',
width: '130',
width: '160',
checkarr: [],
fixed: false,
sortable: true,
@ -797,7 +798,7 @@ export default {
label: '创建时间',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,

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

@ -537,23 +537,24 @@ export default {
checkarr: [],
fixed: true,
},
{
prop: 'serviceNumber',
label: '服务号',
prop: 'waybillNumber',
label: '运单号',
type: 2,
values: '',
width: '130',
width: '160',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
{
prop: 'waybillNumber',
label: '运单号',
prop: 'serviceNumber',
label: '服务号',
type: 2,
values: '',
width: '130',
width: '180',
checkarr: [],
fixed: true,
sortable: true,
@ -564,7 +565,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '130',
width: '260',
checkarr: [],
fixed: false,
sortable: true,
@ -574,7 +575,7 @@ export default {
label: '商场名称',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -584,7 +585,7 @@ export default {
label: '货物名称',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -594,7 +595,7 @@ export default {
// label: '零担',
// type: 2,
// values: '',
// width: '130',
// width: '140',
// checkarr: [
// ],
@ -606,7 +607,7 @@ export default {
label: '所在仓库',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -616,7 +617,7 @@ export default {
label: '入库时间',
type: 4,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -626,7 +627,7 @@ export default {
label: '最新入库时间',
type: 4,
values: '',
width: '130',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
@ -636,7 +637,7 @@ export default {
label: '在库时间',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -646,7 +647,7 @@ export default {
label: '订单总件数',
type: 1,
values: '',
width: '130',
width: '160',
checkarr: [],
fixed: false,
sortable: true,
@ -656,7 +657,7 @@ export default {
label: '收货单位',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -666,7 +667,7 @@ export default {
label: '收货人',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -676,7 +677,7 @@ export default {
label: '在库件数',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -686,7 +687,7 @@ export default {
label: '可用数量',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -696,7 +697,7 @@ export default {
label: '未入库数量',
type: 1,
values: '',
width: '130',
width: '160',
checkarr: [],
fixed: false,
sortable: true,
@ -706,7 +707,7 @@ export default {
label: '分拣数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -716,7 +717,7 @@ export default {
label: '配送数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -726,7 +727,7 @@ export default {
label: '中转数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -736,7 +737,7 @@ export default {
label: '签收数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -746,17 +747,17 @@ export default {
label: '上架状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'allocation',
label: '货区-货位-货架',
label: '货位信息',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -766,7 +767,7 @@ export default {
label: '订单来源',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -776,7 +777,7 @@ export default {
label: '所在托盘',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -786,7 +787,7 @@ export default {
label: '冻结状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [
{
value: '1',
@ -805,7 +806,7 @@ export default {
label: '订单状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -815,7 +816,7 @@ export default {
label: '预约状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -825,7 +826,7 @@ export default {
label: '备货状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -835,7 +836,7 @@ export default {
label: '入库状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -845,7 +846,7 @@ export default {
label: '是否齐套',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [
{
value: '2',
@ -864,7 +865,7 @@ export default {
// label: '品牌',
// type: 2,
// values: '',
// width: '130',
// width: '140',
// checkarr: [],
// fixed: false,
// sortable: true,
@ -874,7 +875,7 @@ export default {
// label: '服务类型',
// type: 1,
// values: '',
// width: '130',
// width: '140',
// checkarr: [],
// fixed: false,
// sortable: true,
@ -884,7 +885,7 @@ export default {
label: '通知状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [
{
value: '1',
@ -903,7 +904,7 @@ export default {
label: '顾客名字',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -913,7 +914,7 @@ export default {
label: '顾客电话',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -923,7 +924,7 @@ export default {
label: '顾客地址',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -933,7 +934,7 @@ export default {
label: '增值服务',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -943,7 +944,7 @@ export default {
label: '创建人',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -953,7 +954,7 @@ export default {
label: '创建时间',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,

42
src/views/distribution/reservation/reservation.vue
Unescape View File

@ -420,7 +420,7 @@ export default {
label: '预约单编号',
type: 2,
values: '',
width: '130',
width: '160',
checkarr: [],
fixed: true,
sortable: true,
@ -431,7 +431,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '130',
width: '260',
checkarr: [],
fixed: true,
sortable: true,
@ -442,7 +442,7 @@ export default {
label: '服务号',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -452,7 +452,7 @@ export default {
label: '仓库',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -462,7 +462,7 @@ export default {
label: '收货单位',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -472,7 +472,7 @@ export default {
label: '门店',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -482,7 +482,7 @@ export default {
label: '收货人',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -502,7 +502,7 @@ export default {
label: '收件人电话',
type: 2,
values: '',
width: '130',
width: '160',
fixed: false,
sortable: true,
},
@ -511,7 +511,7 @@ export default {
label: '预约时间',
type: 4,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -545,7 +545,7 @@ export default {
label: '时段',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [
{
label: '上午',
@ -568,7 +568,7 @@ export default {
label: '配送方式',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -609,7 +609,7 @@ export default {
label: '服务类型',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [
{
label: '上楼',
@ -648,7 +648,7 @@ export default {
label: '预约包件数',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -668,7 +668,7 @@ export default {
label: '待收货款',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -678,7 +678,7 @@ export default {
label: '其他费用',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -688,7 +688,7 @@ export default {
label: '代收运费',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -771,7 +771,7 @@ export default {
label: '备货状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [
{
label: '待备货',
@ -795,7 +795,7 @@ export default {
// label: '备货区',
// type: 2,
// values: '',
// width: '130',
// width: '140',
// checkarr: [],
// fixed: false,
// sortable: true
@ -805,7 +805,7 @@ export default {
// label: '备货区编号',
// type: 2,
// values: '',
// width: '130',
// width: '140',
// checkarr: [],
// fixed: false,
// sortable: true,
@ -816,7 +816,7 @@ export default {
// label: '签收类型',
// type: 2,
// values: '',
// width: '130',
// width: '140',
// checkarr: [],
// fixed: false,
// sortable: true,
@ -827,7 +827,7 @@ export default {
// label: '备注',
// type: 1,
// values: '',
// width: '130',
// width: '140',
// checkarr: [],
// fixed: false,
// sortable: false,

10
src/views/distribution/signfor/distributionSignfor.vue
Unescape View File

@ -237,7 +237,7 @@ export default {
label: '配送车次',
type: 2,
values: '',
width: '130',
width: '220',
checkarr: [],
fixed: false,
sortable: true,
@ -248,7 +248,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '130',
width: '230',
checkarr: [],
fixed: false,
sortable: true,
@ -259,7 +259,7 @@ export default {
label: '配送仓库',
type: 2,
values: '',
width: '130',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
@ -281,7 +281,7 @@ export default {
label: '客户电话',
type: 2,
values: '',
width: '130',
width: '220',
checkarr: [],
fixed: false,
sortable: true,
@ -324,7 +324,7 @@ export default {
label: '总件数',
type: 1,
values: '',
width: '130',
width: '150',
checkarr: [],
fixed: false,
sortable: true,

2
src/views/distribution/signfor/distributionSignfortreat.vue
Unescape View File

@ -544,7 +544,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '130',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

72
src/views/reservation/reservation_list.vue
Unescape View File

@ -206,36 +206,7 @@
@click="viewReservation(slotProps.scope)"
>查看
</el-text>
<el-text
size="small"
type="primary"
link
icon="el-icon-view"
@click="editsolt(slotProps.scope)"
>编辑
</el-text>
<el-text
size="small"
type="primary"
link
icon="el-icon-view"
@click="cancelReservation(slotProps.scope)"
>取消预约
</el-text>
<el-text
v-if="this.queryB.reservationStatus === '1' ? true : false"
size="small"
@click="confirmReservation(slotProps.scope)"
>确认预约
</el-text>
<el-text
size="small"
type="primary"
link
icon="el-icon-view"
@click="printData(slotProps.scope)"
>打印
</el-text>
</template>
</tablecmt>
</template>
@ -329,16 +300,7 @@
<el-date-picker v-model="info.stockupDate" type="date" placeholder="选择日期">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="装卸班组" :label-width="formLabelWidth">-->
<!-- <el-select v-model="form.loader" clearable placeholder="请选择装卸班组">-->
<!-- <el-option-->
<!-- v-for="item in loaderData"-->
<!-- :key="item.dictKey"-->
<!-- :label="item.dictValue"-->
<!-- :value="item.dictKey">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="备货区域:">
<el-select v-model="info.stockupArea" clearable placeholder="请选择备货区编号">
<el-option
@ -516,30 +478,7 @@ export default {
fixed: false,
sortable: true,
},
// {
// prop: 'periodOfTime',
// label: '时段1',
// type: 3,
// values: '',
// width: '180',
// checkarr: [
// {
// label: '上午',
// value: '1'
// },
// {
// label: '下午',
// value: '2'
// },
// {
// label: '全天',
// value: '3'
// },
// ],
// fixed: false,
// sortable: true,
// head:true,
// },
{
prop: 'periodOfTimeName',
label: '时段',
@ -1222,7 +1161,7 @@ export default {
await getPostList(ides).then(res => {
// console.log(">>>>",res.data.data);
res.data.data.forEach(i => {
if (i.postName == '叉车') {
if (i.postName == '拣货员') {
ide = i;
}
});
@ -1404,7 +1343,6 @@ export default {
let data = this.selectionList;
let a = [];
let b = [];
console.log('>>>>>>>>>>>>>', data);
data.forEach(d => {
if (d.stockupStatus === '20' || d.stockupStatusName === '待备货') {
a.push(d.reservationCode);
@ -1512,9 +1450,7 @@ export default {
// }
let query = this.queryB;
query.reservationStatus = '2';
console.log('this.activename :>> ', this.activename);
if (this.activename === 'nocheck') {
console.log('123123 :>> ', 123123);
query = this.queryA;
query.reservationStatus = this.queryA.reservationStatus || '1';
}

93
src/views/warehouse/parcelList/distributionParcelList.vue
Unescape View File

@ -165,16 +165,7 @@ export default {
sortable: false,
head: false,
},
{
prop: 'orderCode',
label: '订单自编号',
type: 2,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'warehouse',
label: '仓库',
@ -187,58 +178,58 @@ export default {
head: false,
},
{
prop: 'conditionsType',
label: '包件明细状态',
type: 3,
prop: 'trainNumber',
label: '车次号',
type: 2,
values: '',
width: '130',
checkarr: [
{
label: '定制品',
value: '1',
},
{
label: '库存品',
value: '2',
},
],
checkarr: [],
fixed: false,
sortable: false,
head: false,
sortable: true,
},
{
prop: 'orderPackageCode',
label: '包条码',
prop: 'orderCode',
label: '订单自编号',
type: 2,
values: '',
width: '130',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'goodsAllocation',
label: '货位信息',
prop: 'orderPackageCode',
label: '包条码',
type: 2,
values: '',
width: '130',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'pallet',
label: '所在托盘',
type: 2,
prop: 'conditionsType',
label: '包件明细状态',
type: 3,
values: '',
width: '130',
checkarr: [],
checkarr: [
{
label: '定制品',
value: '1',
},
{
label: '库存品',
value: '2',
},
],
fixed: false,
sortable: true,
sortable: false,
head: false,
},
{
prop: 'firsts',
label: '一级品',
@ -298,27 +289,41 @@ export default {
// fixed: false,
// sortable: true,
// },
{
prop: 'quantity',
label: '数量',
type: 1,
prop: 'goodsAllocation',
label: '货位信息',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
head: false,
},
{
prop: 'trainNumber',
label: '车次号',
prop: 'pallet',
label: '所在托盘',
type: 2,
values: '',
width: '180',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'quantity',
label: '数量',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
],
drawerShow: false,
height: 0,

Write Preview
Loading…
Cancel
Save