页面优化

20240912_adapter
qiuyt 5 months ago
parent 98ab1b1356
commit a290eb30e1

@ -2,18 +2,18 @@
<div> <div>
<el-card> <el-card>
<div> <div>
<el-form :inline="true" :model="userQuery" size="mini" v-if="showSearch"> <el-form label-width="auto" :model="userQuery" size="mini" v-if="showSearch" class="order-el-form">
<el-row :gutter="24"> <el-row :gutter="20">
<!--<el-col :span="6">--> <!--<el-col :span="6">-->
<!-- <el-form-item label="所属部门:">--> <!-- <el-form-item label="所属部门:">-->
<!-- <el-input v-model="userQuery.deptName" placeholder="所属部门" clearable></el-input>--> <!-- <el-input v-model="userQuery.deptName" placeholder="所属部门" clearable></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!--</el-col>--> <!--</el-col>-->
<el-col :span="10"> <el-col :span="8">
<el-form-item label="当前部门:" class="query-form-item"> <el-form-item label="当前部门:" class="query-form-item">
<el-select v-model="userQuery.deptCode" class="width-full" placeholder="请选择" filterable clearable <el-select v-model="userQuery.deptCode" class="width-full" placeholder="请选择" filterable clearable
@change="changeUsers" @change="changeUsers" style="width: 80%"
> >
<el-option v-for="item in DeptList" :key="item.id" :label="item.name" :value="item.code"/> <el-option v-for="item in DeptList" :key="item.id" :label="item.name" :value="item.code"/>
</el-select> </el-select>
@ -28,7 +28,7 @@
<!-- <invSelect :value.sync="userQuery.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>--> <!-- <invSelect :value.sync="userQuery.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!--</el-col>--> <!--</el-col>-->
<el-col :span="10"> <el-col :span="8">
<el-form-item label="账号/名称:"> <el-form-item label="账号/名称:">
<el-input v-model="userQuery.userKey" placeholder="请输入账号/名称" clearable> <el-input v-model="userQuery.userKey" placeholder="请输入账号/名称" clearable>
</el-input> </el-input>
@ -41,7 +41,7 @@
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> <!-- <el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>-->
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit"></el-button> <el-button type="primary" icon="el-icon-search" @click="onSubmit"></el-button>
</el-button-group> </el-button-group>

@ -26,7 +26,7 @@
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group style="display:flex;"> <el-button-group style="display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> <!-- <el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>-->
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="search"></el-button> <el-button type="primary" icon="el-icon-search" @click="search"></el-button>
<el-button type="primary" icon="el-icon-plus" @click.native="handleForm(null, null)" <el-button type="primary" icon="el-icon-plus" @click.native="handleForm(null, null)"

@ -108,7 +108,7 @@
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> <!-- <el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>-->
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit"></el-button> <el-button type="primary" icon="el-icon-search" @click="onSubmit"></el-button>
<el-button type="primary" icon="el-icon-plus" @click="addCargowWorkplace"></el-button> <el-button type="primary" icon="el-icon-plus" @click="addCargowWorkplace"></el-button>

@ -109,7 +109,7 @@
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> <!-- <el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>-->
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit"></el-button> <el-button type="primary" icon="el-icon-search" @click="onSubmit"></el-button>
<el-button type="primary" icon="el-icon-plus" @click="addWorkplace"></el-button> <el-button type="primary" icon="el-icon-plus" @click="addWorkplace"></el-button>

@ -126,7 +126,7 @@
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group style="display:flex;"> <el-button-group style="display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> <!-- <el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>-->
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmitFind"></el-button> <el-button type="primary" icon="el-icon-search" @click="onSubmitFind"></el-button>
<el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading"> <el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">

@ -113,7 +113,7 @@
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group style="display:flex;"> <el-button-group style="display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> <!-- <el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>-->
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmitFind"></el-button> <el-button type="primary" icon="el-icon-search" @click="onSubmitFind"></el-button>
</el-button-group> </el-button-group>

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" label-width="100px"> <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" label-width="100px">
<!-- <el-row>--> <!-- <el-row>-->
<!-- <el-col :span="8">--> <!-- <el-col :span="8">-->
<!-- <el-form-item label="领用单号:">--> <!-- <el-form-item label="领用单号:">-->
@ -76,6 +76,8 @@
<!-- </el-row>--> <!-- </el-row>-->
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList" > <template v-for="(item, index) in queryList" >
<div v-if="showSearch || item.isImport">
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id"> <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
@ -149,13 +151,14 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group style="display:flex;"> <el-button-group style="display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch"></el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmitFind"></el-button> <el-button type="primary" icon="el-icon-search" @click="onSubmitFind"></el-button>
</el-button-group> </el-button-group>
@ -456,7 +459,7 @@ export default {
data() { data() {
return { return {
defaultSort: {prop: 'createTime', order: 'desc'}, defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true, showSearch: false,
filterQuery: { filterQuery: {
billAction: null, billAction: null,
billNo: "", billNo: "",

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" label-width="100px"> <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" label-width="100px">
<!-- <el-row>--> <!-- <el-row>-->
<!-- <el-col :span="8">--> <!-- <el-col :span="8">-->
<!-- <el-form-item label="领用单号:">--> <!-- <el-form-item label="领用单号:">-->
@ -83,6 +83,8 @@
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList" > <template v-for="(item, index) in queryList" >
<div v-if="showSearch || item.isImport">
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id"> <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
@ -156,12 +158,13 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group style="display:flex;"> <el-button-group style="display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch"></el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmitFind"></el-button> <el-button type="primary" icon="el-icon-search" @click="onSubmitFind"></el-button>
</el-button-group> </el-button-group>
@ -442,12 +445,13 @@ import {
findInvByUserOptimize, findInvByUserOptimize,
findByFromOptimize} from "@/api/system/invSubWarehouse"; findByFromOptimize} from "@/api/system/invSubWarehouse";
import {executeFuc, getHead} from "@/utils/customConfig"; import {executeFuc, getHead} from "@/utils/customConfig";
import fa from 'element-ui/src/locale/lang/fa'
export default { export default {
data() { data() {
return { return {
defaultSort: {prop: 'createTime', order: 'desc'}, defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true, showSearch: false,
filterQuery: { filterQuery: {
billAction: null, billAction: null,
billNo: "", billNo: "",

Loading…
Cancel
Save