@@ -1,13 +1,8 @@ | |||
/* | |||
* @Author: gtz | |||
* @Date: 2021-03-04 16:13:51 | |||
<<<<<<< HEAD | |||
* @LastEditors: fzq | |||
* @LastEditTime: 2022-03-11 11:13:47 | |||
======= | |||
* @LastEditors: gtz | |||
* @LastEditTime: 2022-03-12 14:22:52 | |||
>>>>>>> develop | |||
* @LastEditors: zwq | |||
* @LastEditTime: 2022-03-14 10:58:20 | |||
* @Description: file content | |||
*/ | |||
export default { | |||
@@ -1,14 +1,8 @@ | |||
/* | |||
* @Author: gtz | |||
* @Date: 2021-03-04 16:13:51 | |||
<<<<<<< HEAD | |||
* @LastEditors: fzq | |||
* @LastEditTime: 2022-03-11 11:13:22 | |||
* @Description: file content | |||
======= | |||
* @LastEditors: gtz | |||
* @LastEditTime: 2022-03-12 14:23:06 | |||
>>>>>>> develop | |||
* @LastEditors: zwq | |||
* @LastEditTime: 2022-03-14 10:58:12 | |||
*/ | |||
export default { | |||
visual: { | |||
@@ -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 } | |||
}, | |||
{ | |||
path: '/dataDictionary', | |||
path: '/DataDictionary', | |||
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 }, | |||
children: [{ | |||
path: 'dataDictionary', | |||
@@ -260,7 +260,7 @@ export const constantRoutes = [ | |||
{ | |||
path: '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 } | |||
} | |||
] | |||
@@ -268,7 +268,7 @@ export const constantRoutes = [ | |||
{ | |||
path: '/Warehouse', | |||
component: Layout, | |||
redirect: '/Warehouse/workOrderManage', | |||
redirect: '/Warehouse/StorageBoxInfo', | |||
name: 'Warehouse', | |||
meta: { title: routerTitle.Warehouse?.[language] || routerTitle.Warehouse.en, icon: 'form', iconPart: 'orderManage', affix: true, required: true, requireToken: true }, | |||
children: [ | |||
@@ -497,7 +497,7 @@ export const constantRoutes = [ | |||
path: '/basic', | |||
component: Layout, | |||
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 }, | |||
children: [ | |||
{ | |||
@@ -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' | |||
}, | |||
{ | |||
@@ -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: 'fullCode', | |||
label: i18n.t('module.basicData.Warehouse.TaskBoxNumber'), | |||
align: 'center' | |||
}, | |||
// { | |||
// prop: 'substrateNo', | |||
// label: i18n.t('module.basicData.Warehouse.BoxStatus'), | |||
// align: 'center' | |||
// }, | |||
{ | |||
prop: 'wcode', | |||
label: i18n.t('module.basicData.Warehouse.BoxNumber'), | |||
prop: 'emptyCode', | |||
label: i18n.t('module.basicData.Warehouse.FullBoxNumber'), | |||
align: 'center' | |||
}, | |||
{ | |||
@@ -162,18 +158,23 @@ const tableProps = [ | |||
align: 'center' | |||
}, | |||
{ | |||
prop: 'updateTime', | |||
label: i18n.t('module.basicData.Warehouse.CompletionTime'), | |||
prop: 'anotherCurrLocation', | |||
label: i18n.t('module.basicData.Warehouse.StartLocation'), | |||
align: 'center' | |||
}, | |||
{ | |||
prop: 'anotherTargetLocation', | |||
label: i18n.t('module.basicData.Warehouse.TargetLocation'), | |||
align: 'center' | |||
}, | |||
{ | |||
prop: 'currLocation', | |||
label: i18n.t('module.basicData.Warehouse.StartLocation'), | |||
label: i18n.t('module.basicData.Warehouse.FullBoxStartLocation'), | |||
align: 'center' | |||
}, | |||
{ | |||
prop: 'targetLocation', | |||
label: i18n.t('module.basicData.Warehouse.TargetLocation'), | |||
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) { | |||
@@ -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: '' | |||
} | |||
} | |||
}, | |||
@@ -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 => { | |||
@@ -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() | |||
}) | |||