Skip to content

T
TF-MOM-WEB
Commit 0c6d6105 authored by jingnan's avatar jingnan 👀
Browse files
Options

架次搜索增加隐藏标识（指令下发，站位计划维护，实物构型管理）

parent 544ffad5
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 69 deletions
applications/dee-mes/src/privateComponents/components/physicalConfigurationManagement/components/left.vue
View file @ 0c6d6105
<template>
<div class="physicalConfigurationManagement_left">
<div class="search-box box">
<div class="title"><i class="search-icon" /><span>架次搜索</span></div>
<div class="row">
<label>机型:</label>
<el-select v-model="form.model" size="mini" placeholder="请选择">
<el-option
v-for="item in modelData"
:key="item.id"
:label="item.defName"
:value="item.id"
/>
</el-select>
<div class="search-box box" :style="{height:showSearchConditions?'150px':'40px'}">
<div class="title"><i class="search-icon" /><span>架次搜索</span>
<div class="search-condition-operation-item" @click="toggleSearchConditions"><img
class="search-condition-operation-icon"
:src="showSearchConditions?'icons/circle-fold.png':'icons/circle-collapse.png'"
>
</div>
</div>
<div class="row">
<label>架次:</label>
<el-select v-model="form.sorties" filterable clearable size="mini" placeholder="请选择">
<el-option
v-for="item in sortiesData"
:key="item.id"
:label="item.defCode"
:value="item.id"
/>
</el-select>
</div>
<div class="row">
<el-button size="mini" type="primary" @click="getExtPosition">查询</el-button>
<div v-if="showSearchConditions" class="search-conditions">
<div class="row">
<label>机型:</label>
<el-select v-model="form.model" size="mini" placeholder="请选择">
<el-option
v-for="item in modelData"
:key="item.id"
:label="item.defName"
:value="item.id"
/>
</el-select>
</div>
<div class="row">
<label>架次:</label>
<el-select v-model="form.sorties" filterable clearable size="mini" placeholder="请选择">
<el-option
v-for="item in sortiesData"
:key="item.id"
:label="item.defCode"
:value="item.id"
/>
</el-select>
</div>
<div class="row">
<el-button size="mini" type="primary" @click="getExtPosition">查询</el-button>
</div>
</div>
</div>
<div class="station-box box">
<div class="station-box box" :style="{height:showSearchConditions?'calc(100% - 190px)':'calc(100% - 80px)'}">
<Tree ref="tree" :search-form="form" />
</div>
</div>
......@@ -53,7 +61,8 @@ export default {
},
treeLoading: false,
treeData: [],
defaultExpandedKeys: []
defaultExpandedKeys: [],
showSearchConditions: true // 控制搜索条件是否显示
}
},
watch: {
......@@ -156,6 +165,9 @@ export default {
*/
getExtPosition() {
this.$refs.tree.getExtPosition()
},
toggleSearchConditions() {
this.showSearchConditions = !this.showSearchConditions
}
}
}
......@@ -165,5 +177,21 @@ export default {
.physicalConfigurationManagement_left {
height: 100%;
overflow: hidden;
.search-box {
height: 150px;
font-size: 14px;
position: relative; /* 允许内部元素使用绝对定位 */
.title {
margin-left: 10px;
text-align: left;
margin-top: 10px;
display: flex; /* 使用flex布局来更好地控制子元素 */
align-items: center; /* 垂直居中 */
/* 添加按钮的右外边距或定位，具体取决于您的布局需求 */
.search-condition-operation-item {
margin-left: auto; /* 将按钮推到右边 */
}
}
}
}
</style>
applications/dee-mes/src/views/assemblyPlanManagement/instructionsIssued/components/stationPlanList.vue
View file @ 0c6d6105
......@@ -8,25 +8,33 @@
>
<template slot="paneL">
<div class="left-container">
<div class="search-box box">
<div class="title"><i class="search-icon" /><span>架次搜索</span></div>
<div class="row">
<label>机型:</label>
<el-select v-model="form.model" size="mini" placeholder="请选择" :loading="modelLoading">
<el-option v-for="item in modelData" :key="item.id" :label="item.defName" :value="item.id" />
</el-select>
<div class="search-box box" :style="{height:showSearchConditions?'150px':'40px'}">
<div class="title"><i class="search-icon" /><span>架次搜索</span>
<div class="search-condition-operation-item" @click="toggleSearchConditions"><img
class="search-condition-operation-icon"
:src="showSearchConditions?'icons/circle-fold.png':'icons/circle-collapse.png'"
>
</div>
</div>
<div class="row">
<label>架次:</label>
<el-select v-model="form.sorties" size="mini" placeholder="请选择" :loading="sortiesLoading">
<el-option v-for="(item, i) in sortiesData" :key="item.value + i" :label="item.label" :value="item.value" />
</el-select>
</div>
<div class="row">
<el-button size="mini" type="primary" @click="getTreeData">查询</el-button>
<div v-if="showSearchConditions" class="search-conditions">
<div class="row">
<label>机型:</label>
<el-select v-model="form.model" size="mini" placeholder="请选择" :loading="modelLoading">
<el-option v-for="item in modelData" :key="item.id" :label="item.defName" :value="item.id" />
</el-select>
</div>
<div class="row">
<label>架次:</label>
<el-select v-model="form.sorties" size="mini" placeholder="请选择" :loading="sortiesLoading">
<el-option v-for="(item, i) in sortiesData" :key="item.value + i" :label="item.label" :value="item.value" />
</el-select>
</div>
<div class="row">
<el-button size="mini" type="primary" @click="getTreeData">查询</el-button>
</div>
</div>
</div>
<div class="station-box box">
<div class="station-box box " :style="{height:showSearchConditions?'calc(100% - 190px)':'calc(100% - 80px)'}">
<!-- <el-input
v-model="filterText"
placeholder="输入关键字进行过滤"
......@@ -133,7 +141,8 @@ export default {
isCooperate: false,
currentNodekey: '',
filterText: '',
requestUrl: ''
requestUrl: '',
showSearchConditions: true // 控制搜索条件是否显示
}
},
watch: {
......@@ -617,6 +626,9 @@ export default {
}
}
})
},
toggleSearchConditions() {
this.showSearchConditions = !this.showSearchConditions
}
}
}
......@@ -631,13 +643,20 @@ export default {
height: 100%;
overflow-x:hidden;
.search-box {
height: 150px;
font-size: 14px;
.title {
height: 150px;
font-size: 14px;
position: relative; /* 允许内部元素使用绝对定位 */
.title {
margin-left: 10px;
text-align: left;
margin-top: 10px;
}
display: flex; /* 使用flex布局来更好地控制子元素 */
align-items: center; /* 垂直居中 */
/* 添加按钮的右外边距或定位，具体取决于您的布局需求 */
.search-condition-operation-item {
margin-left: auto; /* 将按钮推到右边 */
}
}
.search-icon {
display: inline-block;
width: 21px;
......
applications/dee-mes/src/views/assemblyPlanManagement/stationPlanMaintenance/stationPlanList.vue
View file @ 0c6d6105
......@@ -8,25 +8,33 @@
>
<template slot="paneL">
<div class="left-container">
<div class="search-box box">
<div class="title"><i class="search-icon" /><span>架次搜索</span></div>
<div class="row">
<label>机型:</label>
<el-select v-model="form.model" size="mini" placeholder="请选择" :loading="modelLoading">
<el-option v-for="item in modelData" :key="item.id" :label="item.defName" :value="item.id" />
</el-select>
<div class="search-box box" :style="{height:showSearchConditions?'150px':'40px'}">
<div class="title"><i class="search-icon" /><span>架次搜索</span>
<div class="search-condition-operation-item" @click="toggleSearchConditions"><img
class="search-condition-operation-icon"
:src="showSearchConditions?'icons/circle-fold.png':'icons/circle-collapse.png'"
>
</div>
</div>
<div class="row">
<label>架次:</label>
<el-select v-model="form.sorties" size="mini" placeholder="请选择" :loading="sortiesLoading">
<el-option v-for="(item, i) in sortiesData" :key="item.value + i" :label="item.label" :value="item.value" />
</el-select>
</div>
<div class="row">
<el-button size="mini" type="primary" @click="getTreeData">查询</el-button>
<div v-if="showSearchConditions" class="search-conditions">
<div class="row">
<label>机型:</label>
<el-select v-model="form.model" size="mini" placeholder="请选择" :loading="modelLoading">
<el-option v-for="item in modelData" :key="item.id" :label="item.defName" :value="item.id" />
</el-select>
</div>
<div class="row">
<label>架次:</label>
<el-select v-model="form.sorties" size="mini" placeholder="请选择" :loading="sortiesLoading">
<el-option v-for="(item, i) in sortiesData" :key="item.value + i" :label="item.label" :value="item.value" />
</el-select>
</div>
<div class="row">
<el-button size="mini" type="primary" @click="getTreeData">查询</el-button>
</div>
</div>
</div>
<div class="station-box box">
<div class="station-box box " :style="{height:showSearchConditions?'calc(100% - 190px)':'calc(100% - 80px)'}">
<div class="search-area">
<el-input v-model="keyword" placeholder="请输入关键字" class="search-input" clearable>
<!-- <el-button slot="append" icon="el-icon-search" @click="searchData" /> -->
......@@ -191,7 +199,8 @@ export default {
activeNodeData: {},
currentNodekey: '',
areaUpdatingLists: {},
requestParams: []
requestParams: [],
showSearchConditions: true // 控制搜索条件是否显示
}
},
watch: {
......@@ -733,6 +742,9 @@ export default {
const tmpData = {}
tmpData.row = data.row.extSupporting
this.$emit('getMissData', tmpData)
},
toggleSearchConditions() {
this.showSearchConditions = !this.showSearchConditions
}
}
}
......@@ -748,13 +760,20 @@ export default {
overflow-x:hidden;
// width: 15%;
.search-box {
height: 150px;
font-size: 14px;
.title {
height: 150px;
font-size: 14px;
position: relative; /* 允许内部元素使用绝对定位 */
.title {
margin-left: 10px;
text-align: left;
margin-top: 10px;
}
display: flex; /* 使用flex布局来更好地控制子元素 */
align-items: center; /* 垂直居中 */
/* 添加按钮的右外边距或定位，具体取决于您的布局需求 */
.search-condition-operation-item {
margin-left: auto; /* 将按钮推到右边 */
}
}
.search-icon {
display: inline-block;
width: 21px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment