This commit is contained in:
刘晓鹏 2025-05-12 09:22:57 +08:00
parent eef4079220
commit d6dbe5ea23
17 changed files with 196 additions and 127 deletions

View File

@ -2,4 +2,5 @@
ENV = development ENV = development
# 本地环境接口地址 # 本地环境接口地址
VITE_API_URL = http://58.252.252.77:90 VITE_API_URL1 = http://58.252.252.77:90
VITE_API_URL = https://maxcess.gatedge.cn:91

View File

@ -2,4 +2,5 @@
ENV = production ENV = production
# 线上环境接口地址 # 线上环境接口地址
VITE_API_URL = http://58.252.252.77:90 VITE_API_URL1 = http://58.252.252.77:90
VITE_API_URL = https://maxcess.gatedge.cn:91

View File

@ -12,8 +12,8 @@
name="description" name="description"
content="123" content="123"
/> />
<link rel="icon" href="/favicon.ico" /> <link rel="icon" href="/logo.png" />
<title>vue-next-admin</title> <title>Maxcess SCEP</title>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>

BIN
public/logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

BIN
src/assets/logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

View File

@ -5,7 +5,7 @@ export default {
PODetails: 'PO Details ', PODetails: 'PO Details ',
DeliveryNoteList: 'Delivery Note List', DeliveryNoteList: 'Delivery Note List',
DocNumber: 'PO Number', DocNumber: 'PO Number',
DocStatus: 'PO Status', DocStatus: 'Line Status',
normal: 'Normal', normal: 'Normal',
closed: 'Closed', closed: 'Closed',
StartDate: 'Start Date', StartDate: 'Start Date',
@ -17,8 +17,9 @@ export default {
proceed: 'proceed', proceed: 'proceed',
date: 'Date', date: 'Date',
date1: 'Date', date1: 'Date',
status: 'Status', status: 'PO Status',
unclosed: 'Unclosed', unclosed: 'Unclosed',
closed1: 'Closed',
partNumber: 'Part Number', partNumber: 'Part Number',
materialName: 'Material Name', materialName: 'Material Name',
unit: 'Unit', unit: 'Unit',
@ -80,4 +81,24 @@ export default {
receiver:'Receiver', receiver:'Receiver',
sltzddh:'Delivery Note Number' 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",
}
}; };

View File

@ -5,9 +5,9 @@ export default {
PODetails: '采购订单明细', PODetails: '采购订单明细',
DeliveryNoteList: '送货管理列表', DeliveryNoteList: '送货管理列表',
DocNumber: '单据编号', DocNumber: '单据编号',
DocStatus: '业务状态', DocStatus: '行业务关闭',
normal: '正常', normal: '正常',
closed: '关闭', closed: '业务关闭',
StartDate: '开始采购日期', StartDate: '开始采购日期',
EndDate: '采购结束日期', EndDate: '采购结束日期',
search: '搜索', search: '搜索',
@ -17,8 +17,9 @@ export default {
proceed: '去查看', proceed: '去查看',
date: '日期', date: '日期',
date1: '采购日期', date1: '采购日期',
status: '关闭状态', status: '订单关闭',
unclosed: '未关闭', unclosed: '未关闭',
closed1: '关闭',
partNumber: '物料编码', partNumber: '物料编码',
materialName: '物料名称', materialName: '物料名称',
unit: '采购单位', unit: '采购单位',
@ -81,4 +82,24 @@ export default {
receiver:'接收人', receiver:'接收人',
sltzddh:'收料通知单单号' sltzddh:'收料通知单单号'
}, },
tiaoma:{
pno:'物料编码',
qty:'包装数量',
bn:'美塞斯批号',
po:'采购订单号',
grn:'收料通知单',
zddy:'整单打印',
xzdyj:'选择默认打印机',
mbs:'每包数',
bzsxh:'包装数 / 序号',
dytm:'打印条码',
bzdy:'包装打印',
zhuhai:'珠海',
taiguo:'泰国',
qxzdymb:'请选择打印模板',
dyjzzgzz:'打印机正在工作中',
qdyzddym:'确定要打印整单吗',
jcdwdypz:'检测到无打印插件,正在下载',
noMac:'MAC无打印配置',
}
}; };

View File

@ -1,7 +1,7 @@
<template> <template>
<div class="layout-logo" v-if="setShowLogo" @click="onThemeConfigChange"> <div class="layout-logo" v-if="setShowLogo" @click="onThemeConfigChange">
<img :src="logoMini" class="layout-logo-medium-img" /> <img :src="logoMini" class="layout-logo-medium-img" />
<span>{{ themeConfig.globalTitle }}</span> <!-- <span>{{ themeConfig.globalTitle }}</span>-->
</div> </div>
<div class="layout-logo-size" v-else @click="onThemeConfigChange"> <div class="layout-logo-size" v-else @click="onThemeConfigChange">
<img :src="logoMini" class="layout-logo-size-img" /> <img :src="logoMini" class="layout-logo-size-img" />
@ -12,7 +12,7 @@
import { computed } from 'vue'; import { computed } from 'vue';
import { storeToRefs } from 'pinia'; import { storeToRefs } from 'pinia';
import { useThemeConfig } from '/@/stores/themeConfig'; import { useThemeConfig } from '/@/stores/themeConfig';
import logoMini from '/@/assets/logo-mini.svg'; import logoMini from '/@/assets/logo.png';
// //
const storesThemeConfig = useThemeConfig(); const storesThemeConfig = useThemeConfig();
@ -32,7 +32,7 @@ const onThemeConfigChange = () => {
<style scoped lang="scss"> <style scoped lang="scss">
.layout-logo { .layout-logo {
width: 220px; //width: 220px;
height: 50px; height: 50px;
display: flex; display: flex;
align-items: center; align-items: center;
@ -52,8 +52,8 @@ const onThemeConfigChange = () => {
} }
} }
&-medium-img { &-medium-img {
width: 20px; height: 49px;
margin-right: 5px; //margin-right: 5px;
} }
} }
.layout-logo-size { .layout-logo-size {

View File

@ -112,7 +112,7 @@ export function getBackEndControlRoutes() {
const { userInfos } = storeToRefs(stores); const { userInfos } = storeToRefs(stores);
const auth = userInfos.value.roles[0]; const auth = userInfos.value.roles[0];
// 管理员 admin // 管理员 admin
if (auth === 'admin') return menuApi.getAdminMenu(); if (auth === 'admin' || auth === 'root') return menuApi.getAdminMenu();
// 其它用户 test // 其它用户 test
else return menuApi.getTestMenu(); else return menuApi.getTestMenu();
} }

View File

@ -58,7 +58,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: true, isAffix: true,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'root','common'],
icon: 'iconfont icon-shouye', icon: 'iconfont icon-shouye',
}, },
}, },
@ -73,7 +73,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-shouye', icon: 'iconfont icon-shouye',
}, },
}, },
@ -88,7 +88,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-shouye', icon: 'iconfont icon-shouye',
}, },
}, },
@ -103,7 +103,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-shouye', icon: 'iconfont icon-shouye',
}, },
}, },
@ -119,7 +119,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin'], roles: ['admin', 'root'],
icon: 'iconfont icon-xitongshezhi', icon: 'iconfont icon-xitongshezhi',
}, },
children: [ children: [
@ -134,7 +134,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-caidan', icon: 'iconfont icon-caidan',
}, },
}, },
@ -149,7 +149,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'ele-ColdDrink', icon: 'ele-ColdDrink',
}, },
}, },
@ -164,7 +164,22 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-icon-',
},
},
{
path: '/system/version',
name: 'systemVersion',
component: () => import('/@/views/system/version/index.vue'),
meta: {
title: 'PDA版本管理',
isLink: '',
isHide: false,
isKeepAlive: true,
isAffix: false,
isIframe: false,
roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-icon-', icon: 'iconfont icon-icon-',
}, },
}, },
@ -179,7 +194,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'ele-OfficeBuilding', icon: 'ele-OfficeBuilding',
}, },
}, },
@ -194,7 +209,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'ele-SetUp', icon: 'ele-SetUp',
}, },
}, },
@ -212,7 +227,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-quanxian', icon: 'iconfont icon-quanxian',
}, },
children: [ children: [
@ -228,7 +243,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: '', icon: '',
}, },
children: [ children: [
@ -243,7 +258,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: '', icon: '',
}, },
}, },
@ -258,7 +273,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: '', icon: '',
}, },
}, },
@ -275,7 +290,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: '', icon: '',
}, },
children: [ children: [
@ -290,7 +305,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: '', icon: '',
}, },
}, },
@ -310,7 +325,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-caidan', icon: 'iconfont icon-caidan',
}, },
children: [ children: [
@ -326,7 +341,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-caidan', icon: 'iconfont icon-caidan',
}, },
children: [ children: [
@ -341,7 +356,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-caidan', icon: 'iconfont icon-caidan',
}, },
}, },
@ -357,7 +372,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-caidan', icon: 'iconfont icon-caidan',
}, },
children: [ children: [
@ -372,7 +387,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-caidan', icon: 'iconfont icon-caidan',
}, },
}, },
@ -387,7 +402,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-caidan', icon: 'iconfont icon-caidan',
}, },
}, },
@ -404,7 +419,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-caidan', icon: 'iconfont icon-caidan',
}, },
}, },
@ -421,7 +436,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-caidan', icon: 'iconfont icon-caidan',
}, },
}, },
@ -439,7 +454,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-crew_feature', icon: 'iconfont icon-crew_feature',
}, },
children: [ children: [
@ -454,7 +469,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'ele-Pointer', icon: 'ele-Pointer',
}, },
}, },
@ -469,7 +484,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'ele-Odometer', icon: 'ele-Odometer',
}, },
}, },
@ -484,7 +499,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-fuwenbenkuang', icon: 'iconfont icon-fuwenbenkuang',
}, },
}, },
@ -499,7 +514,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-caijian', icon: 'iconfont icon-caijian',
}, },
}, },
@ -514,7 +529,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-ico', icon: 'iconfont icon-ico',
}, },
}, },
@ -529,7 +544,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-ditu', icon: 'iconfont icon-ditu',
}, },
}, },
@ -544,7 +559,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'ele-Printer', icon: 'ele-Printer',
}, },
}, },
@ -559,7 +574,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'ele-DocumentCopy', icon: 'ele-DocumentCopy',
}, },
}, },
@ -574,7 +589,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-tuodong', icon: 'iconfont icon-tuodong',
}, },
}, },
@ -589,7 +604,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon--chaifenlie', icon: 'iconfont icon--chaifenlie',
}, },
}, },
@ -607,7 +622,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-fuzhiyemian', icon: 'iconfont icon-fuzhiyemian',
}, },
children: [ children: [
@ -622,7 +637,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'ele-Sell', icon: 'ele-Sell',
}, },
/** /**
@ -643,7 +658,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: false, isKeepAlive: false,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'ele-Sunny', icon: 'ele-Sunny',
}, },
}, },
@ -660,7 +675,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: false, isKeepAlive: false,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'ele-Sunny', icon: 'ele-Sunny',
}, },
}, },
@ -675,7 +690,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'ele-Present', icon: 'ele-Present',
}, },
}, },
@ -690,7 +705,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'ele-Eleme', icon: 'ele-Eleme',
}, },
}, },
@ -705,7 +720,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'ele-SetUp', icon: 'ele-SetUp',
}, },
}, },
@ -720,7 +735,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-biaodan', icon: 'iconfont icon-biaodan',
}, },
}, },
@ -735,7 +750,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-jiliandongxuanzeqi', icon: 'iconfont icon-jiliandongxuanzeqi',
}, },
}, },
@ -750,7 +765,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-diqiu', icon: 'iconfont icon-diqiu',
}, },
}, },
@ -765,7 +780,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-shuxing', icon: 'iconfont icon-shuxing',
}, },
}, },
@ -780,7 +795,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-chazhaobiaodanliebiao', icon: 'iconfont icon-chazhaobiaodanliebiao',
}, },
}, },
@ -795,7 +810,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-zidingyibuju', icon: 'iconfont icon-zidingyibuju',
}, },
}, },
@ -810,7 +825,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-step', icon: 'iconfont icon-step',
}, },
}, },
@ -825,7 +840,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-15tupianyulan', icon: 'iconfont icon-15tupianyulan',
}, },
}, },
@ -840,7 +855,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-bolangneng', icon: 'iconfont icon-bolangneng',
}, },
}, },
@ -855,7 +870,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-shuxingtu', icon: 'iconfont icon-shuxingtu',
}, },
}, },
@ -870,7 +885,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'ele-Pointer', icon: 'ele-Pointer',
}, },
}, },
@ -948,7 +963,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-xuanzeqi', icon: 'iconfont icon-xuanzeqi',
}, },
}, },
@ -963,7 +978,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'ele-Bell', icon: 'ele-Bell',
}, },
}, },
@ -978,7 +993,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'fa fa-thumbs-o-up', icon: 'fa fa-thumbs-o-up',
}, },
}, },
@ -993,7 +1008,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-shuju', icon: 'iconfont icon-shuju',
}, },
}, },
@ -1145,7 +1160,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-ico_shuju', icon: 'iconfont icon-ico_shuju',
}, },
}, },
@ -1160,7 +1175,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-gerenzhongxin', icon: 'iconfont icon-gerenzhongxin',
}, },
}, },
@ -1175,7 +1190,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'common'], roles: ['admin', 'common', 'root'],
icon: 'iconfont icon-gongju', icon: 'iconfont icon-gongju',
}, },
}, },

View File

@ -45,7 +45,7 @@ export const useUserInfo = defineStore('userInfo', {
// test 按钮权限标识 // test 按钮权限标识
let testAuthBtnList: Array<string> = ['btn.add', 'btn.link']; let testAuthBtnList: Array<string> = ['btn.add', 'btn.link'];
// 不同用户模拟不同的用户权限 // 不同用户模拟不同的用户权限
if (userName === 'admin') { if (userName === 'admin' || userName === 'root') {
defaultRoles = adminRoles; defaultRoles = adminRoles;
defaultAuthBtnList = adminAuthBtnList; defaultAuthBtnList = adminAuthBtnList;
} else { } else {

View File

@ -25,7 +25,7 @@
</el-tooltip> </el-tooltip>
</template> </template>
<template #printBtn="{ row }"> <template #printBtn="{ row }">
<el-button type="text" @click="printPackingFun(row,expandObj.row)">包装打印</el-button> <el-button type="text" @click="printPackingFun(row,expandObj.row)">{{ t('message.index.print') }}</el-button>
</template> </template>
</avue-crud> </avue-crud>
</div> </div>
@ -44,18 +44,18 @@
</div> </div>
<div class="selectItem"> <div class="selectItem">
<el-input v-model="state.indexRow.fBillNo" style="width: 280px" size="default" disabled> <el-input v-model="state.indexRow.fBillNo" style="width: 280px" size="default" disabled>
<template #prepend>收料通知单</template> <template #prepend>{{ t('message.tiaoma.grn') }}</template>
</el-input> </el-input>
</div> </div>
<div class="selectItem"> <div class="selectItem">
<el-select v-model="state.printSelection" clearable placeholder="请选择打印模板" size="default" style="width: 150px"> <el-select v-model="state.printSelection" clearable :placeholder="t('message.tiaoma.qxzdymb')" size="default" style="width: 150px">
<el-option label="珠海" value="0" /> <el-option :label="t('message.tiaoma.zhuhai')" value="0" />
<el-option label="泰国" value="1" /> <el-option :label="t('message.tiaoma.taiguo')" value="1" />
</el-select> </el-select>
</div> </div>
<el-button type="primary" size="default" @click="printCheckAllFun">整单打印</el-button> <el-button type="primary" size="default" @click="printCheckAllFun">{{ t('message.tiaoma.zddy') }}</el-button>
<el-button type="primary" size="default" @click="defaultPrinterFun">选择默认打印机</el-button> <el-button type="primary" size="default" @click="defaultPrinterFun">{{ t('message.tiaoma.xzdyj') }}</el-button>
<el-button type="danger" size="default" v-if="state.timer !== null" @click="printCheckDangerFun">取消打印 </el-button> <!-- <el-button type="danger" size="default" v-if="state.timer !== null" @click="printCheckDangerFun">取消打印</el-button> -->
</div> </div>
</template> </template>
</avue-crud> </avue-crud>
@ -102,8 +102,8 @@ const state: any = reactive({
{ label: computed(() => t('message.index.supplierCode')), prop: 'supplierId' }, { label: computed(() => t('message.index.supplierCode')), prop: 'supplierId' },
{ label: computed(() => t('message.index.supplierName')), prop: 'supplierName'}, { label: computed(() => t('message.index.supplierName')), prop: 'supplierName'},
{ label: computed(() => t('message.index.shipmentQTY')), prop: 'qty' }, { label: computed(() => t('message.index.shipmentQTY')), prop: 'qty' },
{ label: '每包数', prop: 'packagingQuantity' }, { label: computed(() => t('message.tiaoma.mbs')), prop: 'packagingQuantity' },
{ label: '包装数 / 序号', prop: 'quantityPerPackage' }, { label: computed(() => t('message.tiaoma.bzsxh')), prop: 'quantityPerPackage' },
{ label: computed(() => t('message.index.print')), prop: 'printBtn' }, { label: computed(() => t('message.index.print')), prop: 'printBtn' },
], ],
}, },
@ -131,8 +131,8 @@ const state: any = reactive({
{ label: computed(() => t('message.index.supplierCode')), prop: 'supplierId' }, { label: computed(() => t('message.index.supplierCode')), prop: 'supplierId' },
{ label: computed(() => t('message.index.supplierName')), prop: 'supplierName' }, { label: computed(() => t('message.index.supplierName')), prop: 'supplierName' },
{ label: computed(() => t('message.index.shipmentQTY')), prop: 'qty' }, { label: computed(() => t('message.index.shipmentQTY')), prop: 'qty' },
{ label: '每包数', prop: 'packagingQuantity' }, { label: computed(() => t('message.tiaoma.mbs')), prop: 'packagingQuantity' },
{ label: '包装数 / 序号', prop: 'quantityPerPackage' }, { label: computed(() => t('message.tiaoma.bzsxh')), prop: 'quantityPerPackage' },
{ label: computed(() => t('message.index.print')), prop: 'printBtn' }, { label: computed(() => t('message.index.print')), prop: 'printBtn' },
], ],
}, },
@ -150,22 +150,15 @@ const state: any = reactive({
// //
const printVerification = () => { const printVerification = () => {
if (state.printSelection === '') { if (state.printSelection === '') {
ElMessage.warning('请选择打印模板'); ElMessage.warning(t('message.tiaoma.qxzdymb'));
return false; return false;
} }
if (state.timer !== null) { if (state.timer !== null) {
ElMessage.warning('打印机正在工作中'); ElMessage.warning(t('message.tiaoma.dyjzzgzz'));
return false; return false;
} }
return true; return true;
}; };
//
const printCheckDangerFun = () => {
LODOP.SET_PRINT_MODE(`CONTROL_PRINTER:${state.printJQ}`, 'PURGE');
clearInterval(state.allSetTime);
clearInterval(state.timer);
state.timer = null;
};
// //
const defaultPrinterFun = () => { const defaultPrinterFun = () => {
LODOP.SELECT_PRINTER(); LODOP.SELECT_PRINTER();
@ -177,7 +170,7 @@ const printCheckAllFun = () => {
closeOnClickModal: false, closeOnClickModal: false,
closeOnPressEscape: false, closeOnPressEscape: false,
title: t('message.index.prompt'), title: t('message.index.prompt'),
message: '确定要打印整单吗?', message: t('message.index.qdyzddym'),
confirmButtonText: t('message.index.confirm'), confirmButtonText: t('message.index.confirm'),
cancelButtonText: t('message.user.logOutCancel'), cancelButtonText: t('message.user.logOutCancel'),
showCancelButton: true, showCancelButton: true,
@ -194,7 +187,7 @@ const printCheckAllFun = () => {
clearInterval(state.allSetTime); clearInterval(state.allSetTime);
state.allSetTime = null; state.allSetTime = null;
} }
}, 500); }, 1000);
done(); done();
} else { } else {
done(); done();
@ -274,10 +267,10 @@ const AddPrintContentZhuhai = (row: any) => {
// //
const AddPrintContentTaiguo = (row: any) => { const AddPrintContentTaiguo = (row: any) => {
LODOP.ADD_PRINT_BARCODE(25, 15, 150, 150, 'QRCode', row.fBarCode); LODOP.ADD_PRINT_BARCODE(25, 15, 150, 150, 'QRCode', row.fBarCode);
LODOP.ADD_PRINT_TEXT(28, 160, 300, 20, `物料编码${row.materialCode}`); LODOP.ADD_PRINT_TEXT(28, 160, 300, 20, `${t('message.tiaoma.pno')}${row.materialCode}`);
LODOP.ADD_PRINT_TEXT(58, 160, 300, 20, `包装数量${row.packagingQuantity}`); LODOP.ADD_PRINT_TEXT(58, 160, 300, 20, `${t('message.tiaoma.qty')}${row.packagingQuantity}`);
LODOP.ADD_PRINT_TEXT(88, 160, 300, 20, `美塞斯批号${row.mssSupplierLot}`); LODOP.ADD_PRINT_TEXT(88, 160, 300, 20, `${t('message.tiaoma.bn')}${row.mssSupplierLot}`);
LODOP.ADD_PRINT_TEXT(118, 160, 300, 20, `供应商批号:${row.fSupplierLot}`); LODOP.ADD_PRINT_TEXT(118, 160, 300, 20, `${t('message.tiaoma.po')}${row.purchaseBillNo}`);
}; };
// //
const inputNumberFun = (e: any, row: any) => { const inputNumberFun = (e: any, row: any) => {
@ -307,10 +300,8 @@ const inputNumberFun = (e: any, row: any) => {
); );
child.quantityPerPackage = i + 1; child.quantityPerPackage = i + 1;
child.printBtn = '打印此包装'; child.printBtn = t('message.index.print');
child.supplierName = item.supplierName child.supplierName = item.supplierName
console.log(item)
console.log(child)
if (i === packages - 1 && item.qty % e !== 0) { if (i === packages - 1 && item.qty % e !== 0) {
child.packagingQuantity = item.qty % e; child.packagingQuantity = item.qty % e;
child.qty = child.packagingQuantity child.qty = child.packagingQuantity
@ -327,8 +318,8 @@ const inputNumberFun = (e: any, row: any) => {
const openShowDataFun = (row: any) => { const openShowDataFun = (row: any) => {
if (LODOP === undefined) { if (LODOP === undefined) {
ElNotification({ ElNotification({
title: '提示', title: t('message.index.prompt'),
message: '检测到无打印插件,正在下载', message: t('message.tiaoma.jcdwdypz'),
type: 'warning', type: 'warning',
duration: 0, duration: 0,
position: 'top-left', position: 'top-left',
@ -338,8 +329,8 @@ const openShowDataFun = (row: any) => {
window.location.href = 'http://58.252.252.77:8085/CLodop_Setup_for_Win64NT_6.623EN.exe'; window.location.href = 'http://58.252.252.77:8085/CLodop_Setup_for_Win64NT_6.623EN.exe';
} else if (userAgent.includes('mac')) { } else if (userAgent.includes('mac')) {
ElNotification({ ElNotification({
title: '提示', title: t('message.index.prompt'),
message: 'MAC无打印配置', message: t('message.index.noMac'),
type: 'error', type: 'error',
duration: 0, duration: 0,
position: 'top-left', position: 'top-left',
@ -357,7 +348,7 @@ const openShowDataFun = (row: any) => {
item.packagingQuantity = item.qty; item.packagingQuantity = item.qty;
item.quantityPerPackage = 1; item.quantityPerPackage = 1;
item.children = []; item.children = [];
item.printBtn = '打印条码'; item.printBtn = t('message.index.print');
}); });
state.show = true; state.show = true;
} }

View File

@ -27,7 +27,6 @@
<div class="multi-line-omit">{{ row.supplierName }}</div> <div class="multi-line-omit">{{ row.supplierName }}</div>
</el-tooltip> </el-tooltip>
</template> </template>
43
<template #menu-left> <template #menu-left>
<div class="selectBoxes"> <div class="selectBoxes">
<div class="selectItem"> <div class="selectItem">
@ -50,11 +49,7 @@
<el-button type="primary" size="default" @click="selectFun">{{ t('message.index.search') }}</el-button> <el-button type="primary" size="default" @click="selectFun">{{ t('message.index.search') }}</el-button>
<el-button size="default" @click="resetFun">{{ t('message.index.reset') }}</el-button> <el-button size="default" @click="resetFun">{{ t('message.index.reset') }}</el-button>
<el-button type="primary" size="default" @click="state.selectedDataShow = true"> <el-button type="primary" size="default" @click="state.selectedDataShow = true">
<span <span>{{ t('message.index.selected') }} {{ state.selectedData.length }} {{ t('message.index.items') }}{{ t('message.index.print') }}</span>
>{{ t('message.index.selected') }} {{ state.selectedData.length }} {{ t('message.index.items') }}{{
t('message.index.print')
}}</span
>
</el-button> </el-button>
</div> </div>
</template> </template>

View File

@ -5,16 +5,17 @@
</div> </div>
<div class="btnList"> <div class="btnList">
<el-button type="primary" @click="printElement">打印</el-button> <el-button type="primary" @click="printElement">{{ t('message.index.print') }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { defineProps, reactive, ref, nextTick, defineEmits } from 'vue'; import { defineProps, reactive, ref, defineEmits } from 'vue';
import ceshi from './ceshi.vue'; import ceshi from './ceshi.vue';
import printJS from 'print-js'; import printJS from 'print-js';
import html2canvas from 'html2canvas'; import html2canvas from 'html2canvas';
import { useI18n } from 'vue-i18n';
const { t } = useI18n()
const ceshiRef = ref(); const ceshiRef = ref();
const emits = defineEmits(['close']); const emits = defineEmits(['close']);
const props = defineProps({ const props = defineProps({
@ -36,7 +37,6 @@ const closeFun = () => {
const printElement = () => { const printElement = () => {
captureSnapshot(); captureSnapshot();
// DOM HTML // DOM HTML
}; };
// //
const captureSnapshot = async () => { const captureSnapshot = async () => {

View File

@ -20,7 +20,7 @@
</el-tooltip> </el-tooltip>
</template> </template>
<template #fCancelStatus="{ row }"> <template #fCancelStatus="{ row }">
{{ row.ifHidden === 0 ? (row.fCancelStatus === 'A' ? t('message.index.closed') : t('message.index.unclosed')) : '' }} {{ row.ifHidden === 0 ? (row.fCancelStatus === 'A' ? t('message.index.unclosed') : t('message.index.unclosed')) : '' }}
</template> </template>
<template #materialName="{ row }"> <template #materialName="{ row }">
<el-tooltip :content="row.materialName" placement="top"> <el-tooltip :content="row.materialName" placement="top">
@ -168,8 +168,8 @@ const state = reactive({
prop: 'fCancelStatus', prop: 'fCancelStatus',
filters: true, filters: true,
dicData: [ dicData: [
{ label: computed(() => t('message.index.unclosed')), value: 'A' }, { label: computed(() => t('message.index.unclosed')), value: 'A' },
{ label: computed(() => t('message.index.closed')), value: 'B' }, { label: computed(() => t('message.index.closed1')), value: 'B' },
], ],
width: '110', width: '110',
}, },
@ -186,8 +186,8 @@ const state = reactive({
searchSpan: 3, searchSpan: 3,
filters: true, filters: true,
dicData: [ dicData: [
{ label: computed(() => t('message.index.normal')), value: 'A' }, { label: computed(() => t('message.index.normal')), value: 'A' },
{ label: computed(() => t('message.index.closed')), value: 'B' }, { label: computed(() => t('message.index.closed')), value: 'B' },
], ],
width: '110', width: '110',
}, },

View File

@ -0,0 +1,24 @@
<template>
<div class="system-user-container layout-padding">
<el-card class="layout-padding-auto" shadow="hover">
</el-card>
</div>
</template>
<script lang="ts" setup>
import { reactive, onMounted } from 'vue';
// import { listApi } from '../../../api/list/index';
// import { ElMessage } from 'element-plus';
//
const state = reactive({
data: {},
});
//
onMounted(() => {});
</script>
<style lang="scss" scoped>
</style>

View File

@ -29,7 +29,7 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
hmr: true, hmr: true,
proxy: { proxy: {
'/api': { '/api': {
target: 'http://8.134.66.212:90', target: 'https://maxcess.gatedge.cn:91',
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, ''), rewrite: (path) => path.replace(/^\/api/, ''),