mt-fe-group/11-wms
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

11-wms-zjl #16

Merged
juzi merged 3 commits from 11-wms-zjl into master 2022-11-18 11:09:50 +08:00
Conversation 0 Commits 3 Files Changed 12 +31 -28
5 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 93ea975af5 - Show all commits

2
src/utils/wmsDic.js
View File

@ -100,7 +100,7 @@ export function getStoreList() {
} }
// 库区 // 库区
const KQList = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N'] const KQList = ['A', 'B', 'C', 'D']
export function getKQList() { export function getKQList() {
let KQ = '' let KQ = ''
KQ += KQList[parseInt(Math.random() * KQList.length)] KQ += KQList[parseInt(Math.random() * KQList.length)]

42
src/views/OperationalOverview/storageCockpit.vue
View File

@ -37,15 +37,15 @@
<div :style="{ fontSize: 13 * beilv + 'px' }"> <div :style="{ fontSize: 13 * beilv + 'px' }">
<el-row :style="{ marginBottom: 15 * beilv + 'px'}"> <el-row :style="{ marginBottom: 15 * beilv + 'px'}">
<el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">时间:</span><span class="rightText">2022.12.12 13:12:45</span></div></el-col> <el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">时间:</span><span class="rightText">2022.12.12 13:12:45</span></div></el-col>
<el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">成品编码:</span><span class="rightText">34394233442</span></div></el-col> <el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">成品编码:</span><span class="rightText">CP5651696250</span></div></el-col>
</el-row> </el-row>
<el-row :style="{ marginBottom: 15 * beilv + 'px'}"> <el-row :style="{ marginBottom: 15 * beilv + 'px'}">
<el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">入库作业号:</span><span class="rightText">347384734</span></div></el-col> <el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">入库作业号:</span><span class="rightText">RQ5055348160</span></div></el-col>
<el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">成品规格:</span><span class="rightText">234*345*34</span></div></el-col> <el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">成品规格:</span><span class="rightText">3.2-1033*2089</span></div></el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">执行叉车:</span><span class="rightText">叉车</span></div></el-col> <el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">执行叉车:</span><span class="rightText">叉车</span></div></el-col>
<el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">库位:</span><span class="rightText">A区34货位3层</span></div></el-col> <el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">库位:</span><span class="rightText">成品库D-D区-14</span></div></el-col>
</el-row> </el-row>
</div> </div>
</base-container> </base-container>
@ -69,18 +69,18 @@
<div :style="{ fontSize: 13 * beilv + 'px' }"> <div :style="{ fontSize: 13 * beilv + 'px' }">
<el-row :style="{ marginBottom: 10 * beilv + 'px'}"> <el-row :style="{ marginBottom: 10 * beilv + 'px'}">
<el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">时间:</span><span class="rightText">2022.12.12 13:12:45</span></div></el-col> <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">时间:</span><span class="rightText">2022.12.12 13:12:45</span></div></el-col>
<el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">ERP订单:</span><span class="rightText">34394233442</span></div></el-col> <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">ERP订单:</span><span class="rightText">TCP203</span></div></el-col>
</el-row> </el-row>
<el-row :style="{ marginBottom: 10 * beilv + 'px'}"> <el-row :style="{ marginBottom: 10 * beilv + 'px'}">
<el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">成品编码:</span><span class="rightText">34394233442</span></div></el-col> <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">成品编码:</span><span class="rightText">CP3212128221</span></div></el-col>
<el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">出库作业号:</span><span class="rightText">347384734</span></div></el-col> <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">出库作业号:</span><span class="rightText">CQ3727367699</span></div></el-col>
</el-row> </el-row>
<el-row :style="{ marginBottom: 10 * beilv + 'px'}"> <el-row :style="{ marginBottom: 10 * beilv + 'px'}">
<el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">成品规格:</span><span class="rightText">234*345*34</span></div></el-col> <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">成品规格:</span><span class="rightText">3.2-1128*1716</span></div></el-col>
<el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">执行叉车:</span><span class="rightText">叉车</span></div></el-col> <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">执行叉车:</span><span class="rightText">叉车</span></div></el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">库位:</span><span class="rightText">A区34货位3层</span></div></el-col> <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">库位:</span><span class="rightText">成品库C-C区-1</span></div></el-col>
<el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">库位前置区:</span><span class="rightText">A区34货位3层</span></div></el-col> <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">库位前置区:</span><span class="rightText">A区34货位3层</span></div></el-col>
</el-row> </el-row>
</div> </div>
@ -368,22 +368,22 @@ export default {
test1: 'RQ5055348178', test1: 'RQ5055348178',
test2: 'D4288603319', test2: 'D4288603319',
test3: 'CP5651696263', test3: 'CP5651696263',
test4: '100*50mm', test4: '3.2-1033*2089',
test5: 'A区' test5: '成品库D-D区-15'
}, },
{ {
test1: 'RQ3722771932', test1: 'RQ3722771932',
test2: 'D3732827773', test2: 'D3732827773',
test3: 'CP4140258231', test3: 'CP4140258231',
test4: '100*100mm', test4: '2.0-1128*2272',
test5: 'K区' test5: '成品库B-A区-13'
}, },
{ {
test1: 'RQ1342208728', test1: 'RQ1342208728',
test2: 'D6178738555', test2: 'D6178738555',
test3: 'CP5284407553', test3: 'CP5284407553',
test4: '70*50mm', test4: '2.0-1128*1716',
test5: 'G区' test5: '成品库A-B区-9'
} }
] ]
}, },
@ -401,22 +401,22 @@ export default {
test1: 'CQ3727367714', test1: 'CQ3727367714',
test2: 'TCP231', test2: 'TCP231',
test3: 'CP3212128336', test3: 'CP3212128336',
test4: '50*50mm', test4: '3.2-1128*1716',
test5: 'H区' test5: '成品库C-C区-4'
}, },
{ {
test1: 'CQ7080508785', test1: 'CQ7080508785',
test2: 'TCP186', test2: 'TCP186',
test3: 'CP2760242729', test3: 'CP2760242729',
test4: '100*120mm', test4: '3.2-1128*1718',
test5: 'B区' test5: '成品库D-D区-1'
}, },
{ {
test1: 'CQ8843212447', test1: 'CQ8843212447',
test2: 'TCP67', test2: 'TCP67',
test3: 'CP1569191519', test3: 'CP1569191519',
test4: '120*120mm', test4: '3.2-1032*1747',
test5: 'A区' test5: '成品库C-B区-12'
} }
] ]
}, },

7
src/views/wmsBasicData/goodsAreaData.vue
View File

@ -43,7 +43,7 @@ import BaseTable from '@/components/BaseTable'
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn' import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
import i18n from '@/lang' import i18n from '@/lang'
import { getHWList } from '@/utils/wmsDic' import { getStoreList, getKQList } from '@/utils/wmsDic'
import moment from 'moment' import moment from 'moment'
/** /**
* 表格表头配置项 TypeScript接口注释 * 表格表头配置项 TypeScript接口注释
@ -201,8 +201,9 @@ export default {
const obj = {} const obj = {}
const sj = Math.floor(Math.random() * 720 + 10) const sj = Math.floor(Math.random() * 720 + 10)
obj.createTime = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss') obj.createTime = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss')
obj.name2 = getHWList() obj.store = getStoreList()
obj.name1 = obj.name2[2] + '区' obj.name1 = (obj.store === '辅材库' || obj.store === '备件库') ? '' : getKQList() + '区'
obj.name2 = obj.store + (obj.name1 ? '-' + obj.name1 : '') + '-' + (obj.store === '备件库' ? (parseInt(Math.random() * 19 + 1) + '-' + parseInt(Math.random() * 2 + 1)) : parseInt(Math.random() * 16))
obj.name3 = obj.name2 obj.name3 = obj.name2
obj.name4 = parseInt(Math.random() * 2) ? '有货' : '无货' obj.name4 = parseInt(Math.random() * 2) ? '有货' : '无货'
obj.name5 = parseInt(Math.random() * 2) ? 'Y' : 'N' obj.name5 = parseInt(Math.random() * 2) ? 'Y' : 'N'

2
src/views/wmsBasicData/warehouseData.vue
View File

@ -179,7 +179,7 @@ export default {
const sj = Math.floor(Math.random() * 720 + 10) const sj = Math.floor(Math.random() * 720 + 10)
obj.createTime = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss') obj.createTime = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss')
obj.name1 = getStoreList() obj.name1 = getStoreList()
obj.name2 = getKQList() + '区' obj.name2 = (obj.name1 === '辅材库' || obj.name1 === '备件库') ? '' : getKQList() + '区'
obj.name3 = '成品仓' obj.name3 = '成品仓'
obj.name4 = 'TCP' + sj obj.name4 = 'TCP' + sj
temp.push(obj) temp.push(obj)

6
src/views/wmsOutStore/outStoreOperation.vue
View File

@ -34,7 +34,7 @@ import Pagination from '@/components/Pagination'
import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn' import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
import { tableHeight } from '@/utils/index' import { tableHeight } from '@/utils/index'
import outStoreDocumentsAdd from './components/outStoreDocumentsAdd.vue' import outStoreDocumentsAdd from './components/outStoreDocumentsAdd.vue'
import { getOperationCode2List, getOutboundNoList, getHWList, getHCQList, getTimeArr, getDriverCodeList } from '@/utils/wmsDic' import { getOperationCode2List, getOutboundNoList, getStoreList, getHCQList, getTimeArr, getDriverCodeList, getKQList } from '@/utils/wmsDic'
const tableProps = [ const tableProps = [
{ {
prop: 'operationCode', prop: 'operationCode',
@ -135,7 +135,9 @@ export default {
const timeArrList = getTimeArr() const timeArrList = getTimeArr()
obj.operationCode = getOperationCode2List() obj.operationCode = getOperationCode2List()
obj.outboundOrderNo = getOutboundNoList() obj.outboundOrderNo = getOutboundNoList()
obj.goodsArea = getHWList() 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.shipmentCacheArea = getHCQList()
obj.startTime = timeArrList[0] obj.startTime = timeArrList[0]
obj.endTime = timeArrList[1] obj.endTime = timeArrList[1]