mt-fe-group/11-wms
12
0
Vork 0
Code Kwesties Pull-aanvragen Publicaties Wiki Activiteit

Merge pull request '11.23修改' (#17) from 11-wms-zjl into master

Bladeren bron 
Reviewed-on: #17
This commit is contained in:
朱菊兰 2022-11-24 08:41:15 +08:00
bovenliggende 57159bec8d d027ff4d64
commit dfa7206e41
6 gewijzigde bestanden met toevoegingen van 31 en 17 verwijderingen
Statistieken weergeven Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

2
src/views/wmsInStore/acceptGoods.vue
Bestand weergeven

@ -129,8 +129,8 @@ export default {
obj.trayID = getTrayList()
obj.internalControlCode = getProductList()
obj.customerCode = getCustomerCodeList()
obj.num = parseInt(Math.random() * 180 + 100)
obj.productDpec = getProductSpecList()
obj.num = obj.productDpec.substring(0, 1) === '3' ? parseInt(Math.random() * 100 + 100) : parseInt(Math.random() * 100 + 200)
obj.batch = getBatchList()
obj.packCode = getPackList()
temp.push(obj)

4
src/views/wmsInventoryManagement/inventory.vue
Bestand weergeven

@ -26,7 +26,7 @@ import { getMaterialCodeList, getKQList, getProductSpecList, getGoodsList } from
const tableProps = [
{
prop: 'productName',
label: '品名'
label: '盖板玻璃或背板玻璃'
},
{
prop: 'spec',
@ -54,7 +54,7 @@ export default {
{
type: 'input',
label: '关键字',
placeholder: '品名,物料编码,库区',
placeholder: '盖板玻璃或背板玻璃,物料编码,库区',
param: 'name',
width: 250
},

2
src/views/wmsInventoryManagement/inventoryQuery.vue
Bestand weergeven

@ -27,7 +27,7 @@ import moment from 'moment'
const tableProps = [
{
prop: 'productName',
label: '品名'
label: '盖板玻璃或背板玻璃'
},
{
prop: 'spec',

4
src/views/wmsInventoryManagement/stockTaking.vue
Bestand weergeven

@ -33,7 +33,7 @@ const tableProps = [
},
{
prop: 'productName',
label: '品名'
label: '盖板玻璃或背板玻璃'
},
{
prop: 'spec',
@ -73,7 +73,7 @@ export default {
{
type: 'input',
label: '关键字',
placeholder: '盘点单号,品名,物料编码',
placeholder: '盘点单号,盖板玻璃或背板玻璃,物料编码',
param: 'name',
width: 250
},

2
src/views/wmsOutStore/outStoreDocuments.vue
Bestand weergeven

@ -134,7 +134,7 @@ export default {
obj.outboundOrderNo = getOutboundNoList()
obj.customerName = getCompTyleList()
obj.shipmentCacheArea = getHCQList()
obj.num = parseInt(Math.random() * 1000)
obj.num = parseInt(Math.random() * 40 + 20) + '（箱）'
obj.spec = getProductSpecList()
const sj = Math.floor(Math.random() * 100)
obj.deliveryTime = moment().add(sj, 'days').add(sj, 'hour').add(sj, 'minutes').add(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss')

34
src/views/wmsOutStore/outStoreOperation.vue
Bestand weergeven

@ -34,7 +34,7 @@ import Pagination from '@/components/Pagination'
import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
import { tableHeight } from '@/utils/index'
import outStoreDocumentsAdd from './components/outStoreDocumentsAdd.vue'
import { getOperationCode2List, getOutboundNoList, getStoreList, getHCQList, getTimeArr, getDriverCodeList, getKQList } from '@/utils/wmsDic'
import { getOperationCode2List, getOutboundNoList, getStoreList, getTimeArr, getDriverCodeList } from '@/utils/wmsDic'
const tableProps = [
{
prop: 'operationCode',
@ -110,7 +110,7 @@ export default {
current: 1,
size: 20
},
tableH: tableHeight(275),
tableH: tableHeight(290),
tableProps,
list: [],
listLoading: false,
@ -122,31 +122,45 @@ export default {
},
mounted() {
window.addEventListener('resize', () => {
this.tableH = tableHeight(275)
this.tableH = tableHeight(290)
})
this.getList()
},
methods: {
getList() {
const temp = []
const num = 20
const temp2 = []
const num = 17
for (let i = 0; i < num; i++) {
const obj = {}
const timeArrList = getTimeArr()
obj.operationCode = getOperationCode2List()
obj.operationCode = 'CQ1510433590'
obj.outboundOrderNo = getOutboundNoList()
obj.store = getStoreList()
obj.name1 = (obj.store === '辅材库' || obj.store === '备件库') ? '' : getKQList() + '区'
obj.goodsArea = obj.store + (obj.name1 ? '-' + obj.name1 : '') + '-' + (obj.store === '备件库' ? (parseInt(Math.random() * 19 + 1) + '-' + parseInt(Math.random() * 2 + 1)) : parseInt(Math.random() * 16))
obj.shipmentCacheArea = getHCQList()
obj.goodsArea = '成品库C-C区-' + (i + 8)
obj.shipmentCacheArea = 'HCQC' + (2631 - i)
obj.startTime = timeArrList[0]
obj.endTime = timeArrList[1]
obj.driverCode = getDriverCodeList()
temp.push(obj)
}
this.list = temp
const arr = ['备件库-13-2', '辅材库-14', '备件库-13-4']
for (let i = 0; i < 3; i++) {
const obj = {}
const timeArrList = getTimeArr()
obj.operationCode = getOperationCode2List()
obj.outboundOrderNo = getOutboundNoList()
obj.store = getStoreList()
obj.goodsArea = arr[i]
obj.shipmentCacheArea = 'HCQC' + (2897 - i)
obj.startTime = timeArrList[0]
obj.endTime = timeArrList[1]
obj.driverCode = getDriverCodeList()
temp2.push(obj)
}
this.list = temp.concat(temp2)
console.log(this.list)
this.total = num
this.total = 20
},
btnClick(val) {
console.log(val)