diff --git a/.env.development b/.env.development index 6743c2d..986d253 100644 --- a/.env.development +++ b/.env.development @@ -2,4 +2,5 @@ ENV = development # 本地环境接口地址 -VITE_API_URL = http://58.252.252.77:90 \ No newline at end of file +VITE_API_URL1 = http://58.252.252.77:90 +VITE_API_URL = https://maxcess.gatedge.cn:91 \ No newline at end of file diff --git a/.env.production b/.env.production index 5d1474a..cfce855 100644 --- a/.env.production +++ b/.env.production @@ -2,4 +2,5 @@ ENV = production # 线上环境接口地址 -VITE_API_URL = http://58.252.252.77:90 \ No newline at end of file +VITE_API_URL1 = http://58.252.252.77:90 +VITE_API_URL = https://maxcess.gatedge.cn:91 \ No newline at end of file diff --git a/index.html b/index.html index cbdfd47..1f0f730 100644 --- a/index.html +++ b/index.html @@ -12,8 +12,8 @@ name="description" content="123" /> - - vue-next-admin + + Maxcess SCEP
diff --git a/public/logo.png b/public/logo.png new file mode 100644 index 0000000..5ac36bf Binary files /dev/null and b/public/logo.png differ diff --git a/src/assets/logo.png b/src/assets/logo.png new file mode 100644 index 0000000..5ac36bf Binary files /dev/null and b/src/assets/logo.png differ diff --git a/src/i18n/pages/materialReceiptNotice/en.ts b/src/i18n/pages/materialReceiptNotice/en.ts index b4e5718..6d00aaf 100644 --- a/src/i18n/pages/materialReceiptNotice/en.ts +++ b/src/i18n/pages/materialReceiptNotice/en.ts @@ -5,7 +5,7 @@ export default { PODetails: 'PO Details ', DeliveryNoteList: 'Delivery Note List', DocNumber: 'PO Number', - DocStatus: 'PO Status', + DocStatus: 'Line Status', normal: 'Normal', closed: 'Closed', StartDate: 'Start Date', @@ -17,8 +17,9 @@ export default { proceed: 'proceed', date: 'Date', date1: 'Date', - status: 'Status', + status: 'PO Status', unclosed: 'Unclosed', + closed1: 'Closed', partNumber: 'Part Number', materialName: 'Material Name', unit: 'Unit', @@ -80,4 +81,24 @@ export default { receiver:'Receiver', sltzddh:'Delivery Note Number' }, + tiaoma:{ + pno:'P/NO', + qty:'Qty', + bn:'Batch No', + po:'PO', + grn:'GRN#', + zddy:'Print all', + xzdyj:'Select Printer', + mbs:'QTY/bag', + bzsxh:'Label/#', + dytm:'Print Label', + bzdy:'Print Label', + zhuhai:'Zhuhai', + taiguo:'Thailand', + qxzdymb:'Please select the printing tempelate', + dyjzzgzz:'Printing', + qdyzddym:'Confirm to print out all', + jcdwdypz:'Downloading printer driver', + noMac:"Don't support Apple Mac computer", + } }; diff --git a/src/i18n/pages/materialReceiptNotice/zh-cn.ts b/src/i18n/pages/materialReceiptNotice/zh-cn.ts index 0b12f6e..375eeca 100644 --- a/src/i18n/pages/materialReceiptNotice/zh-cn.ts +++ b/src/i18n/pages/materialReceiptNotice/zh-cn.ts @@ -5,9 +5,9 @@ export default { PODetails: '采购订单明细', DeliveryNoteList: '送货管理列表', DocNumber: '单据编号', - DocStatus: '业务状态', + DocStatus: '行业务关闭', normal: '正常', - closed: '关闭', + closed: '业务关闭', StartDate: '开始采购日期', EndDate: '采购结束日期', search: '搜索', @@ -17,8 +17,9 @@ export default { proceed: '去查看', date: '日期', date1: '采购日期', - status: '关闭状态', + status: '订单关闭', unclosed: '未关闭', + closed1: '关闭', partNumber: '物料编码', materialName: '物料名称', unit: '采购单位', @@ -81,4 +82,24 @@ export default { receiver:'接收人', sltzddh:'收料通知单单号' }, + tiaoma:{ + pno:'物料编码', + qty:'包装数量', + bn:'美塞斯批号', + po:'采购订单号', + grn:'收料通知单', + zddy:'整单打印', + xzdyj:'选择默认打印机', + mbs:'每包数', + bzsxh:'包装数 / 序号', + dytm:'打印条码', + bzdy:'包装打印', + zhuhai:'珠海', + taiguo:'泰国', + qxzdymb:'请选择打印模板', + dyjzzgzz:'打印机正在工作中', + qdyzddym:'确定要打印整单吗', + jcdwdypz:'检测到无打印插件，正在下载', + noMac:'MAC无打印配置', + } }; diff --git a/src/layout/logo/index.vue b/src/layout/logo/index.vue index 7bb8a30..6bf8069 100644 --- a/src/layout/logo/index.vue +++ b/src/layout/logo/index.vue @@ -1,7 +1,7 @@