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

优化页面显示

dev-xx
qb 5 months ago
parent
04790cbcd1
commit
b73eaa9597
6 changed files with 473 additions and 439 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. 28
      src/components/tablecmt/tablecmt.vue
  2. 36
      src/option/basicdata/BackStockTask.js
  3. 743
      src/option/basicdata/basicdataWarehouseTemp.js
  4. 96
      src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
  5. 7
      src/views/distribution/artery/truckLoadingDetails.vue
  6. 2
      src/views/waybill/orderPackageList.vue

28
src/components/tablecmt/tablecmt.vue
Unescape View File

@ -24,6 +24,7 @@
:label="column.label"
:fixed="column.fixed"
:sortable="column.sortable"
:show-overflow-tooltip="column.isextrahide === false ? false : true"
:selectable="isselectfun"
v-show="column.head"
>
@ -37,7 +38,7 @@
:prop="column.prop"
:label="column.label"
flexible
show-overflow-tooltip
:show-overflow-tooltip="column.isextrahide === false ? false : true"
class="el_boxsa"
>
<template #header>
@ -112,8 +113,9 @@
"
:id="scope.row[column.prop]"
v-if="Number(column.type) < 6 && Number(column.type) > 0"
>{{ scope.row[column.prop] }}</el-text
>
>{{ scope.row[column.prop] }}
</el-text>
<el-switch
@change="makeCargo(scope.row, column)"
v-else-if="column.type == 11"
@ -127,7 +129,7 @@
>
<span v-if="item.value==scope.row[column.prop]">{{ item.label }}</span>
</el-text
> -->
> -->
<el-text
style=""
class="mx-2 tabculconte colors"
@ -167,7 +169,7 @@
v-for="(item, index) in scope.row[column.prop].split(',')"
:src="item"
:preview-src-list="scope.row[column.prop].split(',')"
/> -->
/> -->
<el-image
preview-teleported
v-else-if="column.type == 7"
@ -181,6 +183,22 @@
</template>
</el-table-column>
</template>
<template v-if="column.type === 30" #default="scope">
<el-text
@click.stop
@dblclick.stop="Copytxt(scope.row[column.prop])"
class="mx-2 tabculconte"
:class="
scope.row[column.prop] == props.searchInput && scope.row[column.prop]
? 'static-class'
: ''
"
:id="scope.row[column.prop]"
>{{ scope.row[column.prop] }}
</el-text>
</template>
<template #header>
<div style="display: inline-block">
<div class="tilbox">

36
src/option/basicdata/BackStockTask.js
Unescape View File

@ -17,7 +17,7 @@ export default [
{
label: '配送回库任务编号',
prop: 'taskCode',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -27,7 +27,7 @@ export default [
{
label: '回库任务类型',
prop: 'retentionTypeName',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -37,7 +37,7 @@ export default [
{
label: '包条码',
prop: 'orderPackageCode',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -47,7 +47,7 @@ export default [
{
label: '订单编号',
prop: 'orderCode',
type: 1,
type: 30,
values: '',
width: '300',
checkarr: [],
@ -57,7 +57,7 @@ export default [
{
label: '运单编号',
prop: 'waybillNumber',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -67,7 +67,7 @@ export default [
{
label: '配送类型',
prop: 'deliveryTypeName',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -77,7 +77,7 @@ export default [
{
label: '货物类型',
prop: 'conditionsName',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -87,7 +87,7 @@ export default [
{
label: '预约编号',
prop: 'reservationCode',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -97,7 +97,7 @@ export default [
{
label: '配送车次',
prop: 'trainNumber',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -107,7 +107,7 @@ export default [
{
label: '装车车牌',
prop: 'vehicleNumber',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -117,7 +117,7 @@ export default [
{
label: '件数',
prop: 'retentionQuantity',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -127,7 +127,7 @@ export default [
{
label: '物料编码',
prop: 'materialNumber',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -137,7 +137,7 @@ export default [
{
label: '物料名称',
prop: 'materialName',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -147,7 +147,7 @@ export default [
{
label: '创建时间',
prop: 'createTime',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -157,7 +157,7 @@ export default [
{
label: '仓库名称',
prop: 'warehouseName',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -167,7 +167,7 @@ export default [
{
label: '回库任务状态',
prop: 'confirmStatusName',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -177,7 +177,7 @@ export default [
{
label: '回库操作人员',
prop: 'retentionScanUsername',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -187,7 +187,7 @@ export default [
{
label: '回库时间',
prop: 'retentionScanTime',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],

743
src/option/basicdata/basicdataWarehouseTemp.js
Unescape View File

@ -1,377 +1,374 @@
export const columnList = [
{
prop: '',
label: '复选框',
type: 0,
width: 55,
fixed: true,
},
{
prop: '',
label: '序号',
type: 12,
values: '',
width: 55,
fixed: true,
},
{
prop: 'name',
label: '仓库名称',
type: 1,
values: '',
width: '100',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'warehouseCode',
label: '仓库编码',
type:1,
values: '',
width: '100',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'abbreviation',
label: '仓库简称',
type: 1,
values: '',
width: '120',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'linkman',
label: '联系人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'contactNumber',
label: '联系电话',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'legalPerson',
label: '法人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'legalPersonPhone',
label: '法人联系电话',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'deposit',
label: '押金',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'functionType',
label: '职能类型',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'warehouseAddress',
label: '仓库地址',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'departmentName',
label: '所属部门',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'warehouseType',
label: '仓库类型',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'fireGrade',
label: '消防等级',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'fireRatingNot',
label: '是否有消防等级',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'warehouseStructure',
label: '仓库结构',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'elevatedNot',
label: '是否高架',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'storeyHeight',
label: '仓库层高',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'powerCondition',
label: '电力类型',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'unitPrice',
label: '租金单价',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'acreage',
label: '面积',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'startDate',
label: '开始时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'endDate',
label: '到期时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'rentType',
label: '租金类型',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'grade',
label: '仓库等级',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'administrativeFee',
label: '管理费',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'seating',
label: '库位数',
type: 1,
values: '',
width: '170',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: '',
label: '复选框',
type: 0,
width: 55,
fixed: true,
},
{
prop: '',
label: '序号',
type: 12,
values: '',
width: 55,
fixed: true,
},
{
prop: 'name',
label: '仓库名称',
type: 30,
values: '',
width: '100',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'warehouseCode',
label: '仓库编码',
type: 1,
values: '',
width: '100',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'abbreviation',
label: '仓库简称',
type: 30,
values: '',
width: '120',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'linkman',
label: '联系人',
type: 30,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'contactNumber',
label: '联系电话',
type: 30,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'legalPerson',
label: '法人',
type: 30,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'legalPersonPhone',
label: '法人联系电话',
type: 30,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'deposit',
label: '押金',
type: 30,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'functionType',
label: '职能类型',
type: 30,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'warehouseAddress',
label: '仓库地址',
type: 30,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'departmentName',
label: '所属部门',
type: 30,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'warehouseType',
label: '仓库类型',
type: 30,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'fireGrade',
label: '消防等级',
type: 30,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'fireRatingNot',
label: '是否有消防等级',
type: 30,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'warehouseStructure',
label: '仓库结构',
type: 30,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'elevatedNot',
label: '是否高架',
type: 30,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'storeyHeight',
label: '仓库层高',
type: 30,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'temporaryTurnoverArea',
label: '临时周转面积(m²)',
type: 1,
values: '',
width: '170',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'singleStorageLocationArea',
label: '单库位面积(m²)',
type: 1,
values: '',
width: '170',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'handlingStorageEntranceFee',
label: '代作业入库费(元/件)',
type: 1,
values: '',
width: '170',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'handlingStorageExitFee',
label: '代作业出库费(元/件)',
type: 1,
values: '',
width: '170',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'powerCondition',
label: '电力类型',
type: 30,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'unitPrice',
label: '租金单价',
type: 30,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'acreage',
label: '面积',
type: 30,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'startDate',
label: '开始时间',
type: 30,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'endDate',
label: '到期时间',
type: 30,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'remarks',
label: '备注',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'createUserName',
label: '操作',
type: 6,
values: '',
width: '180',
checkarr: [],
fixed: 'right',
sortable: false,
},
]
{
prop: 'rentType',
label: '租金类型',
type: 30,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'grade',
label: '仓库等级',
type: 30,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'administrativeFee',
label: '管理费',
type: 30,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'seating',
label: '库位数',
type: 30,
values: '',
width: '170',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'temporaryTurnoverArea',
label: '临时周转面积(m²)',
type: 30,
values: '',
width: '170',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'singleStorageLocationArea',
label: '单库位面积(m²)',
type: 30,
values: '',
width: '170',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'handlingStorageEntranceFee',
label: '代作业入库费(元/件)',
type: 30,
values: '',
width: '170',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'handlingStorageExitFee',
label: '代作业出库费(元/件)',
type: 30,
values: '',
width: '170',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'remarks',
label: '备注',
type: 30,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'createUserName',
label: '操作',
type: 6,
values: '',
width: '180',
checkarr: [],
fixed: 'right',
sortable: false,
},
];

96
src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
Unescape View File

@ -169,6 +169,7 @@ import option from '@/option/basic/basicPdarecords';
import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict';
import dayjs from 'dayjs';
import { handleTranslationDataSeclect } from '@/utils/util';
export default {
data() {
@ -615,7 +616,7 @@ export default {
{
prop: 'serviceNumber',
label: '服务号',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -626,7 +627,7 @@ export default {
{
prop: 'waybillNumber',
label: '运单号',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -637,7 +638,7 @@ export default {
{
prop: 'orderCode',
label: '订单自编号',
type: 1,
type: 30,
values: '',
width: '300',
checkarr: [],
@ -648,7 +649,7 @@ export default {
{
prop: 'orderPackageCode',
label: '包条码',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -656,10 +657,24 @@ export default {
sortable: true,
head: false,
},
{
prop: 'isFleeingName',
label: '是否窜货',
type: 30,
values: '',
width: '80',
checkarr: [
{ value: 0, label: '否' },
{ value: 1, label: '是' },
],
fixed: false,
sortable: false,
head: false,
},
{
prop: 'warehouse',
label: '仓库',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -670,7 +685,7 @@ export default {
{
prop: 'firsts',
label: '一级品类',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -681,7 +696,7 @@ export default {
{
prop: 'second',
label: '二级品类',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -692,7 +707,7 @@ export default {
{
prop: 'thirdProduct',
label: '三级品类',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -703,7 +718,7 @@ export default {
{
prop: 'materialCode',
label: '物品编号',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -714,7 +729,7 @@ export default {
{
prop: 'materialName',
label: '物品名称',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -725,7 +740,7 @@ export default {
{
prop: 'brandName',
label: '品牌',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -736,7 +751,7 @@ export default {
{
prop: 'orderPackageStatusName',
label: '包件状态',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -747,7 +762,7 @@ export default {
{
prop: 'orderPackageFreezeStatusName',
label: '包件冻结状态',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -758,7 +773,7 @@ export default {
{
prop: 'orderPackageGroundingStatusName',
label: '包件上架状态',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -769,7 +784,7 @@ export default {
{
prop: 'orderPackageStockupStatusName',
label: '包件备货状态',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -780,7 +795,7 @@ export default {
{
prop: 'orderPackageReservationStatusName',
label: '包件预约状态',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -791,7 +806,7 @@ export default {
{
prop: 'orderPackageLoadingStatusName',
label: '包件装车状态',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -802,7 +817,7 @@ export default {
{
prop: 'positionCode',
label: '所在库位',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -813,7 +828,7 @@ export default {
// {
// prop: 'columnNum',
// label: '所在列',
// type: 1,
// type: 30,
// values: '',
// width: '150',
// checkarr: [],
@ -824,7 +839,7 @@ export default {
// {
// prop: 'layerNum',
// label: '所在层',
// type: 1,
// type: 30,
// values: '',
// width: '150',
// checkarr: [],
@ -847,7 +862,7 @@ export default {
{
prop: 'sku',
label: 'sku',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -858,7 +873,7 @@ export default {
{
prop: 'descriptionGoods',
label: '物料名称',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -869,7 +884,7 @@ export default {
{
prop: 'cargoNumber',
label: '物料编号',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -880,7 +895,7 @@ export default {
{
prop: 'cargoNorms',
label: '规格',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -891,7 +906,7 @@ export default {
{
prop: 'cargoUnit',
label: '单位',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -902,7 +917,7 @@ export default {
{
prop: 'warehouseName',
label: '仓库',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -913,7 +928,7 @@ export default {
{
prop: 'marketName',
label: '商场名称',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -924,7 +939,7 @@ export default {
{
prop: 'positionCode',
label: '所在库位',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -935,7 +950,7 @@ export default {
// {
// prop: 'columnNum',
// label: '所在列',
// type: 1,
// type: 30,
// values: '',
// width: '150',
// checkarr: [],
@ -946,7 +961,7 @@ export default {
// {
// prop: 'layerNum',
// label: '所在层',
// type: 1,
// type: 30,
// values: '',
// width: '150',
// checkarr: [],
@ -957,7 +972,7 @@ export default {
{
prop: 'num',
label: '数量',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -980,7 +995,7 @@ export default {
{
prop: 'dealerName',
label: '经销商名称',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -991,7 +1006,7 @@ export default {
{
prop: 'waybillNo',
label: '运单号',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -1002,7 +1017,7 @@ export default {
{
prop: 'dealerCode',
label: '经销商编码',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -1013,7 +1028,7 @@ export default {
{
prop: 'consigneePerson',
label: '运单收货人',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -1024,7 +1039,7 @@ export default {
{
prop: 'consigneeAddress',
label: '运单收货地址',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -1035,7 +1050,7 @@ export default {
{
prop: 'consigneeMobile',
label: '运单收货电话',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -1046,7 +1061,7 @@ export default {
{
prop: 'positionCode',
label: '所在库位',
type: 1,
type: 30,
values: '',
width: '150',
checkarr: [],
@ -1057,7 +1072,7 @@ export default {
// {
// prop: 'columnNum',
// label: '所在列',
// type: 1,
// type: 30,
// values: '',
// width: '150',
// checkarr: [],
@ -1068,7 +1083,7 @@ export default {
// {
// prop: 'layerNum',
// label: '所在行',
// type: 1,
// type: 30,
// values: '',
// width: '150',
// checkarr: [],
@ -1245,6 +1260,7 @@ export default {
getpackList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.packdata = data.records;
handleTranslationDataSeclect(this.packdata, this.wrapoptioncolumn);
this.packpage.total = data.total;
});
},

7
src/views/distribution/artery/truckLoadingDetails.vue
Unescape View File

@ -85,9 +85,9 @@
<!-- 零担批量卸车确认 -->
<el-button
v-if="permissionObj.truckLoadingDetails_delete"
v-if="permissionObj.truckLoadingDetails_zeroUnload"
type="primary"
icon="Delete"
icon="CircleCheck"
@click="handleBatchLoadConfirm"
>零担批量卸车确认
</el-button>
@ -398,6 +398,7 @@ import {
handleClearTableQuery,
getObjType,
ChecksWhetherTheWarehouseIsSelected,
isNumber,
} from '@/utils/util';
import { detailsColumnList } from '@/option/distribution/TripartiteTransfer';
import { useRouter, useRoute } from 'vue-router';
@ -1617,6 +1618,8 @@ const handleBatchLoadConfirm = () => {
for (let i = 0; i < details.selectionList.length; i++) {
const val = details.selectionList[i];
if (!isNumber(val.unloadNum) || val.unloadNum <= 0)
return ElMessage.warning('零担卸车确认需要卸车数大于0');
if (Number(val.type) !== 2) return ElMessage.warning('请勿选择包件数据');
loadScanIds.push(val.id);
}

2
src/views/waybill/orderPackageList.vue
Unescape View File

@ -490,7 +490,7 @@ const {
for (let i = 0; i < details.packageListColumnList.length; i++) {
const item = details.packageListColumnList[i];
if (item.type !== 0 && item.type !== 12 && item.type !== 6 && item.type !== 13) item.type = 1;
if (item.type !== 0 && item.type !== 12 && item.type !== 6 && item.type !== 13) item.type = 30;
console.log('item :>> ', item);
}

Write Preview
Loading…
Cancel
Save