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

Merge branch 'develop' into gtz

Browse Source
This commit is contained in:
gtz217
2022-03-14 16:59:06 +08:00
parent 5277788174 127092be26
commit 2351e96c9e
11 changed files with 195 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
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-10 21:00:58
* @LastEditTime: 2022-03-11 11:14:02
* @Description:
-->
<template>
@@ -17,7 +17,7 @@
@getDataList="getList"
@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>
</div>
<base-table
@@ -102,11 +102,11 @@ const tableProps = [
label: i18n.t('module.basicData.cache.columnMark'),
align: 'center'
},
{
prop: 'locationType',
label: i18n.t('module.basicData.cache.locationType'),
align: 'center'
},
// {
// prop: 'locationType',
// label: i18n.t('module.basicData.cache.locationType'),
// align: 'center'
// },
{
prop: 'statusName',
label: i18n.t('module.basicData.cache.status'),
@@ -147,7 +147,10 @@ export default {
size: 990,
shelfId: '',
id: ''
}
},
sheCode: this.$t('module.basicData.cache.sheCode'),
sheName: this.$t('module.basicData.cache.sheName'),
locaNum: this.$t('module.basicData.cache.locaNum')
}
},
created() {

6
src/views/basicData/Cache/components/locationAttr-add.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 16:37:56
* @LastEditors: fzq
* @LastEditTime: 2022-03-10 21:14:13
* @LastEditTime: 2022-03-11 11:03:31
* @Description:
-->
<template>
@@ -26,9 +26,9 @@
<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-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-form-item>
</el-form-item> -->
<!-- <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-form-item> -->

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

@@ -1,8 +1,8 @@
<!--
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: gtz
* @LastEditTime: 2022-03-12 14:21:37
* @LastEditors: zwq
* @LastEditTime: 2022-03-14 10:35:17
* @Description:
-->
<template>
@@ -86,7 +86,7 @@ import i18n from '@/lang'
import BaseTable from '@/components/BaseTable'
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
// import { timeFormatter } from '@/filters'
import { timeFormatter } from '@/filters'
/**
* 表格表头配置项 TypeScript接口注释
* tableConfig<ConfigItem> = []
@@ -118,6 +118,7 @@ const tableProps = [
{
prop: 'createTime',
label: i18n.t('module.basicData.Warehouse.ExecutionTime'),
filter: timeFormatter,
align: 'center'
},
{

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

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: zwq
* @LastEditTime: 2022-01-13 15:49:01
* @LastEditTime: 2022-03-14 10:37:13
* @Description:
-->
<template>
@@ -44,7 +44,7 @@
/>
</el-select>
</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
v-model="formData.timeSlot"
type="daterange"
@@ -55,7 +55,7 @@
:range-separator="$t('module.orderManage.order.To')"
clearable
/>
</el-form-item>
</el-form-item> -->
<el-form-item>
<el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
</el-form-item>
@@ -92,7 +92,7 @@ import i18n from '@/lang'
import BaseTable from '@/components/BaseTable'
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
// import { timeFormatter } from '@/filters'
import { timeFormatter } from '@/filters'
/**
* 表格表头配置项 TypeScript接口注释
* tableConfig<ConfigItem> = []
@@ -124,31 +124,27 @@ const tableProps = [
{
prop: 'createTime',
label: i18n.t('module.basicData.Warehouse.ExecutionTime'),
filter: timeFormatter,
align: 'center'
},
{
prop: 'status',
label: i18n.t('module.basicData.Warehouse.TaskStatus'),
prop: 'taskSource',
label: i18n.t('module.basicData.Warehouse.TaskSource'),
align: 'center'
},
// {
// prop: 'taskType',
// label: i18n.t('module.basicData.Warehouse.TaskType'),
// align: 'center'
// },
{
prop: 'name',
label: i18n.t('module.basicData.Warehouse.VehicleName'),
prop: 'taskType',
label: i18n.t('module.basicData.Warehouse.TaskType'),
align: 'center'
},
// {
// prop: 'substrateNo',
// label: i18n.t('module.basicData.Warehouse.BoxStatus'),
// align: 'center'
// },
{
prop: 'wcode',
label: i18n.t('module.basicData.Warehouse.BoxNumber'),
prop: 'fullCode',
label: i18n.t('module.basicData.Warehouse.TaskBoxNumber'),
align: 'center'
},
{
prop: 'emptyCode',
label: i18n.t('module.basicData.Warehouse.FullBoxNumber'),
align: 'center'
},
{
@@ -162,19 +158,24 @@ const tableProps = [
align: 'center'
},
{
prop: 'updateTime',
label: i18n.t('module.basicData.Warehouse.CompletionTime'),
align: 'center'
},
{
prop: 'currLocation',
prop: 'anotherCurrLocation',
label: i18n.t('module.basicData.Warehouse.StartLocation'),
align: 'center'
},
{
prop: 'targetLocation',
prop: 'anotherTargetLocation',
label: i18n.t('module.basicData.Warehouse.TargetLocation'),
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: '',
status: '',
equipmentId: '',
timeSlot: [],
endTime: '',
startTime: '',
// timeSlot: [],
// endTime: '',
// startTime: '',
current: 1,
size: 10
},
@@ -231,13 +232,13 @@ export default {
},
methods: {
getList() {
if (this.formData.timeSlot) {
this.formData.startTime = this.formData.timeSlot[0]
this.formData.endTime = this.formData.timeSlot[1]
} else {
this.formData.startTime = ''
this.formData.endTime = ''
}
// if (this.formData.timeSlot) {
// this.formData.startTime = this.formData.timeSlot[0]
// this.formData.endTime = this.formData.timeSlot[1]
// } else {
// this.formData.startTime = ''
// this.formData.endTime = ''
// }
this.listLoading = true
HistoricalTaskList(this.formData).then(response => {
if (response.data.records) {

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

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: zwq
* @LastEditTime: 2022-03-11 10:31:39
* @LastEditTime: 2022-03-14 10:35:21
* @Description:
-->
<template>
@@ -15,9 +15,9 @@
size="medium"
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
v-model="listQuery.processId"
v-model="listQuery.key"
:placeholder="$i18nForm(['placeholder.input', $t('module.art.processList.processName')])"
clearable
filterable
@@ -27,7 +27,7 @@
v-for="(item, index) in processArr"
:key="index"
:label="item.name"
:value="item.id"
:value="item.name"
/>
</el-select>
</el-form-item>
@@ -65,6 +65,7 @@ import BaseTable from '@/components/BaseTable'
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
import i18n from '@/lang'
import { timeFormatter } from '@/filters'
/**
* 表格表头配置项 TypeScript接口注释
* tableConfig<ConfigItem> = []
@@ -101,6 +102,7 @@ const tableProps = [
{
prop: 'createTime',
label: i18n.t('module.art.eqName'),
filter: timeFormatter,
align: 'center'
}
]
@@ -131,7 +133,7 @@ export default {
listQuery: {
current: 1,
size: 10,
processId: ''
key: ''
}
}
},

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

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: zwq
* @LastEditTime: 2022-01-18 14:30:25
* @LastEditTime: 2022-03-14 09:33:28
* @Description:
-->
<template>
@@ -92,7 +92,7 @@ const tableProps = [
]
export default {
name: 'StorageBoxInfo',
name: 'ScrapInfo',
components: { Pagination, BaseTable },
filters: {
statusFilter(status) {
@@ -123,15 +123,18 @@ export default {
},
created() {
this.getList()
const listQuery1 = {
current: 1,
size: 100
}
StorageBoxRackCode(listQuery1).then(res => {
this.storageBoxList = res.data.records
})
this.init()
},
methods: {
init() {
const listQuery1 = {
current: 1,
size: 100
}
StorageBoxRackCode(listQuery1).then(res => {
this.storageBoxList = res.data.records
})
},
getList() {
this.listLoading = true
StorageBoxInfoList(this.listQuery).then(response => {

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

@@ -2,12 +2,12 @@
* @Author: zwq
* @Date: 2020-12-29 16:37:56
* @LastEditors: zwq
* @LastEditTime: 2022-03-04 11:05:23
* @LastEditTime: 2022-03-14 10:55:22
* @Description:
-->
<template>
<el-dialog
:title="'btn.see' | i18nFilter"
:title="$t('module.basicData.Warehouse.PerformTaskManual')"
:visible.sync="visible"
>
<el-row :gutter="10">
@@ -22,27 +22,66 @@
<el-row>
<el-col :span="24">
<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-col>
<el-col :span="24">
<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-col>
<el-col :span="24">
<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-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.TaskStatus')" prop="name">
<el-input v-model="dataForm.name" readonly :style="{width: '100%'}" />
<el-form-item :label="$t('module.basicData.Warehouse.TaskStatus')" prop="TaskStatus">
<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-col>
<el-col :span="24">
<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-col>
</el-row>
@@ -51,26 +90,35 @@
<el-row>
<el-col :span="24">
<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-col>
<el-col :span="24">
<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-col>
<el-col :span="24">
<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-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.NextOperation')" prop="anotherCurrLocation">
<el-input
<el-select
v-model="dataForm.anotherCurrLocation"
readonly
:placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.NextOperation')])"
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-col>
</el-row>
@@ -86,17 +134,23 @@
<script>
// 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 {
data() {
return {
visible: false,
processArr: [],
TaskStatusArr: [],
storageBoxList: [],
dataForm: {
id: '',
taskCode: undefined,
orderName: undefined,
fullCode: undefined,
name: undefined,
TaskStatus: undefined,
remark: undefined,
field119: undefined,
createTime: undefined,
@@ -116,6 +170,32 @@ export default {
init(id) {
this.dataForm.id = id
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.$refs['dataForm'].resetFields()
})

7
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-07 09:28:21
* @LastEditTime: 2022-03-11 11:08:53
-->
<template>
<div class="app-container">
@@ -12,7 +12,7 @@
<el-button type="success" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
<el-button type="primary" @click="addNew()">{{ 'btn.add' | i18nFilter }}</el-button>
</div> -->
<div style="title">存储箱号:{{ num }}
<div style="title">{{ storageCode }}:{{ num }}
<el-button type="success" style="back" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
</div>
<base-table
@@ -104,6 +104,7 @@ export default {
return {
addOrUpdateVisible: false,
num: '',
storageCode: this.$t('module.basicData.visual.TipsBefore'),
tableBtn,
trueWidth: 200,
tableProps,
@@ -148,7 +149,7 @@ export default {
},
getList() {
this.listLoading = true
this.num = this.listQuery.substrateCode
this.num = this.listQuery.storageBoxCode
this.listQuery.code = this.$route.query.code
console.log(this.listQuery)
listSubstrate(this.listQuery).then(response => {