diff --git a/anrui-base/anrui-base-ui/src/layout/components/TagsView/index.vue b/anrui-base/anrui-base-ui/src/layout/components/TagsView/index.vue index 221c509b92..e745d91fc4 100644 --- a/anrui-base/anrui-base-ui/src/layout/components/TagsView/index.vue +++ b/anrui-base/anrui-base-ui/src/layout/components/TagsView/index.vue @@ -137,7 +137,6 @@ export default { refreshSelectedTag(view) { this.$store.dispatch('tagsView/delCachedView', view).then(() => { const { fullPath } = view - console.log('112233',view) this.$nextTick(() => { this.$router.replace({ path: '/redirect' + fullPath diff --git a/anrui-base/anrui-base-ui/src/router/index.js b/anrui-base/anrui-base-ui/src/router/index.js index faa0a67bec..e422ebd45f 100644 --- a/anrui-base/anrui-base-ui/src/router/index.js +++ b/anrui-base/anrui-base-ui/src/router/index.js @@ -8,6 +8,15 @@ Vue.use(Router) /* 所有角色可以访问/没有权限要求的基页 */ export const constantRoutes = [ + { + path: '/redirect', + component: Layout, + hidden: true, + children: [{ + path: '/redirect/:path(.*)', + component: () => import('@/views/redirect/index.vue') + }] + }, { path: '/', redirect: 'index' @@ -53,7 +62,8 @@ export const constantRoutes = [ import('@/views/changshang/changshangguanli/changshangguanli.vue'), name: 'changshangguanli', meta: { - title: '厂商管理' + title: '厂商管理', + noCache: true, } }, ] @@ -73,7 +83,8 @@ export const constantRoutes = [ import('@/views/pinpai/pinpaiguanli/pinpaiguanli.vue'), name: 'pinpaiguanli', meta: { - title: '品牌管理' + title: '品牌管理', + noCache: true, } }, { @@ -83,7 +94,8 @@ export const constantRoutes = [ name: 'pinpaiAdd', hidden: true, meta: { - title: '品牌管理' + title: '品牌管理', + noCache: true, } }, { @@ -93,7 +105,8 @@ export const constantRoutes = [ name: 'pinpaiInfo', hidden: true, meta: { - title: '品牌详情' + title: '品牌详情', + noCache: true, } }, { @@ -123,7 +136,8 @@ export const constantRoutes = [ import('@/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangguanli.vue'), name: 'jingxiaoshangguanli', meta: { - title: '经销商管理' + title: '经销商管理', + noCache: true, } }, { @@ -133,7 +147,8 @@ export const constantRoutes = [ name: 'jingxiaoshangAdd', hidden: true, meta: { - title: '经销商添加' + title: '经销商添加', + noCache: true, } }, { @@ -143,7 +158,8 @@ export const constantRoutes = [ name: 'jingxiaoshangEdit', hidden: true, meta: { - title: '经销商修改' + title: '经销商修改', + noCache: true, } }, { @@ -153,7 +169,8 @@ export const constantRoutes = [ name: 'jingxiaoshangInfo', hidden: true, meta: { - title: '经销商详情' + title: '经销商详情', + noCache: true, } } // { @@ -185,7 +202,8 @@ export const constantRoutes = [ import('@/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue'), name: 'guakaogongsiguanli', meta: { - title: '经销商' + title: '经销商', + noCache: true, } }, // { @@ -245,7 +263,8 @@ export const constantRoutes = [ import('@/views/zifang/zifangguanli/zifangguanli.vue'), name: 'zifangguanli', meta: { - title: '资方信息管理' + title: '资方信息管理', + noCache: true, } }, { @@ -255,7 +274,8 @@ export const constantRoutes = [ name: 'zifangguanliAdd', hidden: true, meta: { - title: '资方信息添加' + title: '资方信息添加', + noCache: true, } }, { @@ -265,7 +285,8 @@ export const constantRoutes = [ name: 'zifangguanliInfo', hidden: true, meta: { - title: '资方信息详细信息' + title: '资方信息详细信息', + noCache: true, } }, { @@ -274,7 +295,8 @@ export const constantRoutes = [ import('@/views/zifang/zifangzhengce/zifangzhengce.vue'), name: 'zifangzhengce', meta: { - title: '资方政策管理' + title: '资方政策管理', + noCache: true, } }, { @@ -284,7 +306,8 @@ export const constantRoutes = [ name: 'zifangzhengceAdd', hidden: true, meta: { - title: '资方政策添加' + title: '资方政策添加', + noCache: true, } }, { @@ -294,7 +317,8 @@ export const constantRoutes = [ name: 'zifangzhengceInfo', hidden: true, meta: { - title: '资方政策详细信息' + title: '资方政策详细信息', + noCache: true, } } @@ -313,7 +337,7 @@ export const constantRoutes = [ path: '/fileList/index', component: () => import('@/views/fileList/fileList.vue'), name: 'fileList', - meta: { title: '资料清单' } + meta: { title: '资料清单',noCache: true, } }] }, diff --git a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue index 9629a23e48..dc927e623d 100644 --- a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue +++ b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue @@ -168,7 +168,7 @@ import guakaogongsiInfo from './guakaogongsiInfo.vue' import ButtonBar from '@/components/ButtonBar/index.vue' export default { - name: 'Guakaogongsiguanli', + name: 'guakaogongsiguanli', components: { Pagination, pageye, diff --git a/anrui-base/anrui-base-ui/src/views/redirect/index.vue b/anrui-base/anrui-base-ui/src/views/redirect/index.vue new file mode 100644 index 0000000000..db4c1d66d1 --- /dev/null +++ b/anrui-base/anrui-base-ui/src/views/redirect/index.vue @@ -0,0 +1,12 @@ + diff --git a/anrui-base/anrui-base-ui/src/views/zifang/zifangguanli/zifangguanli.vue b/anrui-base/anrui-base-ui/src/views/zifang/zifangguanli/zifangguanli.vue index 5b5a2f3cb0..beaac1e382 100644 --- a/anrui-base/anrui-base-ui/src/views/zifang/zifangguanli/zifangguanli.vue +++ b/anrui-base/anrui-base-ui/src/views/zifang/zifangguanli/zifangguanli.vue @@ -95,7 +95,7 @@ import zifangguanliAdd from './zifangguanliAdd.vue' import zifangguanliInfo from './zifangguanliInfo.vue' export default { - name: 'Zifangguanli', + name: 'zifangguanli', components: { Pagination, pageye, diff --git a/anrui-base/anrui-base-ui/src/views/zifang/zifangzhengce/zifangzhengce.vue b/anrui-base/anrui-base-ui/src/views/zifang/zifangzhengce/zifangzhengce.vue index 1c774fa435..5bdaced2a5 100644 --- a/anrui-base/anrui-base-ui/src/views/zifang/zifangzhengce/zifangzhengce.vue +++ b/anrui-base/anrui-base-ui/src/views/zifang/zifangzhengce/zifangzhengce.vue @@ -151,7 +151,7 @@ import { brandLike } from '@/api/jichuxinxi/brandManagement' import { basefinbankDnamesDown } from '@/api/jichuxinxi/basefinbank' // 资方名称 export default { - name: 'Zifangzhengce', + name: 'zifangzhengce', components: { Pagination, pageye diff --git a/anrui-buscenter/anrui-buscenter-ui/src/layout/components/TagsView/index.vue b/anrui-buscenter/anrui-buscenter-ui/src/layout/components/TagsView/index.vue index 04708d4bca..93bd5f137b 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/layout/components/TagsView/index.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/layout/components/TagsView/index.vue @@ -141,8 +141,8 @@ } = view this.$nextTick(() => { this.$router.replace({ - // path: '/redirect' + fullPath - path: fullPath + path: '/redirect' + fullPath + // path: fullPath }) }) }) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/router/index.js b/anrui-buscenter/anrui-buscenter-ui/src/router/index.js index 1f9a317941..c81a70e946 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/router/index.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/router/index.js @@ -7,16 +7,26 @@ import codemenu from './modules/codemenu' Vue.use(Router) -export const constantRoutes = [{ - path: '/', - redirect: 'index' -}, { - path: '/login', - component: () => import('@/views/login/login.vue') -}, { - path: '/home', - component: () => import('@/views/Home/Home.vue'), - name: 'home' +export const constantRoutes = [ + { + path: '/redirect', + component: Layout, + hidden: true, + children: [{ + path: '/redirect/:path(.*)', + component: () => import('@/views/redirect/index.vue') + }] + }, + { + path: '/', + redirect: 'index' + }, { + path: '/login', + component: () => import('@/views/login/login.vue') + }, { + path: '/home', + component: () => import('@/views/Home/Home.vue'), + name: 'home' }, { path: '/index', diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/redirect/index.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/redirect/index.vue new file mode 100644 index 0000000000..db4c1d66d1 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/redirect/index.vue @@ -0,0 +1,12 @@ + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/layout/components/TagsView/index.vue b/anrui-buscenter/anrui-finmanage-ui/src/layout/components/TagsView/index.vue index ce2d1d44a4..3c86d6ebf1 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/layout/components/TagsView/index.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/layout/components/TagsView/index.vue @@ -138,8 +138,7 @@ export default { const { fullPath } = view this.$nextTick(() => { this.$router.replace({ - path: fullPath - // path: '/redirect' + fullPath + path: '/redirect' + fullPath }) }) }) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/router/index.js b/anrui-buscenter/anrui-finmanage-ui/src/router/index.js index 25b8068a05..1f4b3085f1 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/router/index.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/router/index.js @@ -9,7 +9,17 @@ import Layout from '@/layout' import codemenu from './modules/codemenu' -export const constantRoutes = [{ +export const constantRoutes = [ + { + path: '/redirect', + component: Layout, + hidden: true, + children: [{ + path: '/redirect/:path(.*)', + component: () => import('@/views/redirect/index.vue') + }] + }, + { path: '/', redirect: 'index' }, { diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/redirect/index.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/redirect/index.vue new file mode 100644 index 0000000000..db4c1d66d1 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/redirect/index.vue @@ -0,0 +1,12 @@ + diff --git a/anrui-management/anrui-management-ui/src/layout/components/TagsView/index.vue b/anrui-management/anrui-management-ui/src/layout/components/TagsView/index.vue index d3b099f84a..ff1f8da266 100644 --- a/anrui-management/anrui-management-ui/src/layout/components/TagsView/index.vue +++ b/anrui-management/anrui-management-ui/src/layout/components/TagsView/index.vue @@ -130,8 +130,7 @@ export default { const { fullPath } = view this.$nextTick(() => { this.$router.replace({ - path: fullPath - // path: '/redirect' + fullPath + path: '/redirect' + fullPath }) }) }) diff --git a/anrui-management/anrui-management-ui/src/router/index.js b/anrui-management/anrui-management-ui/src/router/index.js index 6ae1c6fd1f..e2bb93b113 100644 --- a/anrui-management/anrui-management-ui/src/router/index.js +++ b/anrui-management/anrui-management-ui/src/router/index.js @@ -8,6 +8,15 @@ import Layout from '@/layout' /* 所有角色可以访问/没有权限要求的基页 */ export const constantRoutes = [ + { + path: '/redirect', + component: Layout, + hidden: true, + children: [{ + path: '/redirect/:path(.*)', + component: () => import('@/views/redirect/index.vue') + }] + }, { path: '/', redirect: 'index' diff --git a/anrui-management/anrui-management-ui/src/views/redirect/index.vue b/anrui-management/anrui-management-ui/src/views/redirect/index.vue new file mode 100644 index 0000000000..db4c1d66d1 --- /dev/null +++ b/anrui-management/anrui-management-ui/src/views/redirect/index.vue @@ -0,0 +1,12 @@ + diff --git a/anrui-scm/anrui-scm-ui/src/layout/components/TagsView/index.vue b/anrui-scm/anrui-scm-ui/src/layout/components/TagsView/index.vue index a6e3362c97..487d00a1c5 100644 --- a/anrui-scm/anrui-scm-ui/src/layout/components/TagsView/index.vue +++ b/anrui-scm/anrui-scm-ui/src/layout/components/TagsView/index.vue @@ -139,8 +139,7 @@ export default { const { fullPath } = view this.$nextTick(() => { this.$router.replace({ - path: fullPath - // path: '/redirect' + fullPath + path: '/redirect' + fullPath }) }) }) diff --git a/anrui-scm/anrui-scm-ui/src/router/index.js b/anrui-scm/anrui-scm-ui/src/router/index.js index 25b8068a05..1f4b3085f1 100644 --- a/anrui-scm/anrui-scm-ui/src/router/index.js +++ b/anrui-scm/anrui-scm-ui/src/router/index.js @@ -9,7 +9,17 @@ import Layout from '@/layout' import codemenu from './modules/codemenu' -export const constantRoutes = [{ +export const constantRoutes = [ + { + path: '/redirect', + component: Layout, + hidden: true, + children: [{ + path: '/redirect/:path(.*)', + component: () => import('@/views/redirect/index.vue') + }] + }, + { path: '/', redirect: 'index' }, { diff --git a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js index 95cf5090d6..1386cba674 100644 --- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js +++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js @@ -393,7 +393,7 @@ const codemenu = [ path: '/kucunguanli/rukuguanli', component: () => import('@/views/supplychain/rukuguanli/rukuguanliAwait.vue'), name: 'rukuguanliawait', - meta: { title: '入库车辆管理' } + meta: { title: '入库车辆管理',noCache:true } } ] }, diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue index d7c704bb87..c2352d4f88 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue @@ -85,7 +85,7 @@ {{ scope.row.receiver }} - + diff --git a/anrui-scm/anrui-scm-ui/src/views/examinePage/chukushenhe/chukushenheTodo.vue b/anrui-scm/anrui-scm-ui/src/views/examinePage/chukushenhe/chukushenheTodo.vue index 6e4848178c..1e2a69cd2c 100644 --- a/anrui-scm/anrui-scm-ui/src/views/examinePage/chukushenhe/chukushenheTodo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/examinePage/chukushenhe/chukushenheTodo.vue @@ -9,19 +9,13 @@ type="primary" size="small" :disabled="createBtn" - @click="handleAgree()" - >同意 + @click="handleAgree()">同意 不同意 - 返回 + @click="handleDisagree()">不同意 + 返回
@@ -31,8 +25,7 @@ label-position="right" label-width="100%" class="formadd" - :rules="rules" - > + :rules="rules">
出库申请
@@ -56,8 +49,7 @@ 是否为终端客户: + >是否为终端客户: diff --git a/anrui-scm/anrui-scm-ui/src/views/redirect/index.vue b/anrui-scm/anrui-scm-ui/src/views/redirect/index.vue new file mode 100644 index 0000000000..db4c1d66d1 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/redirect/index.vue @@ -0,0 +1,12 @@ + diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue index 1a7efc1e1e..7154f3ce04 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue @@ -61,9 +61,12 @@ - + @@ -84,6 +87,10 @@
+ + + + @@ -97,6 +104,7 @@ import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' import cunfangdidianbiangengAdd from '@/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd' import cunfangdidianbiangengInfo from '@/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengInfo' +import upload from '../../../components/uploadFile/upload_chexing' export default { name: 'cunfangdidianbiangeng', @@ -105,7 +113,8 @@ export default { Pagination, pageye, cunfangdidianbiangengAdd, - cunfangdidianbiangengInfo + cunfangdidianbiangengInfo, + upload }, data() { @@ -114,6 +123,9 @@ export default { viewState: 1, // 1、列表 2、添加 3、修改 4、查看 isSearchShow: false, tableLoading: false, + dialogImgVisible: false, + srcList: [], + imgList:[], multipleSelection:[], sids:[], dataList: [], @@ -300,8 +312,9 @@ export default { handleUpload(){ }, - handleCheckImg(){ - + handleCheckImg(row){ + this.dialogImgVisible = true + // this.srcList = row.vehicleModelUrls }, // 车型名称下拉框 getModelName() { @@ -358,4 +371,8 @@ export default { .tab-header /deep/ .el-form-item { margin-bottom: 10px; } +.upload_img { + display: inline-block; + padding-right: 10px; +} diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue index bbcefe2773..40b0aa8d54 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue @@ -9,7 +9,7 @@
车辆存放地点变更申请
- +
@@ -77,8 +77,10 @@ 保险状态 - - + + + + diff --git a/anrui-system-ui/src/layout/components/TagsView/index.vue b/anrui-system-ui/src/layout/components/TagsView/index.vue index 373543fa77..5c3d53e259 100644 --- a/anrui-system-ui/src/layout/components/TagsView/index.vue +++ b/anrui-system-ui/src/layout/components/TagsView/index.vue @@ -140,8 +140,7 @@ export default { const { fullPath } = view this.$nextTick(() => { this.$router.replace({ - path: fullPath - // path: '/redirect' + fullPath + path: '/redirect' + fullPath }) }) }) diff --git a/anrui-system-ui/src/router/index.js b/anrui-system-ui/src/router/index.js index 340fc97943..fd7a16d144 100644 --- a/anrui-system-ui/src/router/index.js +++ b/anrui-system-ui/src/router/index.js @@ -1,14 +1,23 @@ import Vue from 'vue' import Router from 'vue-router' +/* Layout */ +import Layout from '@/layout' Vue.use(Router) -/* Layout */ -import Layout from '@/layout' /* 所有角色可以访问/没有权限要求的基页 */ export const constantRoutes = [ + { + path: '/redirect', + component: Layout, + hidden: true, + children: [{ + path: '/redirect/:path(.*)', + component: () => import('@/views/redirect/index.vue') + }] + }, { path: '/', redirect: 'login' diff --git a/anrui-system-ui/src/views/redirect/index.vue b/anrui-system-ui/src/views/redirect/index.vue new file mode 100644 index 0000000000..db4c1d66d1 --- /dev/null +++ b/anrui-system-ui/src/views/redirect/index.vue @@ -0,0 +1,12 @@ +