duhanyu
杜函宇 2 years ago
parent a295c44a1e
commit efe7721783

@ -26,7 +26,7 @@
</div>
</router-link>
</scroll-pane>
<el-dropdown class="avatar-container" trigger="click">
<!-- <el-dropdown class="avatar-container" trigger="click">
<div class="avatar-wrapper">
<span class="user-name" style="margin-right: 3px">操作</span>
<i class="el-icon-caret-bottom" />
@ -39,7 +39,7 @@
<span>关闭当前</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-dropdown> -->
</div>
</template>
@ -180,15 +180,19 @@ export default {
});
},
refreshSelectedTag(view) {
let obj = {path:view.path,name:view.name}
this.$tab.refreshPage(obj);
this.$tab.refreshPage(view);
if (this.$route.meta.link) {
this.$store.dispatch("tagsView/delIframeView", this.$route);
}
},
closeSelectedTag(view) {
this.$tab.closePage(view).then(({ visitedViews }) => {
if (this.isActive(view)) {
this.toLastView(visitedViews, view);
}
});
if (!view.meta.affix) {
this.$tab.closePage(view).then(({ visitedViews }) => {
if (this.isActive(view)) {
this.toLastView(visitedViews, view);
}
});
}
},
closeRightTags() {
this.$tab.closeRightPage(this.selectedTag).then((visitedViews) => {
@ -254,7 +258,6 @@ export default {
this.visible = false;
},
handleScroll() {
console.log(111);
this.closeMenu();
},
},

@ -11,50 +11,55 @@ function kickOut() {
location.href = location.origin + "/login";
}
}
NProgress.configure({ showSpinner: false });
const routerSList = [
const whiteList = [
"/404",
"/401",
'/drugArchives',
'/cosmeticsArchives',
'/health',
"/cosmeticsArchives",
"/cosmeticsDetail",
"/health",
];
NProgress.configure({ showSpinner: false });
router.beforeEach((to, from, next) => {
NProgress.start();
let token = localStorage.getItem('MSSM-LIAONING__TOKEN')
if (token) {
if(to.path == '/cosmeticsDetail' && routerSList.indexOf(from.path) == -1){
next({ path: '/' })
}else {
next()
}
if (store.state.myselfPermission.routerList.length > 0) {
let current = store.state.myselfPermission.routerList.filter(
(item) => item.path == to.path || from.path == "/"
);
if (current.length > 0) {
next();
} else {
Message.error("无权限访问!");
}
} else {
store
.dispatch("GetPermission")
.then((res) => {
console.log(res);
if (res.length > 0) {
if (whiteList.indexOf(to.path) !== -1) {
if (token) {
if (store.state.myselfPermission.routerList.length > 0) {
let current = store.state.myselfPermission.routerList.filter(
(item) => item.path == to.path || from.path == "/"
);
if (current.length > 0) {
next();
} else {
//根据参数判断是否可以跳
if (to.query.id && to.path == '/cosmeticsDetail') {
next();
} else {
kickOut();
Message.error("无权限访问!");
}
})
.catch((error) => {
kickOut();
});
}
} else {
store
.dispatch("GetPermission")
.then((res) => {
if (res.length > 0) {
next({ path: res });
} else {
kickOut();
}
})
.catch((error) => {
kickOut();
});
}
} else {
// 没有token
Message.error("获取令牌失败!");
kickOut();
}
} else {
// 没有token
Message.error("获取令牌失败!");
kickOut();
NProgress.done();
}
});

@ -4,21 +4,18 @@ import router from "@/router";
export default {
// 刷新当前tab页签
refreshPage(obj) {
console.log(obj);
console.log( router.currentRoute);
const { path, query, matched } = router.currentRoute;
// if (obj === undefined) {
// matched.forEach((m) => {
// if (m.components && m.components.default && m.components.default.name) {
// if (!["Layout", "ParentView"].includes(m.components.default.name)) {
// obj = { name: m.components.default.name, path: path, query: query };
// }
// }
// });
// }
if (obj === undefined) {
matched.forEach((m) => {
if (m.components && m.components.default && m.components.default.name) {
if (!["Layout", "ParentView"].includes(m.components.default.name)) {
obj = { name: m.components.default.name, path: path, query: query };
}
}
});
}
return store.dispatch("tagsView/delCachedView", obj).then(() => {
const { path, query } = obj;
router.replace({
path: "/redirect" + path,
query: query,

@ -30,17 +30,17 @@ import Layout from "@/layout";
// 公共路由
export const constantRoutes = [
// {
// path: "/redirect",
// component: Layout,
// hidden: true,
// children: [
// {
// path: "/redirect/:path(.*)",
// component: () => import("@/views/redirect"),
// },
// ],
// },
{
path: "/redirect",
component: Layout,
hidden: true,
children: [
{
path: "/redirect/:path(.*)",
component: () => import("@/views/redirect"),
},
],
},
// {
// path: "/login",
// component: () => import("@/views/login"),
@ -72,15 +72,14 @@ export const constantRoutes = [
name: "drugArchives",
icon: require("@/assets/images/tree4.svg"),
component: () => import("@/views/productsMsg/index.vue"),
isDiy:true,
meta: { title: "药品档案", },
meta: { title: "药品档案", },
},
{
path: "/cosmeticsArchives",
name: "cosmeticsArchives",
icon: require("@/assets/images/tree4.svg"),
component: () => import("@/views/productsMsg/components/cosmeticsArchives.vue"),
meta: { title: "化妆品档案", flag: true },
meta: { title: "化妆品档案", },
},
{
path: "/cosmeticsDetail",

@ -12,7 +12,6 @@ const selfPermission = {
userData: {},
inspectorId: "",
},
mutations: {
//动态按钮权限
SET_PERMISSIONLIST: (state, permissions) => {
@ -62,11 +61,9 @@ const selfPermission = {
let menuTree = infoData.menuTree.filter(
(item) => item.appCode == "CPGL"
);
console.log(menuTree);
let fileTreeOut = filterTree(menuTree[0].childMenuList, []);
console.log(fileTreeOut);
fileTreeOut[0].meta.affix = true
commit("SET_ROUTER", fileTreeOut);
resolve(fileTreeOut.length > 0 ? fileTreeOut[0].path : []);
})
.catch((error) => {

@ -6,9 +6,7 @@ const state = {
const mutations = {
ADD_IFRAME_VIEW: (state, view) => {
// console.log(111);
// console.log(state);
// console.log(view);
if (state.iframeViews.some((v) => v.path === view.path)) return;
state.iframeViews.push(
Object.assign({}, view, {
@ -17,9 +15,7 @@ const mutations = {
);
},
ADD_VISITED_VIEW: (state, view) => {
// console.log(222);
// console.log(state);
// console.log(view);
if (state.visitedViews.some((v) => v.path === view.path)) return;
state.visitedViews.push(
Object.assign({}, view, {
@ -28,18 +24,14 @@ const mutations = {
);
},
ADD_CACHED_VIEW: (state, view) => {
// console.log(333);
// console.log(state);
// console.log(view);
;
if (state.cachedViews.includes(view.name)) return;
if (view.meta && !view.meta.noCache) {
state.cachedViews.push(view.name);
}
},
DEL_VISITED_VIEW: (state, view) => {
// console.log(444);
// console.log(state);
// console.log(view);
for (const [i, v] of state.visitedViews.entries()) {
if (v.path === view.path) {
state.visitedViews.splice(i, 1);
@ -51,23 +43,19 @@ const mutations = {
);
},
DEL_IFRAME_VIEW: (state, view) => {
// console.log(555);
// console.log(state,view);
state.iframeViews = state.iframeViews.filter(
(item) => item.path !== view.path
);
},
DEL_CACHED_VIEW: (state, view) => {
console.log(666);
console.log(state);
console.log(view);
const index = state.cachedViews.indexOf(view.name);
index > -1 && state.cachedViews.splice(index, 1);
},
DEL_OTHERS_VISITED_VIEWS: (state, view) => {
// console.log(777);
// console.log(state,view);
state.visitedViews = state.visitedViews.filter((v) => {
return v.meta.affix || v.path === view.path;
});
@ -76,8 +64,7 @@ const mutations = {
);
},
DEL_OTHERS_CACHED_VIEWS: (state, view) => {
// console.log(888);
// console.log(state,view);
const index = state.cachedViews.indexOf(view.name);
if (index > -1) {
state.cachedViews = state.cachedViews.slice(index, index + 1);
@ -86,17 +73,14 @@ const mutations = {
}
},
DEL_ALL_VISITED_VIEWS: (state) => {
// keep affix tags
// console.log(999);
// console.log(state);
const affixTags = state.visitedViews.filter((tag) => tag.meta.affix);
state.visitedViews = affixTags;
state.iframeViews = [];
},
DEL_ALL_CACHED_VIEWS: (state) => {
state.cachedViews = [];
// console.log(101010);
// console.log(state);
},
UPDATE_VISITED_VIEW: (state, view) => {
for (let v of state.visitedViews) {

@ -4,11 +4,28 @@
<div class="headerText">
<div class="searchP">查询条件</div>
</div>
<el-form ref="form1" :model="form1" label-width="150px">
<el-form ref="form1" :model="form1" label-width="100px">
<div style="margin-top: 10px">
<el-row>
<el-col :span="7">
<el-form-item label="产品名称或者备案编码">
<el-form-item label="产品名称">
<el-input v-model="form1.cpmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="备案编号">
<el-input v-model="form1.babm"></el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="生产企业">
<el-input v-model="form1.scqy"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-form-item label="注册证编号">
<el-input v-model="form1.name"></el-input>
</el-form-item>
</el-col>
@ -28,16 +45,6 @@
</el-option>
</el-select> </el-form-item
></el-col>
<!-- <el-col :span="7">
<el-form-item label="备案编码">
<el-input v-model="form1.name"></el-input>
</el-form-item>
</el-col> -->
<!-- <el-col :span="7">
<el-form-item label="生产企业">
<el-input v-model="form1.a1"></el-input>
</el-form-item>
</el-col> -->
</el-row>
</div>
</el-form>
@ -145,8 +152,10 @@ export default {
},
],
form1: {
a1: "",
babm: "",
cpmc: "",
name: "",
scqy: "",
size: 10,
current: 1,
},
@ -160,7 +169,8 @@ export default {
//
toDetail(e) {
// console.log(e);
this.$router.push(`/cosmeticsDetail`)
this.$router.push({ path: `/cosmeticsDetail`, query: { id: 23423 } });
// this.$router.push({ path: `/drugArchives`,query:{id:23423} });
},
//
searchList() {
@ -175,8 +185,10 @@ export default {
//
reset() {
this.form1 = {
babm: "",
cpmc: "",
name: "",
a1: "",
scqy: "",
size: 10,
current: 1,
};
@ -280,7 +292,7 @@ export default {
}
.tabs {
width: 100%;
height: 25%;
height: 30%;
background: #fff;
}
}
@ -293,7 +305,7 @@ export default {
text-align: center;
}
.tabsBottom {
height: 75%;
height: 70%;
padding-top: 10px;
.foot-main {
height: 100%;

@ -4,19 +4,16 @@
<div class="headerText">
<div class="searchP">查询条件</div>
</div>
<el-form ref="form1" :model="form1">
<el-form ref="form1" :model="form1" label-width="150px">
<div style="margin-top: 10px">
<el-row>
<el-col :span="10">
<el-form-item
label="产品名称或者注册证编号或备案编号"
label-width="230px"
>
<el-input v-model="form1.name"></el-input>
<el-col :span="7">
<el-form-item label="产品名称">
<el-input v-model="form1.cpmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="产品管理类别" label-width="130px">
<el-col :span="7">
<el-form-item label="产品类别">
<el-select v-model="form1.cplb" placeholder="请选择产品类别">
<el-option
v-for="item in options"
@ -28,6 +25,18 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="生产企业">
<el-input v-model="form1.scqy"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-form-item label="注册证编号或备案编号">
<el-input v-model="form1.zczh"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
@ -48,18 +57,18 @@
</div>
<section class="table-box">
<div class="table-item">
<el-table
v-loading="loading"
:data="tableData"
border
height="300"
>
<el-table v-loading="loading" :data="tableData" border height="300">
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" />
<el-table-column label="产品名称" prop="cpmc"> </el-table-column>
<el-table-column label="产品类型" prop="cplx"></el-table-column>
<el-table-column label="产品管理类别" prop="cplb"></el-table-column>
<el-table-column label="注册证编号/备案编号" prop="zczh"> </el-table-column>
<el-table-column label="生产企业" prop="zcsqr"></el-table-column>
<el-table-column
label="产品管理类别"
prop="cplb"
></el-table-column>
<el-table-column label="注册证编号/备案编号" prop="zczh">
</el-table-column>
<el-table-column
label="操作"
class-name="small-padding fixed-width"
@ -99,7 +108,7 @@ export default {
//===========
loading: false,
tableData: [],
total: 0,
total: 1,
options: [
{
value: 1,
@ -112,7 +121,9 @@ export default {
],
form1: {
cplb: "",
name: "",
cpmc: "",
scqy: "",
zczh: "",
size: 10,
current: 1,
},
@ -140,7 +151,9 @@ export default {
reset() {
this.form1 = {
cplb: "",
name: "",
cpmc: "",
scqy: "",
zczh: "",
size: 10,
current: 1,
};
@ -190,7 +203,7 @@ export default {
}
.tabs {
width: 100%;
height: 25%;
height: 30%;
background: #fff;
}
}
@ -203,7 +216,7 @@ export default {
text-align: center;
}
.tabsBottom {
height: 75%;
height: 70%;
padding-top: 10px;
.foot-main {
height: 100%;

Loading…
Cancel
Save