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

Compare commits

base: mt-ck-00a:127092be26d0782e91c43aba21ee9db9a4dd2b94
Branches Tags
mt-ck-00a:develop
mt-ck-00a:zwq
mt-ck-00a:fzq
mt-ck-00a:gtz
mt-ck-00a:test
mt-ck-00a:dy
mt-ck-00a:cicd
mt-ck-00a:master
..
compare: mt-ck-00a:3d3c802d018205010231d7865486cd7036e360ed
Branches Tags
mt-ck-00a:develop
mt-ck-00a:zwq
mt-ck-00a:fzq
mt-ck-00a:gtz
mt-ck-00a:test
mt-ck-00a:dy
mt-ck-00a:cicd
mt-ck-00a:master

No commits in common. "127092be26d0782e91c43aba21ee9db9a4dd2b94" and "3d3c802d018205010231d7865486cd7036e360ed" have entirely different histories.
127092be26 ... 3d3c802d01

8 changed files with 87 additions and 163 deletions
Show Stats Expand all files Collapse all files

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

@ -1,8 +1,13 @@
/* /*
* @Author: gtz * @Author: gtz
* @Date: 2021-03-04 16:13:51 * @Date: 2021-03-04 16:13:51
* @LastEditors: zwq <<<<<<< HEAD
* @LastEditTime: 2022-03-14 10:58:20 * @LastEditors: fzq
* @LastEditTime: 2022-03-11 11:13:47
=======
* @LastEditors: gtz
* @LastEditTime: 2022-03-12 14:22:52
>>>>>>> develop
* @Description: file content * @Description: file content
*/ */
export default { export default {

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

@ -1,8 +1,14 @@
/* /*
* @Author: gtz * @Author: gtz
* @Date: 2021-03-04 16:13:51 * @Date: 2021-03-04 16:13:51
* @LastEditors: zwq <<<<<<< HEAD
* @LastEditTime: 2022-03-14 10:58:12 * @LastEditors: fzq
* @LastEditTime: 2022-03-11 11:13:22
* @Description: file content
=======
* @LastEditors: gtz
* @LastEditTime: 2022-03-12 14:23:06
>>>>>>> develop
*/ */
export default { export default {
visual: { visual: {

10
src/router/index.js
View File

@ -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: 'processList', name: 'Process',
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/StorageBoxInfo', redirect: '/Warehouse/workOrderManage',
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: 'basic', name: 'ArticleManager',
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: [
{ {

7
src/views/basicData/Warehouse/CurrentTask.vue
View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: zwq * @Author: zwq
* @Date: 2020-12-29 15:41:11 * @Date: 2020-12-29 15:41:11
* @LastEditors: zwq * @LastEditors: gtz
* @LastEditTime: 2022-03-14 10:35:17 * @LastEditTime: 2022-03-12 14:21:37
* @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,7 +118,6 @@ 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'
}, },
{ {

71
src/views/basicData/Warehouse/HistoricalTask.vue
View File

@ -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-14 10:37:13 * @LastEditTime: 2022-01-13 15:49:01
* @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,27 +124,31 @@ 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: 'taskSource', prop: 'status',
label: i18n.t('module.basicData.Warehouse.TaskSource'), label: i18n.t('module.basicData.Warehouse.TaskStatus'),
align: 'center' align: 'center'
}, },
// {
// prop: 'taskType',
// label: i18n.t('module.basicData.Warehouse.TaskType'),
// align: 'center'
// },
{ {
prop: 'taskType', prop: 'name',
label: i18n.t('module.basicData.Warehouse.TaskType'), label: i18n.t('module.basicData.Warehouse.VehicleName'),
align: 'center' align: 'center'
}, },
// {
// prop: 'substrateNo',
// label: i18n.t('module.basicData.Warehouse.BoxStatus'),
// align: 'center'
// },
{ {
prop: 'fullCode', prop: 'wcode',
label: i18n.t('module.basicData.Warehouse.TaskBoxNumber'), label: i18n.t('module.basicData.Warehouse.BoxNumber'),
align: 'center'
},
{
prop: 'emptyCode',
label: i18n.t('module.basicData.Warehouse.FullBoxNumber'),
align: 'center' align: 'center'
}, },
{ {
@ -158,23 +162,18 @@ const tableProps = [
align: 'center' align: 'center'
}, },
{ {
prop: 'anotherCurrLocation', prop: 'updateTime',
label: i18n.t('module.basicData.Warehouse.StartLocation'), label: i18n.t('module.basicData.Warehouse.CompletionTime'),
align: 'center'
},
{
prop: 'anotherTargetLocation',
label: i18n.t('module.basicData.Warehouse.TargetLocation'),
align: 'center' align: 'center'
}, },
{ {
prop: 'currLocation', prop: 'currLocation',
label: i18n.t('module.basicData.Warehouse.FullBoxStartLocation'), label: i18n.t('module.basicData.Warehouse.StartLocation'),
align: 'center' align: 'center'
}, },
{ {
prop: 'name', prop: 'targetLocation',
label: i18n.t('module.basicData.Warehouse.VehicleName'), label: i18n.t('module.basicData.Warehouse.TargetLocation'),
align: 'center' align: 'center'
} }
] ]
@ -195,9 +194,9 @@ export default {
taskType: '', taskType: '',
status: '', status: '',
equipmentId: '', equipmentId: '',
// timeSlot: [], timeSlot: [],
// endTime: '', endTime: '',
// startTime: '', startTime: '',
current: 1, current: 1,
size: 10 size: 10
}, },
@ -232,13 +231,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) {

12
src/views/basicData/Warehouse/ProcessStorageManagement.vue
View File

@ -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-14 10:35:21 * @LastEditTime: 2022-03-11 10:31:39
* @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="key"> <el-form-item :label="$t('module.art.processList.processName')" prop="processId">
<el-select <el-select
v-model="listQuery.key" v-model="listQuery.processId"
: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.name" :value="item.id"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -65,7 +65,6 @@ 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> = []
@ -102,7 +101,6 @@ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
label: i18n.t('module.art.eqName'), label: i18n.t('module.art.eqName'),
filter: timeFormatter,
align: 'center' align: 'center'
} }
] ]
@ -133,7 +131,7 @@ export default {
listQuery: { listQuery: {
current: 1, current: 1,
size: 10, size: 10,
key: '' processId: ''
} }
} }
}, },

21
src/views/basicData/Warehouse/StorageBoxInfo.vue
View File

@ -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-14 09:33:28 * @LastEditTime: 2022-01-18 14:30:25
* @Description: * @Description:
--> -->
<template> <template>
@ -92,7 +92,7 @@ const tableProps = [
] ]
export default { export default {
name: 'ScrapInfo', name: 'StorageBoxInfo',
components: { Pagination, BaseTable }, components: { Pagination, BaseTable },
filters: { filters: {
statusFilter(status) { statusFilter(status) {
@ -123,18 +123,15 @@ export default {
}, },
created() { created() {
this.getList() this.getList()
this.init() const listQuery1 = {
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 => {

110
src/views/basicData/Warehouse/components/CurrentTask-add.vue
View File

@ -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-14 10:55:22 * @LastEditTime: 2022-03-04 11:05:23
* @Description: * @Description:
--> -->
<template> <template>
<el-dialog <el-dialog
:title="$t('module.basicData.Warehouse.PerformTaskManual')" :title="'btn.see' | i18nFilter"
:visible.sync="visible" :visible.sync="visible"
> >
<el-row :gutter="10"> <el-row :gutter="10">
@ -22,66 +22,27 @@
<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-select <el-input v-model="dataForm.taskCode" readonly :style="{width: '100%'}" />
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" :style="{width: '100%'}" /> <el-input v-model="dataForm.orderName" readonly :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-select <el-input v-model="dataForm.fullCode" readonly :style="{width: '100%'}" />
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="TaskStatus"> <el-form-item :label="$t('module.basicData.Warehouse.TaskStatus')" prop="name">
<el-select <el-input v-model="dataForm.name" readonly :style="{width: '100%'}" />
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" :style="{width: '100%'}" /> <el-input v-model="dataForm.remark" readonly :style="{width: '100%'}" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -90,35 +51,26 @@
<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" :style="{width: '100%'}" /> <el-input v-model="dataForm.createTime" readonly :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" :style="{width: '100%'}" /> <el-input v-model="dataForm.taskType" readonly :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" :style="{width: '100%'}" /> <el-input v-model="dataForm.emptyCode" readonly :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-select <el-input
v-model="dataForm.anotherCurrLocation" v-model="dataForm.anotherCurrLocation"
:placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.NextOperation')])" readonly
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>
@ -134,23 +86,17 @@
<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,
TaskStatus: undefined, name: undefined,
remark: undefined, remark: undefined,
field119: undefined, field119: undefined,
createTime: undefined, createTime: undefined,
@ -170,32 +116,6 @@ 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()
}) })