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

Compare commits

base: mt-fe-group:e9b4e7dd1ab2bbc42e4f0e1cd590ce5dfd5e817f
Branches Tags
mt-fe-group:master
mt-fe-group:11-wms-zjl
mt-fe-group:zwq
..
compare: mt-fe-group:ff9d8091f969c10629920a3a476538500efe8224
Branches Tags
mt-fe-group:master
mt-fe-group:11-wms-zjl
mt-fe-group:zwq

No commits in common. "e9b4e7dd1ab2bbc42e4f0e1cd590ce5dfd5e817f" and "ff9d8091f969c10629920a3a476538500efe8224" have entirely different histories.
e9b4e7dd1a ... ff9d8091f9

21 changed files with 281 additions and 517 deletions
Show Stats Expand all files Collapse all files

225
src/utils/wmsDic.js
View File

@ -1,225 +0,0 @@
import moment from 'moment'
// 托盘List
export function getTrayList() {
let trayID = 'TP'
for (let i = 0; i < 3; i++) {
trayID += parseInt(Math.random() * 89 + 10)
}
return trayID
}
// 成品内控码List
export function getProductList() {
let prodCode = 'CP'
for (let i = 0; i < 5; i++) {
prodCode += parseInt(Math.random() * 89 + 10)
}
return prodCode
}
// 客户标签号List
export function getCustomerCodeList() {
let customerCode = '2022'
for (let i = 0; i < 5; i++) {
customerCode += parseInt(Math.random() * 89 + 10)
}
return customerCode
}
// 成品规格List
export function getProductSpecList() {
const list = ['50*50mm', '70*50mm', '70*70mm', '100*50mm', '100*70mm', '100*100mm', '100*120mm', '120*120mm']
const spec = list[parseInt(Math.random() * (list.length))]
return spec
}
// 批次List
export function getBatchList() {
let batch = '2022'
for (let i = 0; i < 8; i++) {
batch += parseInt(Math.random() * 89 + 10)
}
return batch
}
// 包装机List
export function getPackList() {
let batch = '0'
batch += parseInt(Math.random() * 8 + 1)
return batch
}
// 入库单号List
export function getReceiptNoList() {
let receiptNo = 'RQD2022'
for (let i = 0; i < 3; i++) {
receiptNo += parseInt(Math.random() * 89 + 10)
}
return receiptNo
}
// 出库单号List
export function getOutboundNoList() {
let receiptNo = 'CKD2022'
for (let i = 0; i < 3; i++) {
receiptNo += parseInt(Math.random() * 89 + 10)
}
return receiptNo
}
// 盘点单号List
export function getInventoryNoList() {
let inventoryNumber = 'PD2022'
for (let i = 0; i < 3; i++) {
inventoryNumber += parseInt(Math.random() * 89 + 10)
}
return inventoryNumber
}
// 入库作业号List
export function getOperationCodeList() {
let operationCode = 'RQ'
for (let i = 0; i < 5; i++) {
operationCode += parseInt(Math.random() * 89 + 10)
}
return operationCode
}
// 出库库作业号List
export function getOperationCode2List() {
let operationCode = 'CQ'
for (let i = 0; i < 5; i++) {
operationCode += parseInt(Math.random() * 89 + 10)
}
return operationCode
}
// 仓库
const storeList = ['1号立体库', '2号立体库', '3号立体库', '4号立体库', '5号立体库', '6号立体库', '7号立体库', '8号立体库']
export function getStoreList() {
let store = ''
store += storeList[parseInt(Math.random() * storeList.length)]
return store
}
// 库区
const KQList = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N']
export function getKQList() {
let KQ = ''
KQ += KQList[parseInt(Math.random() * KQList.length)]
return KQ
}
// 货位
export function getHWList() {
let HW = 'HW'
HW += KQList[parseInt(Math.random() * KQList.length)]
for (let i = 0; i < 2; i++) {
HW += parseInt(Math.random() * 9)
HW += parseInt(Math.random() * 8 + 1)
}
return HW
}
// 缓存区
export function getHCQList() {
let HW = 'HCQ'
HW += KQList[parseInt(Math.random() * KQList.length)]
for (let i = 0; i < 2; i++) {
HW += parseInt(Math.random() * 9)
HW += parseInt(Math.random() * 8 + 1)
}
return HW
}
// 司机/AGB编号List
export function getDriverCodeList() {
let driverCode = 'D'
for (let i = 0; i < 5; i++) {
driverCode += parseInt(Math.random() * 89 + 10)
}
return driverCode
}
// 随机生成开始和结束时间
export function getTimeArr() {
const sj = parseInt(Math.random() * 365)
const sj2 = sj + parseInt(Math.random() * 60 + 1)
const temp = []
const start = moment().subtract(sj2, 'days').subtract(sj2, 'hour').subtract(sj2, 'minutes').subtract(sj2, 'seconds').format('YYYY-MM-DD hh:mm:ss')
temp.push(start)
const end = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss')
temp.push(end)
return temp
}
// 物料编码List
export function getMaterialCodeList() {
let materialCode = 'WL'
for (let i = 0; i < 4; i++) {
materialCode += parseInt(Math.random() * 89 + 10)
}
return materialCode
}
// 名字
const nameList = ['张明', '李燕', '王国庆', '张强', '周敏']
export function getNameList() {
let name = ''
name = nameList[parseInt(Math.random() * (nameList.length))]
return name
}
// 客户数据
const compList = ['台玻', 'FUYAO福耀', 'SG南玻', 'XYG信义玻璃', '耀皮', '福莱特玻璃', 'CLFG洛玻', 'SHABO沙玻', 'KIBING旗滨', '金晶玻璃', '济南金昊', '东莞佳美特', '汇中矿产', '文盛新材料', '西点化学', '开源塑胶', '奥驰商贸', '竹中科技', '程龙玻璃']
export function getCompTyleList() {
let comp = ''
comp = compList[parseInt(Math.random() * (compList.length))]
return comp
}
// 客户联系人
const contactList = ['张总', '李总', '王总', '孙总', '赵总', '周总', '钱总', '吴总', '郑总', '杨总', '朱总', '蒋总', '江总', '马总']
export function getContactList() {
let name = ''
name = contactList[parseInt(Math.random() * (contactList.length))]
return name
}
// 手机号前三位
const phoneList = ['139', '138', '137', '136', '135', '134', '159', '158', '157', '150', '151', '152', '188', '187', '182', '183', '184', '178', '130', '131', '132', '156', '155', '186', '185', '176', '133', '153', '189', '180', '181', '177']
export function getPhoneList() {
let name = ''
name = phoneList[parseInt(Math.random() * (phoneList.length))]
return name
}
// 物品名称
const goodsList = ['钢化玻璃', '磨砂玻璃', '喷砂玻璃', '压花玻璃', '夹丝玻璃', '夹层玻璃']
export function getGoodsList() {
let name = ''
name = goodsList[parseInt(Math.random() * (goodsList.length))]
return name
}
// 玻璃编码List
export function getGlassCodeList() {
let materialCode = 'SJG'
for (let i = 0; i < 4; i++) {
materialCode += parseInt(Math.random() * 89 + 10)
}
return materialCode
}
// 角色编码List
export function getRoleCodeList() {
let materialCode = 'R'
for (let i = 0; i < 4; i++) {
materialCode += parseInt(Math.random() * 89 + 10)
}
return materialCode
}
// 角色名称List
export function getRoleNameList() {
const materialCode = ['超级管理员', '管理员', '1号线管理员', '2号线管理员', '1号线加工人员', '2号线加工人员', '质检1组', '质检2组', '质检3组', '质检4组']
return materialCode
}

40
src/views/wmsBasicData/components/customerData-add.vue
View File

@ -7,6 +7,10 @@
--> -->
<template> <template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? 'btn.add' : 'btn.edit' | i18nFilter" width="40%" class="dialog" @close="close"> <el-dialog :visible.sync="visible" :title="!dataForm.id ? 'btn.add' : 'btn.edit' | i18nFilter" width="40%" class="dialog" @close="close">
<!-- <small-title slot="title">
{{ !dataForm.id ? 'btn.add' : 'btn.edit' | i18nFilter }}
</small-title> -->
<el-form <el-form
ref="dataForm" ref="dataForm"
:model="dataForm" :model="dataForm"
@ -42,6 +46,13 @@
clearable clearable
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="ERP代码" prop="name5">
<el-input
v-model="dataForm.name5"
placeholder="请输入ERP代码"
clearable
/>
</el-form-item> -->
</el-form> </el-form>
<el-row style="text-align: right"> <el-row style="text-align: right">
@ -52,6 +63,7 @@
</template> </template>
<script> <script>
// import SmallTitle from '@/components/BaseDrawer/components/SmallTitle.vue'
export default { export default {
// components: { SmallTitle }, // components: { SmallTitle },
@ -63,7 +75,9 @@ export default {
name1: '', name1: '',
name2: '', name2: '',
name3: '', name3: '',
name4: '' name4: '',
name5: '',
name6: ''
}, },
dataRule: { dataRule: {
name1: [ name1: [
@ -77,23 +91,13 @@ export default {
} }
}, },
methods: { methods: {
init(val) { init(row) {
if (val) { this.dataForm = row || ''
this.$nextTick(() => { console.log(row)
this.dataForm.name1 = val.name1
this.dataForm.name2 = val.name2
this.dataForm.name3 = val.name3
this.dataForm.name4 = val.name4
})
} else {
this.$nextTick(() => {
this.dataForm.name1 = ''
this.dataForm.name2 = ''
this.dataForm.name3 = ''
this.dataForm.name4 = ''
})
}
this.visible = true this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
})
}, },
// 表单提交 // 表单提交
dataFormSubmit() { dataFormSubmit() {
@ -105,6 +109,7 @@ export default {
duration: 1500, duration: 1500,
onClose: () => { onClose: () => {
this.visible = false this.visible = false
this.$emit('refreshDataList')
} }
}) })
} }
@ -112,6 +117,7 @@ export default {
}, },
close() { close() {
this.visible = false this.visible = false
this.$emit('refreshDataList')
} }
} }
} }

28
src/views/wmsBasicData/components/goodsAreaData-add.vue
View File

@ -98,27 +98,13 @@ export default {
} }
}, },
methods: { methods: {
init(val) { init(row) {
if (val) { this.dataForm = row || ''
this.$nextTick(() => { console.log(row)
this.dataForm.name1 = val.name1
this.dataForm.name2 = val.name2
this.dataForm.name3 = val.name3
this.dataForm.name4 = val.name4
this.dataForm.name5 = val.name5
this.dataForm.name6 = val.name6
})
} else {
this.$nextTick(() => {
this.dataForm.name1 = ''
this.dataForm.name2 = ''
this.dataForm.name3 = ''
this.dataForm.name4 = ''
this.dataForm.name5 = ''
this.dataForm.name6 = ''
})
}
this.visible = true this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
})
}, },
// 表单提交 // 表单提交
dataFormSubmit() { dataFormSubmit() {
@ -130,6 +116,7 @@ export default {
duration: 1500, duration: 1500,
onClose: () => { onClose: () => {
this.visible = false this.visible = false
this.$emit('refreshDataList')
} }
}) })
} }
@ -137,6 +124,7 @@ export default {
}, },
close() { close() {
this.visible = false this.visible = false
this.$emit('refreshDataList')
} }
} }
} }

24
src/views/wmsBasicData/components/goodsData-add.vue
View File

@ -82,23 +82,13 @@ export default {
} }
}, },
methods: { methods: {
init(val) { init(row) {
if (val) { this.dataForm = row || ''
this.$nextTick(() => { console.log(row)
this.dataForm.name1 = val.name1
this.dataForm.name2 = val.name2
this.dataForm.name3 = val.name3
this.dataForm.name4 = val.name4
})
} else {
this.$nextTick(() => {
this.dataForm.name1 = ''
this.dataForm.name2 = ''
this.dataForm.name3 = ''
this.dataForm.name4 = ''
})
}
this.visible = true this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
})
}, },
// 表单提交 // 表单提交
dataFormSubmit() { dataFormSubmit() {
@ -110,6 +100,7 @@ export default {
duration: 1500, duration: 1500,
onClose: () => { onClose: () => {
this.visible = false this.visible = false
this.$emit('refreshDataList')
} }
}) })
} }
@ -117,6 +108,7 @@ export default {
}, },
close() { close() {
this.visible = false this.visible = false
this.$emit('refreshDataList')
} }
} }
} }

24
src/views/wmsBasicData/components/warehouseData-add.vue
View File

@ -82,23 +82,13 @@ export default {
} }
}, },
methods: { methods: {
init(val) { init(row) {
if (val) { this.dataForm = row || ''
this.$nextTick(() => { console.log(row)
this.dataForm.name1 = val.name1
this.dataForm.name2 = val.name2
this.dataForm.name3 = val.name3
this.dataForm.name4 = val.name4
})
} else {
this.$nextTick(() => {
this.dataForm.name1 = ''
this.dataForm.name2 = ''
this.dataForm.name3 = ''
this.dataForm.name4 = ''
})
}
this.visible = true this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
})
}, },
// 表单提交 // 表单提交
dataFormSubmit() { dataFormSubmit() {
@ -110,6 +100,7 @@ export default {
duration: 1500, duration: 1500,
onClose: () => { onClose: () => {
this.visible = false this.visible = false
this.$emit('refreshDataList')
} }
}) })
} }
@ -117,6 +108,7 @@ export default {
}, },
close() { close() {
this.visible = false this.visible = false
this.$emit('refreshDataList')
} }
} }
} }

43
src/views/wmsBasicData/customerData.vue
View File

@ -42,9 +42,8 @@ import HeadForm from '@/components/basicData/HeadForm'
import BaseTable from '@/components/BaseTable' 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 { timeFormatter } from '@/filters'
import i18n from '@/lang' import i18n from '@/lang'
import { getCompTyleList, getContactList, getPhoneList } from '@/utils/wmsDic'
import moment from 'moment'
/** /**
* 表格表头配置项 TypeScript接口注释 * 表格表头配置项 TypeScript接口注释
* tableConfig<ConfigItem> = [] * tableConfig<ConfigItem> = []
@ -80,7 +79,8 @@ const tableBtn = [
const tableProps = [ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
label: i18n.t('module.basicData.factory.createTime') label: i18n.t('module.basicData.factory.createTime'),
filter: timeFormatter
}, },
{ {
prop: 'name1', prop: 'name1',
@ -162,7 +162,7 @@ export default {
console.log(raw) console.log(raw)
if (raw.type === 'delete') { if (raw.type === 'delete') {
this.$confirm( this.$confirm(
`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name1}]?`, `${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name}]?`,
this.$t('module.basicData.visual.Tips'), this.$t('module.basicData.visual.Tips'),
{ {
confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'), confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
@ -182,29 +182,22 @@ export default {
}) })
.catch(() => {}) .catch(() => {})
} else { } else {
this.$nextTick(() => { this.addNew(raw.data)
this.addOrUpdateVisible = true
this.$refs.addOrUpdate.init(raw.data)
})
} }
}, },
getList() { getList() {
this.listLoading = false this.listLoading = false
this.listQuery.key = this.headFormValue.name this.listQuery.key = this.headFormValue.name
const temp = [] this.list = [
const num = 20 {
for (let i = 0; i < num; i++) { id: 1,
const obj = {} name1: '东路钢铁公司',
const sj = Math.floor(Math.random() * 720 + 10) name2: '供应商',
obj.createTime = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss') name3: '张总',
obj.name1 = getCompTyleList() name4: '13768470056',
obj.name2 = '供应商' name5: ''
obj.name3 = getContactList()
obj.name4 = getPhoneList() + parseInt(Math.random() * 89999999 + 10000000)
temp.push(obj)
} }
this.list = temp ]
this.total = num
}, },
btnClick(val) { btnClick(val) {
this.headFormValue = val this.headFormValue = val
@ -215,13 +208,17 @@ export default {
}, },
clickTopBtn(val) { clickTopBtn(val) {
if (val === 'add') { if (val === 'add') {
this.addNew()
}
},
// 新增 / 修改
addNew(row) {
this.addOrUpdateVisible = true this.addOrUpdateVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.addOrUpdate.init() this.$refs.addOrUpdate.init(row)
}) })
} }
} }
}
} }
</script> </script>

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

@ -42,9 +42,8 @@ import HeadForm from '@/components/basicData/HeadForm'
import BaseTable from '@/components/BaseTable' 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 { timeFormatter } from '@/filters'
import i18n from '@/lang' import i18n from '@/lang'
import { getHWList } from '@/utils/wmsDic'
import moment from 'moment'
/** /**
* 表格表头配置项 TypeScript接口注释 * 表格表头配置项 TypeScript接口注释
* tableConfig<ConfigItem> = [] * tableConfig<ConfigItem> = []
@ -80,7 +79,8 @@ const tableBtn = [
const tableProps = [ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
label: i18n.t('module.basicData.factory.createTime') label: i18n.t('module.basicData.factory.createTime'),
filter: timeFormatter
}, },
{ {
prop: 'name1', prop: 'name1',
@ -166,7 +166,7 @@ export default {
console.log(raw) console.log(raw)
if (raw.type === 'delete') { if (raw.type === 'delete') {
this.$confirm( this.$confirm(
`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name1}]?`, `${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name}]?`,
this.$t('module.basicData.visual.Tips'), this.$t('module.basicData.visual.Tips'),
{ {
confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'), confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
@ -186,31 +186,23 @@ export default {
}) })
.catch(() => {}) .catch(() => {})
} else { } else {
this.addOrUpdateVisible = true this.addNew(raw.data)
this.$nextTick(() => {
this.$refs.addOrUpdate.init(raw.data)
})
} }
}, },
getList() { getList() {
this.listLoading = false this.listLoading = false
this.listQuery.key = this.headFormValue.name this.listQuery.key = this.headFormValue.name
const temp = [] this.list = [
const num = 20 {
for (let i = 0; i < num; i++) { id: 1,
const obj = {} name1: 'A区',
const sj = Math.floor(Math.random() * 720 + 10) name2: '2022040696',
obj.createTime = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss') name3: '成品',
obj.name2 = getHWList() name4: '空闲',
obj.name1 = obj.name2[2] + '区' name5: '开',
obj.name3 = obj.name2 name6: '关'
obj.name4 = parseInt(Math.random() * 2) ? '有货' : '无货'
obj.name5 = parseInt(Math.random() * 2) ? 'Y' : 'N'
obj.name6 = parseInt(Math.random() * 2) ? 'Y' : 'N'
temp.push(obj)
} }
this.list = temp ]
this.total = num
}, },
btnClick(val) { btnClick(val) {
this.headFormValue = val this.headFormValue = val
@ -221,13 +213,17 @@ export default {
}, },
clickTopBtn(val) { clickTopBtn(val) {
if (val === 'add') { if (val === 'add') {
this.addNew()
}
},
// 新增 / 修改
addNew(row) {
this.addOrUpdateVisible = true this.addOrUpdateVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.addOrUpdate.init() this.$refs.addOrUpdate.init(row)
}) })
} }
} }
}
} }
</script> </script>

42
src/views/wmsBasicData/goodsData.vue
View File

@ -42,9 +42,8 @@ import HeadForm from '@/components/basicData/HeadForm'
import BaseTable from '@/components/BaseTable' 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 { timeFormatter } from '@/filters'
import i18n from '@/lang' import i18n from '@/lang'
import { getGoodsList, getGlassCodeList } from '@/utils/wmsDic'
import moment from 'moment'
/** /**
* 表格表头配置项 TypeScript接口注释 * 表格表头配置项 TypeScript接口注释
* tableConfig<ConfigItem> = [] * tableConfig<ConfigItem> = []
@ -80,7 +79,8 @@ const tableBtn = [
const tableProps = [ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
label: i18n.t('module.basicData.factory.createTime') label: i18n.t('module.basicData.factory.createTime'),
filter: timeFormatter
}, },
{ {
prop: 'name1', prop: 'name1',
@ -158,7 +158,7 @@ export default {
console.log(raw) console.log(raw)
if (raw.type === 'delete') { if (raw.type === 'delete') {
this.$confirm( this.$confirm(
`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name1}]?`, `${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name}]?`,
this.$t('module.basicData.visual.Tips'), this.$t('module.basicData.visual.Tips'),
{ {
confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'), confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
@ -178,29 +178,21 @@ export default {
}) })
.catch(() => {}) .catch(() => {})
} else { } else {
this.addOrUpdateVisible = true this.addNew(raw.data)
this.$nextTick(() => {
this.$refs.addOrUpdate.init(raw.data)
})
} }
}, },
getList() { getList() {
this.listLoading = false this.listLoading = false
this.listQuery.key = this.headFormValue.name this.listQuery.key = this.headFormValue.name
const temp = [] this.list = [
const num = 20 {
for (let i = 0; i < num; i++) { id: 1,
const obj = {} name1: '清洗液',
const sj = Math.floor(Math.random() * 720 + 10) name2: '20220608684',
obj.createTime = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss') name3: '清洗机',
obj.name1 = getGoodsList() name4: ''
obj.name2 = getGlassCodeList()
obj.name3 = '深加工玻璃'
obj.name4 = '安全'
temp.push(obj)
} }
this.list = temp ]
this.total = num
}, },
btnClick(val) { btnClick(val) {
this.headFormValue = val this.headFormValue = val
@ -211,13 +203,17 @@ export default {
}, },
clickTopBtn(val) { clickTopBtn(val) {
if (val === 'add') { if (val === 'add') {
this.addNew()
}
},
// 新增 / 修改
addNew(row) {
this.addOrUpdateVisible = true this.addOrUpdateVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.addOrUpdate.init() this.$refs.addOrUpdate.init(row)
}) })
} }
} }
}
} }
</script> </script>

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

@ -42,9 +42,23 @@ import HeadForm from '@/components/basicData/HeadForm'
import BaseTable from '@/components/BaseTable' 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 { timeFormatter } from '@/filters'
import i18n from '@/lang' import i18n from '@/lang'
import { getKQList, getStoreList } from '@/utils/wmsDic' /**
import moment from 'moment' * 表格表头配置项 TypeScript接口注释
* tableConfig<ConfigItem> = []
*
* Interface ConfigItem = {
* prop: string,
* label: string,
* width: string,
* align: string,
* subcomponent: function,
* filter: function
* }
*
*
*/
const topBtnConfig = [ const topBtnConfig = [
{ {
type: 'add', type: 'add',
@ -65,7 +79,8 @@ const tableBtn = [
const tableProps = [ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
label: i18n.t('module.basicData.factory.createTime') label: i18n.t('module.basicData.factory.createTime'),
filter: timeFormatter
}, },
{ {
prop: 'name1', prop: 'name1',
@ -143,7 +158,7 @@ export default {
console.log(raw) console.log(raw)
if (raw.type === 'delete') { if (raw.type === 'delete') {
this.$confirm( this.$confirm(
`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name1}]?`, `${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name}]?`,
this.$t('module.basicData.visual.Tips'), this.$t('module.basicData.visual.Tips'),
{ {
confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'), confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
@ -163,29 +178,20 @@ export default {
}) })
.catch(() => {}) .catch(() => {})
} else { } else {
this.addOrUpdateVisible = true this.addNew(raw.data)
this.$nextTick(() => {
this.$refs.addOrUpdate.init(raw.data)
})
} }
}, },
getList() { getList() {
this.listLoading = false this.listLoading = false
this.listQuery.key = this.headFormValue.name this.listQuery.key = this.headFormValue.name
const temp = [] this.list = [
const num = 20 {
for (let i = 0; i < num; i++) { id: 1,
const obj = {} name1: '东仓库',
const sj = Math.floor(Math.random() * 720 + 10) name2: 'A区',
obj.createTime = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss') name3: '空闲'
obj.name1 = getStoreList()
obj.name2 = getKQList() + '区'
obj.name3 = '成品仓'
obj.name4 = 'TCP' + sj
temp.push(obj)
} }
this.list = temp ]
this.total = num
}, },
btnClick(val) { btnClick(val) {
this.headFormValue = val this.headFormValue = val
@ -196,13 +202,17 @@ export default {
}, },
clickTopBtn(val) { clickTopBtn(val) {
if (val === 'add') { if (val === 'add') {
this.addNew()
}
},
// 新增 / 修改
addNew(row) {
this.addOrUpdateVisible = true this.addOrUpdateVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.addOrUpdate.init() this.$refs.addOrUpdate.init(row)
}) })
} }
} }
}
} }
</script> </script>

18
src/views/wmsInStore/acceptGoods.vue
View File

@ -36,7 +36,6 @@ 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 accetpGoodsAdd from './components/accetpGoodsAdd.vue' import accetpGoodsAdd from './components/accetpGoodsAdd.vue'
import { getTrayList, getProductList, getCustomerCodeList, getProductSpecList, getBatchList, getPackList } from '@/utils/wmsDic'
const topBtnConfig = [ const topBtnConfig = [
{ {
type: 'add', type: 'add',
@ -128,15 +127,18 @@ export default {
getList() { getList() {
const temp = [] const temp = []
const num = 20 const num = 20
const spcList = ['50*50m', '100*50m', '100*100m', '70*100m', '100*120m']
const packCodeList = ['01', '02', '03', '04', '05']
for (let i = 0; i < num; i++) { for (let i = 0; i < num; i++) {
const obj = {} const obj = {}
obj.trayID = getTrayList() obj.trayID = '1020' + i
obj.internalControlCode = getProductList() obj.internalControlCode = '202210200001' + i
obj.customerCode = getCustomerCodeList() obj.customerCode = '20221020100' + i
obj.num = parseInt(Math.random() * 1000) obj.num = parseInt(Math.random() * 200 + 100)
obj.productDpec = getProductSpecList() const sj = Math.floor(Math.random() * 5)
obj.batch = getBatchList() obj.productDpec = spcList[sj]
obj.packCode = getPackList() obj.batch = '20221003' + i
obj.packCode = packCodeList[sj]
temp.push(obj) temp.push(obj)
} }
this.list = temp this.list = temp

20
src/views/wmsInStore/inStoreDocuments.vue
View File

@ -36,7 +36,6 @@ 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 inStoreDocumentsAdd from './components/inStoreDocumentsAdd.vue' import inStoreDocumentsAdd from './components/inStoreDocumentsAdd.vue'
import { getTrayList, getReceiptNoList, getProductList, getCustomerCodeList, getProductSpecList, getBatchList, getPackList } from '@/utils/wmsDic'
const topBtnConfig = [ const topBtnConfig = [
{ {
type: 'add', type: 'add',
@ -132,16 +131,19 @@ export default {
getList() { getList() {
const temp = [] const temp = []
const num = 20 const num = 20
const spcList = ['50*50m', '100*50m', '100*100m', '70*100m', '100*120m']
const packCodeList = ['01', '02', '03', '04', '05']
for (let i = 0; i < num; i++) { for (let i = 0; i < num; i++) {
const obj = {} const obj = {}
obj.receiptNo = getReceiptNoList() obj.receiptNo = '200101' + i
obj.trayID = getTrayList() obj.trayID = '1020' + i
obj.internalControlCode = getProductList() obj.internalControlCode = '202210200001' + i
obj.customerCode = getCustomerCodeList() obj.customerCode = '20221020100' + i
obj.num = parseInt(Math.random() * 1000) obj.num = parseInt(Math.random() * 200 + 100)
obj.productDpec = getProductSpecList() const sj = Math.floor(Math.random() * 5)
obj.batch = getBatchList() obj.productDpec = spcList[sj]
obj.packCode = getPackList() obj.batch = '20221003' + i
obj.packCode = packCodeList[sj]
temp.push(obj) temp.push(obj)
} }
this.list = temp this.list = temp

14
src/views/wmsInStore/warehouseOperation.vue
View File

@ -24,7 +24,6 @@ import HeadForm from '@/components/basicData/HeadForm'
import BaseTable from '@/components/BaseTable' import BaseTable from '@/components/BaseTable'
import Pagination from '@/components/Pagination' import Pagination from '@/components/Pagination'
import { tableHeight } from '@/utils/index' import { tableHeight } from '@/utils/index'
import { getOperationCodeList, getReceiptNoList, getHWList, getDriverCodeList, getTimeArr } from '@/utils/wmsDic'
const tableProps = [ const tableProps = [
{ {
prop: 'operationCode', prop: 'operationCode',
@ -106,13 +105,12 @@ export default {
const num = 20 const num = 20
for (let i = 0; i < num; i++) { for (let i = 0; i < num; i++) {
const obj = {} const obj = {}
const timeArrList = getTimeArr() obj.operationCode = '200101' + i
obj.operationCode = getOperationCodeList() obj.receiptNo = '1020' + i
obj.receiptNo = getReceiptNoList() obj.goodsArea = '1-1-' + i
obj.goodsArea = getHWList() obj.startTime = '2022-10-' + (i + 1)
obj.startTime = timeArrList[0] obj.endTime = '2022-10-' + (i + 2)
obj.endTime = timeArrList[1] obj.driverCode = 'd20152' + i
obj.driverCode = getDriverCodeList()
temp.push(obj) temp.push(obj)
} }
this.list = temp this.list = temp

14
src/views/wmsInventoryManagement/inventory.vue
View File

@ -7,6 +7,8 @@
:height="tableH" :height="tableH"
:table-config="tableProps" :table-config="tableProps"
:table-data="list" :table-data="list"
:is-loading="listLoading"
@clickTopBtn="clickTopBtn"
/> />
<pagination <pagination
v-show="total > 0" v-show="total > 0"
@ -22,7 +24,6 @@ import HeadForm from '@/components/basicData/HeadForm'
import BaseTable from '@/components/BaseTable' import BaseTable from '@/components/BaseTable'
import Pagination from '@/components/Pagination' import Pagination from '@/components/Pagination'
import { tableHeight } from '@/utils/index' import { tableHeight } from '@/utils/index'
import { getMaterialCodeList, getKQList, getProductSpecList, getGoodsList } from '@/utils/wmsDic'
const tableProps = [ const tableProps = [
{ {
prop: 'productName', prop: 'productName',
@ -87,12 +88,15 @@ export default {
getList() { getList() {
const temp = [] const temp = []
const num = 20 const num = 20
const spcList = ['50*50m', '100*50m', '100*100m', '70*100m', '100*120m']
const storeAreaList = ['A区', 'B区', 'C区', 'D区', 'E区']
for (let i = 0; i < num; i++) { for (let i = 0; i < num; i++) {
const obj = {} const obj = {}
obj.productName = getGoodsList() obj.productName = i + 1
obj.spec = getProductSpecList() const sj = Math.floor(Math.random() * 5)
obj.materialCode = getMaterialCodeList() obj.spec = spcList[sj]
obj.storeArea = getKQList() + '区' obj.materialCode = '20314655' + i
obj.storeArea = storeAreaList[sj]
obj.num = Math.floor(Math.random() * 2000) obj.num = Math.floor(Math.random() * 2000)
temp.push(obj) temp.push(obj)
} }

32
src/views/wmsInventoryManagement/inventoryQuery.vue
View File

@ -7,6 +7,8 @@
:height="tableH" :height="tableH"
:table-config="tableProps" :table-config="tableProps"
:table-data="list" :table-data="list"
:is-loading="listLoading"
@clickTopBtn="clickTopBtn"
/> />
<pagination <pagination
v-show="total > 0" v-show="total > 0"
@ -22,8 +24,6 @@ import HeadForm from '@/components/basicData/HeadForm'
import BaseTable from '@/components/BaseTable' import BaseTable from '@/components/BaseTable'
import Pagination from '@/components/Pagination' import Pagination from '@/components/Pagination'
import { tableHeight } from '@/utils/index' import { tableHeight } from '@/utils/index'
import { getProductSpecList, getMaterialCodeList, getTrayList, getHWList, getBatchList, getGoodsList } from '@/utils/wmsDic'
import moment from 'moment'
const tableProps = [ const tableProps = [
{ {
prop: 'productName', prop: 'productName',
@ -63,8 +63,7 @@ const tableProps = [
}, },
{ {
prop: 'batch', prop: 'batch',
label: '批次号', label: '批次号'
minWidth: 200
}, },
{ {
prop: 'num', prop: 'num',
@ -124,19 +123,22 @@ export default {
getList() { getList() {
const temp = [] const temp = []
const num = 20 const num = 20
const spcList = ['50*50m', '100*50m', '100*100m', '70*100m', '100*120m']
const statusList = ['已分配', '未分配', '状态1', '状态2', '状态3']
const storeAreaList = ['A区', 'B区', 'C区', 'D区', 'E区']
for (let i = 0; i < num; i++) { for (let i = 0; i < num; i++) {
const obj = {} const obj = {}
obj.productName = getGoodsList() obj.productName = i + 1
const sj = Math.floor(Math.random() * 720 + 10) const sj = Math.floor(Math.random() * 5)
obj.spec = getProductSpecList() obj.spec = spcList[sj]
obj.status = parseInt(Math.random() * 2) ? '已分配' : '未分配' obj.status = statusList[sj]
obj.materialCode = getMaterialCodeList() obj.materialCode = '20314655' + i
obj.goodsArea = getHWList() obj.storeArea = storeAreaList[sj]
obj.storeArea = obj.goodsArea[2] + '区' obj.goodsArea = '1-1-' + i
obj.trayID = getTrayList() obj.trayID = '10210' + i
obj.productionTime = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss') obj.productionTime = '2022-10-' + (i + 2)
obj.validityTime = parseInt(sj / 5) + '个月' obj.validityTime = Math.floor(Math.random() * 36) + '个月'
obj.batch = getBatchList() obj.batch = '202210255643' + i
obj.num = Math.floor(Math.random() * 2000) obj.num = Math.floor(Math.random() * 2000)
temp.push(obj) temp.push(obj)
} }

17
src/views/wmsInventoryManagement/locationQuery.vue
View File

@ -24,7 +24,6 @@ import HeadForm from '@/components/basicData/HeadForm'
import BaseTable from '@/components/BaseTable' import BaseTable from '@/components/BaseTable'
import Pagination from '@/components/Pagination' import Pagination from '@/components/Pagination'
import { tableHeight } from '@/utils/index' import { tableHeight } from '@/utils/index'
import { getHWList, getStoreList } from '@/utils/wmsDic'
const tableProps = [ const tableProps = [
{ {
prop: 'goodsAreaCode', prop: 'goodsAreaCode',
@ -114,14 +113,14 @@ export default {
const num = 20 const num = 20
for (let i = 0; i < num; i++) { for (let i = 0; i < num; i++) {
const obj = {} const obj = {}
obj.goodsAreaCode = getHWList() obj.goodsAreaCode = '3200101' + i
obj.goodsAreaName = obj.goodsAreaCode obj.goodsAreaName = '3200101' + i
obj.goodsAreaStatus = parseInt(Math.random() * 2) ? '有货' : '无货' obj.goodsAreaStatus = i + 1
obj.roadway = '巷道' + Math.floor(Math.random() * 15 + 1) obj.roadway = Math.floor(Math.random() * 5 + 1)
obj.storeArea = obj.goodsAreaCode[2] + '区' obj.storeArea = i
obj.store = getStoreList() obj.store = i
obj.warehousingLock = parseInt(Math.random() * 2) ? 'Y' : 'N' obj.warehousingLock = i
obj.outboundLock = parseInt(Math.random() * 2) ? 'Y' : 'N' obj.outboundLock = i
temp.push(obj) temp.push(obj)
} }
this.list = temp this.list = temp

22
src/views/wmsInventoryManagement/stockTaking.vue
View File

@ -24,8 +24,6 @@ import HeadForm from '@/components/basicData/HeadForm'
import BaseTable from '@/components/BaseTable' import BaseTable from '@/components/BaseTable'
import Pagination from '@/components/Pagination' import Pagination from '@/components/Pagination'
import { tableHeight } from '@/utils/index' import { tableHeight } from '@/utils/index'
import { getInventoryNoList, getMaterialCodeList, getProductSpecList, getTrayList, getNameList, getGoodsList } from '@/utils/wmsDic'
import moment from 'moment'
const tableProps = [ const tableProps = [
{ {
prop: 'inventoryNumber', prop: 'inventoryNumber',
@ -117,18 +115,20 @@ export default {
getList() { getList() {
const temp = [] const temp = []
const num = 20 const num = 20
const spcList = ['50*50m', '100*50m', '100*100m', '70*100m', '100*120m']
const nameList = ['张明', '李燕', '王一', '张强', '王四']
for (let i = 0; i < num; i++) { for (let i = 0; i < num; i++) {
const obj = {} const obj = {}
obj.inventoryNumber = getInventoryNoList() obj.inventoryNumber = '200101' + i
obj.productName = getGoodsList() obj.productName = i + 1
obj.spec = getProductSpecList()
obj.materialCode = getMaterialCodeList()
obj.trayID = getTrayList()
obj.num = Math.floor(Math.random() * 2000)
obj.takeNum = parseInt(Math.random() * 2) ? obj.num + Math.floor(Math.random() * 20 - 10) : obj.num
const sj = Math.floor(Math.random() * 5) const sj = Math.floor(Math.random() * 5)
obj.takeTime = moment().add(sj, 'days').add(sj, 'hour').add(sj, 'minutes').add(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss') obj.spec = spcList[sj]
obj.operator = getNameList() obj.materialCode = '20314655' + i
obj.trayID = '1020' + i
obj.num = Math.floor(Math.random() * 2000)
obj.takeNum = Math.floor(Math.random() * 2000)
obj.takeTime = '2022-10-' + (i + 2)
obj.operator = nameList[sj]
temp.push(obj) temp.push(obj)
} }
this.list = temp this.list = temp

17
src/views/wmsOutStore/outStoreDocuments.vue
View File

@ -36,8 +36,6 @@ 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 { getOutboundNoList, getHCQList, getProductSpecList, getCompTyleList } from '@/utils/wmsDic'
import moment from 'moment'
const topBtnConfig = [ const topBtnConfig = [
{ {
type: 'add', type: 'add',
@ -129,15 +127,16 @@ export default {
getList() { getList() {
const temp = [] const temp = []
const num = 20 const num = 20
const spcList = ['50*50m', '100*50m', '100*100m', '70*100m', '100*120m']
for (let i = 0; i < num; i++) { for (let i = 0; i < num; i++) {
const obj = {} const obj = {}
obj.outboundOrderNo = getOutboundNoList() obj.outboundOrderNo = '1020' + i
obj.customerName = getCompTyleList() obj.customerName = '客户' + i
obj.shipmentCacheArea = getHCQList() obj.shipmentCacheArea = '20221020100' + i
obj.num = parseInt(Math.random() * 1000) obj.num = parseInt(Math.random() * 200 + 100)
obj.spec = getProductSpecList() const sj = Math.floor(Math.random() * 5)
const sj = Math.floor(Math.random() * 100) obj.spec = spcList[sj]
obj.deliveryTime = moment().add(sj, 'days').add(sj, 'hour').add(sj, 'minutes').add(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss') obj.deliveryTime = '2022-10-' + (i + 1)
temp.push(obj) temp.push(obj)
} }
this.list = temp this.list = temp

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

@ -34,7 +34,6 @@ 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'
const tableProps = [ const tableProps = [
{ {
prop: 'operationCode', prop: 'operationCode',
@ -132,18 +131,16 @@ export default {
const num = 20 const num = 20
for (let i = 0; i < num; i++) { for (let i = 0; i < num; i++) {
const obj = {} const obj = {}
const timeArrList = getTimeArr() obj.operationCode = '200101' + i
obj.operationCode = getOperationCode2List() obj.outboundOrderNo = '1020' + i
obj.outboundOrderNo = getOutboundNoList() obj.goodsArea = '1-1-' + i
obj.goodsArea = getHWList() obj.shipmentCacheArea = '20221020100' + i
obj.shipmentCacheArea = getHCQList() obj.startTime = '2022-10-' + (i + 1)
obj.startTime = timeArrList[0] obj.endTime = '2022-10-' + (i + 2)
obj.endTime = timeArrList[1] obj.driverCode = 'd20152' + i
obj.driverCode = getDriverCodeList()
temp.push(obj) temp.push(obj)
} }
this.list = temp this.list = temp
console.log(this.list)
this.total = num this.total = num
}, },
btnClick(val) { btnClick(val) {

30
src/views/wmsStatisticalReports/inventoryReport.vue
View File

@ -1,3 +1,11 @@
<!--/*
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditTime: 2022-04-15
* @LastEditors: juzi
* @Description: 拆分了搜索区和功能按钮区，增加了toptitle
*/
-->
<template> <template>
<div class="app-container"> <div class="app-container">
<head-form :form-config="headFormConfig" @headBtnClick="btnClick" /> <head-form :form-config="headFormConfig" @headBtnClick="btnClick" />
@ -10,6 +18,8 @@
:height="tableH" :height="tableH"
:table-config="tableProps" :table-config="tableProps"
:table-data="list" :table-data="list"
:is-loading="listLoading"
@clickTopBtn="clickTopBtn"
/> />
<pagination <pagination
v-show="total > 0" v-show="total > 0"
@ -26,8 +36,6 @@ import HeadForm from '@/components/basicData/HeadForm'
import BaseTable from '@/components/BaseTable' import BaseTable from '@/components/BaseTable'
import Pagination from '@/components/Pagination' import Pagination from '@/components/Pagination'
import { tableHeight } from '@/utils/index' import { tableHeight } from '@/utils/index'
import { getReceiptNoList, getProductSpecList, getMaterialCodeList, getGoodsList } from '@/utils/wmsDic'
import moment from 'moment'
const tableProps = [ const tableProps = [
{ {
prop: 'orderCode', prop: 'orderCode',
@ -111,16 +119,18 @@ export default {
getList() { getList() {
const temp = [] const temp = []
const num = 20 const num = 20
const spcList = ['50*50m', '100*50m', '100*100m', '70*100m', '100*120m']
for (let i = 0; i < num; i++) { for (let i = 0; i < num; i++) {
const obj = {} const obj = {}
obj.orderCode = getReceiptNoList() obj.orderCode = '20314655' + i
obj.type = '深加工玻璃' const sj = Math.floor(Math.random() * 5)
obj.productName = getGoodsList() obj.spec = spcList[sj]
const sj = Math.floor(Math.random() * 100) obj.materialCode = '20314655' + i
obj.spec = getProductSpecList() obj.productName = '10210' + i
obj.materialCode = getMaterialCodeList() obj.time = '2022-10-' + (i + 2)
obj.num = Math.floor(Math.random() * 2000 + 200) obj.type = Math.floor(Math.random() * 36) + '型'
obj.time = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss') obj.batch = '202210255643' + i
obj.num = Math.floor(Math.random() * 2000)
temp.push(obj) temp.push(obj)
} }
this.list = temp this.list = temp

20
src/views/wmsStatisticalReports/outStoreReport.vue
View File

@ -18,6 +18,8 @@
:height="tableH" :height="tableH"
:table-config="tableProps" :table-config="tableProps"
:table-data="list" :table-data="list"
:is-loading="listLoading"
@clickTopBtn="clickTopBtn"
/> />
<pagination <pagination
v-show="total > 0" v-show="total > 0"
@ -34,8 +36,6 @@ import HeadForm from '@/components/basicData/HeadForm'
import BaseTable from '@/components/BaseTable' import BaseTable from '@/components/BaseTable'
import Pagination from '@/components/Pagination' import Pagination from '@/components/Pagination'
import { tableHeight } from '@/utils/index' import { tableHeight } from '@/utils/index'
import { getOutboundNoList, getProductSpecList, getMaterialCodeList, getGoodsList } from '@/utils/wmsDic'
import moment from 'moment'
const tableProps = [ const tableProps = [
{ {
prop: 'orderCode', prop: 'orderCode',
@ -119,16 +119,18 @@ export default {
getList() { getList() {
const temp = [] const temp = []
const num = 20 const num = 20
const spcList = ['50*50m', '100*50m', '100*100m', '70*100m', '100*120m']
for (let i = 0; i < num; i++) { for (let i = 0; i < num; i++) {
const obj = {} const obj = {}
obj.orderCode = getOutboundNoList() obj.orderCode = '20314655' + i
obj.type = '深加工玻璃'
obj.productName = getGoodsList()
const sj = Math.floor(Math.random() * 5) const sj = Math.floor(Math.random() * 5)
obj.spec = getProductSpecList() obj.spec = spcList[sj]
obj.materialCode = getMaterialCodeList() obj.materialCode = '20314655' + i
obj.time = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss') obj.productName = '10210' + i
obj.num = Math.floor(Math.random() * 2000 + 200) obj.time = '2022-10-' + (i + 2)
obj.type = Math.floor(Math.random() * 36) + '型'
obj.batch = '202210255643' + i
obj.num = Math.floor(Math.random() * 2000)
temp.push(obj) temp.push(obj)
} }
this.list = temp this.list = temp

23
src/views/wmsSystemSettings/roleManagement.vue
View File

@ -35,6 +35,7 @@
</template> </template>
<script> <script>
import basicData from '@/filters/basicData'
import HeadForm from '@/components/basicData/HeadForm' import HeadForm from '@/components/basicData/HeadForm'
import i18n from '@/lang' import i18n from '@/lang'
const topBtnConfig = [ const topBtnConfig = [
@ -66,7 +67,8 @@ const tableProps = [{
}, { }, {
prop: 'enabled', prop: 'enabled',
label: i18n.t('roleManage.status'), label: i18n.t('roleManage.status'),
align: 'center' align: 'center',
filter: basicData('enableState')
}, },
// { // {
// prop: 'category', // prop: 'category',
@ -86,7 +88,6 @@ import BaseTable from '@/components/BaseTable'
import Pagination from '@/components/Pagination' import Pagination from '@/components/Pagination'
import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn' import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
import { getRoleCodeList, getRoleNameList } from '@/utils/wmsDic'
export default { export default {
name: 'RoleManagement', name: 'RoleManagement',
components: { Pagination, BaseTable, MethodBtn, AddForm, EditForm, HeadForm, menuEmpower }, components: { Pagination, BaseTable, MethodBtn, AddForm, EditForm, HeadForm, menuEmpower },
@ -150,18 +151,14 @@ export default {
} }
}, },
async getList() { async getList() {
const temp = [] this.list = [
const num = 10 {
for (let i = 0; i < num; i++) { id: 1,
const obj = {} name: '管理员',
obj.code = getRoleCodeList() code: 'R254815254',
obj.name = getRoleNameList()[i] enabled: 1
obj.enabled = parseInt(Math.random() * 2) ? '启用' : '禁用'
obj.remark = '无'
temp.push(obj)
} }
this.list = temp ]
this.total = num
}, },
// 新增 / 修改 // 新增 / 修改
addNew() { addNew() {