mt-ck-00a/mt-ck-wms-ui
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fzq #75

Merged
zwq merged 2 commits from fzq into develop 2022-03-18 15:03:47 +08:00
Conversation 0 Commits 2 Files Changed 9 +115 -40
9 changed files with 115 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lang/i18n/en/module/basicData.js
View File

@ -1,8 +1,8 @@
/*
* @Author: gtz
* @Date: 2021-03-04 16:13:51
* @LastEditors: zwq
* @LastEditTime: 2022-03-16 10:10:59
* @LastEditors: fzq
* @LastEditTime: 2022-03-18 14:03:12
* @Description: file content
*/
export default {
@ -31,7 +31,6 @@ export default {
Tips: 'Tips',
TipsBefore: 'Are you sure you want to delete',
TipsStorageBefore: 'Confirm to add location:',
PleaseAddLocationFirst: 'Please Add Location First!',
Description: 'Description',
Remarks: 'Remarks',
Yes: 'Yes',

34
src/lang/i18n/en/module/report.js
View File

@ -1,8 +1,8 @@
/*
* @Author: gtz
* @Date: 2021-04-22 19:48:46
* @LastEditors: gtz
* @LastEditTime: 2021-04-23 14:36:08
* @LastEditors: fzq
* @LastEditTime: 2022-03-18 14:50:00
* @Description: file content
*/
@ -11,7 +11,35 @@ export default {
reportName: 'Report name',
reportSort: 'Report Sort',
createTime: 'Create Date',
operation: 'Operation'
operation: 'Operation',
storageBoxNumber: 'StorageBox Number',
queryFiltering: 'Query Filtering',
storageBoxReport: 'StorageBoxReport'
},
inventory: {
code: 'Code',
status: 'Status',
inprocessCode: 'Inprocess Code',
nextprocessCode: 'Next Process Code',
currentLocation: 'Current Location',
storeTime: 'Store Time',
orderName: 'Order Name',
substrateDetails: 'Substrate Details',
viewSubstrates: 'View Substrates',
manual: 'Manual',
downl: 'Download'
},
substrate: {
substrateCode: 'SubstrateCode',
location: 'Location',
storeTime: 'Store Time',
substrateStatus: 'Substrate Status',
editSubstrate: 'Edit Substrate',
interCode: 'Inter Code',
subStorageStatus: 'Sub Storage Status',
load: 'Load',
unload: 'Unload',
machineHandID: 'Machine Hand ID'
},
reportSort: {
all: 'All'

6
src/lang/i18n/zh/module/basicData.js
View File

@ -1,9 +1,9 @@
/*
* @Author: gtz
* @Date: 2021-03-04 16:13:51
* @LastEditors: zwq
* @LastEditTime: 2022-03-16 10:10:43
* @Description: file content
* @LastEditors: fzq
* @LastEditTime: 2022-03-18 14:56:18
* * @Description: file content
*/
export default {
visual: {

11
src/lang/i18n/zh/module/report.js
View File

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2021-04-22 19:48:46
* @LastEditors: fzq
* @LastEditTime: 2022-03-06 16:50:50
* @LastEditTime: 2022-03-18 14:49:43
* @Description: file content
*/
@ -13,7 +13,8 @@ export default {
createTime: '添加时间',
operation: '操作',
storageBoxNumber: '存储箱号',
queryFiltering: '查询过滤'
queryFiltering: '查询过滤',
storageBoxReport: '存储箱报表'
},
inventory: {
code: '存储箱号',
@ -34,7 +35,11 @@ export default {
storeTime: '入库时间',
substrateStatus: '基板状态',
editSubstrate: '编辑基板',
interCode: '内部编码'
interCode: '内部编码',
subStorageStatus: '存取状态',
load: '上片',
unload: '下片',
machineHandID: '机械手ID'
},
reportSort: {
all: '全部'

10
src/views/basicData/Cache/components/location-add.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: fzq
* @LastEditTime: 2022-03-15 09:45:30
* @LastEditTime: 2022-03-18 13:53:50
* @Description:
-->
<template>
@ -143,10 +143,11 @@ export default {
}],
listLoading: true,
listQuery: {
name: '',
current: 1,
size: 990,
shelfId: '',
id: ''
size: 20
// shelfId: '',
// id: ''
},
sheCode: this.$t('module.basicData.cache.sheCode'),
sheName: this.$t('module.basicData.cache.sheName'),
@ -188,6 +189,7 @@ export default {
this.listLoading = true
this.listQuery.name = key
// shelfId与查询参数id关联
console.log(this.listQuery)
this.listQuery.id = this.listQuery.shelfId
locationList(this.listQuery).then(response => {
if (response.data.records) {

1
src/views/basicData/Equipment/components/equipmentInfo-add.vue
View File

@ -586,6 +586,7 @@ export default {
})
})
} else {
console.log(data)
equipmentInfoAdd(data).then(res => {
this.$message({
message: this.$t('module.basicData.visual.success'),

5
src/views/report-manage/CurrentInventory.vue
View File

@ -4,7 +4,7 @@
* @Author: fzq
* @Date: 2022-03-04 20:54:54
* @LastEditors: fzq
* @LastEditTime: 2022-03-07 09:46:36
* @LastEditTime: 2022-03-18 14:55:13
-->
<template>
<div class="app-container">
@ -198,7 +198,8 @@ export default {
let fileName = ''
const contentDisposition = res.headers['content-disposition']
if (contentDisposition) {
fileName = contentDisposition.slice(contentDisposition.indexOf('filename=') + 9)
// fileName = contentDisposition.slice(contentDisposition.indexOf('filename=') + 9)
fileName = this.$t('module.report.reportList.storageBoxReport') + '.xlsx'
}
const blob = new Blob([res.data])
const reader = new FileReader()

60
src/views/report-manage/components/edit-substrate.vue
View File

@ -4,7 +4,7 @@
* @Author: fzq
* @Date: 2022-03-05 17:45:46
* @LastEditors: fzq
* @LastEditTime: 2022-03-16 16:11:55
* @LastEditTime: 2022-03-18 14:46:26
-->
<template>
<!-- <el-dialog
@ -19,17 +19,33 @@
<el-form-item :label="$t('module.report.substrate.substrateCode')" prop="substrateCode">
<el-input v-model="dataForm.substrateCode" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.substrateCode')])" clearable />
</el-form-item>
<el-form-item :label="$t('module.report.substrate.location')" prop="location">
<el-input v-model="dataForm.location" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.location')])" clearable />
<el-form-item :label="$t('module.report.substrate.location')" prop="locationName">
<el-input v-model="dataForm.locationName" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.location')])" clearable />
</el-form-item>
<el-form-item :label="$t('module.report.substrate.storeTime')" prop="storeTime">
<el-input v-model="dataForm.storeTime" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.storeTime')])" clearable />
</el-form-item>
<el-form-item :label="$t('module.report.substrate.substrateStatus')" prop="substrateStatus">
<el-input v-model="dataForm.substrateStatus" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.substrateStatus')])" clearable />
<el-form-item :label="$t('module.report.substrate.substrateStatus')" prop="status">
<el-input v-model="dataForm.status" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.substrateStatus')])" clearable />
</el-form-item>
<el-form-item :label="$t('module.report.substrate.interCode')" prop="interCode">
<!-- <el-form-item :label="$t('module.report.substrate.interCode')" prop="interCode">
<el-input v-model="dataForm.interCode" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.interCode')])" clearable />
</el-form-item> -->
<!-- <el-form-item :label="$t('module.report.substrate.subStorageStatus')" prop="subStorageStatus">
<el-input v-model="dataForm.subStorageStatus" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.subStorageStatus')])" clearable />
</el-form-item> -->
<el-form-item :label="$t('module.report.substrate.subStorageStatus')" prop="subStorageStatus">
<el-select v-model="dataForm.subStorageStatus" :placeholder="this.$t('module.report.substrate.subStorageStatus')" default>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('module.report.substrate.machineHandID')" prop="machineHandID">
<el-input v-model="dataForm.machineHandID" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.machineHandID')])" clearable />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@ -56,7 +72,7 @@ export default {
visible: false,
dataForm: {
// substrateCode: '',
// location: '',
// locationName: '',
// storeTime: '',
// substrateStatus: '',
// code: '',
@ -68,9 +84,19 @@ export default {
// size: 10,
// locationStorageSubID: ''
},
options: [
{
value: 1,
label: this.$t('module.report.substrate.load')
},
{
value: 2,
label: this.$t('module.report.substrate.unload')
}
],
list: {
id: '',
location: '',
locationName: '',
storeTime: '',
substrateCode: '',
substrateStatus: ''
@ -78,12 +104,6 @@ export default {
dataRule: {
substrateCode: [
{ required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.report.substrate.substrateCode')]), trigger: 'blur' }
],
code: [
{ required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.report.substrate.substrateCode')]), trigger: 'blur' }
],
interCode: [
{ required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.report.substrate.substrateCode')]), trigger: 'blur' }
]
}
}
@ -135,13 +155,15 @@ export default {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
const data = {
'substrateStatus': this.dataForm.substrateStatus,
'status': this.dataForm.status,
'storeTime': this.dataForm.storeTime,
'id': this.dataForm.id,
'code': this.dataForm.substrateCode,
'location': this.dataForm.location,
'interCode': this.dataForm.interCode,
'storageBoxFid': this.dataForm.storageBoxFid
'substrateCode': this.dataForm.substrateCode,
'locationName': this.dataForm.locationName,
// 'interCode': this.dataForm.interCode,
'storageBoxFid': this.dataForm.storageBoxFid,
'machineHandID': this.dataForm.machineHandID,
'subStorageStatus': this.dataForm.subStorageStatus
}
console.log(data)
updateSubstrate(data).then(res => {

23
src/views/report-manage/components/viewSubstrate.vue
View File

@ -4,7 +4,7 @@
* @Author: fzq
* @Date: 2022-03-05 15:55:45
* @LastEditors: fzq
* @LastEditTime: 2022-03-16 16:09:15
* @LastEditTime: 2022-03-18 14:39:56
-->
<template>
<div class="app-container">
@ -71,7 +71,7 @@ const tableProps = [
align: 'center'
},
{
prop: 'location',
prop: 'locationName',
label: i18n.t('module.report.substrate.location'),
align: 'center'
},
@ -81,9 +81,19 @@ const tableProps = [
align: 'center'
},
{
prop: 'substrateStatus',
prop: 'status',
label: i18n.t('module.report.substrate.substrateStatus'),
align: 'center'
},
{
prop: 'subStorageStatusName',
label: i18n.t('module.report.substrate.subStorageStatus'),
align: 'center'
},
{
prop: 'machineHandID',
label: i18n.t('module.report.substrate.machineHandID'),
align: 'center'
}
]
@ -161,6 +171,13 @@ export default {
// console.log(response)
if (response.data) {
this.list = response.data
for (var x = 0; x < this.list.length; x++) {
if (this.list[x].subStorageStatus === 1) {
this.list[x].subStorageStatusName = this.$t('module.report.substrate.load')
} else if (this.list[x].subStorageStatus === 2) {
this.list[x].subStorageStatusName = this.$t('module.report.substrate.unload')
}
}
console.log(this.list)
} else {
this.list.splice(0, this.list.length)