Compare commits

..

No commits in common. "86cc8122cedebcc92801f752d7ff836f5947ad38" and "6396669db158e0fd725332e6fbf0ee4c9b49dec9" have entirely different histories.

5 changed files with 4 additions and 11 deletions

View File

@ -2,7 +2,6 @@
<div> <div>
<template v-if="!item.children || (item.children && item.children.length === 0)"> <template v-if="!item.children || (item.children && item.children.length === 0)">
<el-menu-item <el-menu-item
v-if="!item.root"
@click="goRoute(item.path || item.routePath)" @click="goRoute(item.path || item.routePath)"
:index="item.path || item.routePath" :index="item.path || item.routePath"
> >

View File

@ -25,12 +25,12 @@ const constRoutes = [
/** /**
* home路由redirect使用 * home路由redirect使用
*/ */
const homeRoute = { path: '/', root: true, redirect: '' }; const homeRoute = { path: '/', hidden: true, redirect: '' };
/** /**
* 404 * 404
*/ */
const notFoundRoute = { path: '/:catchAll(.*)', redirect: '/404', root: true }; const notFoundRoute = { path: '/:catchAll(.*)', redirect: '/404', hidden: true };
/** /**
* 使require加载组件 * 使require加载组件

View File

@ -42,7 +42,7 @@
</el-form> </el-form>
<div class="page-search-btns"> <div class="page-search-btns">
<el-button type="primary" @click="handleQueryInfo">搜索</el-button> <el-button type="primary" @click="handleQueryInfo">搜索</el-button>
<!-- <el-button type="primary" @click="InAdvanceQuery">刷新</el-button>--> <el-button type="primary" @click="InAdvanceQuery">刷新</el-button>
<el-button type="primary" @click="exportExcel">导出</el-button> <el-button type="primary" @click="exportExcel">导出</el-button>
</div> </div>
</el-row> </el-row>
@ -258,8 +258,6 @@ const updateList = (col: any) => {
function handleQueryInfo() { function handleQueryInfo() {
state.queryParams.pageNum = 1 state.queryParams.pageNum = 1
state.queryParamsActivate.pageNum = 1; state.queryParamsActivate.pageNum = 1;
state.BoxDetailList = [];
state.total1 = 0
HandleQuery() HandleQuery()
} }
function HandleQuery() { function HandleQuery() {

View File

@ -120,10 +120,6 @@ const state = reactive({
active_row: {}, active_row: {},
StockStateList : [ StockStateList : [
{
ENUMVALUE : "" ,
DESCRIPTION : "全部"
},
{ {
ENUMVALUE : "Created" , ENUMVALUE : "Created" ,
DESCRIPTION : "创建" DESCRIPTION : "创建"

View File

@ -36,7 +36,7 @@
</el-form> </el-form>
<div class="page-search-btns"> <div class="page-search-btns">
<el-button type="primary" @click="handleQueryInfo">搜索</el-button> <el-button type="primary" @click="handleQueryInfo">搜索</el-button>
<!-- <el-button type="primary" @click="print" :disabled="state.button_print" v-loading="state.loadings">打印</el-button>--> <el-button type="primary" @click="print" :disabled="state.button_print" v-loading="state.loadings">打印</el-button>
</div> </div>
</el-row> </el-row>