From 9f43da7e1ff0c624b834400c1a21e82071c3fe8e Mon Sep 17 00:00:00 2001 From: zhang <2012681011@qq.com> Date: Tue, 14 Jan 2025 17:21:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/pdm/order/slittingplan/index.vue | 254 +++++++++--------- .../src/views/wms/pdm/sub/index.vue | 40 +-- 2 files changed, 148 insertions(+), 146 deletions(-) diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue index f4b77ed..9e0718e 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue @@ -13,18 +13,19 @@ > - + @@ -32,18 +33,19 @@ - + @@ -51,19 +53,20 @@ - - + + @@ -74,37 +77,37 @@ - + - - + + - + @@ -114,11 +117,11 @@ - + @@ -132,11 +135,11 @@ - + @@ -150,11 +153,11 @@ - + @@ -168,11 +171,11 @@ - + @@ -188,27 +191,27 @@ - - + + - - + + @@ -231,7 +234,7 @@ :disabled="crud.selections.length < 1" @click="upMaterFinish" > - 上料完成 + {{ $t('slittingplan.placeholder.end1') }} - 套管完成 + {{ $t('slittingplan.placeholder.end2') }} - 配送完成 + {{ $t('slittingplan.placeholder.end3') }} - 入站完成 + {{ $t('slittingplan.placeholder.end4') }} - 强制完成 + {{ $t('slittingplan.placeholder.end5') }} - 设置上轴 + {{ $t('slittingplan.placeholder.end6') }} - 设置下轴 + {{ $t('slittingplan.placeholder.end7') }} - 设置左卷 + {{ $t('slittingplan.placeholder.end8') }} - 设置右卷 + {{ $t('slittingplan.placeholder.end9') }} @@ -327,152 +330,152 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -485,72 +488,72 @@ @selection-change="crud.selectionChangeHandler" > - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - + + + + @@ -565,9 +568,8 @@ import crudSlittingproductionplan from '@/views/wms/pdm/order/slittingplan/slitt import CRUD, { crud, form, header, presenter } from '@crud/crud' 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, order_type: null, @@ -619,11 +621,11 @@ const defaultForm = { export default { name: 'Slittingproductionplan', dicts: ['product_area', 'order_type', 'cut_product_status', 'ware_house', 'paper_tube_or_frp', 'IS_OR_NOT'], - components: { pagination, crudOperation, rrOperation, udOperation }, + components: { pagination, crudOperation, rrOperation }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ - title: '分切计划', + title: i18n.t('slittingplan.title'), url: 'api/slittingproductionplan', idField: 'workorder_id', sort: 'workorder_id,desc', @@ -642,31 +644,31 @@ export default { permission: {}, rules: { order_type: [ - { required: true, message: '分切订单类型不能为空', trigger: 'blur' } + { required: true, message: this.$t('slittingplan.msg.isNotEmpty'), trigger: 'blur' } ], container_name: [ - { required: true, message: '子卷号不能为空', trigger: 'blur' } + { required: true, message: this.$t('slittingplan.msg.isNotEmpty'), trigger: 'blur' } ], split_weight: [ - { required: true, message: '子卷理论重量不能为空', trigger: 'blur' } + { required: true, message: this.$t('slittingplan.msg.isNotEmpty'), trigger: 'blur' } ], split_breadth: [ - { required: true, message: '子卷幅宽不能为空', trigger: 'blur' } + { required: true, message: this.$t('slittingplan.msg.isNotEmpty'), trigger: 'blur' } ], split_height: [ - { required: true, message: '子卷长度不能为空', trigger: 'blur' } + { required: true, message: this.$t('slittingplan.msg.isNotEmpty'), trigger: 'blur' } ], sale_order_name: [ - { required: true, message: '销售订单及行号不能为空', trigger: 'blur' } + { required: true, message: this.$t('slittingplan.msg.isNotEmpty'), trigger: 'blur' } ], product_name: [ - { required: true, message: '产品编码不能为空', trigger: 'blur' } + { required: true, message: this.$t('slittingplan.msg.isNotEmpty'), trigger: 'blur' } ], description: [ - { required: true, message: '产品描述不能为空', trigger: 'blur' } + { required: true, message: this.$t('slittingplan.msg.isNotEmpty'), trigger: 'blur' } ], ware_house: [ - { required: true, message: '来源卷位置不能为空', trigger: 'blur' } + { required: true, message: this.$t('slittingplan.msg.isNotEmpty'), trigger: 'blur' } ] } } @@ -686,7 +688,7 @@ export default { } crudSlittingproductionplan.upMaterFinish(data).then(res => { this.crud.toQuery() - this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.notify(this.$t('slittingplan.msg.success'), CRUD.NOTIFICATION_TYPE.SUCCESS) }) }, caseFinish() { @@ -696,7 +698,7 @@ export default { } crudSlittingproductionplan.caseFinish(data).then(res => { this.crud.toQuery() - this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.notify(this.$t('slittingplan.msg.success'), CRUD.NOTIFICATION_TYPE.SUCCESS) }) }, sendFinish() { @@ -706,7 +708,7 @@ export default { } crudSlittingproductionplan.sendFinish(data).then(res => { this.crud.toQuery() - this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.notify(this.$t('slittingplan.msg.success'), CRUD.NOTIFICATION_TYPE.SUCCESS) }) }, inFinish() { @@ -716,7 +718,7 @@ export default { } crudSlittingproductionplan.inFinish(data).then(res => { this.crud.toQuery() - this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.notify(this.$t('slittingplan.msg.success'), CRUD.NOTIFICATION_TYPE.SUCCESS) }) }, compelFinish() { @@ -726,7 +728,7 @@ export default { } crudSlittingproductionplan.compelFinish(data).then(res => { this.crud.toQuery() - this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.notify(this.$t('slittingplan.msg.success'), CRUD.NOTIFICATION_TYPE.SUCCESS) }) }, formatStatusName(row) { @@ -761,7 +763,7 @@ export default { } crudSlittingproductionplan.setDirection(param).then(() => { this.crud.toQuery() - this.crud.notify('设置成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.notify(this.$t('slittingplan.msg.success'), CRUD.NOTIFICATION_TYPE.SUCCESS) }) }, setLeftOrRight(flag) { @@ -772,7 +774,7 @@ export default { } crudSlittingproductionplan.setDirection(param).then(() => { this.crud.toQuery() - this.crud.notify('设置成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.notify(this.$t('slittingplan.msg.success'), CRUD.NOTIFICATION_TYPE.SUCCESS) }) }, edit(row, index) { diff --git a/lms/nladmin-ui/src/views/wms/pdm/sub/index.vue b/lms/nladmin-ui/src/views/wms/pdm/sub/index.vue index dc16fe4..c5fec4d 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/sub/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/sub/index.vue @@ -11,31 +11,31 @@ label-width="115px" label-suffix=":" > - + - + - + - 分配 + {{ $t('packagerelation.placeholder.allocation') }} - - + + - + - + @@ -139,11 +139,11 @@ import crudSubpackagerelation from './packagerelation' import CRUD, { crud, form, header, presenter } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' -import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' import { download } from '@/api/data' import { downloadFile } from '@/utils' import DivDialog from '@/views/wms/pdm/sub/DivDialog.vue' +import i18n from '@/i18n' const defaultForm = { workorder_id: null, @@ -183,11 +183,11 @@ const defaultForm = { export default { name: 'Packagerelation', dicts: ['sub_package_relation', 'IS_OR_NOT'], - components: { pagination, crudOperation, rrOperation, udOperation, DivDialog }, + components: { pagination, crudOperation, rrOperation, DivDialog }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ - title: '子卷装箱', + title: i18n.t('packagerelation.title'), optShow: { add: false, edit: false, del: false }, url: 'api/pdmBiSubpackagerelation/queryContainerization', crudMethod: { ...crudSubpackagerelation },