'工序库位+报表'

This commit is contained in:
Fanzink
2022-03-06 19:36:26 +08:00
parent 82f44b5a62
commit 97997681a2
14 changed files with 376 additions and 193 deletions

View File

@@ -1,30 +1,34 @@
<!--
* @Descripttion:
* @version:
* @Author: fzq
* @Date: 2022-03-04 11:12:42
* @LastEditors: fzq
* @LastEditTime: 2022-03-06 19:17:36
-->
<template>
<el-dialog
:title="!dataForm.id ? 'btn.add' : 'btn.edit' | i18nFilter"
:title="!dataForm.locationId ? 'btn.add' : 'btn.edit' | i18nFilter"
:visible.sync="visible"
>
<el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="130px" @keyup.enter.native="dataFormSubmit()">
<el-form-item :label="$t('module.basicData.storageBox.name')" prop="storageBoxName">
<el-input v-model="dataForm.storageBoxName" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.storageBox.name')])" clearable />
<el-form ref="dataForm" :model="dataForm" label-width="130px" @keyup.enter.native="dataFormSubmit()">
<el-form-item :label="$t('module.basicData.processLocation.sequence')" prop="sequence">
<el-input v-model="dataForm.sequence" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.sequence')])" clearable />
</el-form-item>
<el-form-item :label="$t('module.basicData.storageBox.code')" prop="code">
<el-input v-model="dataForm.code" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.storageBox.code')])" clearable />
<el-form-item :label="$t('module.basicData.processLocation.workSequenId')" prop="workSequenId">
<el-input v-model="dataForm.workSequenId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.workSequenId')])" clearable />
</el-form-item>
<el-form-item :label="$t('module.basicData.visual.EnglishName')" prop="enName">
<el-input v-model="dataForm.enName" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.EnglishName')])" clearable />
<el-form-item :label="$t('module.basicData.processLocation.locationName')" prop="locationName">
<el-input v-model="dataForm.locationName" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.locationName')])" clearable />
</el-form-item>
<el-form-item :label="$t('module.basicData.storageBox.status')" prop="status">
<el-select v-model="dataForm.status" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.storageBox.status')])" clearable>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
<el-form-item :label="$t('module.basicData.processLocation.locationId')" prop="locationId">
<el-input v-model="dataForm.locationId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.locationId')])" clearable />
</el-form-item>
<el-form-item :label="$t('module.basicData.visual.Remarks')" prop="note">
<el-input v-model="dataForm.note" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable />
<el-form-item :label="$t('module.basicData.processLocation.isProcess')" prop="isProcess">
<el-input v-model="dataForm.isProcess" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.isProcess')])" clearable />
</el-form-item>
<el-form-item :label="$t('module.basicData.processLocation.equipmentMark')" prop="equipmentMark">
<el-input v-model="dataForm.equipmentMark" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.equipmentMark')])" clearable />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -35,7 +39,7 @@
</template>
<script>
import { storageBoxDetail, storageBoxUpdate, storageBoxAdd, storageBoxCode } from '@/api/basicData/Cache/storageBox'
import { detail, update, add } from '@/api/basicData/Cache/processLocation'
export default {
data() {
@@ -43,56 +47,37 @@ export default {
visible: false,
dataForm: {
id: 0,
storageBoxName: '',
code: '',
status: 0,
enName: '',
note: ''
sequence: '',
locationName: '',
isProcess: '',
equipmentMark: ''
},
options: [
{
value: 0,
label: '正常'
},
{
value: 1,
label: '维修中'
},
{
value: 2,
label: '报废'
}
],
dataRule: {
storageBoxName: [
{
required: true,
message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.storageBox.name')]),
trigger: 'blur' }
],
code: [
{
required: true,
message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.storageBox.code')]),
trigger: 'blur' }
]
listQuery: {
current: 1,
size: 10,
locationId: '',
workSequenId: '',
locationName: ''
}
}
},
methods: {
init(id) {
this.dataForm.id = id || ''
init(LocationId) {
this.listQuery.LocationId = LocationId || ''
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
storageBoxDetail(this.dataForm.id).then(res => {
if (this.listQuery.LocationId) {
// list(this.listQuery).then(res =>{
// this.list = response.data.records
// })
detail(this.dataForm.id).then(res => {
this.dataForm = res.data
})
} else {
storageBoxCode().then(res => {
this.dataForm.code = res.data
})
// storageBoxCode().then(res => {
// this.dataForm.code = res.data
// })
}
})
},
@@ -103,7 +88,7 @@ export default {
const data = this.dataForm
data.id = this.dataForm.id
if (this.dataForm.id) {
storageBoxUpdate(data).then(res => {
update(data).then(res => {
this.$message({
message: this.$t('module.basicData.visual.success'),
type: 'success',
@@ -115,7 +100,7 @@ export default {
})
})
} else {
storageBoxAdd(data).then(res => {
add(data).then(res => {
this.$message({
message: this.$t('module.basicData.visual.success'),
type: 'success',