Browse Source

高级筛选等组件同步更新

master
安虹睿 1 year ago
parent
commit
c06718c724
  1. 26
      Code/Fe/src/components/ErrorLog/index.vue
  2. 20
      Code/Fe/src/components/addEditFromApiPop/index.vue
  3. 3
      Code/Fe/src/components/currenButton/innerButton.vue
  4. 2
      Code/Fe/src/components/currenDescriptions/index.vue
  5. 37
      Code/Fe/src/components/filterForDetailPage/index.vue
  6. 56
      Code/Fe/src/components/searchOverall/index.vue
  7. 4
      Code/Fe/src/components/searchOverall/style/index.scss
  8. 6
      Code/Fe/src/components/tableTree/index.vue
  9. 2
      Code/Fe/src/components/umyTable/index.vue

26
Code/Fe/src/components/ErrorLog/index.vue

@ -1,15 +1,31 @@
<template>
<div v-if="errorLogs.length>0">
<el-badge :is-dot="true" style="line-height: 25px;margin-top: -5px;" @click.native="dialogTableVisible=true">
<el-button style="padding: 8px 10px;" size="small" type="danger">
<svg-icon icon-class="bug" />
<el-badge
:is-dot="true"
style="line-height: 10px;"
@click.native="dialogTableVisible=true"
>
<el-button style="padding: 4px" size="small" type="danger">
<svg-icon icon-class="svg_bug" style="font-size: 16px;"/>
</el-button>
</el-badge>
<el-dialog :visible.sync="dialogTableVisible" width="80%" append-to-body>
<el-dialog
:visible.sync="dialogTableVisible"
width="80%"
append-to-body
:close-on-click-modal="true"
:show-close="true"
>
<div slot="title">
<span style="padding-right: 10px;">Error Log</span>
<el-button size="mini" type="primary" icon="el-icon-delete" @click="clearAll">Clear All</el-button>
<el-button
size="mini"
type="primary"
icon="el-icon-delete"
@click="clearAll"
style="float: right;margin-right: 30px;"
>清除全部</el-button>
</div>
<el-table :data="errorLogs" border>
<el-table-column label="Message">

20
Code/Fe/src/components/addEditFromApiPop/index.vue

@ -69,7 +69,7 @@
:disabled="Boolean(item.disabled)"
>
<el-option
v-for="item in getItemEnums(item)"
v-for="item in item.enums_list"
:key="item.value"
:label="item.label"
:value="item.value"
@ -247,24 +247,6 @@ export default {
}
})
},
//
getItemEnums(item){
let _option = []
//
if(item.apiBaseType == 'boolean'){
_option = [{
value: true,
label: '是'
},{
value: false,
label: '否'
},]
}
if(item.isEnums){
_option = item.enums_list
}
return _option
},
//
close() {
this.show = false

3
Code/Fe/src/components/currenButton/innerButton.vue

@ -16,9 +16,8 @@
}"
:class="item.class"
@click="tableButtonClick(item.name,item)"
v-permission="item.permission"
v-permission="item.permission || []"
>{{ item.label }}</el-button>
<!-- v-permission="item.permission" -->
</div>
</template>
<script>

2
Code/Fe/src/components/currenDescriptions/index.vue

@ -146,9 +146,11 @@ export default {
//
initApiEnumList(item,data){
let _item_enumList = {}
if(item.enums_list){
item.enums_list.forEach((item,key)=>{
_item_enumList[item.value] = item.label
})
}
return _item_enumList[data] || '未定义'
},
}

37
Code/Fe/src/components/filterForDetailPage/index.vue

@ -1,5 +1,5 @@
<template>
<div class="filterForDetailPage" v-if="dialogShow">
<div class="filterForDetailPage" v-if="dialogShow">
<el-dialog
title="明细查询"
:visible.sync="dialogShow"
@ -30,6 +30,7 @@
:multipleSelection="multipleSelection"
:MaxResultCount="PageListParams.MaxResultCount"
:setUTableHeight="setUTableHeight"
:selectMaxHeight="'116px'"
@topbutton="topbutton"
@inlineDialog="inlineDialog"
@sortChange="sortChange"
@ -118,17 +119,17 @@
<el-table-column property="address" label="地址"></el-table-column>
</el-table> -->
</el-dialog>
</div>
</template>
<script>
import currenDescriptions from "@/components/currenDescriptions"
import { tableMixins } from "@/mixins/TableMixins";
import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
import { LoadingMixins } from "@/mixins/LoadingMixins";
import { mixins } from "@/mixins/mixins";
import { filterSelectMixins } from '@/mixins/filter-Select'
import {getListDesById,getPageListForDetail} from "@/api/wms-api"
export default {
</div>
</template>
<script>
import currenDescriptions from "@/components/currenDescriptions"
import { tableMixins } from "@/mixins/TableMixins";
import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
import { LoadingMixins } from "@/mixins/LoadingMixins";
import { mixins } from "@/mixins/mixins";
import { filterSelectMixins } from '@/mixins/filter-Select'
import {getListDesById,getPageListForDetail} from "@/api/wms-api"
export default {
name: 'filterForDetailPage',
mixins: [
tableMixins,
@ -315,10 +316,10 @@ export default {
// })
},
}
}
</script>
<style lang="scss">
.filterForDetailPage {
}
</script>
<style lang="scss">
.filterForDetailPage {
.mainTable-dialog{
.el-dialog{
@ -333,5 +334,5 @@ export default {
.filterForDetailPage-list{
height: calc(100%);
overflow: auto;
}
</style>
}
</style>

56
Code/Fe/src/components/searchOverall/index.vue

@ -1,11 +1,11 @@
<template>
<!-- 全面的筛选组件初级普通筛选 + 高级筛选按照配置来判断显示情况-->
<!-- todo:使用v-if每次重新赋值与接口查询保持一致 -->
<div
<!-- 全面的筛选组件初级普通筛选 + 高级筛选按照配置来判断显示情况-->
<!-- todo:使用v-if每次重新赋值与接口查询保持一致 -->
<div
class="searchOverallComponent"
:style="{height:componentsHeight+'px',overflow:isShowMoreList ? 'unset' : 'hidden'}"
v-show="isShow"
>
>
<div
class="border-outer"
ref="searchOverallComponent_inner"
@ -32,6 +32,7 @@
<!-- 高级筛选界面 -->
<div v-if="isShow && isShowMoreList" class="moreListOuter">
<curren-Form
:style="`--navFilterMaxHeight: ${selectMaxHeight};`"
class="navFilter"
size="medium"
labelWidth="0"
@ -94,7 +95,7 @@
:rules="rules && rules.value ? rules.value : []"
>
<el-select
v-if="Object.keys(inputOrSelect(item.column)).length > 0"
v-if="inputOrSelect(item.column)"
v-model="item.value"
placeholder="请选择内容"
:disabled="item.column == '' || item.hide ? true : false"
@ -103,9 +104,7 @@
clearable
>
<el-option
v-for="item in $staticOptions[
inputOrSelect(item.column).filters
]()"
v-for="item in inputOrSelect(item.column)"
:key="item.value"
:label="item.label"
:value="
@ -118,7 +117,7 @@
</el-select>
<!-- 日期时间 -->
<el-date-picker
v-else-if="getColumnType(item.column) == 'dateTime'"
v-else-if="getColumnType(item.column) == 'datetime'"
type="datetime"
v-model="item.value"
:placeholder="'选择日期时间'"
@ -206,11 +205,11 @@
</div>
</div>
</div>
</div>
</template>
<script>
import searchPrimary from "@/components/searchPrimary"
export default {
</div>
</template>
<script>
import searchPrimary from "@/components/searchPrimary"
export default {
name:'searchOverallComponent',
components: {
searchPrimary,
@ -259,6 +258,11 @@ export default {
}
},
props: {
//
selectMaxHeight:{
type: String,
default: '174px'
},
//
searchOverallCoverHeight:{
type: String,
@ -455,8 +459,8 @@ export default {
getColumnType(val) {
var columnsType = this.tableColumns.filter(item => item.prop == val)
if (columnsType.length > 0) {
if (columnsType[0].type) {
return columnsType[0].type
if (columnsType[0].apiBaseType) {
return columnsType[0].apiBaseType
}
} else {
return ''
@ -497,19 +501,15 @@ export default {
},
// moreListinputselect
inputOrSelect(val) {
let data
let data = null
if (val) {
this.tableColumns.forEach((key) => {
if (val == key.prop) {
if (key.filters) {
data = key
} else {
data = {}
if (key.enums_list && key.enums_list.length > 0) {
data = key.enums_list
}
}
})
} else {
data = {}
}
return data
},
@ -636,8 +636,8 @@ export default {
},
}
}
</script>
<style lang="scss" scoped>
@import "./style/index.scss";
</style>
}
</script>
<style lang="scss" scoped>
@import "./style/index.scss";
</style>

4
Code/Fe/src/components/searchOverall/style/index.scss

@ -1,4 +1,4 @@
.searchOverallComponent{
.searchOverallComponent{
height: 0;
transition:all 0.5s;
z-index: 1;
@ -31,7 +31,7 @@
// flex-direction: column;
// width: 100%;
// height: 100%;
max-height: 170px;
max-height: var(--navFilterMaxHeight);
overflow: auto;
.el-form {

6
Code/Fe/src/components/tableTree/index.vue

@ -11,7 +11,7 @@
:icon="item.icon"
:size="item.size"
@click="headerButtonsHandle(item)"
v-permission="item.permission"
v-permission="item.permission || []"
>{{item.label}}</el-button>
</div>
<div class="query-box">
@ -31,7 +31,7 @@
:icon="item.icon"
:size="item.size"
@click="headerButtonsHandle(item)"
v-permission="item.permission"
v-permission="item.permission || []"
>{{item.label}}</el-button>
</div>
</div>
@ -75,7 +75,7 @@
:style="item.style"
v-show="typeof item.hide == 'function' ? !item.hide(scope.row) : !item.hide"
:icon="item.icon"
v-permission="item.permission"
v-permission="item.permission || []"
>{{item.label}}</el-button>
</template>
</el-table-column>

2
Code/Fe/src/components/umyTable/index.vue

@ -167,7 +167,7 @@
:key="indexButton"
type="text"
size="mini"
v-permission="itemButton.permission"
v-permission="itemButton.permission || []"
:style="{color:itemButton.color || '#409EFF'}"
@click="buttonOperationClick_right(scope.row, itemButton, indexButton)"
>{{itemButton.label}}</el-button>

Loading…
Cancel
Save