From 3b046008b6386eb94cf2c6a03715377453ca3c93 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Mon, 4 Dec 2023 22:01:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=9C=BA=E9=A2=84?= =?UTF-8?q?=E7=BA=A6=E5=BA=93=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/distributionStockArticle.js | 14 + src/api/distribution/distributionStockList.js | 7 + src/views/mail/order/add.vue | 500 ++++++++++-------- 3 files changed, 296 insertions(+), 225 deletions(-) diff --git a/src/api/distribution/distributionStockArticle.js b/src/api/distribution/distributionStockArticle.js index 7b6a60eb..bf0a8cd6 100644 --- a/src/api/distribution/distributionStockArticle.js +++ b/src/api/distribution/distributionStockArticle.js @@ -252,6 +252,20 @@ export const selectStockArticleInfoList = (current, size, params) => { } }) } + + +export const selectStockArticleInfoListByMail = (current, size, params) => { + return request({ + url: '/api/logpm-distribution/distributionStockArticle/selectStockArticleInfoListByMail', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + // 在库订单 export const $_selectStockArticleInfoList = (params) => { return request({ diff --git a/src/api/distribution/distributionStockList.js b/src/api/distribution/distributionStockList.js index d9621e5b..409c2734 100644 --- a/src/api/distribution/distributionStockList.js +++ b/src/api/distribution/distributionStockList.js @@ -36,6 +36,13 @@ export const getStockListOwn = (current, size, params) => { }) } +/** + * 商场的库存品列表 + * @param {*} current + * @param {*} size + * @param {*} params + * @returns + */ export const getStockListClient = (current, size, params) => { return request({ url: '/api/logpm-distribution/distributionStockList/listClient', diff --git a/src/views/mail/order/add.vue b/src/views/mail/order/add.vue index e68b6528..41566be5 100644 --- a/src/views/mail/order/add.vue +++ b/src/views/mail/order/add.vue @@ -613,13 +613,13 @@ import { getStockArticleList, getPackageListByStockArticleId, - selectStockArticleInfoList, + getClientList, selectUpdateAvailableStockArticle, getZeroOrderDetail, } from '@/api/distribution/distributionStockArticle'; import { getDetailDelivery } from '@/api/distribution/distributionDelivery'; import { addIncrement } from '@/api/distribution/distributionStockArticle'; - import { getInventoryList, selectInventoryDetail } from '@/api/distribution/distributionStockList'; + import {getStockListClient,selectInventoryDetail } from '@/api/distribution/distributionStockList'; import option from '@/option/distribution/distributionStockArticle'; import { mapGetters } from 'vuex'; @@ -1293,227 +1293,276 @@ }, ], inventoryInfocolumnList: [ - { - prop: '', - label: '序号', - type: 0, - values: '', - width: '50', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'orderCode', - label: '订单自编号', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'marketCode', - label: '商场编码', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'marketName', - label: '商场名称', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'storeCode', - label: '门店编码', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'storeName', - 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: 'materialId', - // label: '物料ID', - // 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: 'cargoUnit', - label: '物料单位', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'category', - label: '品分类', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'warehouseName', - label: '仓库名称', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'quantityStock', - label: '库存数量', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'applyNum', - label: '可用数量', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'quantityOccupied', - label: '冻结数量', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'outboundQuantity', - label: '出库数量', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'brand', - 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: 'cargoUnit', - label: '单位', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'reservationNum', - label: '预约数量', - type: 10, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - ], + { + prop: '', + label: '序号', + type: 0, + values: '', + width: 55, + checkarr: [], + fixed: true, + }, + { + prop: 'serviceNumber', + label: '服务号', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'serviceTypeName', + label: '服务类型', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + // { + // prop: 'orderCode', + // label: '订单自编号', + // type: 2, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, + { + prop: 'descriptionGoods', + label: '货物名称', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'cargoNumber', + label: '货物编号', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + // { + // prop: 'warehouse', + // label: '入库时间', + // type: 2, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, + { + prop: 'despatch', + label: '物流车次', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'incomingBatch', + label: '入库批次', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + // { + // prop: 'mallName', + // label: '商城名称', + // type: 2, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, + { + prop: 'quantityStock', + label: '库存数量', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'quantityOccupied', + label: '冻结数量', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + },{ + prop: 'outboundQuantity', + label: '出库数量', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + /* { + prop: 'despatch', + label: '物流发运车次', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + },*/ + // { + // prop: 'category', + // label: '品分类', + // type: 2, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, + { + prop: 'brandName', + label: '品牌', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'marketName', + label: '商场/客户', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'storeName', + label: '门店名称', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + // { + // prop: 'storeCode', + // label: '门店编码', + // type: 2, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, + // { + // prop: 'marketCode', + // label: '商场编码', + // type: 2, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, + // { + // prop: 'shoppingMall', + // label: '所属商场', + // type: 2, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, + { + prop: 'warehouseName', + label: '仓库名称', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'cargoUnit', + label: '物料单位', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'unpackingQuantity', + label: '拆包数量', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'unpack', + label: '拆包状态', + type: 1, + values: '', + width: '130', + checkarr: [ { + value: `true`, + label: '是', + }, + { + value: `false`, + label: '否', + },], + fixed: false, + sortable: true, + }, + + { + prop: '', + label: '操作', + type: 6, + values: '', + width: '200', + checkarr: [], + fixed: 'right', + hide: true, + }, + // 更多列的配置... + ], columnParcels: [ { prop: '', @@ -1926,7 +1975,7 @@ let params = {}; this.query.serviceType = '2'; params.marketName = this.marketName; - getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( + getStockListClient(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( res => { const inventoryList = res.data.data; inventoryList.records.forEach(item => { @@ -2787,11 +2836,12 @@ if (this.orderData.length !== 0) { this.query.orderIds = this.orderData.map(val => val.id).join(','); } - const res = await selectStockArticleInfoList( + const res = await getClientList( page.currentPage, page.pageSize, Object.assign(params, this.query) ); + console.log('res ===>>', res) const { records, total } = res.data.data; this.stockArticleInfo = records;