diff --git a/src/styles/common.scss b/src/styles/common.scss
index 7b56a7eb..48818aa3 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -13,6 +13,7 @@
.el-card__body {
padding: 5px !important ;
height: 100%;
+ overflow: scroll;
}
}
.avue-crud__pagination {
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 916618ec..59e2d556 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -99,244 +99,178 @@
>
-
订单列表
-
-
-
-
-
-
-
-
-
-
-
-
- 导出
-
-
-
-
- 查看
-
- 打印
-
-
- 异常审核
-
-
- 编辑
-
- 图片上传
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 复核签收
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 批量查看二维码
-
-
- 查看二维码
- 查看轨迹
-
-
-
+
+
+
+
+ 查看
+
+ 打印
+
+
+ 异常审核
+
+
+ 编辑
+
+ 图片上传
+
+
+ 复核签收
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 批量查看二维码
+
+
+ 查看二维码
+ 查看轨迹
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查看二维码
-
-
-
-
-
- 返 回
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+ 查看二维码
+
+
+
@@ -450,34 +384,7 @@
-
@@ -705,6 +612,7 @@
+
-
-
-
@@ -1106,7 +981,19 @@ export default {
signId: null, //当前行签收Id
windowHeight: null,
CheckStore: null,
+ /** 客户列表 */
columnList: [
+ {
+ prop: '',
+ label: '序号',
+ type: 12,
+ values: '',
+ width: '55',
+ checkarr: [],
+ fixed: true,
+ sortable: false,
+ head: false,
+ },
{
prop: 'trainNumber',
label: '配送车次号',
@@ -1192,17 +1079,6 @@ export default {
sortable: true,
head: false,
},
- // {
- // prop: 'packageNub',
- // label: '配送件数',
- // type: 2,
- // values: '',
- // width: '150',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // head: false,
- // },
{
prop: 'reservationNum',
label: '计划包件数',
@@ -1274,26 +1150,6 @@ export default {
fixed: false,
sortable: true,
},
- // {
- // prop: 'isUrgentName',
- // label: '是否加急',
- // type: 1,
- // values: '',
- // width: '180',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // },
- // {
- // prop: 'assignStatusName',
- // label: '备货指派状态',
- // type: 1,
- // values: '',
- // width: '180',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // },
{
prop: 'stockupStatusName',
label: '备货状态',
@@ -1365,16 +1221,6 @@ export default {
sortable: true,
head: false,
},
- // {
- // prop: 'signeeName',
- // label: '签收人',
- // type: 1,
- // values: '',
- // width: '180',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // },
{
prop: 'signingStatus',
label: '文员复核状态',
@@ -1385,159 +1231,6 @@ export default {
fixed: false,
sortable: true,
},
- // {
- // prop: 'stockCount',
- // label: '在库数',
- // type: 4,
- // values: '',
- // width: '180',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // },
- // {
- // prop: 'totalWeight',
- // label: '总重量',
- // type: 2,
- // values: '',
- // width: '150',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // head: false,
- // },
- // {
- // prop: 'totalVolume',
- // label: '总体积',
- // type: 2,
- // values: '',
- // width: '150',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // head: false,
- // },
- // {
- // prop: 'deliveryMethodStr',
- // label: '送货方式',
- // type: 2,
- // values: '',
- // width: '150',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // head: false,
- // },
- // {
- // prop: 'urgencyStr',
- // label: '紧急度',
- // type: 2,
- // values: '',
- // width: '150',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // head: false,
- // },
- // {
- // prop: 'receiptCount',
- // label: '回单数',
- // type: 2,
- // values: '',
- // width: '150',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // head: false,
- // },
- // {
- // prop: 'receiptRequirement',
- // label: '回单要求',
- // type: 2,
- // values: '',
- // width: '150',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // head: false,
- // },
- // {
- // prop: 'agent',
- // label: '经办人',
- // type: 2,
- // values: '',
- // width: '150',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // head: false,
- // },
- // {
- // prop: 'documentMakingTime',
- // label: '制单时间',
- // type: 5,
- // values: '',
- // width: '150',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // head: false,
- // },
- // {
- // prop: 'remark',
- // label: '备注',
- // type: 2,
- // values: '',
- // width: '150',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // head: false,
- // },
- // {
- // prop: 'batchNo',
- // label: '批次号',
- // type: 2,
- // values: '',
- // width: '150',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // head: false,
- // },
- // {
- // prop: 'serviceTypeStr',
- // label: '服务类型',
- // type: 2,
- // values: '',
- // width: '150',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // head: false,
- // },
- // {
- // prop: 'serviceNo',
- // label: '服务号',
- // type: 2,
- // values: '',
- // width: '150',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // head: false,
- // },
- // {
- // prop: 'freezeStatusStr',
- // label: '冻结状态',
- // type: 2,
- // values: '',
- // width: '150',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // head: false,
- // },
{
prop: '',
label: '操作',
@@ -1550,7 +1243,19 @@ export default {
},
// 更多列的配置...
],
+ /** 订单列表 */
ordoptioncolumn: [
+ {
+ prop: '',
+ label: '序号',
+ type: 12,
+ values: '',
+ width: '55',
+ checkarr: [],
+ fixed: true,
+ sortable: false,
+ head: false,
+ },
{
prop: 'waybillNumber',
label: '运单号',
@@ -1771,6 +1476,7 @@ export default {
head: false,
},
],
+ /** 包件列表 */
wrapoptioncolumn: [
{
prop: '',
@@ -1783,6 +1489,17 @@ export default {
sortable: true,
head: false,
},
+ {
+ prop: '',
+ label: '序号',
+ type: 12,
+ values: '',
+ width: '55',
+ checkarr: [],
+ fixed: true,
+ sortable: false,
+ head: false,
+ },
{
prop: 'waybillNumber',
label: '运单号',
@@ -2154,6 +1871,17 @@ export default {
},
],
inventoryoptioncolumn: [
+ {
+ prop: '',
+ label: '序号',
+ type: 12,
+ values: '',
+ width: '55',
+ checkarr: [],
+ fixed: true,
+ sortable: false,
+ head: false,
+ },
{
prop: 'incomingBatch',
label: '入库批次号',
@@ -2586,161 +2314,6 @@ export default {
},
],
},
-
- // 表单配置
- signoption: {
- height: 'auto',
- width: '40px',
- calcHeight: 30,
- tip: false,
- searchShow: false,
- searchMenuSpan: 6,
- border: true,
- index: true,
- viewBtn: true,
- dialogClickModal: false,
- emptyBtn: false, //隐藏清空按钮
- submitBtn: false, //隐藏提交按钮
- column: [
- {
- label: '收货人姓名',
- labelWidth: '150',
- span: 11,
- prop: 'consignee',
- type: 'input',
- width: '150px',
- align: 'center',
- disabled: true,
- rules: [
- {
- required: true,
- message: '请输入收货人姓名',
- trigger: 'blur',
- },
- ],
- },
- {
- label: '收货人电话',
- prop: 'deliveryPhone',
- labelWidth: '150',
- span: 11,
- type: 'input',
- width: '150px',
- align: 'center',
- disabled: true,
- rules: [
- {
- required: true,
- message: '请输入送货人电话',
- trigger: 'blur',
- },
- ],
- },
- {
- label: '收货地址',
- prop: 'deliveryAddress',
- labelWidth: '150',
- span: 11,
- type: 'input',
- width: '150px',
- align: 'center',
- disabled: false,
- rules: [
- {
- required: true,
- message: '请输入收货地址',
- trigger: 'blur',
- },
- ],
- },
- {
- label: '签收类型',
- prop: 'signingType',
- labelWidth: '150',
- span: 11,
- type: 'radio',
- width: '150px',
- align: 'center',
- disabled: false,
- dicData: [
- {
- label: '签收',
- value: '1',
- },
- {
- label: '代签收',
- value: '2',
- },
- ],
- rules: [
- {
- required: true,
- message: '请选择签收类型',
- trigger: 'change',
- },
- ],
- },
- {
- label: '签收图片',
- prop: 'deliverySignPictures',
- labelWidth: '150',
- type: 'upload',
- listType: 'picture-card',
- width: '150px',
- span: 15,
- multiple: true,
- align: 'left',
- action: '/blade-resource/oss/endpoint/put-file',
- limit: 5,
- propsHttp: {
- res: 'data',
- url: 'link',
- },
- disabled: false,
- rules: [
- {
- required: true,
- message: '请上传签收图片',
- trigger: 'change',
- },
- ],
- },
- // {
- // label: "复核图片",
- // prop: "clerkSignPictures",
- // type: 'upload',
- // listType: 'picture-card',
- // dataType: 'string',
- // labelWidth:'150',
- // span:15,
- // multiple:true,
- // width:"200px",
- // align:'left',
- // action: '/blade-resource/oss/endpoint/put-file',
- // limit: 15,
- // propsHttp: {
- // res: 'data',
- // url: 'link',
- // },
- // rules: [{
- // required: true,
- // message: "请上传图片",
- // trigger: "blur"
- // }],
- // },
-
- {
- label: '备注',
- prop: 'clerkSignRemarks',
- labelWidth: '150',
- span: 15,
- type: 'input',
- width: '150px',
- align: 'center',
- },
- ],
- },
-
// 表单配置
wrapoption: {
expand: false,
@@ -3385,538 +2958,212 @@ export default {
width: '150',
checkarr: [],
fixed: false,
- sortable: true,
- head: false,
- },
- {
- prop: 'brandName',
- label: '品牌',
- type: 2,
- values: '',
- width: '150',
- checkarr: [],
- fixed: false,
- sortable: true,
- head: false,
- },
- {
- prop: 'cargoNumber',
- 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: 'cargoNorms',
- label: '物料规格',
- type: 2,
- values: '',
- width: '150',
- checkarr: [],
- fixed: false,
- sortable: true,
- head: false,
- },
- // {
- // prop: 'cargoUnit',
- // label: '物料单位',
- // type: 2,
- // values: '',
- // width: '150',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // head: false,
- // },
- {
- prop: 'stockStatusName',
- label: '备货状态',
- type: 3,
- values: '',
- width: '150',
- checkarr: [
- {
- label: '未备货',
- value: '10',
- },
- {
- label: '已备货',
- value: '20',
- },
- ],
- fixed: false,
- sortable: true,
- head: false,
- },
- {
- prop: 'stockLockingStatusName',
- label: '装车状态',
- type: 3,
- values: '',
- width: '150',
- checkarr: [
- {
- label: '未装车',
- value: '10',
- },
- {
- label: '已装车',
- value: '20',
- },
- ],
- fixed: false,
- sortable: true,
- head: false,
- },
- {
- prop: 'stockSignfoStatusName',
- label: '签收状态',
- type: 3,
- values: '',
- width: '150',
- checkarr: [
- {
- label: '未签收',
- value: '10',
- },
- {
- label: '已签收',
- value: '20',
- },
- ],
- fixed: false,
- sortable: true,
- head: false,
- },
- {
- prop: 'scanTime',
- label: '装车时间',
- type: 4,
- values: '',
- width: '150',
- checkarr: [],
- fixed: false,
- sortable: true,
- head: false,
- },
- {
- prop: 'driverName',
- label: '计划装车人',
- type: 2,
- values: '',
- width: '150',
- checkarr: [],
- fixed: false,
- sortable: true,
- head: false,
- },
- {
- prop: 'scanUser',
- label: '实际装车人',
- type: 2,
- values: '',
- width: '150',
- checkarr: [],
- fixed: false,
- sortable: true,
- head: false,
- },
-
- {
- prop: 'num',
- label: '计划出库数',
- type: 1,
- values: '',
- width: '150',
- checkarr: [],
- fixed: false,
- sortable: true,
- head: false,
- },
- {
- prop: 'loadedNub',
- label: '实际出库数',
- type: 1,
- values: '',
- width: '150',
- checkarr: [],
- fixed: false,
- sortable: true,
- head: false,
- },
- // ————————————————————————————————————————————————————————
- {
- prop: 'signingUser',
- label: '签收人',
- type: 2,
- values: '',
- width: '150',
- checkarr: [],
- fixed: false,
- sortable: true,
- head: false,
- },
- {
- prop: 'signingTime',
- label: '签收时间',
- type: 4,
- values: '',
- width: '150',
- checkarr: [],
- fixed: false,
- sortable: true,
- head: false,
- },
- // ————————————————————————————————————————————————————————
- // {
- // prop: 'deliveryNumber',
- // label: '备货数',
- // type: 2,
- // values: '',
- // width: '150',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // head: false,
- // },
- // {
- // prop: 'readyStock',
- // label: '已备数量',
- // type: 2,
- // values: '',
- // width: '180',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // },
- // {
- // prop: 'readyStock',
- // label: '签收数量',
- // type: 2,
- // values: '',
- // width: '180',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // },
- // {
- // prop: 'cargoNumber',
- // label: '物料编号',
- // type: 3,
- // values: '',
- // width: '150',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // },
- // {
- // prop: 'cargoUnit',
- // label: '单位',
- // type: 2,
- // values: '',
- // width: '150',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // head: false,
- // },
- // {
- // prop: 'pallet',
- // label: '托盘码',
- // type: 2,
- // values: '',
- // width: '150',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // head: false,
- // },
- // {
- // prop: 'goodsAllocation',
- // label: '库位信息',
- // type: 2,
- // values: '',
- // width: '150',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // head: false,
- // },
- // {
- // prop: 'goodsAllocation',
- // label: '签收人',
- // type: 1,
- // values: '',
- // width: '180',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // },
- // {
- // prop: 'readyStock',
- // label: '签收时间',
- // type: 1,
- // values: '',
- // width: '180',
- // checkarr: [],
- // fixed: false,
- // sortable: true,
- // },
- {
- prop: '',
- label: '操作',
- type: 6,
- values: '',
- width: '250',
- checkarr: [],
- fixed: 'right',
- hide: true,
- },
- ],
- },
- // 库存品表单配置
- inventoryoption: {
- expand: false,
- index: true,
- border: true,
- selection: true,
- column: [
- {
- label: 'sku',
- prop: 'sku',
- search: true,
- width: '120px',
- },
- // {
- // label: "订单自编号",
- // prop: "orderCode",
- // search: true,
- // width:"100px"
- // },
- {
- label: '仓库',
- prop: 'marketName',
- search: true,
- width: '120px',
- },
- {
- label: '商场名称',
- prop: 'marketName',
- search: true,
- width: '120px',
- },
- {
- label: '品牌名称',
- prop: 'brandName',
- search: true,
- width: '120px',
- },
- {
- label: '物料名称',
- prop: 'descriptionGoods',
- search: true,
- width: '120px',
- },
- {
- label: '计划出库数量',
- prop: 'plannedQuantity',
- search: true,
- width: '120px',
- },
- // {
- // label: "单位",
- // prop: "cargoUnit",
- // search: true,
- // width:"100px"
- // },
- {
- label: '备货数',
- prop: 'deliveryNumber',
- search: true,
- width: '120px',
- },
- {
- label: '已备数量',
- prop: 'readyStock',
- search: true,
- width: '120px',
- },
-
- {
- label: '物料编号',
- prop: 'cargoNumber',
- search: true,
- width: '120px',
- },
- {
- label: '单位',
- prop: 'cargoUnit',
- search: true,
- width: '120px',
- },
- // {
- // label: '托盘码',
- // prop: 'pallet',
- // width: '100px'
- // },
- // {
- // label: '库位信息',
- // prop: 'goodsAllocation',
- // width: '100px'
- // },
- {
- label: '装车操作人',
- prop: 'goodsAllocation',
- width: '120px',
- },
- {
- label: '装车时间',
- prop: 'goodsAllocation',
- width: '120px',
- },
-
- {
- label: '签收人',
- prop: 'goodsAllocation',
- width: '120px',
- },
- {
- label: '签收数量',
- prop: 'readyStock',
- search: true,
- width: '120px',
+ sortable: true,
+ head: false,
},
{
- label: '签收时间',
- prop: 'readyStock',
- search: true,
- width: '120px',
+ prop: 'brandName',
+ label: '品牌',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
},
- ],
- },
- // 订单表单配置
- ordoption: {
- expand: false,
- index: true,
- border: true,
- selection: true,
- column: [
{
- label: '订单自编号',
- prop: 'orderCode',
- search: true,
- width: '100px',
+ prop: 'cargoNumber',
+ label: '物料编号',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
},
{
- label: '货物名称',
prop: 'descriptionGoods',
- search: true,
- width: '100px',
- },
- {
label: '物料名称',
- prop: 'materialName',
- search: true,
- width: '100px',
- },
- {
- label: '包件数量',
- prop: 'deliveryNumber',
- search: true,
- width: '100px',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
},
{
- label: '已备数量',
- prop: 'stockupNumber',
- search: true,
- width: '100px',
+ prop: 'cargoNorms',
+ label: '物料规格',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
},
+ // {
+ // prop: 'cargoUnit',
+ // label: '物料单位',
+ // type: 2,
+ // values: '',
+ // width: '150',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // head: false,
+ // },
{
- label: '装车数量',
- prop: 'loadingNumber',
- search: true,
- width: '100px',
+ prop: 'stockStatusName',
+ label: '备货状态',
+ type: 3,
+ values: '',
+ width: '150',
+ checkarr: [
+ {
+ label: '未备货',
+ value: '10',
+ },
+ {
+ label: '已备货',
+ value: '20',
+ },
+ ],
+ fixed: false,
+ sortable: true,
+ head: false,
},
- // {
- // label: '签收数量',
- // prop: 'readyStock',
- // search: true,
- // width: '100px'
- // },
{
- label: '订单状态',
- prop: 'orderStatusName',
- search: true,
- width: '100px',
+ prop: 'stockLockingStatusName',
+ label: '装车状态',
+ type: 3,
+ values: '',
+ width: '150',
+ checkarr: [
+ {
+ label: '未装车',
+ value: '10',
+ },
+ {
+ label: '已装车',
+ value: '20',
+ },
+ ],
+ fixed: false,
+ sortable: true,
+ head: false,
},
{
- label: '托盘码',
- prop: 'pallet',
- search: true,
- width: '100px',
+ prop: 'stockSignfoStatusName',
+ label: '签收状态',
+ type: 3,
+ values: '',
+ width: '150',
+ checkarr: [
+ {
+ label: '未签收',
+ value: '10',
+ },
+ {
+ label: '已签收',
+ value: '20',
+ },
+ ],
+ fixed: false,
+ sortable: true,
+ head: false,
},
{
- label: '货位信息',
- prop: 'goodsAllocation',
- search: true,
- width: '100px',
+ prop: 'scanTime',
+ label: '装车时间',
+ type: 4,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
},
{
- label: '收货单位',
- prop: 'consigneeUnit',
- search: true,
- width: '100px',
+ prop: 'driverName',
+ label: '计划装车人',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
},
{
- label: '运单收货人',
- prop: 'consigneePerson',
- search: true,
- width: '100px',
+ prop: 'scanUser',
+ label: '实际装车人',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
},
+
{
- label: '运单收货地址',
- prop: 'consigneeAddress',
- search: true,
- width: '100px',
+ prop: 'num',
+ label: '计划出库数',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
},
{
- label: '运单收货电话',
- prop: 'consigneeMobile',
- search: true,
- width: '100px',
+ prop: 'loadedNub',
+ label: '实际出库数',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
},
+ // ————————————————————————————————————————————————————————
{
- label: '终端收货人',
- prop: 'customerName',
- search: true,
- width: '100px',
+ prop: 'signingUser',
+ label: '签收人',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
},
{
- label: '终端收货地址',
- prop: 'consigneeAddress',
- search: true,
- width: '100px',
+ prop: 'signingTime',
+ label: '签收时间',
+ type: 4,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
},
{
- label: '终端收货电话',
- prop: 'consigneeMobile',
- search: true,
- width: '100px',
+ prop: '',
+ label: '操作',
+ type: 6,
+ values: '',
+ width: '250',
+ checkarr: [],
+ fixed: 'right',
+ hide: true,
},
],
},
@@ -4122,7 +3369,7 @@ export default {
await this.$nextTick();
const tableNode = document.querySelectorAll('.tableNode');
- setNodeHeight(tableNode, '600px');
+ setNodeHeight(tableNode, '60vh');
},
callFordelivery(formName) {
@@ -4236,7 +3483,7 @@ export default {
init() {
this.height = this.setPx(document.body.clientHeight - 340);
},
- handleTabClick(tab, event) {
+ async handleTabClick(tab, event) {
console.log('tab>>>>>>>>', tab.paneName);
let tabName = tab.paneName;
switch (tabName) {
@@ -4268,6 +3515,8 @@ export default {
this.inventoryQuery = {};
break;
}
+ await this.$nextTick();
+ this.setTableHeight();
},
searchHide() {
this.search = !this.search;
@@ -4284,12 +3533,18 @@ export default {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
- }).then(() => {
- NProgress.start();
- exportBlob(downloadUrl, values).then(res => {
- downloadXls(res.data, `配送详情${dateNow()}.xlsx`);
- NProgress.done();
- });
+ }).then(async () => {
+ try {
+ this.loadingObj.pageLoading = true;
+
+ await exportBlob(downloadUrl, values).then(res => {
+ downloadXls(res.data, `配送详情${dateNow()}.xlsx`);
+ });
+ } catch (error) {
+ console.log('error :>> ', error);
+ } finally {
+ this.loadingObj.pageLoading = false;
+ }
});
},
searchChange() {
@@ -5226,43 +4481,44 @@ export default {
},
// 校验图片
-isValidImageUrl(url) {
- // 直接检查 URL 是否以 blob: 开头
- return typeof url === 'string' && !url.startsWith('blob:');
-},
-
-checkImageUrls(row) {
- const invalidImages = []; // 用于存储无效图片的名称
-
- // 遍历 row.map 中的每个键
- for (const photoKey in row.map) {
- const photoArray = row.map[photoKey];
- // 遍历每个 photo 数组中的对象
- for (const photoObj of photoArray) {
- const url = photoObj.urlRoute;
- console.log(url, 'url');
-
- const isValid = this.isValidImageUrl(url);
- if (!isValid) {
- invalidImages.push(photoObj.name); // 如果URL无效，将name加入无效图片数组
+ isValidImageUrl(url) {
+ // 直接检查 URL 是否以 blob: 开头
+ return typeof url === 'string' && !url.startsWith('blob:');
+ },
+
+ checkImageUrls(row) {
+ const invalidImages = []; // 用于存储无效图片的名称
+
+ // 遍历 row.map 中的每个键
+ for (const photoKey in row.map) {
+ const photoArray = row.map[photoKey];
+ // 遍历每个 photo 数组中的对象
+ for (const photoObj of photoArray) {
+ const url = photoObj.urlRoute;
+ console.log(url, 'url');
+
+ const isValid = this.isValidImageUrl(url);
+ if (!isValid) {
+ invalidImages.push(photoObj.name); // 如果URL无效，将name加入无效图片数组
+ }
+ }
}
- }
- }
-
- if (invalidImages.length > 0) {
- invalidImages.forEach(item=>{
- ElMessage({
- message: `图片名称为：${item}存在问题，请删除图片重新上传或者刷新页面重试`,
- type: 'warning',
- })
- })
- console.log(`图片名称为: ${invalidImages.join(', ')}存在问题，请删除图片重新上传，或刷新页面重新尝试`);
- return false;
- } else {
- return true;
- }
-},
+ if (invalidImages.length > 0) {
+ invalidImages.forEach(item => {
+ ElMessage({
+ message: `图片名称为：${item}存在问题，请删除图片重新上传或者刷新页面重试`,
+ type: 'warning',
+ });
+ });
+ console.log(
+ `图片名称为: ${invalidImages.join(', ')}存在问题，请删除图片重新上传，或刷新页面重新尝试`
+ );
+ return false;
+ } else {
+ return true;
+ }
+ },
// 复核签收确认弹窗
submitForm() {
@@ -5341,7 +4597,7 @@ checkImageUrls(row) {
pushPhotoToRow(this.FragilePhotos, 'photo_3');
pushPhotoToRow(this.HomePhotos, 'photo_4');
pushPhotoToRow(this.SignForPhotos, 'photo_5');
- // 测试数据
+ // 测试数据
// row.map.photo_5.push({
// name: "03add918888d36ce0d566da120510840.png",
// reservationId: "1829120012682530818",
@@ -5350,9 +4606,9 @@ checkImageUrls(row) {
// })
const result = this.checkImageUrls(row);
console.log(`图片校验 ${result}`);
- if(!result){
- return
- }
+ if (!result) {
+ return;
+ }
this.TCloading = true; //禁止确定
this.signBox = false;
if (this.signtitle === '图片上传') {
@@ -6048,9 +5304,6 @@ checkImageUrls(row) {
display: flex;
justify-content: flex-end;
}
-:deep(#bodys) {
- height: 300px !important;
-}
.el_abnormalBox {
.maboxhi {
height: 500px !important;
diff --git a/src/views/warehouse/warehouseWaybill.vue b/src/views/warehouse/warehouseWaybill.vue
index efa67a56..c1eef65a 100644
--- a/src/views/warehouse/warehouseWaybill.vue
+++ b/src/views/warehouse/warehouseWaybill.vue
@@ -484,7 +484,7 @@ export default {
{
prop: 'brand',
label: '品牌',
- type: 3,
+ type: 2,
values: '',
width: '130',
checkarr: [],
diff --git a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
index b9e18a0e..308b970d 100644
--- a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
+++ b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
@@ -230,7 +230,14 @@ import { mapGetters, mapMutations } from 'vuex';
import WarehouseWarehousingDetailSub from '@/views/warehouse/warehousingentry/warehouseWarehousingDetailSub.vue';
import { exportBlob } from '@/api/common';
import { getToken } from '@/utils/auth';
-import { downloadXls, handleClearTableQuery, setNodeHeight, getObjType } from '@/utils/util';
+import {
+ downloadXls,
+ handleClearTableQuery,
+ setNodeHeight,
+ getObjType,
+ handleSelectQuery,
+ handleInputQuery,
+} from '@/utils/util';
import dayjs from 'dayjs';
import { getDictionaryBiz } from '@/api/system/dict';
@@ -620,10 +627,7 @@ export default {
console.log(index, row);
},
selectsc(index, row) {
- console.log(index, row);
- if (row.prop === 'conditionsName') {
- this.query['conditions'] = index;
- }
+ handleSelectQuery(index, row, this.query);
this.onLoad(this.page);
},
timesc(index, row) {
@@ -638,9 +642,7 @@ export default {
this.onLoad(this.page);
},
inputsc(index, row) {
- console.log(index, row);
- // console.log(index, row.prop);
- this.query[row.prop] = index;
+ handleInputQuery(index, row, this.query);
this.onLoad(this.page);
},
handleEditOwn(row) {