From e29601d320865c7cf3b6d0d35640659f6f51a0a6 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 30 八月 2023 15:36:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/utils/request.js | 5 +++--
src/views/laboratory/measure/index.vue | 14 +++++++++++---
src/router/index.js | 16 ++++++++++++----
3 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 458100d..a9c9a8d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -472,7 +472,13 @@
name: 'BasicDataMessage',
component: () => import('@/views/basicData/index'),
meta: { title: '鍩虹鏁版嵁', icon: 'el-icon-s-tools' }
- }
+ },
+ {
+ path: 'myBusiness',
+ name: 'MyBusiness',
+ component: () => import('@/views/personal/myBusiness/index'),
+ meta: { title: '鎴戠殑浼佷笟', icon: 'tree', show: false }
+ }
]
},
{ path: '*', redirect: '/404', hidden: true }
@@ -533,9 +539,11 @@
let menuFather = baseRouter
const dataMenuFather = fn3(menuFather)
role.roleMenuList.forEach((r) => {
- dataMenuFather.push(Routees.filter(item => {
- return item.path === r.menuUrl
- })[0])
+ if(r.menuName!='棣栭〉'){
+ dataMenuFather.push(Routees.filter(item => {
+ return item.path === r.menuUrl
+ })[0])
+ }
})
let eqChildren = [];
role.roleMenuList.forEach((r) => {
diff --git a/src/utils/request.js b/src/utils/request.js
index 4218d62..58cf36d 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,4 +1,5 @@
import axios from 'axios'
+import router from '../router/index'
import { MessageBox, Message } from 'element-ui'
import store from '@/store'
import { getToken } from '@/utils/auth'
@@ -63,8 +64,8 @@
})
sessionStorage.removeItem("user")
sessionStorage.setItem("flushPage",1)
- this.$router.replace({path: '/login'});
- location.reload()
+ router.replace({path: '/login'});
+ // location.reload()
}
if(res.code===403){
Message({
diff --git a/src/views/laboratory/measure/index.vue b/src/views/laboratory/measure/index.vue
index 2c6fb63..1bb43b8 100644
--- a/src/views/laboratory/measure/index.vue
+++ b/src/views/laboratory/measure/index.vue
@@ -7,6 +7,9 @@
<el-input v-model="searchData.code" @blur="blurSearch()" class="input-form" placeholder="璇疯緭鍏�">
</el-input>
</el-form-item>
+ <el-form-item v-if="this.radioValue === 1">
+ <el-button type="primary" @click="searchPlan">鏌ヨ</el-button>
+ </el-form-item>
<el-form-item v-if="this.radioValue === 0" :label="this.radioValue === 0 ? '浠櫒璁惧鍚嶇О:' : '璁惧鍚嶇О'"
class="sermargin">
<el-input v-model="searchData.name" class="input-form" placeholder="璇疯緭鍏�">
@@ -504,6 +507,9 @@
search() {
this.getStandingPageList()
},
+ searchPlan(){
+ this.getPlanPageList()
+ },
reset(formName) {
this.searchData.name = ''
this.searchData.code = ''
@@ -515,8 +521,9 @@
},
async getPlanPageList() {
let param = {
- currentPage: this.currentPage, pageSize: this.pageSize,
- code: this.searchData.code, name: this.searchData.name, unit: this.searchData.measureunit
+ currentPage: this.currentPage,
+ pageSize: this.pageSize,
+ plannedOrderNumber: this.searchData.code
}
const res = await getPlanPageList(param)
res.data.list.forEach(item => {
@@ -585,4 +592,5 @@
margin: 10px 0;
}
}
-}</style>
+}
+</style>
--
Gitblit v1.9.3