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

feat: 业务功能前端国际化

Browse Source
This commit is contained in:
liyongde
2024-04-16 13:53:43 +08:00
parent 67ae97d6da
commit eb08f3f43f
43 changed files with 1387 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-ui/src/views/monitor/online/index.vue
View File

@@ -89,7 +89,7 @@ export default {
},
methods: {
doDelete(datas) {
this.$confirm(i18n.t('Online.m3_1') + `${datas.length}` + i18n.t('Online.m3_1'), i18n.t('common.Tips'), {
this.$confirm(i18n.t('Online.msg.m3', { count: datas.length }), i18n.t('common.Tips'), {
confirmButtonText: i18n.t('common.Confirm'),
cancelButtonText: i18n.t('common.Cancel'),
type: 'warning'

2
lms/nladmin-ui/src/views/system/dept/index.vue
View File

@@ -289,7 +289,7 @@ export default {
const satus = this.enabledTypeOptions.find(item => {
return item.key == data.is_used
})
this.$confirm(i18n.t('Dept.msg.tip3.1') + ' "' + satus.display_name + '" ' + data.name + i18n.t('Dept.msg.tip3.2'), i18n.t('common.Tips'), {
this.$confirm(i18n.t('Dept.msg.tip3', { display_name: satus.display_name, name: data.name }), i18n.t('common.Tips'), {
confirmButtonText: i18n.t('common.Confirm'),
cancelButtonText: i18n.t('common.Cancel'),
type: 'warning'

2
lms/nladmin-ui/src/views/system/redis/index.vue
View File

@@ -231,7 +231,7 @@ export default {
this.delBtlStatu = val.length == 0
},
batchDel() {
this.$confirm(i18n.t('common.Tip1') + this.multipleSelection.length + i18n.t('common.Tip2'), i18n.t('common.Tips'), {
this.$confirm(i18n.t('common.Tip1', { count: this.multipleSelection.length }), i18n.t('common.Tips'), {
confirmButtonText: i18n.t('common.Confirm'),
cancelButtonText: i18n.t('common.Cancel'),
type: 'warning'

4
lms/nladmin-ui/src/views/system/user/index.vue
View File

@@ -610,7 +610,7 @@ export default {
// 改变状态
changeEnabled(row) {
const satus = this.enabledTypeOptions.find(item => { return item.key !== row.is_used })
this.$confirm(i18n.t('User.msg.m3_1') + satus.display_name + i18n.t('User.msg.m3_2') + row.username + i18n.t('User.msg.m3_3'), i18n.t('common.Tips'), {
this.$confirm(i18n.t('User.msg.m3', {display_name: satus.display_name, username: row.username}), i18n.t('common.Tips'), {
confirmButtonText: i18n.t('common.Confirm'),
cancelButtonText: i18n.t('common.Cancel'),
type: 'warning'
@@ -618,7 +618,7 @@ export default {
row.is_used = satus.key
crudUser.edit(row).then(res => {
this.crud.toQuery()
this.crud.notify(i18n.t('User.msg.m3_2') + row.username + i18n.t('User.msg.m3_4') + satus.display_name)
this.crud.notify(i18n.t('User.msg.m4', { display_name: satus.display_name, username: row.username }))
})
})
},

8
lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/Dialog.vue
View File

@@ -1,6 +1,6 @@
<template>
<el-dialog
title="回传MES"
:title="$t('CoolRegion.pan1.search.button_1')"
append-to-body
:visible.sync="dialogVisible"
:before-close="handleClose"
@@ -9,14 +9,14 @@
@close="close"
>
<el-form ref="form" :model="form1" size="mini" label-width="110px">
<el-form-item label="母卷号" prop="container_name">
<el-form-item :label="$t('CoolRegion.pan1.dialog.container_name')" prop="container_name">
<el-input v-model="form1.container_name" clearable size="mini" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="close">取消</el-button>
<el-button type="primary" @click="confirm('1')">入冷却回传</el-button>
<el-button type="text" @click="close">{{ $t('common.Cancel') }}</el-button>
<el-button type="primary" @click="confirm('1')">{{ $t('CoolRegion.pan1.search.button_2') }}</el-button>
</div>
</el-dialog>
</template>

102
lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolregionio.vue
View File

@@ -8,56 +8,55 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix=":"
>
<el-form-item label="起点点位编码" label-width="120px">
<el-form-item :label="$t('CoolRegion.pan2.search.start_point_code')">
<el-input
v-model="query.start_point_code"
clearable
placeholder="输入起点点位编码"
:placeholder="$t('CoolRegion.pan2.msg.m1')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="终点点位编码" label-width="120px">
<el-form-item :label="$t('CoolRegion.pan2.search.end_point_code')">
<el-input
v-model="query.end_point_code"
clearable
placeholder="输入终点点位编码"
:placeholder="$t('CoolRegion.pan2.msg.m2')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="批次号" label-width="120px">
<el-form-item :label="$t('CoolRegion.pan2.search.pcsn')">
<el-input
v-model="query.pcsn"
clearable
placeholder="输入批次"
:placeholder="$t('CoolRegion.pan2.msg.m3')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="载具编码" label-width="120px">
<el-form-item :label="$t('CoolRegion.pan2.search.vehicle_code')">
<el-input
v-model="query.vehicle_code"
clearable
placeholder="输入载具"
:placeholder="$t('CoolRegion.pan2.msg.m4')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="创建时间">
<el-form-item :label="$t('CoolRegion.pan2.search.createTime')">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:start-placeholder="$t('common.startDate')"
:end-placeholder="$t('common.endDate')"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
@@ -140,13 +139,25 @@
</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 show-overflow-tooltip prop="bill_code" label="单据编号" width="120px" />
<el-table-column prop="io_type" label="出入类型">
<el-table-column
show-overflow-tooltip
prop="bill_code"
:label="$t('CoolRegion.pan2.table.bill_code')"
width="120px"
/>
<el-table-column
prop="io_type"
:label="$t('CoolRegion.pan2.table.io_type')"
>
<template slot-scope="scope">
{{ dict.label.io_type[scope.row.io_type] }}
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="qty" label="数量" />
<el-table-column
show-overflow-tooltip
prop="qty"
:label="$t('CoolRegion.pan2.table.qty')"
/>
<!-- <el-table-column prop="bill_status" label="单据状态" >
<template slot-scope="scope">
{{ dict.label.st_bill_status[scope.row.bill_status] }}
@@ -157,14 +168,48 @@
{{ dict.label.is_used[scope.row.is_used] }}
</template>
</el-table-column>-->
<el-table-column show-overflow-tooltip prop="pcsn" label="批次" width="120px" />
<el-table-column show-overflow-tooltip prop="start_point_code" label="起始点位" width="120px" />
<el-table-column show-overflow-tooltip prop="end_point_code" label="终点点位" width="120px" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" min-width="150" show-overflow-tooltip />
<el-table-column prop="confirm_optname" label="确认人" />
<el-table-column prop="confirm_time" label="确认时间" min-width="150" show-overflow-tooltip />
<el-table-column
show-overflow-tooltip
prop="pcsn"
:label="$t('CoolRegion.pan2.table.pcsn')"
width="120px"
/>
<el-table-column
how-overflow-tooltip
prop="start_point_code"
:label="$t('CoolRegion.pan2.table.start_point_code')"
width="120px"
/>
<el-table-column
show-overflow-tooltip
prop="end_point_code"
:label="$t('CoolRegion.pan2.table.end_point_code')"
width="120px"
/>
<el-table-column
prop="remark"
:label="$t('CoolRegion.pan1.table.remark')"
/>
<el-table-column
prop="create_name"
:label="$t('CoolRegion.pan2.table.create_name')"
/>
<el-table-column
prop="create_time"
:label="$t('CoolRegion.pan2.table.create_time')"
min-width="150"
show-overflow-tooltip
/>
<el-table-column
prop="confirm_optname"
:label="$t('CoolRegion.pan2.table.confirm_optname')"
/>
<el-table-column
prop="confirm_time"
:label="$t('CoolRegion.pan2.table.confirm_time')"
min-width="150"
show-overflow-tooltip
/>
<!-- <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -188,6 +233,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 = { iostorinv_id: null, bill_code: null, io_type: null, material_id: null, pcsn: null, vehicle_code: null, qty: null, qty_unit_id: null, bill_status: null, start_point_code: null, end_point_code: null, cust_id: null, create_mode: null, task_id: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, confirm_optid: null, confirm_optname: null, confirm_time: null, is_delete: null }
export default {
@@ -197,7 +243,7 @@ export default {
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '冷却区出入',
title: i18n.t('CoolRegion.pan2.title'),
url: 'api/stIvtCoolpointivt/coolRegionIOQueryAll',
idField: 'iostorinv_id',
sort: 'iostorinv_id,desc',
@@ -217,17 +263,17 @@ export default {
},
rules: {
full_point_status: [
{ required: true, message: '满轴位状态不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('CoolRegion.pan1.rules.r1'), trigger: 'blur' }
],
empty_point_status: [
{ required: true, message: '空轴位状态不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('CoolRegion.pan1.rules.r2'), trigger: 'blur' }
],
cool_ivt_status: [
{ required: true, message: '库存状态不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('CoolRegion.pan1.rules.r3'), trigger: 'blur' }
]
},
queryTypeOptions: [
{ key: 'point_code', display_name: '点位编码' }
{ key: 'point_code', display_name: i18n.t('CoolRegion.pan1.dialog.point_code') }
]
}
},

4
lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/index.vue
View File

@@ -2,10 +2,10 @@
<div class="app-container">
<el-tabs type="border-card">
<el-tab-pane>
<span slot="label"><i class="el-icon-date" /> 库存查询</span>
<span slot="label"><i class="el-icon-date" /> {{ $t('CoolRegion.pan1.title') }}</span>
<Inventory />
</el-tab-pane>
<el-tab-pane label="冷却区出入记录">
<el-tab-pane :label="$t('CoolRegion.pan2.title')">
<CoolRegionIO />
</el-tab-pane>
</el-tabs>

202
lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue
View File

@@ -8,30 +8,29 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix=":"
>
<el-form-item label="点位编码">
<el-form-item :label="$t('CoolRegion.pan1.dialog.point_code')">
<el-input
v-model="query.point_code"
clearable
placeholder="输入点位编码"
:placeholder="$t('CoolRegion.pan1.msg.m1')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="母卷号">
<el-form-item :label="$t('CoolRegion.pan1.dialog.container_name')">
<el-input
v-model="query.container_name"
clearable
placeholder="输入母卷号"
:placeholder="$t('CoolRegion.pan1.msg.m2')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="满轴位状态">
<el-form-item :label="$t('CoolRegion.pan1.dialog.full_point_status')">
<el-select
v-model="query.full_point_status"
clearable
@@ -48,7 +47,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="空轴位状态">
<el-form-item :label="$t('CoolRegion.pan1.dialog.empty_point_status')">
<el-select
v-model="query.empty_point_status"
clearable
@@ -65,7 +64,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="生产区域">
<el-form-item :label="$t('CoolRegion.pan1.dialog.product_area')">
<el-select
v-model="query.product_area"
clearable
@@ -82,7 +81,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="生产位置">
<el-form-item :label="$t('CoolRegion.pan1.dialog.point_location')">
<el-select
v-model="query.point_location"
clearable
@@ -99,7 +98,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="库存状态">
<el-form-item :label="$t('CoolRegion.pan1.dialog.cool_ivt_status')">
<el-select
v-model="query.cool_ivt_status"
clearable
@@ -116,7 +115,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="是否启用">
<el-form-item :label="$t('CoolRegion.pan1.dialog.is_used')">
<el-switch
v-model="query.is_used"
active-value="0"
@@ -126,13 +125,13 @@
@change="hand"
/>
</el-form-item>
<el-form-item label="入库时间">
<el-form-item :label="$t('CoolRegion.pan1.search.createTime')">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:start-placeholder="$t('common.startDate')"
:end-placeholder="$t('common.endDate')"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
@@ -151,20 +150,32 @@
:disabled="crud.selections.length !== 1"
@click="uploadMES"
>
回传MES
{{ $t('CoolRegion.pan1.search.button_1') }}
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="520px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="点位编码" prop="point_code">
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
:width="computedLabelWidth"
>
<el-form
ref="form"
:model="form"
:rules="rules"
size="mini"
:label-width="computedFormLabelWidth"
>
<el-form-item :label="$t('CoolRegion.pan1.dialog.point_code')" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产区域">
<el-form-item :label="$t('CoolRegion.pan1.dialog.product_area')">
<el-select
v-model="form.product_area"
size="mini"
placeholder="生产区域"
:placeholder="$t('CoolRegion.pan1.dialog.product_area')"
class="filter-item"
style="width: 370px;"
>
@@ -175,14 +186,14 @@
/>
</el-select>
</el-form-item>
<el-form-item label="是否启用">
<el-form-item :label="$t('CoolRegion.pan1.dialog.is_used')">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0" />
</el-form-item>
<el-form-item label="满轴位状态" prop="full_point_status">
<el-form-item :label="$t('CoolRegion.pan1.dialog.full_point_status')" prop="full_point_status">
<el-select
v-model="form.full_point_status"
size="mini"
placeholder="满轴位状态"
:placeholder="$t('CoolRegion.pan1.dialog.full_point_status')"
class="filter-item"
style="width: 370px;"
>
@@ -193,10 +204,10 @@
/>
</el-select>
</el-form-item>
<el-form-item label="母卷号">
<el-form-item :label="$t('CoolRegion.pan1.dialog.container_name')">
<el-input v-model="form.container_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="空轴位状态" prop="empty_point_status">
<el-form-item :label="$t('CoolRegion.pan1.dialog.empty_point_status')" prop="empty_point_status">
<el-select
v-model="form.empty_point_status"
clearable
@@ -212,10 +223,10 @@
/>
</el-select>
</el-form-item>
<el-form-item label="空轴编码">
<el-form-item :label="$t('CoolRegion.pan1.dialog.empty_vehicle_code')">
<el-input v-model="form.empty_vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="库存状态" prop="cool_ivt_status">
<el-form-item :label="$t('CoolRegion.pan1.dialog.cool_ivt_status')" prop="cool_ivt_status">
<el-select
v-model="form.cool_ivt_status"
clearable
@@ -233,54 +244,121 @@
</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('common.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</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="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
<el-table-column prop="cool_ivt_status" label="库存状态" min-width="100" show-overflow-tooltip>
<el-table-column
prop="point_code"
:label="$t('CoolRegion.pan1.table.point_code')"
:min-width="flexWidth('point_code',crud.data,$t('CoolRegion.pan1.table.point_code'))"
/>
<el-table-column
prop="cool_ivt_status"
:label="$t('CoolRegion.pan1.table.cool_ivt_status')"
:min-width="flexWidth('empty_point_code',crud.data,$t('CoolRegion.pan1.table.cool_ivt_status'))"
>
<template slot-scope="scope">
{{ dict.label.sch_cool_ivt_status[scope.row.cool_ivt_status] }}
</template>
</el-table-column>
<el-table-column prop="full_point_code" label="满轴位" :min-width="flexWidth('full_point_code',crud.data,'满轴位')" />
<el-table-column prop="full_point_status" label="满轴位状态" min-width="100" show-overflow-tooltip>
<el-table-column
prop="full_point_code"
:label="$t('CoolRegion.pan1.table.full_point_code')"
:min-width="flexWidth('full_point_code',crud.data,$t('CoolRegion.pan1.table.full_point_code'))"
/>
<el-table-column
prop="full_point_status"
:label="$t('CoolRegion.pan1.table.full_point_code')"
min-width="100"
show-overflow-tooltip
>
<template slot-scope="scope">
{{ dict.label.sch_full_point_status[scope.row.full_point_status] }}
</template>
</el-table-column>
<el-table-column prop="container_name" label="母卷号" :min-width="flexWidth('container_name',crud.data,'母卷号')" />
<el-table-column prop="empty_point_code" label="空轴位" :min-width="flexWidth('empty_point_code',crud.data,'空轴位')" />
<el-table-column prop="empty_point_status" label="空轴位状态" min-width="100" show-overflow-tooltip>
<el-table-column
prop="container_name"
:label="$t('CoolRegion.pan1.table.container_name')"
:min-width="flexWidth('container_name',crud.data,$t('CoolRegion.pan1.table.container_name'))"
/>
<el-table-column
prop="empty_point_code"
:label="$t('CoolRegion.pan1.table.empty_point_code')"
:min-width="flexWidth('empty_point_code',crud.data,$t('CoolRegion.pan1.table.empty_point_code'))"
/>
<el-table-column
prop="empty_point_status"
:label="$t('CoolRegion.pan1.table.empty_point_code')"
min-width="100"
show-overflow-tooltip
>
<template slot-scope="scope">
{{ dict.label.sch_empty_point_status[scope.row.empty_point_status] }}
</template>
</el-table-column>
<el-table-column prop="empty_vehicle_code" label="空轴编号" />
<el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" />
<el-table-column prop="qty_unit_name" label="计量单位" />
<el-table-column prop="instorage_time" label="入库时间" min-width="140" show-overflow-tooltip />
<el-table-column prop="product_area" label="生产区域">
<el-table-column
prop="empty_vehicle_code"
:label="$t('CoolRegion.pan1.table.empty_vehicle_code')"
:min-width="flexWidth('empty_point_code',crud.data,$t('CoolRegion.pan1.table.empty_vehicle_code'))"
/>
<el-table-column
prop="ivt_qty"
:label="$t('CoolRegion.pan1.table.ivt_qty')"
:formatter="crud.formatNum3"
:min-width="flexWidth('empty_point_code',crud.data,$t('CoolRegion.pan1.table.ivt_qty'))"
/>
<el-table-column
prop="qty_unit_name"
:label="$t('CoolRegion.pan1.table.qty_unit_name')"
:min-width="flexWidth('empty_point_code',crud.data,$t('CoolRegion.pan1.table.qty_unit_name'))"
/>
<el-table-column
prop="instorage_time"
:label="$t('CoolRegion.pan1.table.instorage_time')"
:min-width="flexWidth('empty_point_code',crud.data,$t('CoolRegion.pan1.table.instorage_time'))"
show-overflow-tooltip
/>
<el-table-column
prop="product_area"
:label="$t('CoolRegion.pan1.table.product_area')"
:min-width="flexWidth('empty_point_code',crud.data,$t('CoolRegion.pan1.table.product_area'))"
>
<template slot-scope="scope">
{{ dict.label.product_area[scope.row.product_area] }}
</template>
</el-table-column>
<el-table-column prop="point_location" label="位置">
<el-table-column
prop="point_location"
:label="$t('CoolRegion.pan1.table.point_location')"
>
<template slot-scope="scope">
{{ dict.label.point_location[scope.row.point_location] }}
</template>
</el-table-column>
<el-table-column prop="is_used" label="是否启用">
<el-table-column
prop="is_used"
:label="$t('CoolRegion.pan1.table.is_used')"
>
<template slot-scope="scope">
{{ dict.label.is_used[scope.row.is_used] }}
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" />
<el-table-column prop="update_time" label="修改时间" min-width="150" show-overflow-tooltip />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<el-table-column
prop="remark"
:label="$t('CoolRegion.pan1.table.remark')"
:min-width="flexWidth('empty_point_code',crud.data,$t('CoolRegion.pan1.table.remark'))"
/>
<el-table-column
prop="update_time"
:label="$t('CoolRegion.pan1.table.update_time')"
min-width="150"
show-overflow-tooltip
/>
<el-table-column v-permission="[]" :label="$t('common.Operate')" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
@@ -305,6 +383,7 @@ import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import Dialog from '@/views/wms/pdm/ivt/coolpointivt/Dialog.vue'
import i18n from '@/i18n'
const defaultForm = { ivt_id: null, point_code: null, full_point_code: null, container_name: null, workorder_id: null, full_vehicle_code: null, empty_point_code: null, empty_vehicle_code: null, region_id: null, pcsn: null, ivt_qty: null, qty_unit_id: null, instorage_time: null, product_area: null, point_location: null, sort_seq: null, is_used: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, full_point_status: null, cool_ivt_status: null, empty_point_status: null }
export default {
@@ -314,7 +393,7 @@ export default {
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '冷却区库存',
title: i18n.t('CoolRegion.pan1.title'),
url: 'api/stIvtCoolpointivt',
idField: 'ivt_id',
sort: 'ivt_id,desc',
@@ -336,20 +415,39 @@ export default {
openParam: null,
rules: {
full_point_status: [
{ required: true, message: '满轴位状态不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('CoolRegion.pan1.rules.r1'), trigger: 'blur' }
],
empty_point_status: [
{ required: true, message: '空轴位状态不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('CoolRegion.pan1.rules.r2'), trigger: 'blur' }
],
cool_ivt_status: [
{ required: true, message: '库存状态不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('CoolRegion.pan1.rules.r3'), trigger: 'blur' }
]
},
queryTypeOptions: [
{ key: 'point_code', display_name: '点位编码' }
{ key: 'point_code', display_name: i18n.t('CoolRegion.pan1.dialog.point_code') }
]
}
},
computed: {
computedLabelWidth() {
const item = localStorage.getItem('lang')
if (item === 'zh') {
return `520px`
}
return `600px`
},
computedFormLabelWidth() {
const item = localStorage.getItem('lang')
if (item === 'zh') {
return `100px`
}
if (item === 'in') {
return `180px`
}
return `150px`
}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
@@ -359,7 +457,7 @@ export default {
debugger
const _selectData = this.$refs.table.selection
if (_selectData.length !== 1) {
return this.crud.notify('请选择一个点位进行回传！', CRUD.NOTIFICATION_TYPE.INFO)
return this.crud.notify(i18n.t('CoolRegion.pan1.msg.m3'), CRUD.NOTIFICATION_TYPE.INFO)
}
this.openParam = _selectData[0]
this.dialogShow = true

4
lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/index.vue
View File

@@ -2,10 +2,10 @@
<div class="app-container">
<el-tabs type="border-card">
<el-tab-pane>
<span slot="label"><i class="el-icon-date" /> 库存查询</span>
<span slot="label"><i class="el-icon-date" /> {{ $t('Hot.pan1.title') }}</span>
<PointIvt />
</el-tab-pane>
<el-tab-pane label="烘箱任务">
<el-tab-pane :label="$t('Hot.pan2.title')">
<TaskDtl />
</el-tab-pane>
</el-tabs>

157
lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/pointIvt.vue
View File

@@ -8,20 +8,19 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix=":"
>
<el-form-item label="点位编码">
<el-form-item :label="$t('Hot.pan1.dialog.point_code')">
<el-input
v-model="query.point_code"
clearable
placeholder="输入点位编码"
:placeholder="$t('Hot.pan1.search.p1')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="点位状态">
<el-form-item :label="$t('Hot.pan1.dialog.point_status')">
<el-select
v-model="query.point_status"
clearable
@@ -38,7 +37,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="生产区域">
<el-form-item :label="$t('Hot.pan1.dialog.product_area')">
<el-select
v-model="query.product_area"
clearable
@@ -55,7 +54,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="是否启用">
<el-form-item :label="$t('Hot.pan1.dialog.is_used')">
<el-switch
v-model="query.is_used"
active-value="0"
@@ -65,7 +64,7 @@
@change="hand"
/>
</el-form-item>
<el-form-item label="生产位置">
<el-form-item :label="$t('Hot.pan1.dialog.point_location')">
<el-select
v-model="query.point_location"
clearable
@@ -81,13 +80,13 @@
/>
</el-select>
</el-form-item>
<el-form-item label="入箱时间">
<el-form-item :label="$t('Hot.pan1.dialog.instorage_time')">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:start-placeholder="$t('common.startDate')"
:end-placeholder="$t('common.endDate')"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
@@ -106,7 +105,7 @@
:disabled="crud.selections.length !== 1"
@click="uploadMES"
>
回传MES
{{ $t('Hot.pan1.search.button_1') }}
</el-button>
</crudOperation>
<!--表单组件-->
@@ -115,13 +114,13 @@
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="520px"
:width="computedLabelWidth"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="点位编码" prop="point_code">
<el-form ref="form" :model="form" :rules="rules" size="mini" :label-width="computedFormLabelWidth">
<el-form-item :label="$t('Hot.pan1.dialog.point_code')" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产区域">
<el-form-item :label="$t('Hot.pan1.dialog.product_area')">
<el-select
v-model="query.product_area"
clearable
@@ -137,7 +136,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="点位状态" prop="point_status">
<el-form-item :label="$t('Hot.pan1.dialog.point_status')" prop="point_status">
<el-select
v-model="form.point_status"
clearable
@@ -153,19 +152,19 @@
/>
</el-select>
</el-form-item>
<el-form-item label="母卷号">
<el-form-item :label="$t('Hot.pan1.dialog.container_name')">
<el-input v-model="form.container_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="温度">
<el-form-item :label="$t('Hot.pan1.dialog.temperature')">
<el-input v-model="form.temperature" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-form-item :label="$t('Hot.pan1.dialog.is_used')" prop="is_used">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0" />
</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('common.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
</div>
</el-dialog>
<!--表格渲染-->
@@ -178,37 +177,98 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" width="120px" show-overflow-tooltip label="点位编码" />
<el-table-column prop="point_status" label="点位状态">
<el-table-column
prop="point_code"
:min-width="flexWidth('point_code',crud.data,$t('Hot.pan1.table.point_code'))"
show-overflow-tooltip
:label="$t('Hot.pan1.table.point_code')"
/>
<el-table-column
prop="point_status"
:label="$t('Hot.pan1.table.point_status')"
:min-width="flexWidth('point_status',crud.data,$t('Hot.pan1.table.point_status'))"
>
<template slot-scope="scope">
{{ dict.label.sch_hot_point_status[scope.row.point_status] }}
</template>
</el-table-column>
<el-table-column prop="container_name" label="母卷号" width="150px" show-overflow-tooltip />
<el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" />
<el-table-column prop="instorage_time" label="入箱时间" width="150px" show-overflow-tooltip />
<el-table-column prop="product_area" label="生产区域">
<el-table-column
prop="container_name"
:label="$t('Hot.pan1.table.container_name')"
:min-width="flexWidth('container_name',crud.data,$t('Hot.pan1.table.container_name'))"
show-overflow-tooltip
/>
<el-table-column
prop="ivt_qty"
:label="$t('Hot.pan1.table.ivt_qty')"
:formatter="crud.formatNum3"
:min-width="flexWidth('ivt_qty',crud.data,$t('Hot.pan1.table.ivt_qty'))"
/>
<el-table-column
prop="instorage_time"
:label="$t('Hot.pan1.table.instorage_time')"
:min-width="flexWidth('instorage_time',crud.data,$t('Hot.pan1.table.instorage_time'))"
show-overflow-tooltip
/>
<el-table-column
prop="product_area"
:label="$t('Hot.pan1.table.product_area')"
:min-width="flexWidth('product_area',crud.data,$t('Hot.pan1.table.product_area'))"
>
<template slot-scope="scope">
{{ dict.label.product_area[scope.row.product_area] }}
</template>
</el-table-column>
<el-table-column prop="temperature" label="温度" />
<el-table-column prop="last_time" label="倒计时" width="120" />
<el-table-column prop="group_name" label="组别" />
<el-table-column prop="ext_code" label="外部编码" width="130" />
<el-table-column prop="point_location" label="位置">
<el-table-column
prop="temperature"
:label="$t('Hot.pan1.table.temperature')"
:min-width="flexWidth('temperature',crud.data,$t('Hot.pan1.table.temperature'), 10)"
/>
<el-table-column
prop="last_time"
:label="$t('Hot.pan1.table.last_time')"
:min-width="flexWidth('last_time',crud.data,$t('Hot.pan1.table.last_time'))"
/>
<el-table-column
prop="group_name"
:label="$t('Hot.pan1.table.group_name')"
:min-width="flexWidth('group_name',crud.data,$t('Hot.pan1.table.group_name'))"
/>
<el-table-column
prop="ext_code"
:label="$t('Hot.pan1.table.ext_code')"
:min-width="flexWidth('ext_code',crud.data,$t('Hot.pan1.table.ext_code'))"
/>
<el-table-column
prop="point_location"
:label="$t('Hot.pan1.table.point_location')"
:min-width="flexWidth('point_location',crud.data,$t('Hot.pan1.table.point_location'), 10)"
>
<template slot-scope="scope">
{{ dict.label.point_location[scope.row.point_location] }}
</template>
</el-table-column>
<el-table-column prop="is_used" label="是否启用">
<el-table-column
prop="is_used"
:label="$t('Hot.pan1.table.is_used')"
:min-width="flexWidth('is_used',crud.data,$t('Hot.pan1.table.is_used'))"
>
<template slot-scope="scope">
{{ dict.label.is_used[scope.row.is_used] }}
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" />
<el-table-column prop="update_time" label="修改时间" min-width="150" show-overflow-tooltip />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<el-table-column
prop="remark"
:label="$t('Hot.pan1.table.remark')"
:min-width="flexWidth('remark',crud.data,$t('Hot.pan1.table.remark'))"
/>
<el-table-column
prop="update_time"
:label="$t('Hot.pan1.table.update_time')"
:min-width="flexWidth('update_time',crud.data,$t('Hot.pan1.table.update_time'))"
show-overflow-tooltip
/>
<el-table-column v-permission="[]" :label="$t('common.Operate')" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
@@ -233,6 +293,7 @@ import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import Dialog from '@/views/wms/pdm/ivt/hotpointivt/Dialog.vue'
import i18n from "@/i18n";
const defaultForm = {
ivt_id: null,
@@ -266,7 +327,7 @@ export default {
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '烘烤区点位库存',
title: i18n.t('Hot.pan1.title'),
url: 'api/hotpointivt',
idField: 'ivt_id',
sort: 'ivt_id,desc',
@@ -287,14 +348,30 @@ export default {
dialogShow: false,
rules: {
point_code: [
{ required: true, message: '点位编码不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('Hot.pan1.msg.m1'), trigger: 'blur' }
],
point_status: [
{ required: true, message: '点位状态不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('Hot.pan1.msg.m2'), trigger: 'blur' }
]
}
}
},
computed: {
computedLabelWidth() {
const item = localStorage.getItem('lang')
if (item === 'zh') {
return `520px`
}
return `540px`
},
computedFormLabelWidth() {
const item = localStorage.getItem('lang')
if (item === 'zh') {
return `100px`
}
return `120px`
}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
@@ -307,7 +384,7 @@ export default {
debugger
const _selectData = this.$refs.table.selection
if (_selectData.length !== 1) {
return this.crud.notify('请选择一个点位进行回传！', CRUD.NOTIFICATION_TYPE.INFO)
return this.crud.notify(i18n.t('Hot.pan1.msg.m3'), CRUD.NOTIFICATION_TYPE.INFO)
}
this.openParam = _selectData[0]
this.dialogShow = true

100
lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/taskDtl.vue
View File

@@ -8,66 +8,65 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix=":"
>
<el-form-item label="单据编码">
<el-form-item :label="$t('Hot.pan2.dialog.bill_code')">
<el-input
v-model="query.bill_code"
clearable
placeholder="单据编码"
:placeholder="$t('Hot.pan2.dialog.bill_code')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="任务编码">
<el-form-item :label="$t('Hot.pan2.dialog.task_code')">
<el-input
v-model="query.task_code"
clearable
placeholder="任务编码"
:placeholder="$t('Hot.pan2.dialog.task_code')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="起点编码">
<el-form-item :label="$t('Hot.pan2.dialog.start_point_code')">
<el-input
v-model="query.start_point_code"
clearable
placeholder="起点编码"
:placeholder="$t('Hot.pan2.dialog.start_point_code')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="终点编码">
<el-form-item :label="$t('Hot.pan2.dialog.end_point_code')">
<el-input
v-model="query.next_point_code"
clearable
placeholder="终点编码"
:placeholder="$t('Hot.pan2.dialog.end_point_code')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="母卷号">
<el-form-item :label="$t('Hot.pan2.dialog.container_name')">
<el-input
v-model="query.container_name"
clearable
placeholder="母卷号"
:placeholder="$t('Hot.pan2.dialog.container_name')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="创建时间">
<el-form-item :label="$t('Hot.pan2.dialog.create_time')">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:start-placeholder="$t('common.startDate')"
:end-placeholder="$t('common.endDate')"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
@@ -79,17 +78,61 @@
<crudOperation :permission="permission" />
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column prop="bill_code" label="单据编码" :min-width="flexWidth('bill_code',crud.data,'单据编码')" />
<el-table-column prop="container_name" label="母卷号" :min-width="flexWidth('container_name',crud.data,'母卷号')" />
<el-table-column prop="start_point_code" label="起始点位" :min-width="flexWidth('start_point_code',crud.data,'起始点位')" />
<el-table-column prop="end_point_code" label="终点点位" :min-width="flexWidth('end_point_code',crud.data,'终点点位')" />
<el-table-column prop="temperature" label="烤箱温度" :min-width="flexWidth('temperature',crud.data,'烤箱温度')" />
<el-table-column prop="oven_time" label="烘烤时间" :min-width="flexWidth('oven_time',crud.data,'烘烤时间')" />
<el-table-column prop="task_code" label="任务编码" :min-width="flexWidth('task_code',crud.data,'任务编码')" />
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="confirm_optname" label="确认人" :min-width="flexWidth('confirm_optname',crud.data,'确认人')" />
<el-table-column prop="confirm_time" label="确认时间" :min-width="flexWidth('confirm_time',crud.data,'确认时间')" />
<el-table-column
prop="bill_code"
:label="$t('Hot.pan2.table.bill_code')"
:min-width="flexWidth('bill_code',crud.data,$t('Hot.pan2.table.bill_code'))"
/>
<el-table-column
prop="container_name"
:label="$t('Hot.pan2.table.container_name')"
:min-width="flexWidth('container_name',crud.data,$t('Hot.pan2.table.container_name'))"
/>
<el-table-column
prop="start_point_code"
:label="$t('Hot.pan2.table.start_point_code')"
:min-width="flexWidth('start_point_code',crud.data,$t('Hot.pan2.table.start_point_code'))"
/>
<el-table-column
prop="end_point_code"
:label="$t('Hot.pan2.table.start_point_code')"
:min-width="flexWidth('end_point_code',crud.data,$t('Hot.pan2.table.start_point_code'))"
/>
<el-table-column
prop="temperature"
:label="$t('Hot.pan2.table.temperature')"
:min-width="flexWidth('temperature',crud.data,$t('Hot.pan2.table.temperature'))"
/>
<el-table-column
prop="oven_time"
:label="$t('Hot.pan2.table.oven_time')"
:min-width="flexWidth('oven_time',crud.data,$t('Hot.pan2.table.oven_time'))"
/>
<el-table-column
prop="task_code"
:label="$t('Hot.pan2.table.task_code')"
:min-width="flexWidth('task_code',crud.data,$t('Hot.pan2.table.task_code'))"
/>
<el-table-column
prop="create_name"
:label="$t('Hot.pan2.table.create_name')"
:min-width="flexWidth('create_name',crud.data,$t('Hot.pan2.table.create_name'))"
/>
<el-table-column
prop="create_time"
:label="$t('Hot.pan2.table.create_time')"
:min-width="flexWidth('create_time',crud.data,$t('Hot.pan2.table.create_time'))"
/>
<el-table-column
prop="confirm_optname"
:label="$t('Hot.pan2.table.confirm_optname')"
:min-width="flexWidth('confirm_optname',crud.data,$t('Hot.pan2.table.confirm_optname'))"
/>
<el-table-column
prop="confirm_time"
:label="$t('Hot.pan2.table.confirm_time')"
:min-width="flexWidth('confirm_time',crud.data,$t('Hot.pan2.table.confirm_time'))"
/>
</el-table>
<!--分页组件-->
<pagination />
@@ -104,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 = { }
export default {
@@ -130,9 +174,9 @@ export default {
data() {
return {
statusDtlList: [
{ 'label': '生成', 'value': '10' },
{ 'label': '执行中', 'value': '40' },
{ 'label': '确认', 'value': '50' }
{ 'label': i18n.t('Hot.pan2.statusDtlList.build'), 'value': '10' },
{ 'label': i18n.t('Hot.pan2.statusDtlList.running'), 'value': '40' },
{ 'label': i18n.t('Hot.pan2.statusDtlList.confirm'), 'value': '50' }
],
permission: {
},

82
lms/nladmin-ui/src/views/wms/pdm/ivt/sbpointivt/index.vue
View File

@@ -8,20 +8,19 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix=":"
>
<el-form-item label="点位编码">
<el-form-item :label="$t('SbPointIvt.dialog.point_code')">
<el-input
v-model="query.point_code"
clearable
placeholder="输入点位编码"
:placeholder="$t('SbPointIvt.msg.m1')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="生产区域">
<el-form-item :label="$t('SbPointIvt.dialog.product_area')">
<el-select
v-model="query.product_area"
clearable
@@ -38,7 +37,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="是否启用">
<el-form-item :label="$t('SbPointIvt.dialog.is_used')">
<el-switch
v-model="query.is_used"
active-value="0"
@@ -48,7 +47,7 @@
@change="hand"
/>
</el-form-item>
<el-form-item label="MES启用">
<el-form-item :label="$t('SbPointIvt.dialog.mes_used')">
<el-switch
v-model="query.mes_used"
active-value="0"
@@ -64,19 +63,19 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<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="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="点位编码" prop="point_code">
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" :width="computedLabelWidth">
<el-form ref="form" :model="form" :rules="rules" size="mini" :label-width="computedFormLabelWidth">
<el-form-item :label="$t('SbPointIvt.dialog.point_code')" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="载具编码">
<el-form-item :label="$t('SbPointIvt.dialog.vehicle_code')">
<el-input v-model="form.vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产区域">
<el-form-item :label="$t('SbPointIvt.dialog.product_area')">
<el-select
v-model="form.product_area"
size="mini"
placeholder="生产区域"
:placeholder="$t('SbPointIvt.dialog.product_area')"
class="filter-item"
style="width: 370px;"
>
@@ -87,11 +86,11 @@
/>
</el-select>
</el-form-item>
<el-form-item label="位置">
<el-form-item :label="$t('SbPointIvt.dialog.point_location')">
<el-select
v-model="form.point_location"
size="mini"
placeholder="位置"
:placeholder="$t('SbPointIvt.dialog.point_location')"
class="filter-item"
style="width: 370px;"
>
@@ -102,50 +101,50 @@
/>
</el-select>
</el-form-item>
<el-form-item label="外部编码">
<el-form-item :label="$t('SbPointIvt.dialog.ext_code')">
<el-input v-model="form.ext_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-form-item :label="$t('SbPointIvt.dialog.is_used')" prop="is_used">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0" />
</el-form-item>
<el-form-item label="MES启用" prop="is_used">
<el-form-item :label="$t('SbPointIvt.dialog.mes_used')" prop="is_used">
<el-switch v-model="form.mes_used" active-value="1" inactive-value="0" />
</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('common.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</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="point_code" label="点位编码" />
<el-table-column prop="vehicle_code" label="载具编码" />
<el-table-column prop="product_area" label="生产区域">
<el-table-column prop="point_code" :label="$t('SbPointIvt.table.point_code')" />
<el-table-column prop="vehicle_code" :label="$t('SbPointIvt.table.vehicle_code')" />
<el-table-column prop="product_area" :label="$t('SbPointIvt.table.product_area')">
<template slot-scope="scope">
{{ dict.label.product_area[scope.row.product_area] }}
</template>
</el-table-column>
<el-table-column prop="point_location" label="位置">
<el-table-column prop="point_location" :label="$t('SbPointIvt.table.point_location')">
<template slot-scope="scope">
{{ dict.label.point_location[scope.row.point_location] }}
</template>
</el-table-column>
<el-table-column prop="ext_code" label="外部编码" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="is_used" label="是否启用">
<el-table-column prop="ext_code" :label="$t('SbPointIvt.table.ext_code')" />
<el-table-column prop="remark" :label="$t('SbPointIvt.table.remark')" />
<el-table-column prop="is_used" :label="$t('SbPointIvt.table.is_used')">
<template slot-scope="scope">
{{ dict.label.is_used[scope.row.is_used] }}
</template>
</el-table-column>
<el-table-column prop="mes_used" label="MES启用">
<el-table-column prop="mes_used" :label="$t('SbPointIvt.table.mes_used')">
<template slot-scope="scope">
{{ dict.label.is_used[scope.row.mes_used] }}
</template>
</el-table-column>
<el-table-column prop="update_time" label="修改时间" min-width="150" show-overflow-tooltip />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<el-table-column prop="update_time" :label="$t('SbPointIvt.table.update_time')" min-width="150" show-overflow-tooltip />
<el-table-column v-permission="[]" :label="$t('common.Operate')" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
@@ -168,6 +167,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, point_code: null, point_status: null, vehicle_code: null, product_area: null, point_location: null, ext_code: null, remark: null, is_used: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
export default {
@@ -177,7 +177,7 @@ export default {
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '生箔点位库存',
title: i18n.t('SbPointIvt.title'),
url: 'api/sbpointivt',
idField: 'point_id',
sort: 'point_id,desc',
@@ -197,16 +197,32 @@ export default {
},
rules: {
point_code: [
{ required: true, message: '点位编码不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('SbPointIvt.rules.r1'), trigger: 'blur' }
],
point_status: [
{ required: true, message: '点位状态不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('SbPointIvt.rules.r2'), trigger: 'blur' }
],
is_used: [
{ required: true, message: '是否启用不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('SbPointIvt.rules.r3'), trigger: 'blur' }
]
}}
},
computed: {
computedLabelWidth() {
const item = localStorage.getItem('lang')
if (item === 'zh') {
return `500px`
}
return `530px`
},
computedFormLabelWidth() {
const item = localStorage.getItem('lang')
if (item === 'zh') {
return `80px`
}
return `120px`
}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {

8
lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/Dialog.vue
View File

@@ -1,6 +1,6 @@
<template>
<el-dialog
title="称重"
:title="$t('RawFoil.dialog.weight')"
append-to-body
:visible.sync="dialogVisible"
:before-close="handleClose"
@@ -9,14 +9,14 @@
@close="close"
>
<el-form ref="form" :model="form1" :rules="rules" size="mini" label-width="110px">
<el-form-item label="重量" prop="productin_qty">
<el-form-item :label="$t('RawFoil.dialog.productin_qty')" prop="productin_qty">
<el-input-number v-model="form1.productin_qty" :min="0" :controls="false" :precision="3" style="width: 250px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="close">取消</el-button>
<el-button type="primary" @click="confirm">确认</el-button>
<el-button type="text" @click="close">{{ $t('common.Cancel') }}</el-button>
<el-button type="primary" @click="confirm">{{ $t('common.Confirm') }}</el-button>
</div>
</el-dialog>
</template>

205
lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue
View File

@@ -8,16 +8,15 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="生产区域">
<el-form-item :label="$t('RawFoil.search.product_area')">
<el-select
v-model="query.product_area"
clearable
size="mini"
placeholder="请选择"
:placeholder="$t('common.Please_select')"
class="filter-item"
@change="hand"
>
@@ -29,33 +28,33 @@
</el-select>
</el-form-item>
<el-form-item label="机台编码">
<el-form-item :label="$t('RawFoil.dialog.resource_name')">
<el-input
v-model="query.resource_name"
clearable
size="mini"
placeholder="机台编码"
:placeholder="$t('RawFoil.dialog.resource_name')"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="母卷号">
<label slot="label">母&nbsp;&nbsp;卷&nbsp;&nbsp;号:</label>
<el-form-item :label="$t('RawFoil.dialog.container_name')">
<!-- <label slot="label">母&nbsp;&nbsp;卷&nbsp;&nbsp;号:</label>-->
<el-input
v-model="query.container_name"
clearable
size="mini"
placeholder="母卷号"
:placeholder="$t('RawFoil.dialog.container_name')"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="工单状态">
<el-form-item :label="$t('RawFoil.search.status')">
<el-select
v-model="query.status"
clearable
size="mini"
placeholder="工单状态"
:placeholder="$t('RawFoil.search.status')"
class="filter-item"
@change="hand"
>
@@ -67,13 +66,13 @@
</el-select>
</el-form-item>
<el-form-item label="工单日期">
<el-form-item :label="$t('RawFoil.search.createTime')">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:start-placeholder="$t('common.startDate')"
:end-placeholder="$t('common.endDate')"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
@@ -93,7 +92,7 @@
:disabled="crud.selections.length !== 1"
@click="compelEnd"
>
强制结束
{{ $t('RawFoil.search.button_end') }}
</el-button>
<el-button
slot="right"
@@ -104,7 +103,7 @@
:disabled="crud.selections.length !== 1"
@click="weigh"
>
称重
{{ $t('RawFoil.search.button_weight') }}
</el-button>
</crudOperation>
<!--表单组件-->
@@ -113,17 +112,17 @@
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="800px"
:width="computedLabelWidth"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
<el-form ref="form" :model="form" :rules="rules" size="mini" :label-width="computedFormLabelWidth">
<el-row>
<el-col :span="12">
<el-form-item label="母卷号" prop="container_name">
<el-form-item :label="$t('RawFoil.dialog.container_name')" prop="container_name">
<el-input v-model="form.container_name" style="width: 250px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="机台编码" prop="resource_name">
<el-form-item :label="$t('RawFoil.dialog.resource_name')" prop="resource_name">
<el-input v-model="form.resource_name" style="width: 250px;" />
</el-form-item>
</el-col>
@@ -131,12 +130,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="生产工单" prop="mfg_order_name">
<el-form-item :label="$t('RawFoil.dialog.mfg_order_name')" prop="mfg_order_name">
<el-input v-model="form.mfg_order_name" style="width: 250px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="产品编码" prop="product_name">
<el-form-item :label="$t('RawFoil.dialog.product_name')" prop="product_name">
<el-input v-model="form.product_name" style="width: 250px;" />
</el-form-item>
</el-col>
@@ -144,12 +143,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="产品名称" prop="description">
<el-form-item :label="$t('RawFoil.dialog.description')" prop="description">
<el-input v-model="form.description" style="width: 250px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="理论长度" prop="theory_height">
<el-form-item :label="$t('RawFoil.dialog.theory_height')" prop="theory_height">
<el-input v-model="form.theory_height" style="width: 250px;" />
</el-form-item>
</el-col>
@@ -157,17 +156,17 @@
<el-row>
<el-col :span="12">
<el-form-item label="设备生产速度" prop="eqp_velocity">
<el-form-item :label="$t('RawFoil.dialog.eqp_velocity')" prop="eqp_velocity">
<el-input v-model="form.eqp_velocity" style="width: 250px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="上卷开始时间" prop="up_coiler_date">
<el-form-item :label="$t('RawFoil.dialog.up_coiler_date')" prop="up_coiler_date">
<!-- <el-date-picker v-model="form.up_coiler_date" type="date" placeholder="选择日期" style="width: 250px" value-format="yyyy-MM-dd" />-->
<el-date-picker
v-model="form.up_coiler_date"
type="datetime"
placeholder="选择日期时间"
:placeholder="$t('common.Tip18')"
style="width: 250px"
value-format="yyyy-MM-dd HH:mm:ss"
default-time="12:00:00"
@@ -178,12 +177,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="重量">
<el-form-item :label="$t('RawFoil.dialog.productin_qty')">
<el-input v-model="form.productin_qty" style="width: 250px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="车号">
<el-form-item :label="$t('RawFoil.dialog.agvno')">
<el-input v-model="form.agvno" style="width: 250px;" />
</el-form-item>
</el-col>
@@ -191,22 +190,22 @@
<el-row>
<el-col :span="12">
<el-form-item label="备注">
<el-form-item :label="$t('RawFoil.dialog.remark')">
<el-input v-model="form.remark" style="width: 250px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否重新更新">
<el-radio v-model="form.is_reload_send" label="0">否</el-radio>
<el-radio v-model="form.is_reload_send" label="1">是</el-radio>
<el-form-item :label="$t('RawFoil.dialog.is_reload_send')">
<el-radio v-model="form.is_reload_send" label="0">{{ $t('common.No') }}</el-radio>
<el-radio v-model="form.is_reload_send" label="1">{{ $t('common.Yes') }}</el-radio>
</el-form-item>
</el-col>
</el-row>
</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('common.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
</div>
</el-dialog>
<!--表格渲染-->
@@ -220,22 +219,86 @@
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="workorder_id" label="工单标识" />
<el-table-column prop="mfg_order_name" label="工单号" :min-width="flexWidth('mfg_order_name',crud.data,'工单号')" />
<el-table-column prop="status" label="工单状态" :min-width="flexWidth('status',crud.data,'工单状态')" :formatter="formatStatusName" />
<el-table-column prop="container_name" label="母卷号" :min-width="flexWidth('container_name',crud.data,'母卷号')" />
<el-table-column prop="point_code2" label="点位编码" :min-width="flexWidth('point_code2',crud.data,'点位编码')" />
<el-table-column prop="resource_name" label="机台编码" :min-width="flexWidth('resource_name',crud.data,'机台编码')" />
<el-table-column prop="product_name" label="产品编码" :min-width="flexWidth('product_name',crud.data,'产品编码')" />
<el-table-column prop="theory_height" label="理论长度" :min-width="flexWidth('theory_height',crud.data,'理论长度')" />
<el-table-column prop="realstart_time" label="开始时间" :min-width="flexWidth('realstart_time',crud.data,'开始时间')" />
<el-table-column prop="realend_time" label="结束时间" :min-width="flexWidth('realend_time',crud.data,'结束时间')" />
<el-table-column prop="productin_qty" label="重量" :min-width="flexWidth('productin_qty',crud.data,'重量')" :formatter="crud.formatNum3" />
<el-table-column prop="agvno" label="车号" :min-width="flexWidth('agvno',crud.data,'车号')" />
<el-table-column prop="product_area" label="生产区域" :min-width="flexWidth('product_area',crud.data,'生产区域')" />
<el-table-column prop="is_baking" label="请求烘烤" :min-width="flexWidth('is_baking',crud.data,'请求烘烤')" :formatter="formatBakeIsOrNot" />
<el-table-column prop="is_instor" label="请求入半成品库" :min-width="flexWidth('is_instor',crud.data,'请求入半成品库')" :formatter="formatStorIsOrNot" />
<el-table-column prop="update_time" label="更新时间" :min-width="flexWidth('update_time',crud.data,'更新时间')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<el-table-column
prop="mfg_order_name"
:label="$t('RawFoil.table.mfg_order_name')"
:min-width="flexWidth('mfg_order_name', crud.data, $t('RawFoil.table.mfg_order_name'))"
/>
<el-table-column
prop="status"
:label="$t('RawFoil.table.status')"
:min-width="flexWidth('status', crud.data, $t('RawFoil.table.status'), 5)"
:formatter="formatStatusName"
/>
<el-table-column
prop="container_name"
:label="$t('RawFoil.table.container_name')"
:min-width="flexWidth('container_name',crud.data,$t('RawFoil.table.container_name'))"
/>
<el-table-column
prop="point_code2"
:label="$t('RawFoil.table.point_code2')"
:min-width="flexWidth('point_code2',crud.data,$t('RawFoil.table.point_code2'))"
/>
<el-table-column
prop="resource_name"
:label="$t('RawFoil.table.resource_name')"
:min-width="flexWidth('resource_name',crud.data,$t('RawFoil.table.resource_name'))"
/>
<el-table-column
prop="product_name"
:label="$t('RawFoil.table.product_name')"
:min-width="flexWidth('product_name',crud.data,$t('RawFoil.table.product_name'))"
/>
<el-table-column
prop="theory_height"
:label="$t('RawFoil.table.theory_height')"
:min-width="flexWidth('theory_height',crud.data,$t('RawFoil.table.theory_height'))"
/>
<el-table-column
prop="realstart_time"
:label="$t('RawFoil.table.realstart_time')"
:min-width="flexWidth('realstart_time',crud.data,$t('RawFoil.table.realstart_time'))"
/>
<el-table-column
prop="realend_time"
:label="$t('RawFoil.table.realend_time')"
:min-width="flexWidth('realend_time',crud.data,$t('RawFoil.table.realend_time'))"
/>
<el-table-column
prop="productin_qty"
:label="$t('RawFoil.table.productin_qty')"
:min-width="flexWidth('productin_qty',crud.data,$t('RawFoil.table.productin_qty'))"
:formatter="crud.formatNum3"
/>
<el-table-column
prop="agvno"
:label="$t('RawFoil.table.agvno')"
:min-width="flexWidth('agvno',crud.data,$t('RawFoil.table.agvno'))"
/>
<el-table-column
prop="product_area"
:label="$t('RawFoil.table.product_area')"
:min-width="flexWidth('product_area',crud.data,$t('RawFoil.table.product_area'))"
/>
<el-table-column
prop="is_baking"
:label="$t('RawFoil.table.is_baking')"
:min-width="flexWidth('is_baking',crud.data,$t('RawFoil.table.is_baking'))"
:formatter="formatBakeIsOrNot"
/>
<el-table-column
prop="is_instor"
:label="$t('RawFoil.table.is_instor')"
:min-width="flexWidth('is_instor',crud.data,$t('RawFoil.table.is_instor'))"
:formatter="formatStorIsOrNot"
/>
<el-table-column
prop="update_time"
:label="$t('RawFoil.table.update_time')"
:min-width="flexWidth('update_time',crud.data,$t('RawFoil.table.update_time'))"
/>
<el-table-column v-permission="[]" :label="$t('common.Operate')" width="160px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
@@ -261,6 +324,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 = {
workorder_id: null,
@@ -295,7 +359,7 @@ export default {
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '生箔工序工单',
title: i18n.t('RawFoil.title'),
url: 'api/rawfoilworkorder',
idField: 'workorder_id',
sort: 'workorder_id,desc',
@@ -316,32 +380,51 @@ export default {
permission: {},
rules: {
container_name: [
{ required: true, message: '母卷号不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('RawFoil.msg.m2'), trigger: 'blur' }
],
resource_name: [
{ required: true, message: '机台编码不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('RawFoil.msg.m3'), trigger: 'blur' }
],
mfg_order_name: [
{ required: true, message: '生产工单不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('RawFoil.msg.m4'), trigger: 'blur' }
],
product_name: [
{ required: true, message: '产品编码不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('RawFoil.msg.m5'), trigger: 'blur' }
],
description: [
{ required: true, message: '产品名称不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('RawFoil.msg.m6'), trigger: 'blur' }
],
theory_height: [
{ required: true, message: '理论长度不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('RawFoil.msg.m7'), trigger: 'blur' }
],
eqp_velocity: [
{ required: true, message: '设备生产速度不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('RawFoil.msg.m8'), trigger: 'blur' }
],
p_coiler_date: [
{ required: true, message: '上卷开始时间不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('RawFoil.msg.m9'), trigger: 'blur' }
]
}
}
},
computed: {
computedLabelWidth() {
const item = localStorage.getItem('lang')
if (item === 'in') {
return `900px`
}
return `800px`
},
computedFormLabelWidth() {
const item = localStorage.getItem('lang')
if (item === 'zh') {
return `110px`
}
if (item === 'in') {
return `170px`
}
return `130px`
}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
@@ -363,11 +446,11 @@ export default {
const _selectData = this.$refs.table.selection
const data = _selectData[0]
if (data.status === '09') {
return this.crud.notify('不能对完成状态的工单强制结束', CRUD.NOTIFICATION_TYPE.INFO)
return this.crud.notify(i18n.t('RawFoil.msg.m1'), CRUD.NOTIFICATION_TYPE.INFO)
}
crudRawfoilworkorder.compelEnd(data).then(res => {
this.crud.toQuery()
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.notify(i18n.t('common.Operation_success'), CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
weigh() {