root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:国际化合并

Browse Source
This commit is contained in:
zhangzq
2024-12-21 15:07:57 +08:00
parent de82716361
commit 9f43c2ed72
79 changed files with 2123 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wms_pro/qd/src/views/login.vue
View File

@@ -2,7 +2,7 @@
<div class="login" :style="'background-image:url('+ Background +');'">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
<h3 class="title">
恒森WMS系统
{{this.$i18n.t('common.title')}}
</h3>
<el-form-item prop="username">
<el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">

140
wms_pro/qd/src/views/monitor/server/index.vue
View File

@@ -1,136 +1,12 @@
<template>
<div v-loading="!show" element-loading-text="数据加载中..." :style="!show ? 'height: 500px' : 'height: 100%'" class="app-container">
<div v-if="show">
<el-card class="box-card">
<div style="color: #666;font-size: 13px;">
<svg-icon icon-class="system" style="margin-right: 5px" />
<span>
系统：{{ data.sys.os }}
</span>
<span>
IP：{{ data.sys.ip }}
</span>
<span>
项目已不间断运行：{{ data.sys.day }}
</span>
<i class="el-icon-refresh" style="margin-left: 40px" @click="init" />
</div>
</el-card>
<el-card class="box-card">
<div slot="header" class="clearfix">
<span style="font-weight: bold;color: #666;font-size: 15px">状态</span>
</div>
<div>
<el-col :xs="24" :sm="24" :md="6" :lg="6" :xl="6" style="margin-bottom: 10px">
<div class="title">CPU使用率</div>
<el-tooltip placement="top-end">
<div slot="content" style="font-size: 12px;">
<div style="padding: 3px;">
{{ data.cpu.name }}
</div>
<div style="padding: 3px">
{{ data.cpu.package }}
</div>
<div style="padding: 3px">
{{ data.cpu.core }}
</div>
<div style="padding: 3px">
{{ data.cpu.logic }}
</div>
</div>
<div class="content">
<el-progress type="dashboard" :percentage="parseFloat(data.cpu.used)" />
</div>
</el-tooltip>
<div class="footer">{{ data.cpu.coreNumber }} 核心</div>
</el-col>
<el-col :xs="24" :sm="24" :md="6" :lg="6" :xl="6" style="margin-bottom: 10px">
<div class="title">内存使用率</div>
<el-tooltip placement="top-end">
<div slot="content" style="font-size: 12px;">
<div style="padding: 3px;">
总量：{{ data.memory.total }}
</div>
<div style="padding: 3px">
已使用：{{ data.memory.used }}
</div>
<div style="padding: 3px">
空闲：{{ data.memory.available }}
</div>
</div>
<div class="content">
<el-progress type="dashboard" :percentage="parseFloat(data.memory.usageRate)" />
</div>
</el-tooltip>
<div class="footer">{{ data.memory.used }} / {{ data.memory.total }}</div>
</el-col>
<el-col :xs="24" :sm="24" :md="6" :lg="6" :xl="6" style="margin-bottom: 10px">
<div class="title">交换区使用率</div>
<el-tooltip placement="top-end">
<div slot="content" style="font-size: 12px;">
<div style="padding: 3px;">
总量：{{ data.swap.total }}
</div>
<div style="padding: 3px">
已使用：{{ data.swap.used }}
</div>
<div style="padding: 3px">
空闲：{{ data.swap.available }}
</div>
</div>
<div class="content">
<el-progress type="dashboard" :percentage="parseFloat(data.swap.usageRate)" />
</div>
</el-tooltip>
<div class="footer">{{ data.swap.used }} / {{ data.swap.total }}</div>
</el-col>
<el-col :xs="24" :sm="24" :md="6" :lg="6" :xl="6" style="margin-bottom: 10px">
<div class="title">磁盘使用率</div>
<div class="content">
<el-tooltip placement="top-end">
<div slot="content" style="font-size: 12px;">
<div style="padding: 3px">
总量：{{ data.disk.total }}
</div>
<div style="padding: 3px">
空闲：{{ data.disk.available }}
</div>
</div>
<div class="content">
<el-progress type="dashboard" :percentage="parseFloat(data.disk.usageRate)" />
</div>
</el-tooltip>
</div>
<div class="footer">{{ data.disk.used }} / {{ data.disk.total }}</div>
</el-col>
</div>
</el-card>
<div>
<el-row :gutter="6">
<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" style="margin-bottom: 10px">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span style="font-weight: bold;color: #666;font-size: 15px">CPU使用率监控</span>
</div>
<div>
<v-chart :options="cpuInfo" />
</div>
</el-card>
</el-col>
<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" style="margin-bottom: 10px">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span style="font-weight: bold;color: #666;font-size: 15px">内存使用率监控</span>
</div>
<div>
<v-chart :options="memoryInfo" />
</div>
</el-card>
</el-col>
</el-row>
</div>
</div>
<div style="height:1000px">
<iframe
src="./src/assets/daping/index.html"
width="100%"
height="100%"
frameborder="0"
allowfullscreen
></iframe>
</div>
</template>

104
wms_pro/qd/src/views/wms/dispatch_manage/point/index.vue
View File

@@ -10,13 +10,13 @@
label-width="90px"
label-suffix=":"
>
<el-form-item label="生产车间">
<el-form-item :label="$t('pointmg.label.生产车间')">
<el-select
v-model="query.product_area"
clearable
filterable
size="mini"
placeholder="区域类型"
:placeholder="$t('pointmg.label.生产车间')"
class="filter-item"
@change="crud.toQuery()"
>
@@ -27,24 +27,23 @@
/>
</el-select>
</el-form-item>
<el-form-item label="模糊搜索">
<el-form-item :label="$t('pointmg.label.模糊搜索')">
<el-input
v-model="query.search"
clearable
size="mini"
placeholder="编码名称"
placeholder="$t('pointmg.label.编码名称')"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="区域类型">
<el-form-item :label="$t('pointmg.label.区域类型')">
<el-select
v-model="query.region_code"
clearable
filterable
size="mini"
placeholder="区域类型"
:placeholder="$t('pointmg.label.区域类型')"
class="filter-item"
@change="getPointStatusAndTypeList(query.region_code, 1)"
>
<el-option
v-for="item in regionList"
@@ -53,12 +52,12 @@
/>
</el-select>
</el-form-item>
<el-form-item label="点位类型">
<el-form-item :label="$t('pointmg.label.点位类型')">
<el-select
v-model="query.point_type"
clearable
size="mini"
placeholder="点位类型"
:placeholder="$t('pointmg.label.点位类型')"
class="filter-item"
@change="hand"
>
@@ -69,7 +68,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="是否锁定">
<el-form-item :label="$t('pointmg.label.是否锁定')">
<el-switch
v-model="query.lock_type"
active-value="1"
@@ -90,11 +89,11 @@
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
:title= "$t('pointmg.title')"
width="540px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
<el-form-item label="生产车间" prop="product_area">
<el-form-item :label="$t('pointmg.label.生产车间')" prop="product_area">
<el-select
v-model="form.product_area"
placeholder=""
@@ -108,10 +107,10 @@
/>
</el-select>
</el-form-item>
<el-form-item label="所属区域" prop="region_code">
<el-form-item :label="$t('pointmg.label.所属区域')" prop="region_code">
<el-select
v-model="form.region_code"
placeholder="请选择"
:placeholder="$t('pointmg.label.所属区域')"
style="width: 370px;"
>
<el-option
@@ -121,17 +120,17 @@
/>
</el-select>
</el-form-item>
<el-form-item label="点位编码" prop="code">
<el-form-item :label="$t('pointmg.label.点位编码')" prop="code">
<el-input v-model="form.code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="点位名称" prop="name">
<el-form-item :label="$t('pointmg.label.点位名称')" prop="name">
<el-input v-model="form.name" style="width: 370px;"/>
</el-form-item>
<el-form-item label="锁定类型" prop="lock_type">
<el-form-item :label="$t('pointmg.label.锁定类型')" prop="lock_type">
<el-select
v-model="form.lock_type"
size="mini"
placeholder="锁定类型"
:placeholder="$t('pointmg.label.锁定类型')"
class="filter-item"
style="width: 370px;"
>
@@ -142,14 +141,14 @@
/>
</el-select>
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-form-item :label="$t('pointmg.label.是否启用')" prop="is_used">
<el-switch v-model="form.is_used" :active-value=true :inactive-value=false />
</el-form-item>
<el-form-item v-show="pointTypesDialogList.length > 0" label="点位类型" prop="device_point_type">
<el-form-item v-show="pointTypesDialogList.length > 0" :label="$t('pointmg.label.点位类型')" prop="device_point_type">
<el-select
v-model="form.point_type"
size="mini"
placeholder="设备点位类型"
:placeholder="$t('pointmg.label.点位类型')"
class="filter-item"
style="width: 370px;"
>
@@ -160,25 +159,25 @@
/>
</el-select>
</el-form-item>
<el-form-item label="载具编码" prop="vehicle_code">
<el-form-item :label="$t('pointmg.label.载具编码')" prop="vehicle_code">
<el-input v-model="form.vehicle_code" clearable style="width: 370px;"/>
</el-form-item>
<el-form-item label="位置" prop="point_location">
<el-form-item :label="$t('pointmg.label.位置')" prop="point_location">
<el-input v-model="form.point_location" clearable style="width: 370px;"/>
</el-form-item>
<el-form-item label="优先级" prop="priority">
<el-form-item :label="$t('pointmg.label.优先级')" prop="priority">
<el-input v-model="form.priority" clearable style="width: 370px;"/>
</el-form-item>
<el-form-item label="表单数据" prop="form_data">
<el-form-item :label="$t('pointmg.label.表单数据')" prop="form_data">
<el-input type="textarea" v-model="form.form_data" clearable style="width: 370px;"/>
</el-form-item>
<el-form-item label="备注">
<el-form-item :label="$t('pointmg.label.备注')">
<el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
<el-button type="text" @click="crud.cancelCU">{{ $t('auto.common.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('auto.common.determine') }}</el-button>
</div>
</el-dialog>
<!--表格渲染-->
@@ -191,29 +190,29 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column prop="code" label="点位编码" sortable width="120" show-overflow-tooltip />
<el-table-column prop="name" label="点位名称" width="150" sortable show-overflow-tooltip/>
<el-table-column prop="region_code" label="区域编码" min-width="120" show-overflow-tooltip/>
<el-table-column prop="group_code" label="点位组编码" min-width="120" show-overflow-tooltip/>
<el-table-column prop="point_location" label="位置" min-width="120" show-overflow-tooltip/>
<el-table-column prop="point_type_name" label="点位类型"/>
<el-table-column prop="lock_type_name" label="锁定类型"/>
<el-table-column prop="priority" label="优先级"/>
<el-table-column prop="vehicle_code" label="载具编码" min-width="120" show-overflow-tooltip/>
<el-table-column prop="form_data" label="表单数据" min-width="120" show-overflow-tooltip/>
<el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip/>
<el-table-column prop="is_used" label="是否启用">
<el-table-column prop="code" :label="$t('pointmg.label.点位编码')" sortable width="120" show-overflow-tooltip />
<el-table-column prop="name" :label="$t('pointmg.label.点位名称')" width="150" sortable show-overflow-tooltip/>
<el-table-column prop="region_code" :label="$t('pointmg.label.区域编码')" min-width="120" show-overflow-tooltip/>
<el-table-column prop="group_code" :label="$t('pointmg.label.点位组编码')" min-width="120" show-overflow-tooltip/>
<el-table-column prop="point_location" :label="$t('pointmg.label.位置')" min-width="120" show-overflow-tooltip/>
<el-table-column prop="point_type_name" :label="$t('pointmg.label.点位类型')"/>
<el-table-column prop="lock_type_name" :label="$t('pointmg.label.锁定类型')"/>
<el-table-column prop="priority" :label="$t('pointmg.label.优先级')"/>
<el-table-column prop="vehicle_code" :label="$t('pointmg.label.载具编码')" min-width="120" show-overflow-tooltip/>
<el-table-column prop="form_data" :label="$t('pointmg.label.表单数据')" min-width="120" show-overflow-tooltip/>
<el-table-column prop="remark" :label="$t('pointmg.label.备注')" min-width="100" show-overflow-tooltip/>
<el-table-column prop="is_used" :label="$t('pointmg.label.是否启用')">
<template slot-scope="scope">
{{ scope.row.is_used == '1' ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column prop="create_name" label="创建人"/>
<el-table-column prop="create_time" label="创建时间" width="150"/>
<el-table-column prop="update_name" label="修改人"/>
<el-table-column prop="update_time" label="修改时间" width="150"/>
<el-table-column prop="create_name" :label="$t('pointmg.label.创建人')"/>
<el-table-column prop="create_time" :label="$t('pointmg.label.创建时间')" width="150"/>
<el-table-column prop="update_name" :label="$t('pointmg.label.修改人')"/>
<el-table-column prop="update_time" :label="$t('pointmg.label.修改时间')" width="150"/>
<el-table-column
v-permission="[]"
label="操作"
:label="$t('pointmg.label.操作')"
fixed="right"
width="120px"
align="center"
@@ -239,6 +238,7 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import i18n from "@/i18n";
const defaultForm = {
point_id: null,
@@ -267,7 +267,7 @@ export default {
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '点位',
title: i18n.t('pointmg.title'),
url: 'api/point',
idField: 'id',
optShow: {
@@ -332,14 +332,14 @@ export default {
if (val !== '1') {
msg = '此操作将启用点位，是否继续！'
}
this.$confirm(msg, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
this.$confirm(msg, i18n.t('pointmg.label.提示'), {
confirmButtonText: i18n.t('pointmg.label.确定'),
cancelButtonText: i18n.t('pointmg.label.取消'),
type: 'warning'
}).then(() => {
changeActive(data).then(res => {
this.crud.toQuery()
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.notify(i18n.t('notice.placeholder.successful'), CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
data.is_used = !data.is_used
})
@@ -351,7 +351,7 @@ export default {
param.data = data
param.used = flag
crudPoint.changeUsed(param).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.notify(i18n.t('notice.placeholder.successful'), CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
},
@@ -360,7 +360,7 @@ export default {
param.data = data
param.lock_type = flag
crudPoint.changeLock(param).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.notify(i18n.t('notice.placeholder.successful'), CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
},

55
wms_pro/qd/src/views/wms/dispatch_manage/region/index.vue
View File

@@ -10,13 +10,13 @@
label-width="90px"
label-suffix=":"
>
<el-form-item label="生产车间">
<el-form-item :label="$t('region.label.生产车间')">
<el-select
v-model="query.product_area"
clearable
filterable
size="mini"
placeholder="区域类型"
:placeholder="$t('region.placeholder.区域类型')"
class="filter-item"
@change="crud.toQuery()"
>
@@ -27,11 +27,11 @@
/>
</el-select>
</el-form-item>
<el-form-item label="编码/名称">
<el-form-item :label="$t('region.label.编码名称')">
<el-input
v-model="query.search"
clearable
placeholder="输入编码或名称"
:placeholder="$t('region.placeholder.输入编码或名称')"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
@@ -46,11 +46,11 @@
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
:title="$t('region.title.title')"
width="550px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="生产区域" prop="product_area">
<el-form-item :label="$t('region.label.生产车间')" prop="product_area">
<el-select
v-model="form.product_area"
placeholder=""
@@ -64,13 +64,13 @@
/>
</el-select>
</el-form-item>
<el-form-item label="区域编码" prop="code">
<el-form-item :label="$t('region.label.区域编码')" prop="code">
<el-input v-model="form.code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="区域名称" prop="name">
<el-form-item :label="$t('region.label.区域名称')" prop="name">
<el-input v-model="form.name" style="width: 370px;"/>
</el-form-item>
<el-form-item label="是否合并任务" prop="is_merge">
<el-form-item :label="$t('region.label.是否合并任务')" prop="is_merge">
<el-select
v-model="form.is_merge"
placeholder=""
@@ -84,22 +84,22 @@
/>
</el-select>
</el-form-item>
<el-form-item label="点位类型说明">
<el-form-item :label="$t('region.label.点位类型说明')">
<el-input v-model="form.type_explain" type="textarea" style="width: 370px;"/>
</el-form-item>
<el-form-item label="点位状态说明">
<el-form-item :label="$t('region.label.点位状态说明')">
<el-input v-model="form.status_explain" type="textarea" style="width: 370px;"/>
</el-form-item>
<el-form-item label="表单数据">
<el-form-item :label="$t('region.label.表单数据')">
<el-input v-model="form.form_data" type="textarea" style="width: 370px;"/>
</el-form-item>
<el-form-item label="备注">
<el-form-item :label="$t('region.label.备注')">
<el-input v-model="form.remark" type="textarea" style="width: 370px;"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
<el-button type="text" @click="crud.cancelCU">{{ $t('auto.common.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('auto.common.determine') }}</el-button>
</div>
</el-dialog>
<!--表格渲染-->
@@ -111,21 +111,21 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="code" label="区域编码" width="120" show-overflow-tooltip/>
<el-table-column prop="name" label="区域名称" width="120" show-overflow-tooltip/>
<el-table-column prop="product_area" label="生产区域" width="120" show-overflow-tooltip/>
<el-table-column prop="is_merge" label="是否合并任务" width="120" show-overflow-tooltip>
<el-table-column prop="code" :label="$t('region.label.区域编码')" width="120" show-overflow-tooltip/>
<el-table-column prop="name" :label="$t('region.label.区域名称')" width="120" show-overflow-tooltip/>
<el-table-column prop="product_area" :label="$t('region.label.生产车间')" width="120" show-overflow-tooltip/>
<el-table-column prop="is_merge" :label="$t('region.label.是否合并任务')" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.IS_OR_NOT[scope.row.is_merge] }}
</template>
</el-table-column>
<el-table-column prop="type_explain" label="点位类型说明" width="120" show-overflow-tooltip/>
<el-table-column prop="status_explain" label="点位状态说明" width="120" show-overflow-tooltip/>
<el-table-column prop="form_data" label="表单数据" width="120" show-overflow-tooltip/>
<el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip/>
<el-table-column prop="create_name" label="创建人" width="120" show-overflow-tooltip/>
<el-table-column prop="create_time" label="创建时间" width="120" show-overflow-tooltip/>
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<el-table-column prop="type_explain" :label="$t('region.label.点位类型说明')" width="120" show-overflow-tooltip/>
<el-table-column prop="status_explain" :label="$t('region.label.点位状态说明')" width="120" show-overflow-tooltip/>
<el-table-column prop="form_data" :label="$t('region.label.表单数据')" width="120" show-overflow-tooltip/>
<el-table-column prop="remark" :label="$t('region.label.备注')" width="120" show-overflow-tooltip/>
<el-table-column prop="create_name" :label="$t('region.label.创建人')" width="120" show-overflow-tooltip/>
<el-table-column prop="create_time" :label="$t('region.label.创建时间')" width="120" show-overflow-tooltip/>
<el-table-column v-permission="[]" :label="$t('region.label.操作')" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
@@ -147,6 +147,7 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import i18n from "@/i18n";
const defaultForm = {
id: null,
@@ -170,7 +171,7 @@ export default {
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '区域管理',
title: i18n.t('region.title'),
url: 'api/region',
idField: 'code',
sort: 'code,desc',

117
wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue
View File

@@ -12,52 +12,52 @@
>
<el-form-item label="任务号">
<label slot="label">任&nbsp;&nbsp;务&nbsp;号:</label>
<el-form-item :label="$t('distask.label.任务号')">
<label slot="label">{{ $t('distask.label.任务号')}}</label>
<el-input
v-model="query.task_code"
clearable
style="width: 240px"
placeholder="任务号"
:placeholder="$t('distask.placeholder.任务号')"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="载具号">
<label slot="label">载&nbsp;&nbsp;具&nbsp;号:</label>
<el-form-item :label="$t('distask.label.载具号')">
<label slot="label">{{ $t('distask.label.载具号')}}</label>
<el-input
v-model="query.vehicle_code"
clearable
style="width: 240px"
placeholder="载具号"
:placeholder="$t('distask.placeholder.载具号')"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="点位编码">
<el-form-item :label="$t('distask.label.点位编码')">
<el-input
v-model="query.point_code"
clearable
style="width: 240px"
placeholder="起点"
:placeholder="$t('distask.placeholder.起点')"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="创建时间">
<el-form-item :label="$t('distask.label.创建时间')">
<el-date-picker
v-model="query.createTime"
type="datetimerange"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
range-separator='to'
start-placeholder='start time'
end-placeholder='end time'
@change="crud.toQuery">
</el-date-picker>
</el-form-item>
<el-form-item label="任务状态">
<el-form-item :label="$t('distask.label.任务状态')">
<el-select
v-model="query.status"
multiple
style="width: 360px"
placeholder="任务状态"
:placeholder="$t('distask.placeholder.任务状态')"
class="filter-item"
clearable
@change="handTaskStatus"
@@ -75,125 +75,125 @@
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<span>
未完成数：
{{ $t('distask.label.未完成数') }}
<el-input
v-model="undo"
clearable
style="width: 60px"
/>
<el-button type="primary" @click="taskScheduler()">任务调度</el-button>
<el-button type="primary" @click="taskScheduler()">{{ $t('distask.label.任务调度') }}</el-button>
</span>
<crudOperation :permission="permission"/>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
:title="crud.status.title" width="800px">
:title="$t('distask.title')" width="800px">
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true"
:model="form" :rules="rules" size="mini" label-width="115px" label-suffix=":">
<el-form-item label="任务编码">
<el-form-item :label="$t('distask.label.任务编码')">
<el-input v-model="form.task_code" style="width: 240px;"/>
</el-form-item>
<el-form-item label="任务状态">
<el-form-item :label="$t('distask.label.任务状态')">
<el-input v-model="form.status" style="width: 240px;"/>
</el-form-item>
<el-form-item label="点位1">
<el-form-item :label="$t('distask.label.起点1')">
<el-input v-model="form.point_code1" style="width: 240px;"/>
</el-form-item>
<el-form-item label="点位2">
<el-form-item :label="$t('distask.label.终点1')">
<el-input v-model="form.point_code2" style="width: 240px;"/>
</el-form-item>
<el-form-item label="点位3">
<el-form-item :label="$t('distask.label.起点2')">
<el-input v-model="form.point_code3" style="width: 240px;"/>
</el-form-item>
<el-form-item label="点位4">
<el-form-item :label="$t('distask.label.终点2')">
<el-input v-model="form.point_code4" style="width: 240px;"/>
</el-form-item>
<el-form-item label="载具类型">
<el-form-item :label="$t('distask.label.载具类型')">
<el-input v-model="form.vehicle_type" style="width: 240px;"/>
</el-form-item>
<el-form-item label="载具编码">
<el-form-item :label="$t('distask.label.载具编码')">
<el-input v-model="form.vehicle_code" style="width: 240px;"/>
</el-form-item>
<el-form-item label="优先级">
<el-form-item :label="$t('distask.label.优先级')">
<el-input v-model="form.priority" style="width: 240px;"/>
</el-form-item>
<el-form-item v-if="false" label="处理类">
<el-form-item v-if="false" :label="$t('distask.label.处理类')">
<el-input v-model="form.handle_class" style="width: 240px;"/>
</el-form-item>
<el-form-item label="备注">
<el-form-item :label="$t('distask.label.备注')">
<el-input v-model="form.remark" style="width: 240px;"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
<el-button type="text" @click="crud.cancelCU">{{ $t('auto.common.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('auto.common.determine') }}</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;"
@selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55"/>
<el-table-column prop="product_area" show-overflow-tooltip show-tooltip-when-overflow label="生产区域"/>
<el-table-column prop="task_code" show-overflow-tooltip show-tooltip-when-overflow label="任务编码"/>
<el-table-column prop="task_type" show-overflow-tooltip show-tooltip-when-overflow label="任务类型">
<el-table-column prop="product_area" show-overflow-tooltip show-tooltip-when-overflow :label="$t('distask.label.生产区域')"/>
<el-table-column prop="task_code" show-overflow-tooltip show-tooltip-when-overflow :label="$t('distask.label.任务编码')"/>
<el-table-column prop="task_type" show-overflow-tooltip show-tooltip-when-overflow :label="$t('distask.label.任务类型')">
<template slot-scope="scope">
{{ statusEnum.label.TASK_TYPE[scope.row.task_type] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_code" show-overflow-tooltip show-tooltip-when-overflow label="载具编码">
<el-table-column prop="vehicle_code" show-overflow-tooltip show-tooltip-when-overflow :label="$t('distask.label.载具编码')">
<template slot-scope="scope">
{{ scope.row.vehicle_code ? scope.row.vehicle_code : '-' }}
</template>
</el-table-column>
<el-table-column prop="acs_type" show-overflow-tooltip show-tooltip-when-overflow width="130" label="ACS任务类型"/>
<el-table-column prop="status" show-overflow-tooltip show-tooltip-when-overflow label="任务状态">
<el-table-column prop="acs_type" show-overflow-tooltip show-tooltip-when-overflow width="130" :label="$t('distask.label.ACS任务类型')"/>
<el-table-column prop="status" show-overflow-tooltip show-tooltip-when-overflow :label="$t('distask.label.任务状态')">
<template slot-scope="scope">
{{ statusEnum.label.FORM_STATUS[scope.row.status] }}
</template>
</el-table-column>
<el-table-column prop="task_step" show-overflow-tooltip show-tooltip-when-overflow width="130" label="任务执行步骤"/>
<el-table-column prop="group_code" show-overflow-tooltip show-tooltip-when-overflow label="任务组"/>
<el-table-column prop="point_code1" show-overflow-tooltip show-tooltip-when-overflow width="130" label="起点1"/>
<el-table-column prop="point_code2" show-overflow-tooltip show-tooltip-when-overflow width="130" label="终点1"/>
<el-table-column prop="point_code3" show-overflow-tooltip show-tooltip-when-overflow width="130" label="起点2"/>
<el-table-column prop="point_code4" show-overflow-tooltip show-tooltip-when-overflow width="130" label="终点2"/>
<el-table-column prop="task_step" show-overflow-tooltip show-tooltip-when-overflow width="130" :label="$t('distask.label.任务执行步骤')"/>
<el-table-column prop="group_code" show-overflow-tooltip show-tooltip-when-overflow :label="$t('distask.label.任务组')"/>
<el-table-column prop="point_code1" show-overflow-tooltip show-tooltip-when-overflow width="130" :label="$t('distask.label.起点1')"/>
<el-table-column prop="point_code2" show-overflow-tooltip show-tooltip-when-overflow width="130" :label="$t('distask.label.终点1')"/>
<el-table-column prop="point_code3" show-overflow-tooltip show-tooltip-when-overflow width="130" :label="$t('distask.label.起点2')"/>
<el-table-column prop="point_code4" show-overflow-tooltip show-tooltip-when-overflow width="130" :label="$t('distask.label.终点2')"/>
<el-table-column prop="priority" show-overflow-tooltip show-tooltip-when-overflow label="优先级"/>
<el-table-column prop="handle_class" show-overflow-tooltip show-tooltip-when-overflow width="150" label="处理类"/>
<el-table-column prop="is_send" show-overflow-tooltip show-tooltip-when-overflow label="立即下发"/>
<el-table-column prop="remark" show-overflow-tooltip show-tooltip-when-overflow label="备注"/>
<el-table-column prop="form_data" show-overflow-tooltip show-tooltip-when-overflow width="130" label="自定义参数"/>
<el-table-column prop="create_time" show-overflow-tooltip show-tooltip-when-overflow label="创建时间"/>
<el-table-column prop="update_name" show-overflow-tooltip show-tooltip-when-overflow label="修改人"/>
<el-table-column prop="update_time" show-overflow-tooltip show-tooltip-when-overflow label="修改时间"/>
<el-table-column v-permission="[]" label="操作" width="250px" align="center" fixed="right">
<el-table-column prop="priority" show-overflow-tooltip show-tooltip-when-overflow :label="$t('distask.label.优先级')"/>
<el-table-column prop="handle_class" show-overflow-tooltip show-tooltip-when-overflow width="150" :label="$t('distask.label.处理类')"/>
<el-table-column prop="is_send" show-overflow-tooltip show-tooltip-when-overflow :label="$t('distask.label.立即下发')"/>
<el-table-column prop="remark" show-overflow-tooltip show-tooltip-when-overflow :label="$t('distask.label.备注')"/>
<el-table-column prop="form_data" show-overflow-tooltip show-tooltip-when-overflow width="130" :label="$t('distask.label.自定义参数')"/>
<el-table-column prop="create_time" show-overflow-tooltip show-tooltip-when-overflow :label="$t('distask.label.创建时间')"/>
<el-table-column prop="update_name" show-overflow-tooltip show-tooltip-when-overflow :label="$t('distask.label.修改人')"/>
<el-table-column prop="update_time" show-overflow-tooltip show-tooltip-when-overflow :label="$t('distask.label.修改时间')"/>
<el-table-column v-permission="[]" :label="$t('distask.label.操作')" width="250px" align="center" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
icon="el-icon-success"
@click="doOperate(scope.row, 'c')"
:disabled="scope.row.status!=='10' && scope.row.status!=='30' "
>下发
>{{$t('distask.label.下发')}}
</el-button>
<el-button
type="text"
icon="el-icon-success"
@click="doOperate(scope.row, 'a')"
:disabled="scope.row.status==='80' || scope.row.status==='82' || scope.row.status==='90'"
>完成
>{{$t('distask.label.完成')}}
</el-button>
<el-button
type="text"
icon="el-icon-success"
@click="doOperate(scope.row, 'e')"
:disabled="scope.row.status==='80' || scope.row.status==='82' || scope.row.status==='90'"
>强制完成
>{{$t('distask.label.强制完成')}}
</el-button>
<el-button
type="text"
icon="el-icon-error"
@click="doOperate(scope.row, 'b')"
:disabled="scope.row.status==='80' || scope.row.status==='82' || scope.row.status==='90'"
>取消
>{{$t('distask.label.取消')}}
</el-button>
</template>
</el-table-column>
@@ -213,6 +213,7 @@ import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import crudDict from '@/views/system/dict/dict'
import i18n from "@/i18n";
const defaultForm = {
@@ -246,7 +247,7 @@ export default {
statusEnums: ['TASK_TYPE', 'FORM_STATUS'],
cruds() {
return CRUD({
title: '任务管理',
title: i18n.t('distask.title'),
url: 'api/schBaseTask',
idField: 'task_id',
sort: 'task_code,desc',
@@ -313,7 +314,7 @@ export default {
}
crudSchBaseTask.operation(data).then(res => {
this.crud.toQuery()
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.notify(i18n.t('notice.placeholder.successful'), CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(err => {
console.log(err.response.data.message)
})
@@ -321,7 +322,7 @@ export default {
taskScheduler() {
crudSchBaseTask.scheduler().then(res => {
this.crud.toQuery()
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.notify(i18n.t('notice.placeholder.successful'), CRUD.NOTIFICATION_TYPE.SUCCESS)
})
}
}

55
wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue
View File

@@ -10,12 +10,12 @@
label-width="80px"
label-suffix=":"
>
<el-form-item label="所属仓库">
<el-form-item :label="$t('structinfo.label.所属仓库')">
<el-select
v-model="query.stor_code"
clearable
class="filter-item"
placeholder="所属仓库"
:placeholder="$t('structinfo.label.所属仓库')"
@change="crud.toQuery"
>
<el-option
@@ -26,54 +26,54 @@
/>
</el-select>
</el-form-item>
<el-form-item label="仓位信息">
<el-form-item :label="$t('structinfo.label.仓位信息')">
<el-input
v-model="query.search"
clearable
size="mini"
placeholder="请输入仓位信息"
:placeholder="$t('structinfo.label.仓位信息')"
prefix-icon="el-icon-search"
class="filter-item"
/>
</el-form-item>
<el-form-item label="物料信息">
<el-form-item :label="$t('structinfo.label.物料信息')">
<el-input
v-model="query.material"
clearable
size="mini"
placeholder="请输入物料信息"
:placeholder="$t('structinfo.label.物料信息')"
prefix-icon="el-icon-search"
class="filter-item"
/>
</el-form-item>
<el-form-item label="批号">
<el-form-item :label="$t('structinfo.label.批号')">
<el-input
v-model="query.pcsn"
clearable
size="mini"
placeholder="请输入批号"
:placeholder="$t('structinfo.label.批号')"
prefix-icon="el-icon-search"
class="filter-item"
/>
</el-form-item>
<el-form-item label="载具编码">
<el-form-item :label="$t('structinfo.label.载具编码')">
<el-input
v-model="query.vehicle_code"
clearable
size="mini"
placeholder="请输入载具编码"
:placeholder="$t('structinfo.label.载具编码')"
prefix-icon="el-icon-search"
class="filter-item"
/>
</el-form-item>
<el-form-item label="入库日期" prop="analyseData">
<el-form-item :label="$t('structinfo.label.入库日期')" prop="analyseData">
<el-date-picker
v-model="query.datepick"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
range-separator="to"
start-placeholder="start time"
end-placeholder="end time"
/>
</el-form-item>
<rrOperation />
@@ -84,7 +84,7 @@
icon="el-icon-s-operation"
@click="downloadMethod"
>
导出库存
{{ this.$i18n.t('structinfo.label.导出库存')}}
</el-button>
</el-form>
</div>
@@ -99,21 +99,21 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="struct_code" label="仓位编码" width="150" show-tooltip-when-overflow />
<el-table-column prop="material_code" label="物料编码" width="150" show-tooltip-when-overflow />
<el-table-column prop="material_name" label="物料名称" width="150" show-tooltip-when-overflow />
<el-table-column prop="vehicle_code" label="载具编码" width="150" show-tooltip-when-overflow />
<el-table-column prop="struct_code" :label="$t('structinfo.label.仓位信息')" width="150" show-tooltip-when-overflow />
<el-table-column prop="material_code" :label="$t('structinfo.label.物料信息')" width="150" show-tooltip-when-overflow />
<el-table-column prop="material_name" :label="$t('structinfo.label.物料名称')" width="150" show-tooltip-when-overflow />
<el-table-column prop="vehicle_code" :label="$t('structinfo.label.载具编码')" width="150" show-tooltip-when-overflow />
<!-- <el-table-column prop="parent_vehicle_code" label="父载具编码" width="150" show-tooltip-when-overflow />-->
<el-table-column prop="pcsn" label="批次" min-width="150" show-tooltip-when-overflow />
<el-table-column prop="qty" label="总库存" min-width="150" show-tooltip-when-overflow />
<el-table-column prop="frozen_qty" label="冻结库存" show-tooltip-when-overflow />
<el-table-column prop="unit_id" label="单位" show-tooltip-when-overflow>
<el-table-column prop="pcsn" :label="$t('structinfo.label.批号')" min-width="150" show-tooltip-when-overflow />
<el-table-column prop="qty" :label="$t('structinfo.label.总库存')" min-width="150" show-tooltip-when-overflow />
<el-table-column prop="frozen_qty" :label="$t('structinfo.label.冻结库存')" show-tooltip-when-overflow />
<el-table-column prop="unit_id" :label="$t('structinfo.label.单位')" show-tooltip-when-overflow>
<template slot-scope="scope">{{ tableEnum.label.bm_measure_unit[scope.row.unit_id] }}</template>
</el-table-column>
<el-table-column prop="lock_type" label="库存锁定" show-tooltip-when-overflow>
<el-table-column prop="lock_type" :label="$t('structinfo.label.库存锁定')" show-tooltip-when-overflow>
<template slot-scope="scope">{{ statusEnum.label.LOCK[scope.row.lock_type] }}</template>
</el-table-column>
<el-table-column prop="create_time" label="组盘入库时间" width="120" show-tooltip-when-overflow />
<el-table-column prop="create_time" :label="$t('structinfo.label.入库时间')" width="120" show-tooltip-when-overflow />
<!-- <el-table-column-->
<!-- label="操作"-->
<!-- fixed="right"-->
@@ -140,6 +140,7 @@ import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import structattr from './structattr'
import { downloadFile,downloadFile2 } from '@/utils/index'
import i18n from "@/i18n";
const defaultForm = {
id: null,
@@ -166,7 +167,7 @@ export default {
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '库存变动记录',
title: i18n.t('structinfo.title'),
url: 'api/structattr/getStructIvt',
optShow: {
add: false,
@@ -218,7 +219,7 @@ export default {
document.body.appendChild(link)
link.click()
document.body.removeChild(link)
this.crud.notify('导出成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.notify(i18n.t('notice.placeholder.successful'), CRUD.NOTIFICATION_TYPE.SUCCESS)
})
}
}