UDI
/
udi-spms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
ywj_dev
郑明梁 2 years ago
parent a429a22628 017a8a1c14
commit 10fe2316d2
5 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File

26
src/router/index.js
Unescape Escape View File

@ -36,33 +36,33 @@ export const constantRoutes = [
children: [ children: [
{ {
path: '/redirect/:path(.*)', path: '/redirect/:path(.*)',
component: () => import('@/views/redirect') component: (resolve) => require(['@/views/redirect'],resolve)
} }
] ]
}, },
{ {
path: '/login', path: '/login',
component: () => import('@/views/myLogin'), component: (resolve) => require(['@/views/myLogin'],resolve),
hidden: true hidden: true
}, },
{ {
path: '/register', path: '/register',
component: () => import('@/views/register'), component: (resolve) => require(['@/views/register'],resolve),
hidden: true hidden: true
}, },
{ {
path: '/forgetPasswd', path: '/forgetPasswd',
component: () => import('@/views/forgetPasswd'), component: (resolve) => require(['@/views/forgetPasswd'],resolve),
hidden: true hidden: true
}, },
{ {
path: '/404', path: '/404',
component: () => import('@/views/error/404'), component: (resolve) => require(['@/views/error/404'],resolve),
hidden: true hidden: true
}, },
{ {
path: '/401', path: '/401',
component: () => import('@/views/error/401'), component: (resolve) => require(['@/views/error/401'],resolve),
hidden: true hidden: true
}, },
{ {
@ -72,7 +72,7 @@ export const constantRoutes = [
children: [ children: [
{ {
path: 'index', path: 'index',
component: () => import('@/views/index'), component: (resolve) => require(['@/views/index'],resolve),
name: 'Index', name: 'Index',
meta: { title: '首页', icon: 'dashboard', affix: true } meta: { title: '首页', icon: 'dashboard', affix: true }
} }
@ -86,7 +86,7 @@ export const constantRoutes = [
children: [ children: [
{ {
path: 'profile', path: 'profile',
component: () => import('@/views/system/user/profile/index'), component: (resolve) => require(['@/views/system/user/profile/index'],resolve),
name: 'Profile', name: 'Profile',
meta: { title: '个人中心', icon: 'user' } meta: { title: '个人中心', icon: 'user' }
} }
@ -104,7 +104,7 @@ export const dynamicRoutes = [
children: [ children: [
{ {
path: 'role/:userId(\\d+)', path: 'role/:userId(\\d+)',
component: () => import('@/views/system/user/authRole'), component: (resolve) => require(['@/views/system/user/authRole'],resolve),
name: 'AuthRole', name: 'AuthRole',
meta: { title: '分配角色', activeMenu: '/system/user' } meta: { title: '分配角色', activeMenu: '/system/user' }
} }
@ -118,7 +118,7 @@ export const dynamicRoutes = [
children: [ children: [
{ {
path: 'user/:roleId(\\d+)', path: 'user/:roleId(\\d+)',
component: () => import('@/views/system/role/authUser'), component: (resolve) => require(['@/views/system/role/authUser'],resolve),
name: 'AuthUser', name: 'AuthUser',
meta: { title: '分配用户', activeMenu: '/system/role' } meta: { title: '分配用户', activeMenu: '/system/role' }
} }
@ -132,7 +132,7 @@ export const dynamicRoutes = [
children: [ children: [
{ {
path: 'index/:dictId(\\d+)', path: 'index/:dictId(\\d+)',
component: () => import('@/views/system/dict/data'), component: (resolve) => require(['@/views/system/dict/data'],resolve),
name: 'Data', name: 'Data',
meta: { title: '字典数据', activeMenu: '/system/dict' } meta: { title: '字典数据', activeMenu: '/system/dict' }
} }
@ -146,7 +146,7 @@ export const dynamicRoutes = [
children: [ children: [
{ {
path: 'index', path: 'index',
component: () => import('@/views/system/oss/config'), component: (resolve) => require(['@/views/system/oss/config'],resolve),
name: 'OssConfig', name: 'OssConfig',
meta: { title: '配置管理', activeMenu: '/system/oss' } meta: { title: '配置管理', activeMenu: '/system/oss' }
} }
@ -160,7 +160,7 @@ export const dynamicRoutes = [
children: [ children: [
{ {
path: 'index/:tableId(\\d+)', path: 'index/:tableId(\\d+)',
component: () => import('@/views/tool/gen/editTable'), component: (resolve) => require(['@/views/tool/gen/editTable'],resolve),
name: 'GenEdit', name: 'GenEdit',
meta: { title: '修改生成配置', activeMenu: '/tool/gen' } meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
} }

3
src/store/modules/permission.js
Unescape Escape View File

@ -126,7 +126,8 @@ export const loadView = (view) => {
return (resolve) => require([`@/views/${view}`], resolve) return (resolve) => require([`@/views/${view}`], resolve)
} else { } else {
// 使用 import 实现生产环境的路由懒加载 // 使用 import 实现生产环境的路由懒加载
return () => import(`@/views/${view}`) // return () => import(`@/views/${view}`)
return (resolve) => require([`@/views/${view}`], resolve)
} }
} }

8
src/views/basic/product/product.vue
Unescape Escape View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-row type="flex"> <el-row type="flex" style="flex-wrap: nowrap">
<el-col v-show="showSearch" style="width: 300px"> <el-col v-show="showSearch" style="width: 300px">
<el-tree <el-tree
:data="treeList" :data="treeList"
@ -2132,11 +2132,9 @@ export default {
margin-bottom: 0px; margin-bottom: 0px;
} }
/* .el-row { .el-row {
display: flex; display: flex;
flex-wrap: wrap; }
margin-bottom: 6px;
} */
/* .el-col { /* .el-col {
border-radius: 4px; border-radius: 4px;

16
src/views/inout/DialogCreateOrder.vue
Unescape Escape View File

@ -3,7 +3,8 @@
<el-card style="margin: 5px;margin-top: -20px"> <el-card style="margin: 5px;margin-top: -20px">
<el-form :model="orderFormData" :rules="formRules" ref="dataForm" label-width="100px" <el-form :model="orderFormData" :rules="formRules" ref="dataForm" label-width="100px"
style="margin-bottom: -15px"> style="margin-bottom: -15px">
<el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px"> <el-button-group
style="display: flex; margin: 0px 0 15px 75%; height: 35px">
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
@ -11,13 +12,14 @@
>草稿保存 >草稿保存
</el-button </el-button
> >
<el-button <el-button size="mini" type="primary" @click.native="submit()"
size="mini" v-if="curAction.checkWebNew != 2 || viewType !=1"
type="primary"
@click.native="submit()"
>立即提交 >立即提交
</el-button </el-button>
> <el-button size="mini" type="primary" @click.native="submit(1)"
v-if="curAction.checkWebNew > 1 && viewType == 1"
>待配货提交
</el-button>
<el-button size="mini" type="primary" @click.native="submit(1)" <el-button size="mini" type="primary" @click.native="submit(1)"
v-if="curAction.checkWebNew == 3" v-if="curAction.checkWebNew == 3"

28
src/views/sync/SysUdimsData.vue
Unescape Escape View File

@ -29,20 +29,20 @@
<el-button-group style="display:flex;"> <el-button-group style="display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="search">查询</el-button> <el-button type="primary" icon="search" @click="search">查询</el-button>
<el-button type="primary" icon="search" @click="createScheduleDialog(1)">同步单据 <!-- <el-button type="primary" icon="search" @click="createScheduleDialog(1)">同步单据-->
</el-button> <!-- </el-button>-->
<!-- :disabled="!configParms.orderScanFinish&& !configParms.orderUnReceive&& !configParms.orderUnCheck"--> <!-- &lt;!&ndash; :disabled="!configParms.orderScanFinish&& !configParms.orderUnReceive&& !configParms.orderUnCheck"&ndash;&gt;-->
<el-button type="primary" icon="search" @click="createScheduleDialog(2)" <!-- <el-button type="primary" icon="search" @click="createScheduleDialog(2)"-->
v-if="!configParms.typeBus&& !configParms.typeScan&& !configParms.typeThird"> <!-- v-if="!configParms.typeBus&& !configParms.typeScan&& !configParms.typeThird">-->
同步单据类型 <!-- 同步单据类型-->
</el-button> <!-- </el-button>-->
<el-button type="primary" icon="search" @click="createScheduleDialog(3)" v-if="!configParms.basicProducts&& !configParms.basicCorp&& <!-- <el-button type="primary" icon="search" @click="createScheduleDialog(3)" v-if="!configParms.basicProducts&& !configParms.basicCorp&&-->
!configParms.basicInv&&!configParms.basicThirdProducts&& !configParms.basicThirdCorp&& !configParms.basicThirdInv <!-- !configParms.basicInv&&!configParms.basicThirdProducts&& !configParms.basicThirdCorp&& !configParms.basicThirdInv-->
&& !configParms.basicThirdBusOrder&& !configParms.sysUser">同步基础信息 <!-- && !configParms.basicThirdBusOrder&& !configParms.sysUser">同步基础信息-->
</el-button> <!-- </el-button>-->
<el-button type="primary" icon="search" @click="createScheduleDialog(4)" <!-- <el-button type="primary" icon="search" @click="createScheduleDialog(4)"-->
v-if="configParms.dbDiProducts==2">同步国家库DI数据 <!-- v-if="configParms.dbDiProducts==2">同步国家库DI数据-->
</el-button> <!-- </el-button>-->
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-row> </el-row>

Write Preview
Loading…
Cancel
Save