diff --git a/src/i18n/pages/materialReceiptNotice/en.ts b/src/i18n/pages/materialReceiptNotice/en.ts index 8ac9f89..8139c49 100644 --- a/src/i18n/pages/materialReceiptNotice/en.ts +++ b/src/i18n/pages/materialReceiptNotice/en.ts @@ -1,49 +1,68 @@ export default { - index:{ - POList:'PO List', - PODetails :'PO Details ', - DeliveryNoteList:'Delivery Note List', + index: { + /*销售订单及其明细*/ + POList: 'PO List', + PODetails: 'PO Details ', + DeliveryNoteList: 'Delivery Note List', + DocNumber: 'PO Number', + DocStatus: 'PO Status', + normal: 'Normal', + closed: 'Closed', + StartDate: 'Start Date', + EndDate: 'End Date', + search: 'Search', + reset: 'Reset', + selected: 'Selected', + items: 'items', + proceed: 'proceed', + date: 'Date', + status: 'Status', + unclosed: 'Unclosed', + partNumber: 'Part Number', + materialName: 'Material Name', + unit: 'Unit', + unit1: 'Unit', + qty: 'QTY', + requestDate: 'Request Date', + receivedQTY: 'Acc. Delivery QTY', + unreceivedQTY: 'Unreceived QTY', + earliestDeliveryDate: 'Earliest Delivery Date', + latestDeliveryDate: 'Latest Delivery Date', + view: 'view', + batchUpdateEarliestDeliveryDate: 'Batch update Earliest Delivery Date', + batchUpdateLatestDeliveryDate: 'Batch update Latest Delivery Date', + specification:'Specification', - DocNumber:'PO Number', - DocStatus:'PO Status', - - normal:'Normal', - closed:'Closed', - - StartDate:'Start Date', - EndDate:'End Date', - - search:'Search', - reset:'Reset', - - selected:'Selected', - items:'items', - proceed:'proceed', - - date:'Date', - status:'Status', - - unclosed:'Unclosed', - - partNumber:'Part Number', - - materialName:'Material Name', - - unit:'Unit', - - qty:'QTY', - - deliveryDate:'Delivery Date', - - receivedQTY:'Received QTY', - unreceivedQTY:'Unreceived QTY', - - earliestDeliveryDate:'Earliest Delivery Date', - latestDeliveryDate:'Latest Delivery Date', - - view:'view', - - batchUpdateEarliestDeliveryDate:'Batch update Earliest Delivery Date', - batchUpdateLatestDeliveryDate:'Batch update Latest Delivery Date', - } + /*发货订单及其明细*/ + startDate: 'Start Date', + endDate: 'End Date', + deliveryDate: 'Delivery Date', + deliveryNote: 'Delivery Note #', + maxcessLot: 'Maxcess Lot #', + supplierLot: 'Supplier Lot #', + supplierCode: 'Supplier Code', + supplierName: 'Supplier Name', + deliveryQTY: 'Delivery QTY', + POQTY: 'PO QTY', + print: 'Print', + modifyPassword:'Modify password', + newPassord:'New passord', + cancel:'Cancel ', + confirm :'Confirm', + passwordChangedSuccessfully:'Password changed successfully', + emptyPasswordIsNotAllowed:'Empty password is not allowed.', + pleaseConfirmTheDateChange:' Please confirm the date change', + passwordChangedFailed:'Password changed failed', + shipmentQTY:'Shipment QTY', + invoiceNumber:'Invoice number', + deliveryNote1:'Delivery Note', + deliveryNoteNumber:'Delivery Note Number', + PO:'PO #', + shipper:'Shipper', + year:'Year', + month:'Mnth', + day:'Day', + changedSuccessfully:'changed successfully', + PleaseSelectItemsFirstly:'Please select items firstlys' + }, }; diff --git a/src/i18n/pages/materialReceiptNotice/zh-cn.ts b/src/i18n/pages/materialReceiptNotice/zh-cn.ts index 60888be..e85e241 100644 --- a/src/i18n/pages/materialReceiptNotice/zh-cn.ts +++ b/src/i18n/pages/materialReceiptNotice/zh-cn.ts @@ -1,49 +1,69 @@ export default { - index:{ - POList:'采购管理列表', - PODetails :'采购订单明细', - DeliveryNoteList:'送货管理列表', + index: { + /*销售订单及其明细*/ + POList: '采购管理列表', + PODetails: '采购订单明细', + DeliveryNoteList: '送货管理列表', + DocNumber: '单据编号', + DocStatus: '业务状态', + normal: '正常', + closed: '关闭', + StartDate: '开始采购日期', + EndDate: '采购结束日期', + search: '搜索', + reset: '重置', + selected: '已选中', + items: '条数据', + proceed: '去查看', + date: '采购日期', + status: '关闭状态', + unclosed: '未关闭', + partNumber: '物料编码', + materialName: '物料名称', + unit: '采购单位', + unit1: '单位', + qty: '采购数量', + requestDate: '交货日期', + receivedQTY: '累计已送货数量', + unreceivedQTY: '未发货数量', + earliestDeliveryDate: '供应商承诺交期', + latestDeliveryDate: '供应商承诺交期', + view: '查看', + batchUpdateEarliestDeliveryDate: '批量修改选中承诺日期', + batchUpdateLatestDeliveryDate: '批量修改选中承诺最新交期', + specification: '物料规格', - DocNumber:'单据编号', - DocStatus:'业务状态', - - normal:'正常', - closed:'关闭', - - StartDate:'开始采购日期', - EndDate:'采购结束日期', - - search:'搜索', - reset:'重置', - - selected:'已选中', - items:'条数据', - proceed:'去查看', - - date:'采购日期', - status:'关闭状态', - - unclosed:'未关闭', - - PartNumber:'物料编码', - - materialName:'物料名称', - - unit:'采购单位', - - qty:'采购数量', - - deliveryDate:'交货日期', - - receivedQTY:'累计收料数量', - unreceivedQTY:'剩余收料数量', - - earliestDeliveryDate:'供应商承诺交期', - latestDeliveryDate:'供应商承诺交期', - - view:'查看', - - batchUpdateEarliestDeliveryDate:'批量修改选中承诺日期', - batchUpdateLatestDeliveryDate:'批量修改选中承诺最新交期', - } + /*发货订单及其明细*/ + startDate: '开始送货日期', + endDate: '送货结束日期', + deliveryDate: '送货日期', + deliveryNote: '发货单号', + maxcessLot: '美塞斯批号', + supplierLot: '供应商批号', + supplierCode: '供应商编码', + supplierName: '供应商名称', + deliveryQTY: '发货数量', + POQTY: '采购数量', + print: '打印条码', + modifyPassword: '修改密码', + newPassord: '请输入', + cancel: '取消', + confirm: '确定', + passwordChangedSuccessfully: '修改成功', + emptyPasswordIsNotAllowed: '密码不能为空', + passwordChangedFailed: '修改失败', + shipmentQTY: '本次发货数量', + prompt:'提示', + pleaseConfirmTheDateChange:'是否修改此项日期', + invoiceNumber:'发票号', + deliveryNote1:'采购送货单', + deliveryNoteNumber:'收料通知单编号(送货单号)', + PO:'PO号', + shipper:'送货人', + year:'年', + month:'月', + day:'日', + changedSuccessfully:'修改成功', + PleaseSelectItemsFirstly:'请先选中数据' + }, }; diff --git a/src/layout/navBars/topBar/user.vue b/src/layout/navBars/topBar/user.vue index d87fee9..679af67 100644 --- a/src/layout/navBars/topBar/user.vue +++ b/src/layout/navBars/topBar/user.vue @@ -77,18 +77,18 @@ - 修改密码 + {{ t('message.index.modifyPassword') }} {{ $t('message.user.dropdown5') }} - - + + @@ -134,9 +134,15 @@ const dialogCloseFun = () => { state.password = '' } const passwordFunTJ = () => { + if(state.password === ''){ + ElMessage.warning(t('message.index.emptyPasswordIsNotAllowed')) + return + } listApi().UpPassword({pwd:state.password}).then((res:any) => { if (res.resultCode === 0) { - ElMessage.success('修改成功'); + ElMessage.success(t('message.index.passwordChangedSuccessfully')); + } else { + ElMessage.error(t('message.index.passwordChangedFailed')) } }) } diff --git a/src/views/materialReceiptNotice/ceshi.vue b/src/views/materialReceiptNotice/ceshi.vue index 7b44eff..dccffff 100644 --- a/src/views/materialReceiptNotice/ceshi.vue +++ b/src/views/materialReceiptNotice/ceshi.vue @@ -1,50 +1,49 @@