mt-ck-00a/mt-ck-wms-ui
8
0
Fork 0
程式碼 問題 合併請求 版本發布 Wiki 動態

'工序库位+报表'

瀏覽代碼
此提交包含在：
Fanzink
2022-03-06 19:36:26 +08:00
父節點 82f44b5a62
當前提交 97997681a2
共有 14 個檔案被更改，包括 376 行新增 和 193 行删除
下載 Patch 檔 下載差異檔 展開所有檔案 折疊所有檔案

48
src/api/basicData/Cache/processLocation.js 一般檔案
查看文件

@@ -0,0 +1,48 @@
/*
* @Descripttion:
* @version:
* @Author: fzq
* @Date: 2022-03-06 18:13:49
* @LastEditors: fzq
* @LastEditTime: 2022-03-06 18:29:43
*/
import request from '@/utils/request'
export function list(data) { // 获取工序库位信息列表
return request({
url: '/api/wms/processlocation/page',
method: 'post',
data
})
}
export function detail(id) { // 获取工序库位信息单条数据
return request({
url: '/api/wms/processlocation/getById',
method: 'post',
data: { id }
})
}
export function update(data) { // 更新工序库位信息单条数据
return request({
url: '/api/wms/processlocation/update',
method: 'post',
data
})
}
export function add(data) { // 手动绑定工序库位
return request({
url: '/api/wms/processlocation/add',
method: 'post',
data
})
}
export function locaDelete(id) { // 删除工序库位信息单条数据
return request({
url: '/api/wms/processlocation/delete',
method: 'post',
data: { id }
})
}

5
src/api/report-manage/report.js
查看文件

@@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2021-03-07 18:39:03
* @LastEditors: fzq
* @LastEditTime: 2022-03-05 17:05:03
* @LastEditTime: 2022-03-06 19:27:01
* @Description: file content
*/
import request from '@/utils/request'
@@ -27,7 +27,8 @@ export function download(data) {
return request({
url: '/api/report/report-storage-box/excel-download',
method: 'post',
data
data,
'responseType': 'arraybuffer'
})
}

10
src/lang/i18n.js
查看文件

@@ -594,14 +594,14 @@ export default {
},
process: {
zh: '工序信息',
en: 'Process Info',
en: 'ProcessLocation Info',
processInfo: {
zh: '工序信息',
en: 'Process Info'
zh: '工序库位信息',
en: 'ProcessLocation Info'
},
processInfoAdd: {
zh: '工序信息管理',
en: 'Process Manage'
zh: '工序库位信息管理',
en: 'ProcessLocation Manage'
}
},
equipment: {

10
src/lang/i18n/zh/module/basicData.js
查看文件

@@ -3,7 +3,7 @@
* @Date: 2021-03-04 16:13:51
<<<<<<< HEAD
* @LastEditors: fzq
* @LastEditTime: 2022-03-03 19:52:51
* @LastEditTime: 2022-03-06 18:40:17
=======
* @LastEditors: zwq
* @LastEditTime: 2022-03-04 10:13:41
@@ -251,6 +251,14 @@ export default {
manual: '手动',
workOrderId: '工单名称'
},
processLocation: {
sequence: '顺序',
locationName: '库位名',
isProcess: '是否为工序准备箱',
locationId: '库位ID',
workSequenId: '工序ID',
equipmentMark: '设备标记'
},
productPool: {
productName: '产品名称',
productCode: '产品编码'

9
src/lang/i18n/zh/module/report.js
查看文件

@@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2021-04-22 19:48:46
* @LastEditors: fzq
* @LastEditTime: 2022-03-05 18:24:15
* @LastEditTime: 2022-03-06 16:50:50
* @Description: file content
*/
@@ -24,14 +24,17 @@ export default {
storeTime: '存放时间',
orderName: '工单名',
substrateDetails: '详情基板',
viewSubstrates: '查看基板'
viewSubstrates: '查看基板',
manual: '使用流程',
downl: '导出'
},
substrate: {
substrateCode: '基板编码',
location: '当前位置',
storeTime: '入库时间',
substrateStatus: '基板状态',
editSubstrate: '编辑基板'
editSubstrate: '编辑基板',
interCode: '内部编码'
},
reportSort: {
all: '全部'

1
src/router/index.js
查看文件

@@ -159,7 +159,6 @@ export const constantRoutes = [
path: 'processInfo',
component: () => import('@/views/basicData/Process/processInfo'),
name: 'processInfo',
hidden: true,
meta: { title: routerTitle.basicData.process.processInfo?.[language] || routerTitle.basicData.process.processInfo.en, icon: 'form', affix: true, required: true, requireToken: true }
},
{

107
src/views/basicData/Process/components/processInfo-add.vue
查看文件

@@ -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',

52
src/views/basicData/Process/processInfo.vue
查看文件

@@ -4,7 +4,7 @@
* @Author: fzq
* @Date: 2022-03-03 09:51:25
* @LastEditors: fzq
* @LastEditTime: 2022-03-03 10:06:26
* @LastEditTime: 2022-03-06 19:15:25
-->
<template>
<div class="app-container">
@@ -45,9 +45,8 @@ import BaseTable from '@/components/BaseTable'
import processInfoAdd from './components/processInfo-add'
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
import { storageBoxList, storageBoxDelete } from '@/api/basicData/Cache/storageBox'
import { list, locaDelete } from '@/api/basicData/Cache/processLocation'
import { timeFormatter } from '@/filters'
import basicData from '@/filters/basicData'
/**
* 表格表头配置项 TypeScript接口注释
* tableConfig<ConfigItem> = []
@@ -82,29 +81,33 @@ const tableProps = [
align: 'center'
},
{
prop: 'storageBoxName',
label: i18n.t('module.basicData.storageBox.name'),
prop: 'sequence',
label: i18n.t('module.basicData.processLocation.sequence'),
align: 'center'
},
{
prop: 'code',
label: i18n.t('module.basicData.storageBox.code'),
prop: 'locationName',
label: i18n.t('module.basicData.processLocation.locationName'),
align: 'center'
},
{
prop: 'enName',
label: i18n.t('module.basicData.visual.EnglishName'),
prop: 'isProcess',
label: i18n.t('module.basicData.processLocation.isProcess'),
align: 'center'
},
{
prop: 'status',
label: i18n.t('module.basicData.storageBox.status'),
filter: basicData('storage'),
prop: 'locationId',
label: i18n.t('module.basicData.processLocation.locationId'),
align: 'center'
},
{
prop: 'note',
label: i18n.t('module.basicData.storageBox.remark'),
prop: 'workSequenId',
label: i18n.t('module.basicData.processLocation.workSequenId'),
align: 'center'
},
{
prop: 'equipmentMark',
label: i18n.t('module.basicData.processLocation.equipmentMark'),
align: 'center'
}
]
@@ -126,7 +129,7 @@ export default {
return {
addOrUpdateVisible: false,
keyName: i18n.t('module.basicData.visual.keyword'),
placeholderName: this.$t('module.basicData.storageBox.name') + this.$t('module.basicData.visual.Or') + this.$t('module.basicData.storageBox.code'),
placeholderName: i18n.t('module.basicData.processLocation.locationName'),
tableBtn,
trueWidth: 200,
tableProps,
@@ -136,7 +139,10 @@ export default {
listLoading: true,
listQuery: {
current: 1,
size: 10
size: 10,
locationId: '',
workSequenId: '',
locationName: ''
}
}
},
@@ -146,12 +152,13 @@ export default {
methods: {
handleClick(raw) {
if (raw.type === 'delete') {
this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.storageBoxName}]?`, this.$t('module.basicData.visual.Tips'), {
this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.locationName}]?`, this.$t('module.basicData.visual.Tips'), {
confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
type: 'warning'
}).then(() => {
storageBoxDelete(raw.data.id).then(response => {
console.log(raw.data)
locaDelete(raw.data.id).then(response => {
this.$message({
message: this.$t('module.basicData.visual.success'),
type: 'success',
@@ -163,21 +170,22 @@ export default {
})
}).catch(() => {})
} else if (raw.type === 'edit') {
this.addNew(raw.data.id)
this.addNew(raw.data.locationId)
} else {
this.addNew(raw.data.id, true)
this.addNew(raw.data.locationId, true)
}
},
getList(key) {
this.listLoading = true
this.listQuery.storageBoxName = key
storageBoxList(this.listQuery).then(response => {
this.listQuery.locationName = key
list(this.listQuery).then(response => {
if (response.data.records) {
this.list = response.data.records
} else {
this.list.splice(0, this.list.length)
}
this.total = response.data.total
console.log(response)
this.listLoading = false
})
},

136
src/views/report-manage/CurrentEmptyBox.vue
查看文件

@@ -4,15 +4,15 @@
* @Author: fzq
* @Date: 2022-03-04 20:54:54
* @LastEditors: fzq
* @LastEditTime: 2022-03-04 21:09:44
* @LastEditTime: 2022-03-06 16:37:29
-->
<template>
<div class="app-container">
<head-form
:placeholder-name="placeholderName"
:key-name="keyName"
:show-add="false"
@getDataList="getList"
@add="addNew"
/>
<base-table
:page="listQuery.current"
@@ -21,12 +21,12 @@
:table-data="list"
:is-loading="listLoading"
>
<method-btn
<!-- <method-btn
slot="handleBtn"
:width="trueWidth"
:method-list="tableBtn"
@clickBtn="handleClick"
/>
/> -->
</base-table>
<pagination
v-show="total > 0"
@@ -43,10 +43,7 @@
import HeadForm from '@/components/basicData/HeadForm'
import BaseTable from '@/components/BaseTable'
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
import { storageBoxList, storageBoxDelete } from '@/api/basicData/Cache/storageBox'
import { timeFormatter } from '@/filters'
import basicData from '@/filters/basicData'
import { list } from '@/api/report-manage/report'
/**
* 表格表头配置项 TypeScript接口注释
* tableConfig<ConfigItem> = []
@@ -74,43 +71,41 @@ const tableBtn = [
}
]
const tableProps = [
{
prop: 'createTime',
label: i18n.t('module.basicData.factory.createTime'),
filter: timeFormatter,
align: 'center'
},
{
prop: 'storageBoxName',
label: i18n.t('module.basicData.storageBox.name'),
align: 'center'
},
{
prop: 'code',
label: i18n.t('module.basicData.storageBox.code'),
align: 'center'
},
{
prop: 'enName',
label: i18n.t('module.basicData.visual.EnglishName'),
label: i18n.t('module.report.inventory.code'),
align: 'center'
},
{
prop: 'status',
label: i18n.t('module.basicData.storageBox.status'),
filter: basicData('storage'),
label: i18n.t('module.report.inventory.status'),
align: 'center'
},
{
prop: 'note',
label: i18n.t('module.basicData.storageBox.remark'),
prop: 'inprocessCode',
label: i18n.t('module.report.inventory.inprocessCode'),
align: 'center'
},
{
prop: 'currentLocation',
label: i18n.t('module.report.inventory.currentLocation'),
align: 'center'
},
{
prop: 'storeTime',
label: i18n.t('module.report.inventory.storeTime'),
align: 'center'
},
{
prop: 'manual',
label: i18n.t('module.report.inventory.manual'),
align: 'center'
}
]
export default {
name: 'Area',
components: { Pagination, BaseTable, MethodBtn, HeadForm },
name: 'Inventory',
components: { Pagination, BaseTable, HeadForm },
filters: {
statusFilter(status) {
const statusMap = {
@@ -124,13 +119,12 @@ export default {
data() {
return {
addOrUpdateVisible: false,
keyName: i18n.t('module.basicData.visual.keyword'),
placeholderName: this.$t('module.basicData.storageBox.name') + this.$t('module.basicData.visual.Or') + this.$t('module.basicData.storageBox.code'),
keyName: i18n.t('module.report.reportList.storageBoxNumber'),
placeholderName: this.$t('module.report.reportList.queryFiltering'),
tableBtn,
trueWidth: 200,
tableProps,
list: [],
areaList: [],
total: 0,
listLoading: true,
listQuery: {
@@ -143,50 +137,52 @@ export default {
this.getList()
},
methods: {
handleClick(raw) {
if (raw.type === 'delete') {
this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.storageBoxName}]?`, this.$t('module.basicData.visual.Tips'), {
confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
type: 'warning'
}).then(() => {
storageBoxDelete(raw.data.id).then(response => {
this.$message({
message: this.$t('module.basicData.visual.success'),
type: 'success',
duration: 1500,
onClose: () => {
this.getList()
}
})
})
}).catch(() => {})
} else if (raw.type === 'edit') {
this.addNew(raw.data.id)
} else {
this.addNew(raw.data.id, true)
}
},
// handleClick(raw) {
// if (raw.type === 'delete') {
// this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.storageBoxName}]?`, this.$t('module.basicData.visual.Tips'), {
// confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
// cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
// type: 'warning'
// }).then(() => {
// storageBoxDelete(raw.data.id).then(response => {
// this.$message({
// message: this.$t('module.basicData.visual.success'),
// type: 'success',
// duration: 1500,
// onClose: () => {
// this.getList()
// }
// })
// })
// }).catch(() => {})
// } else if (raw.type === 'edit') {
// this.addNew(raw.data.id)
// } else {
// this.addNew(raw.data.id, true)
// }
// },
getList(key) {
this.listLoading = true
this.listQuery.storageBoxName = key
storageBoxList(this.listQuery).then(response => {
if (response.data.records) {
this.list = response.data.records
this.listQuery.code = key
console.log(this.listQuery)
list(this.listQuery).then(response => {
console.log(response)
if (response.data) {
this.list = response.data
} else {
this.list.splice(0, this.list.length)
}
this.total = response.data.total
// this.total = response.data.total
this.listLoading = false
})
},
// 新增 / 修改
addNew(id) {
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(id, true)
})
}
// 新增 / 修改
// addNew(id) {
// this.addOrUpdateVisible = true
// this.$nextTick(() => {
// this.$refs.addOrUpdate.init(id, true)
// })
// }
}
}
</script>

31
src/views/report-manage/CurrentInventory.vue
查看文件

@@ -4,7 +4,7 @@
* @Author: fzq
* @Date: 2022-03-04 20:54:54
* @LastEditors: fzq
* @LastEditTime: 2022-03-05 15:43:29
* @LastEditTime: 2022-03-06 19:32:34
-->
<template>
<div class="app-container">
@@ -13,6 +13,7 @@
:key-name="keyName"
:show-add="false"
@getDataList="getList"
@downl="downl"
/>
<base-table
:page="listQuery.current"
@@ -40,10 +41,10 @@
</template>
<script>import i18n from '@/lang'
import HeadForm from '@/components/basicData/HeadForm'
import HeadForm from './components/HeadForm'
import BaseTable from '@/components/BaseTable'
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
import { list } from '@/api/report-manage/report'
import { list, download } from '@/api/report-manage/report'
import substrateBtn from './components/substrateBtn.vue'
/**
* 表格表头配置项 TypeScript接口注释
@@ -141,7 +142,8 @@ export default {
listLoading: true,
listQuery: {
current: 1,
size: 10
size: 10,
enabled: 1
}
}
},
@@ -176,7 +178,7 @@ export default {
getList(key) {
this.listLoading = true
this.listQuery.code = key
console.log(this.listQuery)
// console.log(this.listQuery)
list(this.listQuery).then(response => {
console.log(response)
if (response.data) {
@@ -187,6 +189,25 @@ export default {
// this.total = response.data.total
this.listLoading = false
})
},
downl(key) {
this.listLoading = true
this.listQuery.code = key
// console.log(this.listQuery)
download(this.listQuery).then(res => {
console.log(res)
// const fileName = `${+new Date()}.xlsx`
// const blob = new Blob([res], { type: 'application/vnd.ms-excel;charset=utf-8' })
// if (navigator.msSaveBlob) {
// navigator.msSaveBlob(blob, fileName)
// } else {
// const link = document.createElement('a')
// link.href = URL.createObjectURL(blob)
// link.download = fileName
// link.click()
// URL.revokeObjectURL(link.href)
// }
})
}
// 新增 / 修改
// addNew(id) {

67
src/views/report-manage/components/HeadForm.vue 一般檔案
查看文件

@@ -0,0 +1,67 @@
<!--
* @Descripttion:
* @version:
* @Author: fzq
* @Date: 2022-03-06 17:06:51
* @LastEditors: fzq
* @LastEditTime: 2022-03-06 17:10:16
-->
<template>
<el-form :inline="true" @keyup.enter.native="getDataList()">
<el-form-item :label="keyName">
<el-input v-model="key" style="width:300px" :placeholder="placeholderName" clearable />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getDataList()">{{ 'btn.search' | i18nFilter }}</el-button>
<el-button v-if="showAdd" type="primary" @click="add()">{{ 'btn.add' | i18nFilter }}</el-button>
<el-button type="success" @click="downl()">{{ '导出' | i18nFilter }}</el-button>
</el-form-item>
</el-form>
</template>
<script>
import { string } from 'jszip/lib/support'
export default {
props: {
keyName: {
type: string,
default: () => {
return '关键字'
}
},
showAdd: {
type: Boolean,
default: () => {
return true
}
},
placeholderName: {
type: string,
default: () => {
return '请输入关键字'
}
}
},
data() {
return {
key: ''
}
},
methods: {
getDataList() {
this.$emit('getDataList', this.key)
},
add() {
this.$emit('add')
},
downl() {
this.$emit('downl', this.key)
}
}
}
</script>
<style>
</style>

81
src/views/report-manage/components/edit-substrate.vue
查看文件

@@ -4,7 +4,7 @@
* @Author: fzq
* @Date: 2022-03-05 17:45:46
* @LastEditors: fzq
* @LastEditTime: 2022-03-05 18:33:24
* @LastEditTime: 2022-03-06 16:46:54
-->
<template>
<!-- <el-dialog
@@ -20,7 +20,7 @@
<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('mmodule.report.substrate.location')])" clearable />
<el-input v-model="dataForm.location" :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 />
@@ -28,6 +28,9 @@
<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>
<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>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
@@ -56,27 +59,68 @@ export default {
substrateCode: '',
location: '',
storeTime: '',
substrateStatus: '',
code: '',
storageBoxId: '',
storageCode: '',
interCode: ''
},
list: {
id: '',
location: '',
storeTime: '',
substrateCode: '',
substrateStatus: ''
},
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' }
]
}
// dataRule: {
// name: [
// { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.cache.LocationName')]), trigger: 'blur' }
// ],
// code: [
// { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.cache.LocationCode')]), trigger: 'blur' }
// ]
// }
}
},
created() {
this.init()
},
methods: {
// init(id) {
// // this.dataForm.id = id || ''
// this.dataForm.storageBoxId = this.$route.query.id
// this.dataForm.storageCode = this.$route.query.code
// this.visible = true
// this.$nextTick(() => {
// this.$refs['dataForm'].resetFields()
// // console.log(this.dataForm)
// listSubstrate(this.dataForm).then(res => {
// this.dataForm.id = res.data.id
// this.dataForm.location = res.data.location
// this.dataForm.storeTime = res.data.storeTime
// this.dataForm.substrateCode = res.data.substrateCode
// this.dataForm.substrateStatus = res.data.substrateStatus
// // console.log(this.dataForm)
// })
// })
// },
init(id) {
this.dataForm.id = id || ''
// this.dataForm.id = id || ''
this.dataForm.storageBoxId = this.$route.query.id
this.dataForm.storageCode = this.$route.query.code
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
listSubstrate(this.dataForm.id).then(res => {
this.dataForm = res.data
})
listSubstrate(this.dataForm).then(res => {
console.log(res.data[0])
this.dataForm.id = res.data[0].id
this.dataForm.location = res.data[0].location
this.dataForm.storeTime = res.data[0].storeTime
this.dataForm.substrateCode = res.data[0].substrateCode
this.dataForm.substrateStatus = res.data[0].substrateStatus
this.dataForm.interCode = res.data[0].interCode
// console.log(this.dataForm)
})
},
// 表单提交
@@ -88,8 +132,11 @@ export default {
'storeTime': this.dataForm.storeTime,
'id': this.dataForm.id,
'substrateCode': this.dataForm.substrateCode,
'location': this.dataForm.location
'location': this.dataForm.location,
'interCode': this.dataForm.interCode,
'storageBoxId': this.dataForm.storageBoxId
}
console.log(data)
updateSubstrate(data).then(res => {
this.$message({
message: this.$t('module.basicData.visual.success'),

8
src/views/report-manage/components/viewSubstrate.vue
查看文件

@@ -4,7 +4,7 @@
* @Author: fzq
* @Date: 2022-03-05 15:55:45
* @LastEditors: fzq
* @LastEditTime: 2022-03-05 19:42:10
* @LastEditTime: 2022-03-05 19:44:47
-->
<template>
<div class="app-container">
@@ -162,9 +162,9 @@ export default {
// 新增 / 修改
addNew(id) {
this.addOrUpdateVisible = true
// this.$nextTick(() => {
// this.$refs.addOrUpdate.init(id)
// })
this.$nextTick(() => {
this.$refs.addOrUpdate.init(id)
})
},
goback() {
this.$router.go(-1)

4
vue.config.js
查看文件

@@ -46,9 +46,9 @@ module.exports = {
// 这里写入需要代理的api和对应的目标地址
proxy: {
'/api': {
target: 'http://192.168.1.36:8080',
// target: 'http://localhost:8080',
// target: 'http://192.168.0.148:8080',
// target: 'http://a.wms.picaiba.com/api',
target: 'http://a.wms.picaiba.com/api',
// target: 'http://192.168.0.127:8080',
// target: 'http://192.168.0.165:8080',
// target: 'http://192.168.43.105:8080',