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

Merge pull request '更新' (#8) from zwq into develop

Browse Source 
Reviewed-on: #8
This commit is contained in:
朱文强 2022-01-17 15:34:17 +08:00
commit 2455f83b74
5 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/filters/basicData/index.js
View File

@ -1,7 +1,7 @@
/* /*
* @Date: 2020-12-29 16:49:28 * @Date: 2020-12-29 16:49:28
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2021-07-21 15:56:54 * @LastEditTime: 2022-01-17 15:31:40
* @FilePath: \basic-admin\src\filters\basicData\index.js * @FilePath: \basic-admin\src\filters\basicData\index.js
* @Description: * @Description:
*/ */
@ -63,9 +63,9 @@ const table = {
'1': i18n.t('basicDataFilter.enableState.enable') '1': i18n.t('basicDataFilter.enableState.enable')
}, },
storage: { storage: {
'0': i18n.t('basicDataFilter.enableState.normal'), '0': i18n.t('basicDataFilter.storage.normal'),
'1': i18n.t('basicDataFilter.enableState.repairing'), '1': i18n.t('basicDataFilter.storage.repairing'),
'2': i18n.t('basicDataFilter.enableState.scrap') '2': i18n.t('basicDataFilter.storage.scrap')
} }
} }

5
src/views/orderManage/ExecutionInfo.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-01-17 15:00:35 * @LastEditTime: 2022-01-17 15:26:35
* @Description: * @Description:
--> -->
<template> <template>
@ -47,6 +47,7 @@ import BaseTable from '@/components/BaseTable'
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn' import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
import { timeFormatter } from '@/filters' import { timeFormatter } from '@/filters'
import basicData from '@/filters/basicData'
import i18n from '@/lang' import i18n from '@/lang'
/** /**
* 表格表头配置项 TypeScript接口注释 * 表格表头配置项 TypeScript接口注释
@ -90,11 +91,13 @@ const tableProps = [
{ {
prop: 'priority', prop: 'priority',
label: i18n.t('module.basicData.Warehouse.Priority'), label: i18n.t('module.basicData.Warehouse.Priority'),
filter: basicData('priority'),
align: 'center' align: 'center'
}, },
{ {
prop: 'status', prop: 'status',
label: i18n.t('module.basicData.Warehouse.OrderStatus'), label: i18n.t('module.basicData.Warehouse.OrderStatus'),
filter: basicData('workOrderStatus'),
align: 'center' align: 'center'
} }
] ]

5
src/views/orderManage/ProcessInfo.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-01-17 15:12:20 * @LastEditTime: 2022-01-17 15:32:00
* @Description: * @Description:
--> -->
<template> <template>
@ -47,6 +47,7 @@ import BaseTable from '@/components/BaseTable'
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn' import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
import { timeFormatter } from '@/filters' import { timeFormatter } from '@/filters'
import basicData from '@/filters/basicData'
import processLinkBtn from './components/processLinkBtn' import processLinkBtn from './components/processLinkBtn'
import i18n from '@/lang' import i18n from '@/lang'
/** /**
@ -91,11 +92,13 @@ const tableProps = [
{ {
prop: 'priority', prop: 'priority',
label: i18n.t('module.basicData.Warehouse.Priority'), label: i18n.t('module.basicData.Warehouse.Priority'),
filter: basicData('priority'),
align: 'center' align: 'center'
}, },
{ {
prop: 'status', prop: 'status',
label: i18n.t('module.basicData.Warehouse.OrderStatus'), label: i18n.t('module.basicData.Warehouse.OrderStatus'),
filter: basicData('workOrderStatus'),
align: 'center' align: 'center'
}, },
{ {

17
src/views/orderManage/components/ExecutionInfoDetail.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2020-12-29 16:37:56 * @Date: 2020-12-29 16:37:56
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-01-17 15:04:42 * @LastEditTime: 2022-01-17 15:21:50
* @Description: * @Description:
--> -->
<template> <template>
@ -14,7 +14,6 @@
<el-form <el-form
ref="dataForm" ref="dataForm"
:model="dataForm" :model="dataForm"
:rules="rules"
size="medium" size="medium"
label-width="110px" label-width="110px"
label-position="left" label-position="left"
@ -23,17 +22,17 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.OrderName')" prop="name"> <el-form-item :label="$t('module.basicData.Warehouse.OrderName')" prop="name">
<el-input v-model="dataForm.name" :placeholder="$i18nForm([$t('module.basicData.Warehouse.OrderName')])" readonly :style="{width: '100%'}" /> <el-input v-model="dataForm.name" :placeholder="$t('module.basicData.Warehouse.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.IssueOrderTime')" prop="createTime"> <el-form-item :label="$t('module.basicData.Warehouse.IssueOrderTime')" prop="createTime">
<el-input v-model="dataForm.createTime" :placeholder="$i18nForm([$t('module.basicData.Warehouse.IssueOrderTime')])" readonly :style="{width: '100%'}" /> <el-input v-model="dataForm.createTime" :placeholder="$t('module.basicData.Warehouse.IssueOrderTime')" 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.PlanProcessQuantity')" prop="planQuantity"> <el-form-item :label="$t('module.basicData.Warehouse.PlanProcessQuantity')" prop="planQuantity">
<el-input v-model="dataForm.planQuantity" :placeholder="$i18nForm([$t('module.basicData.Warehouse.PlanProcessQuantity')])" readonly :style="{width: '100%'}" /> <el-input v-model="dataForm.planQuantity" :placeholder="$t('module.basicData.Warehouse.PlanProcessQuantity')" readonly :style="{width: '100%'}" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -42,12 +41,12 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.OrderCode')" prop="taskCode"> <el-form-item :label="$t('module.basicData.Warehouse.OrderCode')" prop="taskCode">
<el-input v-model="dataForm.taskCode" :placeholder="$i18nForm([$t('module.basicData.Warehouse.OrderCode')])" readonly :style="{width: '100%'}" /> <el-input v-model="dataForm.taskCode" :placeholder="$t('module.basicData.Warehouse.OrderCode')" 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.OrderStatus')" prop="taskType"> <el-form-item :label="$t('module.basicData.Warehouse.OrderStatus')" prop="taskType">
<el-input v-model="dataForm.taskType" :placeholder="$i18nForm([$t('module.basicData.Warehouse.OrderStatus')])" readonly :style="{width: '100%'}" /> <el-input v-model="dataForm.taskType" :placeholder="$t('module.basicData.Warehouse.OrderStatus')" readonly :style="{width: '100%'}" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -56,14 +55,14 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.TotalProcessName')" prop="craftName"> <el-form-item :label="$t('module.basicData.Warehouse.TotalProcessName')" prop="craftName">
<el-input v-model="dataForm.craftName" :placeholder="$i18nForm([$t('module.basicData.Warehouse.TotalProcessName')])" readonly :style="{width: '100%'}" /> <el-input v-model="dataForm.craftName" :placeholder="$t('module.basicData.Warehouse.TotalProcessName')" 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.SubProcessName')" prop="subProccessName"> <el-form-item :label="$t('module.basicData.Warehouse.SubProcessName')" prop="subProccessName">
<el-input <el-input
v-model="dataForm.subProccessName" v-model="dataForm.subProccessName"
:placeholder="$i18nForm([$t('module.basicData.Warehouse.SubProcessName')])" :placeholder="$t('module.basicData.Warehouse.SubProcessName')"
readonly readonly
:style="{width: '100%'}" :style="{width: '100%'}"
/> />

17
src/views/orderManage/components/ProcessInfoDetail.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2020-12-29 16:37:56 * @Date: 2020-12-29 16:37:56
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-01-17 15:04:50 * @LastEditTime: 2022-01-17 15:22:08
* @Description: * @Description:
--> -->
<template> <template>
@ -14,7 +14,6 @@
<el-form <el-form
ref="dataForm" ref="dataForm"
:model="dataForm" :model="dataForm"
:rules="rules"
size="medium" size="medium"
label-width="110px" label-width="110px"
label-position="left" label-position="left"
@ -23,17 +22,17 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.OrderName')" prop="name"> <el-form-item :label="$t('module.basicData.Warehouse.OrderName')" prop="name">
<el-input v-model="dataForm.name" :placeholder="$i18nForm([$t('module.basicData.Warehouse.OrderName')])" readonly :style="{width: '100%'}" /> <el-input v-model="dataForm.name" :placeholder="$t('module.basicData.Warehouse.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.IssueOrderTime')" prop="createTime"> <el-form-item :label="$t('module.basicData.Warehouse.IssueOrderTime')" prop="createTime">
<el-input v-model="dataForm.createTime" :placeholder="$i18nForm([$t('module.basicData.Warehouse.IssueOrderTime')])" readonly :style="{width: '100%'}" /> <el-input v-model="dataForm.createTime" :placeholder="$t('module.basicData.Warehouse.IssueOrderTime')" 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.PlanProcessQuantity')" prop="planQuantity"> <el-form-item :label="$t('module.basicData.Warehouse.PlanProcessQuantity')" prop="planQuantity">
<el-input v-model="dataForm.planQuantity" :placeholder="$i18nForm([$t('module.basicData.Warehouse.PlanProcessQuantity')])" readonly :style="{width: '100%'}" /> <el-input v-model="dataForm.planQuantity" :placeholder="$t('module.basicData.Warehouse.PlanProcessQuantity')" readonly :style="{width: '100%'}" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -42,12 +41,12 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.OrderCode')" prop="taskCode"> <el-form-item :label="$t('module.basicData.Warehouse.OrderCode')" prop="taskCode">
<el-input v-model="dataForm.taskCode" :placeholder="$i18nForm([$t('module.basicData.Warehouse.OrderCode')])" readonly :style="{width: '100%'}" /> <el-input v-model="dataForm.taskCode" :placeholder="$t('module.basicData.Warehouse.OrderCode')" 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.OrderStatus')" prop="taskType"> <el-form-item :label="$t('module.basicData.Warehouse.OrderStatus')" prop="taskType">
<el-input v-model="dataForm.taskType" :placeholder="$i18nForm([$t('module.basicData.Warehouse.OrderStatus')])" readonly :style="{width: '100%'}" /> <el-input v-model="dataForm.taskType" :placeholder="$t('module.basicData.Warehouse.OrderStatus')" readonly :style="{width: '100%'}" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -56,14 +55,14 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.TotalProcessName')" prop="craftName"> <el-form-item :label="$t('module.basicData.Warehouse.TotalProcessName')" prop="craftName">
<el-input v-model="dataForm.craftName" :placeholder="$i18nForm([$t('module.basicData.Warehouse.TotalProcessName')])" readonly :style="{width: '100%'}" /> <el-input v-model="dataForm.craftName" :placeholder="$t('module.basicData.Warehouse.TotalProcessName')" 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.SubProcessName')" prop="subProccessName"> <el-form-item :label="$t('module.basicData.Warehouse.SubProcessName')" prop="subProccessName">
<el-input <el-input
v-model="dataForm.subProccessName" v-model="dataForm.subProccessName"
:placeholder="$i18nForm([$t('module.basicData.Warehouse.SubProcessName')])" :placeholder="$t('module.basicData.Warehouse.SubProcessName')"
readonly readonly
:style="{width: '100%'}" :style="{width: '100%'}"
/> />