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

Merge branch 'dev' into pre-production

fix_bug_pro20231227
pref_mail@163.com 1 year ago
parent
435cdf592a 3b046008b6
commit
22308488d1
3 changed files with 296 additions and 225 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/api/distribution/distributionStockArticle.js
  2. 7
      src/api/distribution/distributionStockList.js
  3. 500
      src/views/mail/order/add.vue

14
src/api/distribution/distributionStockArticle.js
Unescape View File

@ -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) => { export const $_selectStockArticleInfoList = (params) => {
return request({ return request({

7
src/api/distribution/distributionStockList.js
Unescape View File

@ -36,6 +36,13 @@ export const getStockListOwn = (current, size, params) => {
}) })
} }
/**
* 商场的库存品列表
* @param {*} current
* @param {*} size
* @param {*} params
* @returns
*/
export const getStockListClient = (current, size, params) => { export const getStockListClient = (current, size, params) => {
return request({ return request({
url: '/api/logpm-distribution/distributionStockList/listClient', url: '/api/logpm-distribution/distributionStockList/listClient',

500
src/views/mail/order/add.vue
Unescape View File

@ -613,13 +613,13 @@
import { import {
getStockArticleList, getStockArticleList,
getPackageListByStockArticleId, getPackageListByStockArticleId,
selectStockArticleInfoList, getClientList,
selectUpdateAvailableStockArticle, selectUpdateAvailableStockArticle,
getZeroOrderDetail, getZeroOrderDetail,
} from '@/api/distribution/distributionStockArticle'; } from '@/api/distribution/distributionStockArticle';
import { getDetailDelivery } from '@/api/distribution/distributionDelivery'; import { getDetailDelivery } from '@/api/distribution/distributionDelivery';
import { addIncrement } from '@/api/distribution/distributionStockArticle'; 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 option from '@/option/distribution/distributionStockArticle';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
@ -1293,227 +1293,276 @@
}, },
], ],
inventoryInfocolumnList: [ inventoryInfocolumnList: [
{ {
prop: '', prop: '',
label: '序号', label: '序号',
type: 0, type: 0,
values: '', values: '',
width: '50', width: 55,
checkarr: [], checkarr: [],
fixed: false, fixed: true,
sortable: true, },
head: false, {
}, prop: 'serviceNumber',
{ label: '服务号',
prop: 'orderCode', type: 2,
label: '订单自编号', values: '',
type: 2, width: '130',
values: '', checkarr: [],
width: '150', fixed: true,
checkarr: [], sortable: true,
fixed: false, head: false,
sortable: true, },
head: false, {
}, prop: 'serviceTypeName',
{ label: '服务类型',
prop: 'marketCode', type: 1,
label: '商场编码', values: '',
type: 2, width: '130',
values: '', checkarr: [],
width: '150', fixed: true,
checkarr: [], sortable: true,
fixed: false, head: false,
sortable: true, },
head: false, // {
}, // prop: 'orderCode',
{ // label: '订单自编号',
prop: 'marketName', // type: 2,
label: '商场名称', // values: '',
type: 2, // width: '130',
values: '', // checkarr: [],
width: '150', // fixed: false,
checkarr: [], // sortable: true,
fixed: false, // },
sortable: true, {
head: false, prop: 'descriptionGoods',
}, label: '货物名称',
{ type: 2,
prop: 'storeCode', values: '',
label: '门店编码', width: '130',
type: 2, checkarr: [],
values: '', fixed: false,
width: '150', sortable: true,
checkarr: [], },
fixed: false, {
sortable: true, prop: 'cargoNumber',
head: false, label: '货物编号',
}, type: 2,
{ values: '',
prop: 'storeName', width: '130',
label: '门店名称', checkarr: [],
type: 2, fixed: false,
values: '', sortable: true,
width: '150', },
checkarr: [], // {
fixed: false, // prop: 'warehouse',
sortable: true, // label: '入库时间',
head: false, // type: 2,
}, // values: '',
{ // width: '130',
prop: 'cargoNumber', // checkarr: [],
label: '物料编码', // fixed: false,
type: 2, // sortable: true,
values: '', // },
width: '150', {
checkarr: [], prop: 'despatch',
fixed: false, label: '物流车次',
sortable: true, type: 2,
head: false, values: '',
}, width: '130',
// { checkarr: [],
// prop: 'materialId', fixed: false,
// label: '物料ID', sortable: true,
// type: 2, },
// values: '', {
// width: '150', prop: 'incomingBatch',
// checkarr: [], label: '入库批次',
// fixed: false, type: 2,
// sortable: true, values: '',
// head: false width: '130',
// }, checkarr: [],
{ fixed: false,
prop: 'descriptionGoods', sortable: true,
label: '物料名称', },
type: 2, // {
values: '', // prop: 'mallName',
width: '150', // label: '商城名称',
checkarr: [], // type: 2,
fixed: false, // values: '',
sortable: true, // width: '130',
head: false, // checkarr: [],
}, // fixed: false,
{ // sortable: true,
prop: 'cargoUnit', // },
label: '物料单位', {
type: 2, prop: 'quantityStock',
values: '', label: '库存数量',
width: '150', type: 1,
checkarr: [], values: '',
fixed: false, width: '130',
sortable: true, checkarr: [],
head: false, fixed: false,
}, sortable: true,
{ },
prop: 'category', {
label: '品分类', prop: 'quantityOccupied',
type: 2, label: '冻结数量',
values: '', type: 1,
width: '150', values: '',
checkarr: [], width: '130',
fixed: false, checkarr: [],
sortable: true, fixed: false,
head: false, sortable: true,
}, },{
{ prop: 'outboundQuantity',
prop: 'warehouseName', label: '出库数量',
label: '仓库名称', type: 1,
type: 2, values: '',
values: '', width: '130',
width: '150', checkarr: [],
checkarr: [], fixed: false,
fixed: false, sortable: true,
sortable: true, },
head: false, /* {
}, prop: 'despatch',
{ label: '物流发运车次',
prop: 'quantityStock', type: 2,
label: '库存数量', values: '',
type: 2, width: '130',
values: '', checkarr: [],
width: '150', fixed: false,
checkarr: [], sortable: true,
fixed: false, },*/
sortable: true, // {
head: false, // prop: 'category',
}, // label: '品分类',
{ // type: 2,
prop: 'applyNum', // values: '',
label: '可用数量', // width: '130',
type: 2, // checkarr: [],
values: '', // fixed: false,
width: '150', // sortable: true,
checkarr: [], // },
fixed: false, {
sortable: true, prop: 'brandName',
head: false, label: '品牌',
}, type: 2,
{ values: '',
prop: 'quantityOccupied', width: '130',
label: '冻结数量', checkarr: [],
type: 2, fixed: false,
values: '', sortable: true,
width: '150', },
checkarr: [], {
fixed: false, prop: 'marketName',
sortable: true, label: '商场/客户',
head: false, type: 2,
}, values: '',
{ width: '130',
prop: 'outboundQuantity', checkarr: [],
label: '出库数量', fixed: false,
type: 2, sortable: true,
values: '', },
width: '150', {
checkarr: [], prop: 'storeName',
fixed: false, label: '门店名称',
sortable: true, type: 2,
head: false, values: '',
}, width: '130',
{ checkarr: [],
prop: 'brand', fixed: false,
label: '品牌', sortable: true,
type: 2, },
values: '', // {
width: '150', // prop: 'storeCode',
checkarr: [], // label: '门店编码',
fixed: false, // type: 2,
sortable: true, // values: '',
head: false, // width: '130',
}, // checkarr: [],
{ // fixed: false,
prop: 'cargoNumber', // sortable: true,
label: '规格', // },
type: 2, // {
values: '', // prop: 'marketCode',
width: '150', // label: '商场编码',
checkarr: [], // type: 2,
fixed: false, // values: '',
sortable: true, // width: '130',
head: false, // checkarr: [],
}, // fixed: false,
{ // sortable: true,
prop: 'cargoUnit', // },
label: '单位', // {
type: 2, // prop: 'shoppingMall',
values: '', // label: '所属商场',
width: '150', // type: 2,
checkarr: [], // values: '',
fixed: false, // width: '130',
sortable: true, // checkarr: [],
head: false, // fixed: false,
}, // sortable: true,
{ // },
prop: 'reservationNum', {
label: '预约数量', prop: 'warehouseName',
type: 10, label: '仓库名称',
values: '', type: 2,
width: '150', values: '',
checkarr: [], width: '130',
fixed: false, checkarr: [],
sortable: true, fixed: false,
head: 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: [ columnParcels: [
{ {
prop: '', prop: '',
@ -1926,7 +1975,7 @@
let params = {}; let params = {};
this.query.serviceType = '2'; this.query.serviceType = '2';
params.marketName = this.marketName; 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 => { res => {
const inventoryList = res.data.data; const inventoryList = res.data.data;
inventoryList.records.forEach(item => { inventoryList.records.forEach(item => {
@ -2787,11 +2836,12 @@
if (this.orderData.length !== 0) { if (this.orderData.length !== 0) {
this.query.orderIds = this.orderData.map(val => val.id).join(','); this.query.orderIds = this.orderData.map(val => val.id).join(',');
} }
const res = await selectStockArticleInfoList( const res = await getClientList(
page.currentPage, page.currentPage,
page.pageSize, page.pageSize,
Object.assign(params, this.query) Object.assign(params, this.query)
); );
console.log('res ===>>', res)
const { records, total } = res.data.data; const { records, total } = res.data.data;
this.stockArticleInfo = records; this.stockArticleInfo = records;

Write Preview
Loading…
Cancel
Save