Compare commits

..

No commits in common. "b0f0582e517ea72bf1ced62c1068c2eefa020a08" and "7bc184c9c7c90650266d6f193701a9b799b797ca" have entirely different histories.

16 changed files with 217 additions and 1426 deletions

View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 16:00:14
* @LastEditors: zwq
* @LastEditTime: 2022-01-14 15:29:26
* @LastEditTime: 2022-01-12 16:23:00
* @Description:
*/
import request from '@/utils/request'
@ -26,21 +26,3 @@ export function HistoricalTaskDetail(id) { // 获取任务单条数据
})
}
export function CurrentTaskList(data) { // 获取任务列表
return request({
url: '/api/wms/car/task/execution/info/page',
method: 'post',
data
})
}
export function CurrentTaskDetail(id) { // 获取任务单条数据
const data = {
'id': id
}
return request({
url: '/api/wms/car/task/execution/info/get',
method: 'post',
data
})
}

View File

@ -1,58 +0,0 @@
/*
* @Author: zwq
* @Date: 2020-12-29 16:00:14
* @LastEditors: zwq
* @LastEditTime: 2022-01-14 16:25:25
* @Description:
*/
import request from '@/utils/request'
export function StorageBoxInfoList(data) { // 获取存储箱使用情况
return request({
url: '/api/wms/storage/box/circ/info/page',
method: 'post',
data
})
}
export function StorageBoxInfoDetail(id) { // 获取工厂单条数据
const data = {
'id': id
}
return request({
url: '/api/wms/storage/box/circ/info/get',
method: 'post',
data
})
}
export function factoryUpdate(data) { // 更新工厂单条数据
return request({
url: '/api/wms/storage/box/circ/info/update',
method: 'post',
data
})
}
export function factoryAdd(data) { // 新增工厂单条数据
return request({
url: '/api/wms/storage/box/circ/info/add',
method: 'post',
data
})
}
export function factoryCode() { // 获取工厂code
return request({
url: '/api/wms/storage/box/circ/info/get-code',
method: 'post'
})
}
export function factoryDelete(id) { // 删除工厂单条数据
return request({
url: '/api/wms/storage/box/circ/info/delete',
method: 'post',
data: { id }
})
}

View File

@ -712,10 +712,6 @@ export default {
zh: '存储箱信息',
en: 'Storage Box Info'
},
StorageBoxRack: {
zh: '存储箱上架',
en: 'Storage Box Rack'
},
CurrentTask: {
zh: '当前任务',
en: 'Current Task'
@ -732,14 +728,6 @@ export default {
zh: 'Power Classification',
en: 'Power Classification'
},
ProcessInfo: {
zh: '工艺信息',
en: 'Process Info'
},
ExecutionInfo: {
zh: '执行信息',
en: 'Execution Info'
},
consumption: {
zh: '工单能耗',
en: 'Energy consumption of the repair order'

View File

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2021-03-04 16:13:51
* @LastEditors: zwq
* @LastEditTime: 2022-01-14 16:34:25
* @LastEditTime: 2022-01-12 16:09:24
* @Description: file content
*/
export default {
@ -279,7 +279,6 @@ export default {
Code: 'Code',
TaskType: 'Task Type',
TaskStatus: 'Task Status',
TaskSource: 'Task Source',
VehicleName: 'Vehicle Name',
TimeSlot: 'Time Slot',
ExecutionTime: 'Execution Time',
@ -289,21 +288,6 @@ export default {
NextOperation: 'Next Operation',
CompletionTime: 'Completion Time',
StartLocation: 'Start Location',
FullBoxStartLocation: 'FullBox Start Location',
TaskLocation: 'Task Location',
TargetLocation: 'Target Location',
OrderName: 'Order Name',
TaskBoxNumber: 'Task Box Number',
FullBoxNumber: 'Full Box Number',
EmptyFork: 'Empty Fork',
TaskBoxFork: 'Task Box Fork',
EmptyHandlingTime: 'Empty Handling Time',
TaskBoxHandlingTime: 'TaskBox Handling Time',
StorageBoxNumber: 'Storage Box Number',
CurrentLocation: 'Current Location',
IsEmpty: 'Is Empty',
IsEmptyBox: 'Is Empty Box',
LocationName: 'Location Name',
LocationCode: 'Location Code'
TargetLocation: 'Target Location'
}
}

View File

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2021-03-04 16:13:51
* @LastEditors: zwq
* @LastEditTime: 2022-01-14 16:34:19
* @LastEditTime: 2022-01-12 16:09:25
* @Description: file content
*/
export default {
@ -279,7 +279,6 @@ export default {
Code: '编码',
TaskType: '任务类型',
TaskStatus: '任务状态',
TaskSource: '任务来源',
VehicleName: '车辆名',
TimeSlot: '时间段',
ExecutionTime: '执行时间',
@ -289,22 +288,6 @@ export default {
NextOperation: '下一个工序',
CompletionTime: '完成时间',
StartLocation: '开始库位',
FullBoxStartLocation: '空箱开始库位',
TaskLocation: '任务库位',
TargetLocation: '目标库位',
OrderName: '工单名',
TaskBoxNumber: '任务箱号',
FullBoxNumber: '空箱号',
EmptyFork: '空箱货叉',
TaskBoxFork: '任务箱货叉',
EmptyHandlingTime: '搬运空箱时间',
TaskBoxHandlingTime: '搬运任务箱时间',
StorageBoxNumber: '存储箱号',
CurrentLocation: '当前库位',
IsEmpty: '是否有基板',
IsEmptyBox: '是否空箱',
LocationName: '库位名',
LocationCode: '库位编码'
TargetLocation: '目标库位'
}
}

View File

@ -177,13 +177,6 @@ export const constantRoutes = [
name: 'StorageBoxInfo',
meta: { title: routerTitle.Warehouse.StorageBoxInfo?.[language] || routerTitle.Warehouse.StorageBoxInfo.en, icon: 'form', affix: true, required: true, requireToken: true }
},
{
path: '/StorageBoxRack',
component: () =>
import('@/views/basicData/Warehouse/StorageBoxRack'),
name: 'StorageBoxRack',
meta: { title: routerTitle.Warehouse.StorageBoxRack?.[language] || routerTitle.Warehouse.StorageBoxRack.en, icon: 'form', affix: true, required: true, requireToken: true }
},
{
path: '/CurrentTask',
component: () =>
@ -203,23 +196,195 @@ export const constantRoutes = [
{
path: '/order',
component: Layout,
redirect: '/order/ProcessInfo',
redirect: '/order/workOrderManage',
name: 'orderManage',
meta: { title: routerTitle.order?.[language] || routerTitle.order.en, icon: 'form', iconPart: 'orderManage', affix: true, required: true, requireToken: true },
children: [
{
path: 'ProcessInfo',
path: 'powerClassification',
component: () =>
import('@/views/orderManage/ProcessInfo'),
name: 'ProcessInfo',
meta: { title: routerTitle.order.ProcessInfo?.[language] || routerTitle.order.ProcessInfo.en, icon: 'form', affix: true, required: true, requireToken: true }
import('@/views/orderManage/powerClassification'),
name: 'powerClassification',
meta: { title: routerTitle.order.powerClassification?.[language] || routerTitle.order.powerClassification.en, icon: 'form', affix: true, required: true, requireToken: true }
},
{
path: 'ExecutionInfo',
path: 'erpToMesData',
component: () =>
import('@/views/orderManage/ExecutionInfo'),
name: 'ExecutionInfo',
meta: { title: routerTitle.order.ExecutionInfo?.[language] || routerTitle.order.ExecutionInfo.en, icon: 'form', affix: true, required: true, requireToken: true }
import('@/views/orderManage/erpToMesData'),
name: 'erpToMesData',
meta: { title: routerTitle.order.erpToMesData?.[language] || routerTitle.order.erpToMesData.en, icon: 'form', affix: true, required: true, requireToken: true }
},
{
path: 'erpToMesVisualization',
component: () =>
import('@/views/orderManage/visualization'),
name: 'erpToMesVisualization',
meta: { title: routerTitle.order.erpToMesVisualization?.[language] || routerTitle.order.erpToMesVisualization.en, icon: 'form', affix: true, required: true, requireToken: true }
},
{
path: 'mesToErp',
component: () =>
import('@/views/orderManage/mesToErp'),
name: 'mesToErp',
meta: { title: 'mesToErp', icon: 'form', affix: true, required: true, requireToken: true }
},
{
path: '/workOrderManage',
component: () => import('@/views/orderManage/index'),
name: 'workOrderManage',
meta: { title: routerTitle.order.workOrderManage?.[language] || routerTitle.order.workOrderManage.en, icon: 'form', affix: true, required: true, requireToken: true },
children: [
{
path: 'workOrder',
component: () =>
import('@/views/orderManage/workOrder/workOrder'),
name: 'workOrder',
meta: { title: routerTitle.order.workOrderManage.workOrder?.[language] || routerTitle.order.workOrderManage.workOrder.en, icon: 'form', affix: true, required: true, requireToken: true }
},
{
path: 'workOrderOperation',
component: () => import('@/views/orderManage/workOrder/components/workOrderOperation'),
name: 'workOrderOperation',
hidden: true,
meta: { title: routerTitle.order.workOrderManage.workOrderOperation?.[language] || routerTitle.order.workOrderManage.workOrderOperation.en, icon: 'form', affix: true }
},
{
path: 'workOrderMonitor',
component: () => import('@/views/orderManage/workOrder/components/workOrderMonitor'),
name: 'workOrderMonitor',
hidden: true,
meta: { title: routerTitle.order.workOrderManage.workOrderMonitor?.[language] || routerTitle.order.workOrderManage.workOrderMonitor.en, icon: 'form', affix: true }
},
{
path: 'workOrderVerify',
component: () => import('@/views/orderManage/workOrder/components/workOrderVerify'),
name: 'workOrderVerify',
hidden: true,
meta: { title: routerTitle.order.workOrderManage.workOrderVerify?.[language] || routerTitle.order.workOrderManage.workOrderVerify.en, icon: 'form', affix: true }
},
{
path: 'packingTags',
component: () => import('@/views/orderManage/packingTags'),
name: 'packingTags',
hidden: true,
meta: { title: routerTitle.order.workOrderManage.viewpackingTags?.[language] || routerTitle.order.workOrderManage.viewpackingTags.en, icon: 'form', affix: true }
}
]
},
{
path: '/orderManage',
component: () => import('@/views/orderManage/index'),
name: 'orderManage',
meta: { title: routerTitle.order.orderManage?.[language] || routerTitle.order.orderManage.en, icon: 'form', affix: true, required: true, requireToken: true },
children: [
{
path: 'order',
component: () =>
import('@/views/orderManage/order/order'),
name: 'order',
meta: { title: routerTitle.order.orderManage.order?.[language] || routerTitle.order.orderManage.order.en, icon: 'form', affix: true, required: true, requireToken: true }
},
{
path: 'orderIssue',
component: () =>
import('@/views/orderManage/order/components/orderIssue'),
name: 'orderIssue',
hidden: true,
meta: { title: routerTitle.order.orderManage.orderIssue?.[language] || routerTitle.order.orderManage.orderIssue.en, icon: 'form', affix: true, required: true, requireToken: true }
},
{
path: 'orderDetail',
component: () =>
import('@/views/orderManage/order/components/orderDetail'),
name: 'orderDetail',
hidden: true,
meta: { title: routerTitle.order.orderManage.orderDetail?.[language] || routerTitle.order.orderManage.orderDetail.en, icon: 'form', affix: true, required: true, requireToken: true }
}
]
},
{
path: '/infoTrack',
component: () => import('@/views/orderManage/index'),
name: 'infoTrack',
meta: { title: routerTitle.order.infoTrack?.[language] || routerTitle.order.infoTrack.en, icon: 'form', affix: true, required: true, requireToken: true },
children: [
{
path: 'equipmentParametersTrack',
component: () =>
import('@/views/orderManage/infoTrack/equipmentParametersTrack'),
name: 'equipmentParametersTrack',
meta: { title: routerTitle.order.infoTrack.equipmentParametersTrack?.[language] || routerTitle.order.infoTrack.equipmentParametersTrack.en, icon: 'form', affix: true, required: true, requireToken: true }
},
{
path: 'processSubstrateDataTrack',
component: () =>
import('@/views/orderManage/infoTrack/processSubstrateDataTrack'),
name: 'processSubstrateDataTrack',
meta: { title: routerTitle.order.infoTrack.processSubstrateDataTrack?.[language] || routerTitle.order.infoTrack.processSubstrateDataTrack.en, icon: 'form', affix: true, required: true, requireToken: true }
},
{
path: 'substrateParametersTrack',
component: () =>
import('@/views/orderManage/infoTrack/substrateParametersTrack'),
name: 'substrateParametersTrack',
meta: { title: routerTitle.order.infoTrack.substrateParametersTrack?.[language] || routerTitle.order.infoTrack.substrateParametersTrack.en, icon: 'form', affix: true, required: true, requireToken: true }
},
{
path: 'equipmentEventTrack',
component: () =>
import('@/views/orderManage/infoTrack/equipmentEventTrack'),
name: 'equipmentEventTrack',
hidden: true,
meta: { title: routerTitle.order.infoTrack.equipmentEventTrack?.[language] || routerTitle.order.infoTrack.equipmentEventTrack.en, icon: 'form', affix: true, required: true, requireToken: true }
},
{
path: 'substrateEquipment',
component: () =>
import('@/views/orderManage/infoTrack/substrateEquipment'),
name: 'substrateEquipment',
hidden: true,
meta: { title: routerTitle.order.infoTrack.substrateEquipment?.[language] || routerTitle.order.infoTrack.substrateEquipment.en, icon: 'form', affix: true, required: true, requireToken: true }
}
]
},
{
path: '/substrate',
component: () => import('@/views/orderManage/index'),
name: 'substrate',
hidden: true,
meta: { title: routerTitle.order.substrate?.[language] || routerTitle.order.substrate.en, icon: 'form', affix: true, required: true, requireToken: true },
children: [
{
path: 'substrateBatch',
component: () =>
import('@/views/orderManage/substrateBatch'),
name: 'substrateBatch',
meta: { title: routerTitle.order.substrate.substrateBatch?.[language] || routerTitle.order.substrate.substrateBatch.en, icon: 'form', affix: true, required: true, requireToken: true }
},
{
path: 'substrateBatchAttr',
component: () =>
import('@/views/orderManage/components/substrateBatchAttr'),
name: 'substrateBatchAttr',
hidden: true,
meta: { title: routerTitle.order.substrate.substrateBatchAttr?.[language] || routerTitle.order.substrate.substrateBatchAttr.en, icon: 'form', affix: true, required: true, requireToken: true }
}
]
},
{
path: '/consumption',
component: () =>
import('@/views/orderManage/consumption/consumption'),
name: 'consumption',
meta: { title: routerTitle.order.consumption?.[language] || routerTitle.order.consumption.en, icon: 'form', affix: true, required: true, requireToken: true }
},
{
path: '/powerList',
component: () =>
import('@/views/orderManage/consumption/list'),
name: 'powerList',
hidden: true,
meta: { title: routerTitle.order.details?.[language] || routerTitle.order.details.en, icon: 'form', affix: true, required: true, requireToken: true }
}
]
},
@ -246,7 +411,6 @@ export const constantRoutes = [
component: Layout,
redirect: '/quality',
name: 'qualityManage',
hidden: true,
meta: { title: routerTitle.quality?.[language] || routerTitle.quality.en, icon: 'form', iconPart: 'qualityManage', affix: true, required: true, requireToken: true },
children: [
{

View File

@ -1,254 +1,7 @@
<!--
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @Date: 2022-01-12 15:35:11
* @LastEditors: zwq
* @LastEditTime: 2022-01-14 15:54:12
* @LastEditTime: 2022-01-12 15:35:11
* @Description:
-->
<template>
<div class="app-container">
<el-form
ref="formData"
:model="formData"
:inline="true"
size="medium"
label-width="100px"
>
<el-form-item :label="$t('module.basicData.Warehouse.TaskType')" prop="taskType">
<el-select v-model="formData.taskType" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.TaskType')])" clearable>
<el-option
v-for="item in taskTypeList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('module.basicData.Warehouse.TaskStatus')" prop="status">
<el-select v-model="formData.status" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.TaskStatus')])" clearable>
<el-option
v-for="item in TaskStatusList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('module.basicData.Warehouse.VehicleName')" prop="equipmentId">
<el-select v-model="formData.equipmentId" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.VehicleName')])" clearable>
<el-option
v-for="item in VehicleNameList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
</el-form-item>
</el-form>
<base-table
:page="formData.current"
:limit="formData.size"
:table-config="tableProps"
:table-data="list"
:is-loading="listLoading"
>
<method-btn
slot="handleBtn"
:width="trueWidth"
:method-list="tableBtn"
@clickBtn="handleClick"
/>
</base-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="formData.current"
:limit.sync="formData.size"
@pagination="getList()"
/>
<current-task-info v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList" />
</div>
</template>
<script>
import { CurrentTaskList } from '@/api/basicData/Warehouse/HistoricalTask'
import CurrentTaskInfo from './components/CurrentTaskInfo.vue'
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'
/**
* 表格表头配置项 TypeScript接口注释
* tableConfig<ConfigItem> = []
*
* Interface ConfigItem = {
* prop: string,
* label: string,
* width: string,
* align: string,
* subcomponent: function,
* filter: function
* }
*
*
*/
const tableBtn = [
{
type: 'view',
btnName: 'btn.see'
}
]
const tableProps = [
{
prop: 'taskCode',
label: i18n.t('module.basicData.Warehouse.Code'),
align: 'center'
},
{
prop: 'createTime',
label: i18n.t('module.basicData.Warehouse.ExecutionTime'),
align: 'center'
},
{
prop: 'taskSource',
label: i18n.t('module.basicData.Warehouse.TaskSource'),
align: 'center'
},
{
prop: 'taskType',
label: i18n.t('module.basicData.Warehouse.TaskType'),
align: 'center'
},
{
prop: 'fullCode',
label: i18n.t('module.basicData.Warehouse.TaskBoxNumber'),
align: 'center'
},
{
prop: 'emptyCode',
label: i18n.t('module.basicData.Warehouse.FullBoxNumber'),
align: 'center'
},
{
prop: 'wcurrProcessCode',
label: i18n.t('module.basicData.Warehouse.PreviousOperation'),
align: 'center'
},
{
prop: 'wnextProcessCode',
label: i18n.t('module.basicData.Warehouse.NextOperation'),
align: 'center'
},
{
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.FullBoxStartLocation'),
align: 'center'
},
{
prop: 'name',
label: i18n.t('module.basicData.Warehouse.VehicleName'),
align: 'center'
}
]
export default {
name: 'ScrapInfo',
components: { Pagination, BaseTable, MethodBtn, CurrentTaskInfo },
data() {
return {
trueWidth: 100,
addOrUpdateVisible: false,
tableProps,
tableBtn,
list: [],
total: 0,
listLoading: false,
formData: {
taskType: '',
status: '',
equipmentId: '',
current: 1,
size: 10
},
taskTypeList: [{
'label': '出库',
'value': 0
}, {
'label': '入库',
'value': 1
}, {
'label': '流转',
'value': 2
}],
TaskStatusList: [{
'label': '初始化',
'value': 0
}, {
'label': '损坏',
'value': 1
}],
VehicleNameList: [{
'label': '小车1',
'value': 0
}, {
'label': '小车2',
'value': 1
}]
}
},
created() {
this.getList()
},
methods: {
getList() {
this.listLoading = true
CurrentTaskList(this.formData).then(response => {
if (response.data.records) {
this.list = response.data.records
} else {
this.list.splice(0, this.list.length)
}
this.total = response.data.total
this.listLoading = false
})
},
handleClick(raw) {
console.log(raw)
this.addNew(raw.data.id)
},
// /
addNew(id) {
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(id)
})
}
}
}
</script>
<style scoped>
.edit-input {
padding-right: 100px;
}
.cancel-btn {
position: absolute;
right: 15px;
top: 10px;
}
</style>

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-01-12 16:27:58
* @Description:
-->
<template>
@ -27,20 +27,20 @@
<el-form-item :label="$t('module.basicData.Warehouse.TaskStatus')" prop="status">
<el-select v-model="formData.status" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.TaskStatus')])" clearable>
<el-option
v-for="item in TaskStatusList"
:key="item.value"
:label="item.label"
:value="item.value"
v-for="item in equipmentList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('module.basicData.Warehouse.VehicleName')" prop="equipmentId">
<el-select v-model="formData.equipmentId" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.VehicleName')])" clearable>
<el-option
v-for="item in VehicleNameList"
:key="item.value"
:label="item.label"
:value="item.value"
v-for="item in equipmentList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
@ -66,14 +66,7 @@
:table-config="tableProps"
:table-data="list"
:is-loading="listLoading"
>
<method-btn
slot="handleBtn"
:width="trueWidth"
:method-list="tableBtn"
@clickBtn="handleClick"
/>
</base-table>
/>
<pagination
v-show="total > 0"
:total="total"
@ -81,17 +74,15 @@
:limit.sync="formData.size"
@pagination="getList()"
/>
<historical-task-info v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList" />
</div>
</template>
<script>
import { equipmentInfoList } from '@/api/basicData/Equipment/equipmentInfo'
import { HistoricalTaskList } from '@/api/basicData/Warehouse/HistoricalTask'
import HistoricalTaskInfo from './components/HistoricalTaskInfo.vue'
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'
/**
* 表格表头配置项 TypeScript接口注释
@ -109,12 +100,6 @@ import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
*
*/
const tableBtn = [
{
type: 'view',
btnName: 'btn.see'
}
]
const tableProps = [
{
prop: 'taskCode',
@ -180,13 +165,11 @@ const tableProps = [
export default {
name: 'ScrapInfo',
components: { Pagination, BaseTable, MethodBtn, HistoricalTaskInfo },
components: { Pagination, BaseTable },
data() {
return {
trueWidth: 100,
addOrUpdateVisible: false,
trueWidth: 200,
tableProps,
tableBtn,
list: [],
total: 0,
listLoading: false,
@ -210,26 +193,26 @@ export default {
'label': '流转',
'value': 2
}],
TaskStatusList: [{
'label': '初始化',
'value': 0
}, {
'label': '损坏',
'value': 1
}],
VehicleNameList: [{
'label': '小车1',
'value': 0
}, {
'label': '小车2',
'value': 1
}]
equipmentList: []
}
},
created() {
this.init()
this.getList()
},
methods: {
init() {
const listQuery = {
current: 1,
size: 500
}
this.equipmentList.splice(0, this.equipmentList.length)
equipmentInfoList(listQuery).then(response => {
if (response.data.records) {
this.equipmentList = response.data.records
}
})
},
getList() {
if (this.formData.timeSlot) {
this.formData.startTime = this.formData.timeSlot[0]
@ -248,17 +231,6 @@ export default {
this.total = response.data.total
this.listLoading = false
})
},
handleClick(raw) {
console.log(raw)
this.addNew(raw.data.id)
},
// /
addNew(id) {
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(id)
})
}
}
}

View File

@ -1,169 +1,7 @@
<!--
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @Date: 2022-01-12 15:32:02
* @LastEditors: zwq
* @LastEditTime: 2022-01-14 16:29:02
* @LastEditTime: 2022-01-12 15:32:03
* @Description:
-->
<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"
:limit="listQuery.size"
:table-config="tableProps"
:table-data="list"
:is-loading="listLoading"
>
<method-btn
slot="handleBtn"
:width="trueWidth"
:method-list="tableBtn"
@clickBtn="handleClick"
/>
</base-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="listQuery.current"
:limit.sync="listQuery.size"
@pagination="getList()"
/>
<Factory-add v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList" />
</div>
</template>
<script>
import { StorageBoxInfoList } from '@/api/basicData/Warehouse/StorageBoxInfo'
import FactoryAdd from './components/StorageBoxInfoDetail.vue'
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 { timeFormatter } from '@/filters'
import i18n from '@/lang'
/**
* 表格表头配置项 TypeScript接口注释
* tableConfig<ConfigItem> = []
*
* Interface ConfigItem = {
* prop: string,
* label: string,
* width: string,
* align: string,
* subcomponent: function,
* filter: function
* }
*
*
*/
const tableBtn = [
{
type: 'see',
btnName: 'btn.see'
}
]
const tableProps = [
{
prop: 'code',
label: i18n.t('module.basicData.Warehouse.StorageBoxNumber'),
filter: timeFormatter,
align: 'center'
},
{
prop: 'status',
label: i18n.t('module.basicData.Warehouse.BoxStatus'),
align: 'center'
},
{
prop: 'locationName',
label: i18n.t('module.basicData.Warehouse.CurrentLocation'),
align: 'center'
},
{
prop: 'isEmpty',
label: i18n.t('module.basicData.Warehouse.IsEmpty'),
align: 'center'
}
]
export default {
name: 'StorageBoxInfo',
components: { Pagination, BaseTable, MethodBtn, HeadForm, FactoryAdd },
filters: {
statusFilter(status) {
const statusMap = {
published: 'success',
draft: 'info',
deleted: 'danger'
}
return statusMap[status]
}
},
data() {
return {
keyName: i18n.t('module.basicData.Warehouse.StorageBoxNumber'),
placeholderName: this.$t('module.basicData.Warehouse.StorageBoxNumber'),
addOrUpdateVisible: false,
tableBtn,
trueWidth: 200,
tableProps,
list: [],
total: 0,
listLoading: true,
listQuery: {
current: 1,
size: 10,
name: '',
code: ''
}
}
},
created() {
this.getList()
},
methods: {
handleClick(raw) {
this.addNew(raw.data.id)
},
getList(key) {
this.listLoading = true
this.listQuery.code = key
StorageBoxInfoList(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
this.listLoading = false
})
},
// /
addNew(id) {
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(id)
})
}
}
}
</script>
<style scoped>
.edit-input {
padding-right: 100px;
}
.cancel-btn {
position: absolute;
right: 15px;
top: 10px;
}
</style>

View File

@ -1,179 +0,0 @@
<!--
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: zwq
* @LastEditTime: 2022-01-14 16:34:33
* @Description:
-->
<template>
<div class="app-container">
<head-form
:placeholder-name="placeholderName"
:key-name="keyName"
@getDataList="getList"
@add="addNew"
/>
<base-table
:page="listQuery.current"
:limit="listQuery.size"
:table-config="tableProps"
:table-data="list"
:is-loading="listLoading"
>
<method-btn
slot="handleBtn"
:width="trueWidth"
:method-list="tableBtn"
@clickBtn="handleClick"
/>
</base-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="listQuery.current"
:limit.sync="listQuery.size"
@pagination="getList()"
/>
<Factory-add v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList" />
</div>
</template>
<script>
import { StorageBoxInfoList } from '@/api/basicData/Warehouse/StorageBoxInfo'
import FactoryAdd from './components/StorageBoxInfoDetail.vue'
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 { timeFormatter } from '@/filters'
import i18n from '@/lang'
/**
* 表格表头配置项 TypeScript接口注释
* tableConfig<ConfigItem> = []
*
* Interface ConfigItem = {
* prop: string,
* label: string,
* width: string,
* align: string,
* subcomponent: function,
* filter: function
* }
*
*
*/
const tableBtn = [
{
type: 'see',
btnName: 'btn.see'
}
]
const tableProps = [
{
prop: 'createTime',
label: i18n.t('module.basicData.factory.createTime'),
filter: timeFormatter,
align: 'center'
},
{
prop: 'code',
label: i18n.t('module.basicData.Warehouse.StorageBoxNumber'),
filter: timeFormatter,
align: 'center'
},
{
prop: 'status',
label: i18n.t('module.basicData.Warehouse.BoxStatus'),
align: 'center'
},
{
prop: 'locationName',
label: i18n.t('module.basicData.Warehouse.LocationName'),
align: 'center'
},
{
prop: 'locationCode',
label: i18n.t('module.basicData.Warehouse.LocationCode'),
align: 'center'
},
{
prop: 'isEmpty',
label: i18n.t('module.basicData.Warehouse.IsEmptyBox'),
align: 'center'
}
]
export default {
name: 'StorageBoxInfo',
components: { Pagination, BaseTable, MethodBtn, HeadForm, FactoryAdd },
filters: {
statusFilter(status) {
const statusMap = {
published: 'success',
draft: 'info',
deleted: 'danger'
}
return statusMap[status]
}
},
data() {
return {
keyName: i18n.t('module.basicData.Warehouse.StorageBoxNumber'),
placeholderName: this.$t('module.basicData.Warehouse.StorageBoxNumber'),
addOrUpdateVisible: false,
tableBtn,
trueWidth: 200,
tableProps,
list: [],
total: 0,
listLoading: true,
listQuery: {
current: 1,
size: 10,
name: '',
code: ''
}
}
},
created() {
this.getList()
},
methods: {
handleClick(raw) {
this.addNew(raw.data.id)
},
getList(key) {
this.listLoading = true
this.listQuery.code = key
StorageBoxInfoList(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
this.listLoading = false
})
},
// /
addNew(id) {
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(id)
})
}
}
}
</script>
<style scoped>
.edit-input {
padding-right: 100px;
}
.cancel-btn {
position: absolute;
right: 15px;
top: 10px;
}
</style>

View File

@ -1,178 +0,0 @@
<!--
* @Author: zwq
* @Date: 2020-12-29 16:37:56
* @LastEditors: zwq
* @LastEditTime: 2022-01-14 15:55:39
* @Description:
-->
<template>
<el-dialog
:title="'btn.see' | i18nFilter"
:visible.sync="visible"
>
<el-row :gutter="10">
<el-form
ref="dataForm"
:model="dataForm"
size="medium"
label-width="110px"
label-position="left"
>
<el-col :span="8">
<el-row>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.Code')" prop="taskCode">
<el-input v-model="dataForm.taskCode" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.OrderName')" prop="orderName">
<el-input v-model="dataForm.orderName" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.TaskBoxNumber')" prop="fullCode">
<el-input v-model="dataForm.fullCode" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.VehicleName')" prop="name">
<el-input v-model="dataForm.name" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.EmptyFork')" prop="field124">
<el-input v-model="dataForm.field124" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.EmptyHandlingTime')" prop="field119">
<el-input v-model="dataForm.field119" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span="8">
<el-row>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.ExecutionTime')" prop="createTime">
<el-input v-model="dataForm.createTime" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.TaskType')" prop="taskType">
<el-input v-model="dataForm.taskType" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.FullBoxNumber')" prop="emptyCode">
<el-input v-model="dataForm.emptyCode" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.TaskLocation')" prop="anotherCurrLocation">
<el-input
v-model="dataForm.anotherCurrLocation"
readonly
:style="{width: '100%'}"
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.TaskBoxFork')" prop="field121">
<el-input v-model="dataForm.field121" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span="8">
<el-row>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.TaskSource')" prop="taskSource">
<el-input v-model="dataForm.taskSource" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.PreviousOperation')" prop="anotherCurrProcessCode">
<el-input
v-model="dataForm.anotherCurrProcessCode"
readonly
:style="{width: '100%'}"
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.NextOperation')" prop="anotherNextProcessCode">
<el-input
v-model="dataForm.anotherNextProcessCode"
readonly
:style="{width: '100%'}"
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.TargetLocation')" prop="anotherTargetLocation">
<el-input
v-model="dataForm.anotherTargetLocation"
readonly
:style="{width: '100%'}"
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.BoxStatus')" prop="field126">
<el-input v-model="dataForm.field126" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
</span>
</el-dialog>
</template>
<script>
import { CurrentTaskDetail } from '@/api/basicData/Warehouse/HistoricalTask'
export default {
data() {
return {
visible: false,
dataForm: {
id: '',
taskCode: undefined,
orderName: undefined,
fullCode: undefined,
name: undefined,
field124: undefined,
field119: undefined,
createTime: undefined,
taskType: undefined,
emptyCode: undefined,
anotherCurrLocation: undefined,
field121: undefined,
taskSource: undefined,
anotherCurrProcessCode: undefined,
anotherNextProcessCode: undefined,
anotherTargetLocation: undefined,
field126: undefined
}
}
},
methods: {
init(id) {
this.dataForm.id = id
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
CurrentTaskDetail(this.dataForm.id).then(res => {
this.dataForm = res.data
})
})
}
}
}
</script>

View File

@ -1,194 +0,0 @@
<!--
* @Author: zwq
* @Date: 2020-12-29 16:37:56
* @LastEditors: zwq
* @LastEditTime: 2022-01-13 16:22:39
* @Description:
-->
<template>
<el-dialog
:title="'btn.see' | i18nFilter"
:visible.sync="visible"
>
<el-row :gutter="10">
<el-form
ref="dataForm"
:model="dataForm"
size="medium"
label-width="110px"
label-position="left"
>
<el-col :span="8">
<el-row>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.Code')" prop="taskCode">
<el-input v-model="dataForm.taskCode" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.OrderName')" prop="orderName">
<el-input v-model="dataForm.orderName" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.TaskBoxNumber')" prop="fullCode">
<el-input v-model="dataForm.fullCode" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.VehicleName')" prop="name">
<el-input v-model="dataForm.name" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.EmptyFork')" prop="field124">
<el-input v-model="dataForm.field124" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.EmptyHandlingTime')" prop="field119">
<el-input v-model="dataForm.field119" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span="8">
<el-row>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.ExecutionTime')" prop="createTime">
<el-input v-model="dataForm.createTime" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.TaskType')" prop="taskType">
<el-input v-model="dataForm.taskType" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.FullBoxNumber')" prop="emptyCode">
<el-input v-model="dataForm.emptyCode" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.TaskLocation')" prop="anotherCurrLocation">
<el-input
v-model="dataForm.anotherCurrLocation"
readonly
:style="{width: '100%'}"
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.TaskBoxFork')" prop="field121">
<el-input v-model="dataForm.field121" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.TaskBoxHandlingTime')" prop="field122">
<el-input
v-model="dataForm.field122"
readonly
:style="{width: '100%'}"
/>
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span="8">
<el-row>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.TaskSource')" prop="taskSource">
<el-input v-model="dataForm.taskSource" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.PreviousOperation')" prop="anotherCurrProcessCode">
<el-input
v-model="dataForm.anotherCurrProcessCode"
readonly
:style="{width: '100%'}"
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.NextOperation')" prop="anotherNextProcessCode">
<el-input
v-model="dataForm.anotherNextProcessCode"
readonly
:style="{width: '100%'}"
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.TargetLocation')" prop="anotherTargetLocation">
<el-input
v-model="dataForm.anotherTargetLocation"
readonly
:style="{width: '100%'}"
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.CompletionTime')" prop="field125">
<el-input v-model="dataForm.field125" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.BoxStatus')" prop="field126">
<el-input v-model="dataForm.field126" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
</span>
</el-dialog>
</template>
<script>
import { HistoricalTaskDetail } from '@/api/basicData/Warehouse/HistoricalTask'
export default {
data() {
return {
visible: false,
dataForm: {
id: '',
taskCode: undefined,
orderName: undefined,
fullCode: undefined,
name: undefined,
field124: undefined,
field119: undefined,
createTime: undefined,
taskType: undefined,
emptyCode: undefined,
anotherCurrLocation: undefined,
field121: undefined,
field122: undefined,
taskSource: undefined,
anotherCurrProcessCode: undefined,
anotherNextProcessCode: undefined,
anotherTargetLocation: undefined,
field125: undefined,
field126: undefined
}
}
},
methods: {
init(id) {
this.dataForm.id = id
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
HistoricalTaskDetail(this.dataForm.id).then(res => {
this.dataForm = res.data
})
})
}
}
}
</script>

View File

@ -1,125 +0,0 @@
<!--
* @Author: zwq
* @Date: 2020-12-29 16:37:56
* @LastEditors: zwq
* @LastEditTime: 2021-04-12 16:24:32
* @Description:
-->
<template>
<el-dialog
:title="!dataForm.id ? 'btn.add' : 'btn.edit' | i18nFilter"
:visible.sync="visible"
>
<el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="120px" @keyup.enter.native="dataFormSubmit()">
<el-form-item :label="$t('module.basicData.factory.FactoryName')" prop="name">
<el-input v-model="dataForm.name" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.factory.FactoryName')])" clearable />
</el-form-item>
<el-form-item :label="$t('module.basicData.factory.FactoryCode')" prop="code">
<el-input v-model="dataForm.code" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.factory.FactoryCode')])" clearable />
</el-form-item>
<el-form-item :label="$t('module.basicData.factory.Address')" prop="address">
<el-input v-model="dataForm.address" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.factory.Address')])" clearable />
</el-form-item>
<el-form-item :label="$t('module.basicData.visual.Remarks')" prop="description">
<el-input v-model="dataForm.description" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
<el-button type="primary" @click="dataFormSubmit()">{{ 'btn.confirm' | i18nFilter }}</el-button>
</span>
</el-dialog>
</template>
<script>
import { factoryDetail, factoryUpdate, factoryAdd, factoryCode } from '@/api/basicData/FactoryManagement/factory'
export default {
data() {
return {
visible: false,
dataForm: {
id: 0,
name: '',
code: '',
address: '',
description: ''
},
dataRule: {
name: [
{
required: true,
message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.factory.FactoryName')]),
trigger: 'blur' }
],
code: [
{
required: true,
message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.factory.FactoryCode')]),
trigger: 'blur' }
]
}
}
},
methods: {
init(id) {
this.dataForm.id = id || ''
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
factoryDetail(this.dataForm.id).then(res => {
this.dataForm.name = res.data.name
this.dataForm.code = res.data.code
this.dataForm.address = res.data.address
this.dataForm.description = res.data.description
})
} else {
factoryCode().then(res => {
this.dataForm.code = res.data
})
}
})
},
//
dataFormSubmit() {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
const data = {
'name': this.dataForm.name,
'code': this.dataForm.code,
'address': this.dataForm.address,
'description': this.dataForm.description,
'id': this.dataForm.id
}
if (this.dataForm.id) {
factoryUpdate(data).then(res => {
this.$message({
message: this.$t('module.basicData.visual.success'),
type: 'success',
duration: 1500,
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
}
})
})
} else {
factoryAdd(data).then(res => {
this.$message({
message: this.$t('module.basicData.visual.success'),
type: 'success',
duration: 1500,
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
}
})
})
}
}
})
}
}
}
</script>

View File

@ -1,125 +0,0 @@
<!--
* @Author: zwq
* @Date: 2020-12-29 16:37:56
* @LastEditors: zwq
* @LastEditTime: 2021-04-12 16:24:32
* @Description:
-->
<template>
<el-dialog
:title="!dataForm.id ? 'btn.add' : 'btn.edit' | i18nFilter"
:visible.sync="visible"
>
<el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="120px" @keyup.enter.native="dataFormSubmit()">
<el-form-item :label="$t('module.basicData.factory.FactoryName')" prop="name">
<el-input v-model="dataForm.name" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.factory.FactoryName')])" clearable />
</el-form-item>
<el-form-item :label="$t('module.basicData.factory.FactoryCode')" prop="code">
<el-input v-model="dataForm.code" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.factory.FactoryCode')])" clearable />
</el-form-item>
<el-form-item :label="$t('module.basicData.factory.Address')" prop="address">
<el-input v-model="dataForm.address" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.factory.Address')])" clearable />
</el-form-item>
<el-form-item :label="$t('module.basicData.visual.Remarks')" prop="description">
<el-input v-model="dataForm.description" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
<el-button type="primary" @click="dataFormSubmit()">{{ 'btn.confirm' | i18nFilter }}</el-button>
</span>
</el-dialog>
</template>
<script>
import { factoryDetail, factoryUpdate, factoryAdd, factoryCode } from '@/api/basicData/FactoryManagement/factory'
export default {
data() {
return {
visible: false,
dataForm: {
id: 0,
name: '',
code: '',
address: '',
description: ''
},
dataRule: {
name: [
{
required: true,
message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.factory.FactoryName')]),
trigger: 'blur' }
],
code: [
{
required: true,
message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.factory.FactoryCode')]),
trigger: 'blur' }
]
}
}
},
methods: {
init(id) {
this.dataForm.id = id || ''
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
factoryDetail(this.dataForm.id).then(res => {
this.dataForm.name = res.data.name
this.dataForm.code = res.data.code
this.dataForm.address = res.data.address
this.dataForm.description = res.data.description
})
} else {
factoryCode().then(res => {
this.dataForm.code = res.data
})
}
})
},
//
dataFormSubmit() {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
const data = {
'name': this.dataForm.name,
'code': this.dataForm.code,
'address': this.dataForm.address,
'description': this.dataForm.description,
'id': this.dataForm.id
}
if (this.dataForm.id) {
factoryUpdate(data).then(res => {
this.$message({
message: this.$t('module.basicData.visual.success'),
type: 'success',
duration: 1500,
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
}
})
})
} else {
factoryAdd(data).then(res => {
this.$message({
message: this.$t('module.basicData.visual.success'),
type: 'success',
duration: 1500,
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
}
})
})
}
}
})
}
}
}
</script>

View File

@ -1,7 +0,0 @@
<!--
* @Author: zwq
* @Date: 2022-01-14 16:40:26
* @LastEditors: zwq
* @LastEditTime: 2022-01-14 16:40:27
* @Description:
-->

View File

@ -1,7 +0,0 @@
<!--
* @Author: zwq
* @Date: 2022-01-14 16:37:39
* @LastEditors: zwq
* @LastEditTime: 2022-01-14 16:37:39
* @Description:
-->