界面优化1.0 11/15

dev_unify
wangwei 8 months ago
parent 56406bebbf
commit 08037e63b1

@ -181,7 +181,7 @@
<div class="top-right-btn" style="display: flex; align-items: center;"> <div class="top-right-btn" style="display: flex; align-items: center;">
<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="chooseDrug"></el-button>--> <!--<el-button type="primary" icon="el-icon-plus" @click="chooseDrug"></el-button>-->

@ -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" size="mini" label-width="100px" > <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form" size="mini" label-width="100px" >
<!-- <el-row> <!-- <el-row>
<el-col :span="18"> <el-col :span="18">
<el-form-item label="扫码查询:"> <el-form-item label="扫码查询:">
@ -143,6 +143,7 @@
</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]"
@ -208,12 +209,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> <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 <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -419,7 +421,7 @@ export default {
name: "InvProducts", name: "InvProducts",
data() { data() {
return { return {
showSearch: true, showSearch: false,
filterQuery: { filterQuery: {
nameCode: null, nameCode: null,
cpmctymc: null, cpmctymc: null,
@ -435,6 +437,7 @@ export default {
limit: 10, limit: 10,
udiCode: null, udiCode: null,
filterNoInv: '1', filterNoInv: '1',
keyWords:"",
}, },
list: [], list: [],
total: 0, total: 0,
@ -491,6 +494,7 @@ export default {
productsType: 2, productsType: 2,
page: 1, page: 1,
limit: 10, limit: 10,
keyWords:""
}; };
this.getList(); this.getList();
this.findMethod(this); this.findMethod(this);

@ -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" size="mini" label-width="100px"> <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px">
<!-- <el-row> <!-- <el-row>
<el-col :span="18"> <el-col :span="18">
<el-form-item label="扫码查询:"> <el-form-item label="扫码查询:">
@ -143,6 +143,7 @@
</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]"
@ -221,12 +222,13 @@
end-placeholder="结束日期" end-placeholder="结束日期"
></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> <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="optinPrint"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="optinPrint"></el-button>
<el-button type="primary" icon="el-icon-refresh" @click="selectPrint"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="selectPrint"></el-button>
<el-button <el-button
@ -440,7 +442,7 @@ export default {
name: "supInoutSearchOrder", name: "supInoutSearchOrder",
data() { data() {
return { return {
showSearch: true, showSearch: false,
list: [], list: [],
busTypeOptions: [], busTypeOptions: [],
filterQuery: { filterQuery: {

@ -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" :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch"> <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" >
<!-- <el-row>--> <!-- <el-row>-->
@ -118,6 +118,7 @@
<!-- </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]"
@ -193,12 +194,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> <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 <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -263,17 +265,6 @@
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- &lt;!&ndash; <el-table-column label="验收状态" prop="status" width="100">&ndash;&gt;--> <!-- &lt;!&ndash; <el-table-column label="验收状态" prop="status" width="100">&ndash;&gt;-->
<!-- &lt;!&ndash; <template slot-scope="scope">&ndash;&gt;--> <!-- &lt;!&ndash; <template slot-scope="scope">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-tag :type="statusFilterType(scope.row.status)">{{&ndash;&gt;-->
<!-- &lt;!&ndash; reviceStatus[scope.row.status]&ndash;&gt;-->
<!-- &lt;!&ndash; }}&ndash;&gt;-->
<!-- &lt;!&ndash; </el-tag>&ndash;&gt;-->
<!-- &lt;!&ndash; </template>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-table-column>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-table-column label="审核状态" prop="status" width="100">&ndash;&gt;-->
<!-- &lt;!&ndash; <template slot-scope="scope">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-tag :type="statusFilterType(scope.row.status)">{{&ndash;&gt;-->
<!-- &lt;!&ndash; checkStatus[scope.row.status]&ndash;&gt;-->
<!-- &lt;!&ndash; }}&ndash;&gt;-->
<!-- &lt;!&ndash; </el-tag>&ndash;&gt;--> <!-- &lt;!&ndash; </el-tag>&ndash;&gt;-->
<!-- &lt;!&ndash; </template>&ndash;&gt;--> <!-- &lt;!&ndash; </template>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-table-column>&ndash;&gt;--> <!-- &lt;!&ndash; </el-table-column>&ndash;&gt;-->
@ -1299,7 +1290,7 @@ export default {
imgViewerVisible: false, imgViewerVisible: false,
imgViewerVisibleCold: false, imgViewerVisibleCold: false,
BASE_URL: process.env.VUE_APP_BASE_API, BASE_URL: process.env.VUE_APP_BASE_API,
showSearch: true, showSearch: false,
filterQuery: { filterQuery: {
id: "", id: "",
billNo: null, billNo: null,

@ -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" :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch"> <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" >
<!-- <el-row>--> <!-- <el-row>-->
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item class="query-form-item" label="送货单号:">--> <!-- <el-form-item class="query-form-item" label="送货单号:">-->
@ -135,6 +135,7 @@
<!-- </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]"
@ -210,12 +211,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> <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 <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -272,34 +274,7 @@
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column label="审核状态" prop="status" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag :type="statusFilterType(scope.row.status)">{{-->
<!-- checkStatus[scope.row.status]-->
<!-- }}-->
<!-- </el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- &lt;!&ndash; <el-table-column label="验收状态" prop="status" width="100">&ndash;&gt;-->
<!-- &lt;!&ndash; <template slot-scope="scope">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-tag :type="statusFilterType(scope.row.status)">{{&ndash;&gt;-->
<!-- &lt;!&ndash; reviceStatus[scope.row.status]&ndash;&gt;-->
<!-- &lt;!&ndash; }}&ndash;&gt;-->
<!-- &lt;!&ndash; </el-tag>&ndash;&gt;-->
<!-- &lt;!&ndash; </template>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-table-column>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-table-column label="审核状态" prop="status" width="100">&ndash;&gt;-->
<!-- &lt;!&ndash; <template slot-scope="scope">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-tag :type="statusFilterType(scope.row.status)">{{&ndash;&gt;-->
<!-- &lt;!&ndash; checkStatus[scope.row.status]&ndash;&gt;-->
<!-- &lt;!&ndash; }}&ndash;&gt;-->
<!-- &lt;!&ndash; </el-tag>&ndash;&gt;-->
<!-- &lt;!&ndash; </template>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-table-column>&ndash;&gt;-->
<!-- <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="操作" width="160" fixed="right">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button--> <!-- <el-button-->
<!-- type="text"--> <!-- type="text"-->
@ -1328,7 +1303,7 @@ export default {
BASE_URL: process.env.VUE_APP_BASE_API, BASE_URL: process.env.VUE_APP_BASE_API,
currentManufacturer: {}, currentManufacturer: {},
Upinvoice: false, Upinvoice: false,
showSearch: true, showSearch: false,
filterQuery: { filterQuery: {
id: "", id: "",
billNo: null, billNo: null,

Loading…
Cancel
Save