Merge branch 'develop' into gtz
This commit is contained in:
commit
2351e96c9e
@ -1,8 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* @Author: gtz
|
* @Author: gtz
|
||||||
* @Date: 2021-03-04 16:13:51
|
* @Date: 2021-03-04 16:13:51
|
||||||
* @LastEditors: gtz
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-12 14:22:52
|
* @LastEditTime: 2022-03-14 10:58:20
|
||||||
* @Description: file content
|
* @Description: file content
|
||||||
*/
|
*/
|
||||||
export default {
|
export default {
|
||||||
@ -54,7 +54,8 @@ export default {
|
|||||||
editLocation: 'Edit Location Point',
|
editLocation: 'Edit Location Point',
|
||||||
location: 'Location',
|
location: 'Location',
|
||||||
locationTip: 'Click the picture below to select a point. After selecting a point, select a location in the pop-up box. If you do not select a location when adding a new point, you cannot select the next point. If you want to adjust the order of the points, drag the label at the bottom of the picture to the position you want to adjust. Click to confirm the submission point information and click Reset to reset the point information to the state when the pop-up box is opened',
|
locationTip: 'Click the picture below to select a point. After selecting a point, select a location in the pop-up box. If you do not select a location when adding a new point, you cannot select the next point. If you want to adjust the order of the points, drag the label at the bottom of the picture to the position you want to adjust. Click to confirm the submission point information and click Reset to reset the point information to the state when the pop-up box is opened',
|
||||||
locationInfo: 'Location Point Info'
|
locationInfo: 'Location Point Info',
|
||||||
|
storageCode: 'storageBoxCode'
|
||||||
},
|
},
|
||||||
factory: {
|
factory: {
|
||||||
placeholderName: 'Name Or Code',
|
placeholderName: 'Name Or Code',
|
||||||
@ -165,7 +166,10 @@ export default {
|
|||||||
addCacheArea: 'add Ports Shelf',
|
addCacheArea: 'add Ports Shelf',
|
||||||
warning: 'Layers and Columns must be integer!',
|
warning: 'Layers and Columns must be integer!',
|
||||||
logisticsEquipment: 'Logistics Equipment',
|
logisticsEquipment: 'Logistics Equipment',
|
||||||
processEquipment: 'Process Equipment'
|
processEquipment: 'Process Equipment',
|
||||||
|
sheCode: 'Shelf Code',
|
||||||
|
sheName: 'Shelf Name',
|
||||||
|
locaNum: 'Location Number'
|
||||||
},
|
},
|
||||||
storageBox: {
|
storageBox: {
|
||||||
name: 'Name',
|
name: 'Name',
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* @Author: gtz
|
* @Author: gtz
|
||||||
* @Date: 2021-03-04 16:13:51
|
* @Date: 2021-03-04 16:13:51
|
||||||
* @LastEditors: gtz
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-12 14:23:06
|
* @LastEditTime: 2022-03-14 10:58:12
|
||||||
*/
|
*/
|
||||||
export default {
|
export default {
|
||||||
visual: {
|
visual: {
|
||||||
@ -53,7 +53,8 @@ export default {
|
|||||||
editLocation: '编辑库位点',
|
editLocation: '编辑库位点',
|
||||||
location: '库位',
|
location: '库位',
|
||||||
locationTip: '点击下方图片选点,选点后在弹出框内选择库位,新增点位时未选择库位无法进行下一个选点,若想调整点位顺序可拖动图片下方的标签到你想调整的位置,点击确定提交点位信息,点击重置将点位信息重置到打开弹出框时的状态',
|
locationTip: '点击下方图片选点,选点后在弹出框内选择库位,新增点位时未选择库位无法进行下一个选点,若想调整点位顺序可拖动图片下方的标签到你想调整的位置,点击确定提交点位信息,点击重置将点位信息重置到打开弹出框时的状态',
|
||||||
locationInfo: '库位点信息'
|
locationInfo: '库位点信息',
|
||||||
|
storageCode: '存储箱号'
|
||||||
},
|
},
|
||||||
factory: {
|
factory: {
|
||||||
placeholderName: '名称或编码',
|
placeholderName: '名称或编码',
|
||||||
@ -155,7 +156,10 @@ export default {
|
|||||||
status: '状态',
|
status: '状态',
|
||||||
warning: '行列标必须为整数!',
|
warning: '行列标必须为整数!',
|
||||||
logisticsEquipment: '物流设备',
|
logisticsEquipment: '物流设备',
|
||||||
processEquipment: '工艺设备'
|
processEquipment: '工艺设备',
|
||||||
|
sheCode: '货架编码',
|
||||||
|
sheName: '货架名',
|
||||||
|
locaNum: '库存数量'
|
||||||
},
|
},
|
||||||
storageBox: {
|
storageBox: {
|
||||||
name: '存储箱名称',
|
name: '存储箱名称',
|
||||||
|
@ -218,9 +218,9 @@ export const constantRoutes = [
|
|||||||
meta: { title: routerTitle.basicData.teamManage.staff?.[language] || routerTitle.basicData.teamManage.staff.en, icon: 'form', affix: true, required: true, requireToken: true }
|
meta: { title: routerTitle.basicData.teamManage.staff?.[language] || routerTitle.basicData.teamManage.staff.en, icon: 'form', affix: true, required: true, requireToken: true }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/dataDictionary',
|
path: '/DataDictionary',
|
||||||
component: () => import('@/views/basicData/index'),
|
component: () => import('@/views/basicData/index'),
|
||||||
name: 'dataDictionary',
|
name: 'DataDictionary',
|
||||||
meta: { title: routerTitle.basicData.dataDictionaryType.dataDictionary?.[language] || routerTitle.basicData.dataDictionaryType.dataDictionary.en, icon: 'form', affix: true, required: true, requireToken: true },
|
meta: { title: routerTitle.basicData.dataDictionaryType.dataDictionary?.[language] || routerTitle.basicData.dataDictionaryType.dataDictionary.en, icon: 'form', affix: true, required: true, requireToken: true },
|
||||||
children: [{
|
children: [{
|
||||||
path: 'dataDictionary',
|
path: 'dataDictionary',
|
||||||
@ -260,7 +260,7 @@ export const constantRoutes = [
|
|||||||
{
|
{
|
||||||
path: 'processList',
|
path: 'processList',
|
||||||
component: () => import('@/views/art/processList'),
|
component: () => import('@/views/art/processList'),
|
||||||
name: 'Process',
|
name: 'processList',
|
||||||
meta: { title: routerTitle.technology.processList?.[language] || routerTitle.technology.processList.en, icon: 'form', affix: true, required: true, requireToken: true }
|
meta: { title: routerTitle.technology.processList?.[language] || routerTitle.technology.processList.en, icon: 'form', affix: true, required: true, requireToken: true }
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -268,7 +268,7 @@ export const constantRoutes = [
|
|||||||
{
|
{
|
||||||
path: '/Warehouse',
|
path: '/Warehouse',
|
||||||
component: Layout,
|
component: Layout,
|
||||||
redirect: '/Warehouse/workOrderManage',
|
redirect: '/Warehouse/StorageBoxInfo',
|
||||||
name: 'Warehouse',
|
name: 'Warehouse',
|
||||||
meta: { title: routerTitle.Warehouse?.[language] || routerTitle.Warehouse.en, icon: 'form', iconPart: 'orderManage', affix: true, required: true, requireToken: true },
|
meta: { title: routerTitle.Warehouse?.[language] || routerTitle.Warehouse.en, icon: 'form', iconPart: 'orderManage', affix: true, required: true, requireToken: true },
|
||||||
children: [
|
children: [
|
||||||
@ -497,7 +497,7 @@ export const constantRoutes = [
|
|||||||
path: '/basic',
|
path: '/basic',
|
||||||
component: Layout,
|
component: Layout,
|
||||||
redirect: '/user/manager',
|
redirect: '/user/manager',
|
||||||
name: 'ArticleManager',
|
name: 'basic',
|
||||||
meta: { title: routerTitle.basic?.[language] || routerTitle.basic.en, icon: 'form', iconPart: 'ArticleManager', affix: true, required: true, requireToken: true },
|
meta: { title: routerTitle.basic?.[language] || routerTitle.basic.en, icon: 'form', iconPart: 'ArticleManager', affix: true, required: true, requireToken: true },
|
||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2020-12-29 15:41:11
|
* @Date: 2020-12-29 15:41:11
|
||||||
* @LastEditors: fzq
|
* @LastEditors: fzq
|
||||||
* @LastEditTime: 2022-03-10 21:00:58
|
* @LastEditTime: 2022-03-11 11:14:02
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -17,7 +17,7 @@
|
|||||||
@getDataList="getList"
|
@getDataList="getList"
|
||||||
@add="addNew"
|
@add="addNew"
|
||||||
/>
|
/>
|
||||||
<div style="title">货架编码:{{ shCode }} 货架名称:{{ shName }} 库存量:{{ num }}
|
<div style="title">{{ sheCode }}:{{ shCode }} {{ sheName }}:{{ shName }} {{ locaNum }}:{{ num }}
|
||||||
<el-button type="success" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
|
<el-button type="success" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
|
||||||
</div>
|
</div>
|
||||||
<base-table
|
<base-table
|
||||||
@ -102,11 +102,11 @@ const tableProps = [
|
|||||||
label: i18n.t('module.basicData.cache.columnMark'),
|
label: i18n.t('module.basicData.cache.columnMark'),
|
||||||
align: 'center'
|
align: 'center'
|
||||||
},
|
},
|
||||||
{
|
// {
|
||||||
prop: 'locationType',
|
// prop: 'locationType',
|
||||||
label: i18n.t('module.basicData.cache.locationType'),
|
// label: i18n.t('module.basicData.cache.locationType'),
|
||||||
align: 'center'
|
// align: 'center'
|
||||||
},
|
// },
|
||||||
{
|
{
|
||||||
prop: 'statusName',
|
prop: 'statusName',
|
||||||
label: i18n.t('module.basicData.cache.status'),
|
label: i18n.t('module.basicData.cache.status'),
|
||||||
@ -147,7 +147,10 @@ export default {
|
|||||||
size: 990,
|
size: 990,
|
||||||
shelfId: '',
|
shelfId: '',
|
||||||
id: ''
|
id: ''
|
||||||
}
|
},
|
||||||
|
sheCode: this.$t('module.basicData.cache.sheCode'),
|
||||||
|
sheName: this.$t('module.basicData.cache.sheName'),
|
||||||
|
locaNum: this.$t('module.basicData.cache.locaNum')
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2020-12-29 16:37:56
|
* @Date: 2020-12-29 16:37:56
|
||||||
* @LastEditors: fzq
|
* @LastEditors: fzq
|
||||||
* @LastEditTime: 2022-03-10 21:14:13
|
* @LastEditTime: 2022-03-11 11:03:31
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -26,9 +26,9 @@
|
|||||||
<el-form-item :label="$t('module.basicData.cache.columnMark')" prop="columns">
|
<el-form-item :label="$t('module.basicData.cache.columnMark')" prop="columns">
|
||||||
<el-input v-model="dataForm.columns" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.columnMark')])" clearable />
|
<el-input v-model="dataForm.columns" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.columnMark')])" clearable />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item :label="$t('module.basicData.cache.locationType')" prop="locationType">
|
<!-- <el-form-item :label="$t('module.basicData.cache.locationType')" prop="locationType">
|
||||||
<el-input v-model="dataForm.locationType" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.locationType')])" clearable />
|
<el-input v-model="dataForm.locationType" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.locationType')])" clearable />
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<!-- <el-form-item :label="$t('module.basicData.cache.status')" prop="status">
|
<!-- <el-form-item :label="$t('module.basicData.cache.status')" prop="status">
|
||||||
<el-input v-model="dataForm.status" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.status')])" clearable />
|
<el-input v-model="dataForm.status" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.status')])" clearable />
|
||||||
</el-form-item> -->
|
</el-form-item> -->
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2020-12-29 15:41:11
|
* @Date: 2020-12-29 15:41:11
|
||||||
* @LastEditors: gtz
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-12 14:21:37
|
* @LastEditTime: 2022-03-14 10:35:17
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -86,7 +86,7 @@ import i18n from '@/lang'
|
|||||||
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 { timeFormatter } from '@/filters'
|
||||||
/**
|
/**
|
||||||
* 表格表头配置项 TypeScript接口注释
|
* 表格表头配置项 TypeScript接口注释
|
||||||
* tableConfig<ConfigItem> = []
|
* tableConfig<ConfigItem> = []
|
||||||
@ -118,6 +118,7 @@ const tableProps = [
|
|||||||
{
|
{
|
||||||
prop: 'createTime',
|
prop: 'createTime',
|
||||||
label: i18n.t('module.basicData.Warehouse.ExecutionTime'),
|
label: i18n.t('module.basicData.Warehouse.ExecutionTime'),
|
||||||
|
filter: timeFormatter,
|
||||||
align: 'center'
|
align: 'center'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2020-12-29 15:41:11
|
* @Date: 2020-12-29 15:41:11
|
||||||
* @LastEditors: zwq
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-01-13 15:49:01
|
* @LastEditTime: 2022-03-14 10:37:13
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -44,7 +44,7 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item :label="$t('module.basicData.Warehouse.TimeSlot')" prop="time">
|
<!-- <el-form-item :label="$t('module.basicData.Warehouse.TimeSlot')" prop="time">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="formData.timeSlot"
|
v-model="formData.timeSlot"
|
||||||
type="daterange"
|
type="daterange"
|
||||||
@ -55,7 +55,7 @@
|
|||||||
:range-separator="$t('module.orderManage.order.To')"
|
:range-separator="$t('module.orderManage.order.To')"
|
||||||
clearable
|
clearable
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
|
<el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -92,7 +92,7 @@ import i18n from '@/lang'
|
|||||||
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 { timeFormatter } from '@/filters'
|
||||||
/**
|
/**
|
||||||
* 表格表头配置项 TypeScript接口注释
|
* 表格表头配置项 TypeScript接口注释
|
||||||
* tableConfig<ConfigItem> = []
|
* tableConfig<ConfigItem> = []
|
||||||
@ -124,31 +124,27 @@ const tableProps = [
|
|||||||
{
|
{
|
||||||
prop: 'createTime',
|
prop: 'createTime',
|
||||||
label: i18n.t('module.basicData.Warehouse.ExecutionTime'),
|
label: i18n.t('module.basicData.Warehouse.ExecutionTime'),
|
||||||
|
filter: timeFormatter,
|
||||||
align: 'center'
|
align: 'center'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'status',
|
prop: 'taskSource',
|
||||||
label: i18n.t('module.basicData.Warehouse.TaskStatus'),
|
label: i18n.t('module.basicData.Warehouse.TaskSource'),
|
||||||
align: 'center'
|
align: 'center'
|
||||||
},
|
},
|
||||||
// {
|
|
||||||
// prop: 'taskType',
|
|
||||||
// label: i18n.t('module.basicData.Warehouse.TaskType'),
|
|
||||||
// align: 'center'
|
|
||||||
// },
|
|
||||||
{
|
{
|
||||||
prop: 'name',
|
prop: 'taskType',
|
||||||
label: i18n.t('module.basicData.Warehouse.VehicleName'),
|
label: i18n.t('module.basicData.Warehouse.TaskType'),
|
||||||
align: 'center'
|
align: 'center'
|
||||||
},
|
},
|
||||||
// {
|
|
||||||
// prop: 'substrateNo',
|
|
||||||
// label: i18n.t('module.basicData.Warehouse.BoxStatus'),
|
|
||||||
// align: 'center'
|
|
||||||
// },
|
|
||||||
{
|
{
|
||||||
prop: 'wcode',
|
prop: 'fullCode',
|
||||||
label: i18n.t('module.basicData.Warehouse.BoxNumber'),
|
label: i18n.t('module.basicData.Warehouse.TaskBoxNumber'),
|
||||||
|
align: 'center'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
prop: 'emptyCode',
|
||||||
|
label: i18n.t('module.basicData.Warehouse.FullBoxNumber'),
|
||||||
align: 'center'
|
align: 'center'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -162,19 +158,24 @@ const tableProps = [
|
|||||||
align: 'center'
|
align: 'center'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'updateTime',
|
prop: 'anotherCurrLocation',
|
||||||
label: i18n.t('module.basicData.Warehouse.CompletionTime'),
|
|
||||||
align: 'center'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
prop: 'currLocation',
|
|
||||||
label: i18n.t('module.basicData.Warehouse.StartLocation'),
|
label: i18n.t('module.basicData.Warehouse.StartLocation'),
|
||||||
align: 'center'
|
align: 'center'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'targetLocation',
|
prop: 'anotherTargetLocation',
|
||||||
label: i18n.t('module.basicData.Warehouse.TargetLocation'),
|
label: i18n.t('module.basicData.Warehouse.TargetLocation'),
|
||||||
align: 'center'
|
align: 'center'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
prop: 'currLocation',
|
||||||
|
label: i18n.t('module.basicData.Warehouse.FullBoxStartLocation'),
|
||||||
|
align: 'center'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
prop: 'name',
|
||||||
|
label: i18n.t('module.basicData.Warehouse.VehicleName'),
|
||||||
|
align: 'center'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -194,9 +195,9 @@ export default {
|
|||||||
taskType: '',
|
taskType: '',
|
||||||
status: '',
|
status: '',
|
||||||
equipmentId: '',
|
equipmentId: '',
|
||||||
timeSlot: [],
|
// timeSlot: [],
|
||||||
endTime: '',
|
// endTime: '',
|
||||||
startTime: '',
|
// startTime: '',
|
||||||
current: 1,
|
current: 1,
|
||||||
size: 10
|
size: 10
|
||||||
},
|
},
|
||||||
@ -231,13 +232,13 @@ export default {
|
|||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
getList() {
|
getList() {
|
||||||
if (this.formData.timeSlot) {
|
// if (this.formData.timeSlot) {
|
||||||
this.formData.startTime = this.formData.timeSlot[0]
|
// this.formData.startTime = this.formData.timeSlot[0]
|
||||||
this.formData.endTime = this.formData.timeSlot[1]
|
// this.formData.endTime = this.formData.timeSlot[1]
|
||||||
} else {
|
// } else {
|
||||||
this.formData.startTime = ''
|
// this.formData.startTime = ''
|
||||||
this.formData.endTime = ''
|
// this.formData.endTime = ''
|
||||||
}
|
// }
|
||||||
this.listLoading = true
|
this.listLoading = true
|
||||||
HistoricalTaskList(this.formData).then(response => {
|
HistoricalTaskList(this.formData).then(response => {
|
||||||
if (response.data.records) {
|
if (response.data.records) {
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2020-12-29 15:41:11
|
* @Date: 2020-12-29 15:41:11
|
||||||
* @LastEditors: zwq
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-11 10:31:39
|
* @LastEditTime: 2022-03-14 10:35:21
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -15,9 +15,9 @@
|
|||||||
size="medium"
|
size="medium"
|
||||||
label-width="100px"
|
label-width="100px"
|
||||||
>
|
>
|
||||||
<el-form-item :label="$t('module.art.processList.processName')" prop="processId">
|
<el-form-item :label="$t('module.art.processList.processName')" prop="key">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="listQuery.processId"
|
v-model="listQuery.key"
|
||||||
:placeholder="$i18nForm(['placeholder.input', $t('module.art.processList.processName')])"
|
:placeholder="$i18nForm(['placeholder.input', $t('module.art.processList.processName')])"
|
||||||
clearable
|
clearable
|
||||||
filterable
|
filterable
|
||||||
@ -27,7 +27,7 @@
|
|||||||
v-for="(item, index) in processArr"
|
v-for="(item, index) in processArr"
|
||||||
:key="index"
|
:key="index"
|
||||||
:label="item.name"
|
:label="item.name"
|
||||||
:value="item.id"
|
:value="item.name"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -65,6 +65,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 { timeFormatter } from '@/filters'
|
||||||
/**
|
/**
|
||||||
* 表格表头配置项 TypeScript接口注释
|
* 表格表头配置项 TypeScript接口注释
|
||||||
* tableConfig<ConfigItem> = []
|
* tableConfig<ConfigItem> = []
|
||||||
@ -101,6 +102,7 @@ const tableProps = [
|
|||||||
{
|
{
|
||||||
prop: 'createTime',
|
prop: 'createTime',
|
||||||
label: i18n.t('module.art.eqName'),
|
label: i18n.t('module.art.eqName'),
|
||||||
|
filter: timeFormatter,
|
||||||
align: 'center'
|
align: 'center'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -131,7 +133,7 @@ export default {
|
|||||||
listQuery: {
|
listQuery: {
|
||||||
current: 1,
|
current: 1,
|
||||||
size: 10,
|
size: 10,
|
||||||
processId: ''
|
key: ''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2020-12-29 15:41:11
|
* @Date: 2020-12-29 15:41:11
|
||||||
* @LastEditors: zwq
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-01-18 14:30:25
|
* @LastEditTime: 2022-03-14 09:33:28
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -92,7 +92,7 @@ const tableProps = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'StorageBoxInfo',
|
name: 'ScrapInfo',
|
||||||
components: { Pagination, BaseTable },
|
components: { Pagination, BaseTable },
|
||||||
filters: {
|
filters: {
|
||||||
statusFilter(status) {
|
statusFilter(status) {
|
||||||
@ -123,15 +123,18 @@ export default {
|
|||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
this.getList()
|
this.getList()
|
||||||
const listQuery1 = {
|
this.init()
|
||||||
current: 1,
|
|
||||||
size: 100
|
|
||||||
}
|
|
||||||
StorageBoxRackCode(listQuery1).then(res => {
|
|
||||||
this.storageBoxList = res.data.records
|
|
||||||
})
|
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
init() {
|
||||||
|
const listQuery1 = {
|
||||||
|
current: 1,
|
||||||
|
size: 100
|
||||||
|
}
|
||||||
|
StorageBoxRackCode(listQuery1).then(res => {
|
||||||
|
this.storageBoxList = res.data.records
|
||||||
|
})
|
||||||
|
},
|
||||||
getList() {
|
getList() {
|
||||||
this.listLoading = true
|
this.listLoading = true
|
||||||
StorageBoxInfoList(this.listQuery).then(response => {
|
StorageBoxInfoList(this.listQuery).then(response => {
|
||||||
|
@ -2,12 +2,12 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2020-12-29 16:37:56
|
* @Date: 2020-12-29 16:37:56
|
||||||
* @LastEditors: zwq
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-04 11:05:23
|
* @LastEditTime: 2022-03-14 10:55:22
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
<el-dialog
|
<el-dialog
|
||||||
:title="'btn.see' | i18nFilter"
|
:title="$t('module.basicData.Warehouse.PerformTaskManual')"
|
||||||
:visible.sync="visible"
|
:visible.sync="visible"
|
||||||
>
|
>
|
||||||
<el-row :gutter="10">
|
<el-row :gutter="10">
|
||||||
@ -22,27 +22,66 @@
|
|||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item :label="$t('module.basicData.Warehouse.TaskBoxNumber')" prop="taskCode">
|
<el-form-item :label="$t('module.basicData.Warehouse.TaskBoxNumber')" prop="taskCode">
|
||||||
<el-input v-model="dataForm.taskCode" readonly :style="{width: '100%'}" />
|
<el-select
|
||||||
|
v-model="dataForm.taskCode"
|
||||||
|
:placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.StorageBoxNumber')])"
|
||||||
|
clearable
|
||||||
|
filterable
|
||||||
|
:style="{width: '100%'}"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="(item, index) in storageBoxList"
|
||||||
|
:key="index"
|
||||||
|
:label="item.code"
|
||||||
|
:value="item.code"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item :label="$t('module.basicData.Warehouse.FullBoxNumber')" prop="orderName">
|
<el-form-item :label="$t('module.basicData.Warehouse.FullBoxNumber')" prop="orderName">
|
||||||
<el-input v-model="dataForm.orderName" readonly :style="{width: '100%'}" />
|
<el-input v-model="dataForm.orderName" :style="{width: '100%'}" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item :label="$t('module.basicData.Warehouse.ExecutionOperation')" prop="fullCode">
|
<el-form-item :label="$t('module.basicData.Warehouse.ExecutionOperation')" prop="fullCode">
|
||||||
<el-input v-model="dataForm.fullCode" readonly :style="{width: '100%'}" />
|
<el-select
|
||||||
|
v-model="dataForm.fullCode"
|
||||||
|
:placeholder="$i18nForm(['placeholder.input', $t('module.art.processList.processName')])"
|
||||||
|
clearable
|
||||||
|
filterable
|
||||||
|
:style="{width: '100%'}"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="(item, index) in processArr"
|
||||||
|
:key="index"
|
||||||
|
:label="item.name"
|
||||||
|
:value="item.id"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item :label="$t('module.basicData.Warehouse.TaskStatus')" prop="name">
|
<el-form-item :label="$t('module.basicData.Warehouse.TaskStatus')" prop="TaskStatus">
|
||||||
<el-input v-model="dataForm.name" readonly :style="{width: '100%'}" />
|
<el-select
|
||||||
|
v-model="dataForm.TaskStatus"
|
||||||
|
:placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.TaskStatus')])"
|
||||||
|
clearable
|
||||||
|
filterable
|
||||||
|
:style="{width: '100%'}"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="(item, index) in TaskStatusArr"
|
||||||
|
:key="index"
|
||||||
|
:label="item.dataName"
|
||||||
|
:value="item.dataCode"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item :label="$t('module.basicData.ScrapInfo.remark')" prop="remark">
|
<el-form-item :label="$t('module.basicData.ScrapInfo.remark')" prop="remark">
|
||||||
<el-input v-model="dataForm.remark" readonly :style="{width: '100%'}" />
|
<el-input v-model="dataForm.remark" :style="{width: '100%'}" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
@ -51,26 +90,35 @@
|
|||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item :label="$t('module.basicData.Warehouse.TaskLocation')" prop="createTime">
|
<el-form-item :label="$t('module.basicData.Warehouse.TaskLocation')" prop="createTime">
|
||||||
<el-input v-model="dataForm.createTime" readonly :style="{width: '100%'}" />
|
<el-input v-model="dataForm.createTime" :style="{width: '100%'}" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item :label="$t('module.basicData.Warehouse.FullBoxStartLocation')" prop="taskType">
|
<el-form-item :label="$t('module.basicData.Warehouse.FullBoxStartLocation')" prop="taskType">
|
||||||
<el-input v-model="dataForm.taskType" readonly :style="{width: '100%'}" />
|
<el-input v-model="dataForm.taskType" :style="{width: '100%'}" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item :label="$t('module.basicData.Warehouse.Priority')" prop="emptyCode">
|
<el-form-item :label="$t('module.basicData.Warehouse.Priority')" prop="emptyCode">
|
||||||
<el-input v-model="dataForm.emptyCode" readonly :style="{width: '100%'}" />
|
<el-input v-model="dataForm.emptyCode" :style="{width: '100%'}" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item :label="$t('module.basicData.Warehouse.NextOperation')" prop="anotherCurrLocation">
|
<el-form-item :label="$t('module.basicData.Warehouse.NextOperation')" prop="anotherCurrLocation">
|
||||||
<el-input
|
<el-select
|
||||||
v-model="dataForm.anotherCurrLocation"
|
v-model="dataForm.anotherCurrLocation"
|
||||||
readonly
|
:placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.NextOperation')])"
|
||||||
|
clearable
|
||||||
|
filterable
|
||||||
:style="{width: '100%'}"
|
:style="{width: '100%'}"
|
||||||
/>
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="(item, index) in processArr"
|
||||||
|
:key="index"
|
||||||
|
:label="item.name"
|
||||||
|
:value="item.id"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
@ -86,17 +134,23 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
// import { CurrentTaskDetail } from '@/api/basicData/Warehouse/HistoricalTask'
|
// import { CurrentTaskDetail } from '@/api/basicData/Warehouse/HistoricalTask'
|
||||||
|
import { list } from '@/api/art-manage/process'
|
||||||
|
import { dataDictionaryDataList } from '@/api/basicData/dataDictionary'
|
||||||
|
import { StorageBoxRackCode } from '@/api/basicData/Warehouse/StorageBoxInfo'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
visible: false,
|
visible: false,
|
||||||
|
processArr: [],
|
||||||
|
TaskStatusArr: [],
|
||||||
|
storageBoxList: [],
|
||||||
dataForm: {
|
dataForm: {
|
||||||
id: '',
|
id: '',
|
||||||
taskCode: undefined,
|
taskCode: undefined,
|
||||||
orderName: undefined,
|
orderName: undefined,
|
||||||
fullCode: undefined,
|
fullCode: undefined,
|
||||||
name: undefined,
|
TaskStatus: undefined,
|
||||||
remark: undefined,
|
remark: undefined,
|
||||||
field119: undefined,
|
field119: undefined,
|
||||||
createTime: undefined,
|
createTime: undefined,
|
||||||
@ -116,6 +170,32 @@ export default {
|
|||||||
init(id) {
|
init(id) {
|
||||||
this.dataForm.id = id
|
this.dataForm.id = id
|
||||||
this.visible = true
|
this.visible = true
|
||||||
|
const lparams = {
|
||||||
|
current: 1,
|
||||||
|
size: 999
|
||||||
|
}
|
||||||
|
list(lparams).then(response => {
|
||||||
|
if (response.data.records) {
|
||||||
|
this.processArr = response.data.records
|
||||||
|
} else {
|
||||||
|
this.processArr.splice(0, this.list.length)
|
||||||
|
}
|
||||||
|
this.total = response.data.total
|
||||||
|
})
|
||||||
|
StorageBoxRackCode(lparams).then(res => {
|
||||||
|
this.storageBoxList = res.data.records
|
||||||
|
})
|
||||||
|
dataDictionaryDataList({
|
||||||
|
current: 1,
|
||||||
|
size: 999,
|
||||||
|
dictTypeId: '6'
|
||||||
|
}).then(response => {
|
||||||
|
if (response.data.records) {
|
||||||
|
this.TaskStatusArr = response.data.records
|
||||||
|
} else {
|
||||||
|
this.TaskStatusArr.splice(0, this.scrapsArr.length)
|
||||||
|
}
|
||||||
|
})
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.$refs['dataForm'].resetFields()
|
this.$refs['dataForm'].resetFields()
|
||||||
})
|
})
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
* @Author: fzq
|
* @Author: fzq
|
||||||
* @Date: 2022-03-05 15:55:45
|
* @Date: 2022-03-05 15:55:45
|
||||||
* @LastEditors: fzq
|
* @LastEditors: fzq
|
||||||
* @LastEditTime: 2022-03-07 09:28:21
|
* @LastEditTime: 2022-03-11 11:08:53
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
@ -12,7 +12,7 @@
|
|||||||
<el-button type="success" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
|
<el-button type="success" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
|
||||||
<el-button type="primary" @click="addNew()">{{ 'btn.add' | i18nFilter }}</el-button>
|
<el-button type="primary" @click="addNew()">{{ 'btn.add' | i18nFilter }}</el-button>
|
||||||
</div> -->
|
</div> -->
|
||||||
<div style="title">存储箱号:{{ num }}
|
<div style="title">{{ storageCode }}:{{ num }}
|
||||||
<el-button type="success" style="back" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
|
<el-button type="success" style="back" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
|
||||||
</div>
|
</div>
|
||||||
<base-table
|
<base-table
|
||||||
@ -104,6 +104,7 @@ export default {
|
|||||||
return {
|
return {
|
||||||
addOrUpdateVisible: false,
|
addOrUpdateVisible: false,
|
||||||
num: '',
|
num: '',
|
||||||
|
storageCode: this.$t('module.basicData.visual.TipsBefore'),
|
||||||
tableBtn,
|
tableBtn,
|
||||||
trueWidth: 200,
|
trueWidth: 200,
|
||||||
tableProps,
|
tableProps,
|
||||||
@ -148,7 +149,7 @@ export default {
|
|||||||
},
|
},
|
||||||
getList() {
|
getList() {
|
||||||
this.listLoading = true
|
this.listLoading = true
|
||||||
this.num = this.listQuery.substrateCode
|
this.num = this.listQuery.storageBoxCode
|
||||||
this.listQuery.code = this.$route.query.code
|
this.listQuery.code = this.$route.query.code
|
||||||
console.log(this.listQuery)
|
console.log(this.listQuery)
|
||||||
listSubstrate(this.listQuery).then(response => {
|
listSubstrate(this.listQuery).then(response => {
|
||||||
|
Loading…
Reference in New Issue
Block a user