From 415f9a1436fc1f252775702ddee12600807da3a6 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Fri, 20 Sep 2024 10:58:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=85=8D=E9=80=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distributionDeliveryListdis.js | 506 +++++++++--------- .../distributionDeliveryListmar.js | 4 +- .../deliverylist/distributionDeliveryList.vue | 21 +- .../distributionDeliveryListdis.vue | 18 +- .../distributionDeliveryListmar.vue | 13 +- .../distribution/inventory/BackStockTask.vue | 17 +- 6 files changed, 278 insertions(+), 301 deletions(-) diff --git a/src/option/distribution/distributionDeliveryListdis.js b/src/option/distribution/distributionDeliveryListdis.js index 5490a0c4..560ce076 100644 --- a/src/option/distribution/distributionDeliveryListdis.js +++ b/src/option/distribution/distributionDeliveryListdis.js @@ -1,255 +1,255 @@ export const columnList = [ - { - prop: 'serialNumber', - label: '序号', - type: 0, - values: '', - width: 55, - checkarr: [], - fixed: true, - }, - { - prop: 'trainNumber', - label: '车次号', - type: 13, - values: '', - width: '180', - checkarr: [], - fixed: true, - sortable: true, - // head: true, - }, - { - prop: 'taskTime', - label: '配送日期', - type: 2, - values: '', - width: '130', - checkarr: [], - fixed: true, - sortable: true, - // head: true, - }, - { - prop: 'warehouseName', - label: '仓库', - type: 2, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - }, - { - prop: 'clineName', - label: '客户名称', - type: 2, - values: '', - width: '180', - checkarr: [], - fixed: false, - sortable: true, - hide: true, - }, - { - prop: 'orderCode', - label: '订单自编号', - type: 2, - values: '', - width: '180', - checkarr: [], - fixed: false, - sortable: true, - hide: true, - }, - { - prop: 'kindName', - label: '配送种类', - type: 3, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - }, - { - prop: 'typeName', - label: '配送类型', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - }, + { + prop: 'serialNumber', + label: '序号', + type: 0, + values: '', + width: 55, + checkarr: [], + fixed: true, + }, + { + prop: 'trainNumber', + label: '车次号', + type: 13, + values: '', + width: '180', + checkarr: [], + fixed: true, + sortable: true, + // head: true, + }, + { + prop: 'taskTime', + label: '配送日期', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: true, + sortable: true, + // head: true, + }, + { + prop: 'warehouseName', + label: '仓库', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'clineName', + label: '客户名称', + type: 2, + values: '', + width: '180', + checkarr: [], + fixed: false, + sortable: true, + hide: true, + }, + { + prop: 'orderCode', + label: '订单自编号', + type: 2, + values: '', + width: '180', + checkarr: [], + fixed: false, + sortable: true, + hide: true, + }, + { + prop: 'kindName', + label: '配送种类', + type: 3, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'typeName', + label: '配送类型', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, - { - prop: 'vehicleName', - label: '配送车辆', - type: 2, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - }, - { - prop: 'driverName', - label: '配送司机', - type: 2, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - }, - { - prop: 'distributionCompany', - label: '配送公司', - type: 2, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - }, - // { - // prop: 'deliveryStatus', - // label: '配送状态', - // type: 3, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // hide:true, - // }, - { - prop: 'deliveryStatusName', - label: '配送状态', - type: 3, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - }, - // { - // prop: 'deliveryListLoadingStatusName', - // label: '装车状态', - // type: 3, - // values: '', - // width: '130', - // checkarr: [], - // fixed: false, - // sortable: true - // }, - { - prop: 'customersNumber', - label: '配送客户数', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - isshowSummary: true, - sortable: true, - }, - { - prop: 'price', - label: '配送价格', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - isshowSummary: true, - sortable: true, - }, - { - prop: 'fee', - label: '增值服务', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - isshowSummary: true, - sortable: true, - }, - { - prop: 'orderNumber', - label: '订单总数', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - isshowSummary: true, - sortable: true, - }, - { - prop: 'deliveryNumber', - label: '配送件数', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - isshowSummary: true, - sortable: true, - }, - { - prop: 'inventoryNub', - label: '配送库存品件数', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - isshowSummary: true, - sortable: true, - }, - { - prop: 'scannedNumber', - label: '装车件数', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - isshowSummary: true, - sortable: true, - }, - { - prop: 'signingNumber', - label: '签收件数', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - isshowSummary: true, - sortable: true, - }, - { - prop: 'loadingTeamName', - label: '装卸班组', - type: 2, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - }, - { - prop: '', - label: '操作', - type: 6, - values: '', - width: '200', - checkarr: [], - fixed: 'right', - sortable: false, - }, -] \ No newline at end of file + { + prop: 'vehicleName', + label: '配送车辆', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'driverName', + label: '配送司机', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'distributionCompany', + label: '配送公司', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + // { + // prop: 'deliveryStatus', + // label: '配送状态', + // type: 3, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // hide:true, + // }, + { + prop: 'deliveryStatusName', + label: '配送状态', + type: 3, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + // { + // prop: 'deliveryListLoadingStatusName', + // label: '装车状态', + // type: 3, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true + // }, + { + prop: 'customersNumber', + label: '配送客户数', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + isshowSummary: true, + sortable: true, + }, + { + prop: 'price', + label: '配送价格', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + isshowSummary: true, + sortable: true, + }, + { + prop: 'fee', + label: '增值服务', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + isshowSummary: true, + sortable: true, + }, + { + prop: 'orderNumber', + label: '订单总数', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + isshowSummary: true, + sortable: true, + }, + { + prop: 'deliveryNumber', + label: '配送件数', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + isshowSummary: true, + sortable: true, + }, + { + prop: 'inventoryNub', + label: '配送库存品件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + isshowSummary: true, + sortable: true, + }, + { + prop: 'scannedNumber', + label: '装车件数', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + isshowSummary: true, + sortable: true, + }, + { + prop: 'signingNumber', + label: '签收件数', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + isshowSummary: true, + sortable: true, + }, + { + prop: 'loadingTeamName', + label: '装卸班组', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: '', + label: '操作', + type: 6, + values: '', + width: '200', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; diff --git a/src/option/distribution/distributionDeliveryListmar.js b/src/option/distribution/distributionDeliveryListmar.js index d1561cc2..4655ac9e 100644 --- a/src/option/distribution/distributionDeliveryListmar.js +++ b/src/option/distribution/distributionDeliveryListmar.js @@ -22,7 +22,7 @@ export const columnList = [ { prop: 'taskTime', label: '配送日期', - type: 2, + type: 1, values: '', width: '140', checkarr: [], @@ -248,5 +248,5 @@ export const columnList = [ checkarr: [], fixed: 'right', sortable: false, - } + }, ]; diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue index a0728b02..d542a5b1 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryList.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue @@ -329,7 +329,7 @@ import { getDriverList } from '@/api/basicdata/basicdataDriverArtery'; import { getVehicleList } from '@/api/basicdata/basicdataVehicle'; import print from '@/utils/print'; import { getBillLadingExport } from '@/api/distribution/distrilbutionBillLading'; -import { downloadXls, getObjType, setNodeHeight } from '@/utils/util'; +import { downloadXls, getObjType, handleSelectQuery, setNodeHeight } from '@/utils/util'; import dayjs from 'dayjs'; export default { data() { @@ -425,7 +425,7 @@ export default { { prop: 'taskTime', label: '配送日期', - type: 2, + type: 1, values: '', width: '130', checkarr: [], @@ -456,7 +456,7 @@ export default { { prop: 'orderCode', label: '订单自编号', - type: 3, + type: 2, values: '', width: '150', checkarr: [], @@ -469,7 +469,10 @@ export default { type: 3, values: '', width: '130', - checkarr: [], + checkarr: [ + { label: '商配', value: 1 }, + { label: '市配', value: 2 }, + ], fixed: false, sortable: true, }, @@ -880,15 +883,7 @@ export default { }, btnsc(index, row) {}, selectsc(index, row) { - this.query[row.prop] = index; - if (!index) { - delete this.query[row.prop]; - } - if (row.prop === 'deliveryStatusName') { - this.query['deliveryStatus'] = index; - } else if (row.prop === 'kindName') { - this.query['kind'] = index; - } + handleSelectQuery(index, row, this.query); this.onLoad(this.page); }, timesc(index, row) {}, diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue index 319f8f8b..fc3b1eef 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue @@ -336,7 +336,13 @@ import { addIncrement } from '@/api/distribution/distributionStockArticle'; import { getVehicleList } from '@/api/basicdata/basicdataVehicle'; import { getDriverList } from '@/api/basicdata/basicdataDriverArtery'; import print from '@/utils/print'; -import { downloadXls, getObjType, handleClearTableQuery, setNodeHeight } from '@/utils/util'; +import { + downloadXls, + getObjType, + handleClearTableQuery, + handleSelectQuery, + setNodeHeight, +} from '@/utils/util'; import { ElMessage, ElMessageBox } from 'element-plus'; import * as XLSX from 'xlsx'; export default { @@ -714,15 +720,7 @@ export default { console.log(index, row); }, selectsc(index, row) { - this.query[row.prop] = index; - if (!index) { - delete this.query[row.prop]; - } - if (row.prop === 'deliveryStatusName') { - this.query['deliveryStatus'] = index; - } else if (row.prop === 'kindName') { - this.query['kind'] = index; - } + handleSelectQuery(index, row, this.query); this.onLoad(this.page); }, timesc(index, row) { diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue index c15c8738..de33d978 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue @@ -245,6 +245,7 @@ import { handleClearTableQuery, setNodeHeight, getObjType, + handleSelectQuery, } from '@/utils/util'; export default { @@ -578,17 +579,7 @@ export default { console.log(index, row); }, selectsc(index, row) { - console.log('index :>> ', index); - console.log('row :>> ', row); - this.query[row.prop] = index; - if (!index) { - delete this.query[row.prop]; - } - if (row.prop === 'deliveryStatusName') { - this.query['deliveryStatus'] = index; - } else if (row.prop === 'kindName') { - this.query['kind'] = index; - } + handleSelectQuery(index, row, this.query); this.onLoad(this.page); }, diff --git a/src/views/distribution/inventory/BackStockTask.vue b/src/views/distribution/inventory/BackStockTask.vue index 07d2af9f..fdc6710b 100644 --- a/src/views/distribution/inventory/BackStockTask.vue +++ b/src/views/distribution/inventory/BackStockTask.vue @@ -68,6 +68,7 @@ ({ /** 是否开启搜索 */ search: true, @@ -199,7 +202,7 @@ const details = reactive({ /** 列表 */ columnList: deepClone(columnList), /** 列表数据 */ - data: [{}], + data: [], /** 页面loading */ loadingObj: { /** 列表加载loading */ @@ -224,8 +227,6 @@ const details = reactive({ /** 上传 */ UploadPackageDelivery: false, }, - /** 列表Dom节点 */ - listNode: '', form: {}, /** 全屏 */ fullscreenObj: { @@ -242,14 +243,6 @@ const instance = getCurrentInstance(); /** vuex */ const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList'])); -onMounted(() => { - const timer = setTimeout(() => { - details.listNode = document.querySelector('.maboxhi'); - details.listNode.style.transition = 'all .5s ease-out'; - clearTimeout(timer); - }, 100); -}); - /** 请求页面数据 */ const onLoad = debounce(async () => { try { @@ -336,7 +329,7 @@ const showdrawer = (_flag?: boolean) => { const searchHide = () => { details.search = !details.search; - setNodeHeight(details.listNode, '', true); + setNodeHeight(tableNodeRef.value.$el, '', true); }; /** 表格表头输入框搜索 */