|
|
@@ -11,11 +11,23 @@
|
|
|
<div class="table-page-search-wrapper">
|
|
|
<a-form layout="inline">
|
|
|
<a-row :gutter="48">
|
|
|
- <a-col :md="8" :sm="24">
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
<a-form-item label="关键字">
|
|
|
<a-input v-model.trim="queryParam.keyword" placeholder="请输入名称/编码"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="车间位置">
|
|
|
+ <a-select v-model="queryParam.positionId" placeholder="请选择">
|
|
|
+ <a-select-option
|
|
|
+ v-for="({id,name}) in sbPositionData"
|
|
|
+ :key="id"
|
|
|
+ :label="name"
|
|
|
+ :value="id">{{ name }}
|
|
|
+ </a-select-option>
|
|
|
+ </a-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="设备类型">
|
|
|
<a-tree-select
|
|
|
@@ -30,7 +42,7 @@
|
|
|
</a-tree-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="8 || 24" :sm="24">
|
|
|
+ <a-col :md="6 || 24" :sm="24">
|
|
|
<span class="table-page-search-submitButtons">
|
|
|
<a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
|
|
|
<a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
|
|
|
@@ -72,6 +84,8 @@ import { STable, Ellipsis } from '@/components'
|
|
|
import { getSbInfoPage } from '@/api/sb/info'
|
|
|
import { queryDept } from '@/api/upms/dept'
|
|
|
import { fetchSbTypeTree } from '@/api/sb/type'
|
|
|
+import { querySbPosition } from '@/api/sb/position'
|
|
|
+
|
|
|
export default {
|
|
|
name: 'SbInfoSelectModal',
|
|
|
components: {
|
|
|
@@ -114,6 +128,8 @@ export default {
|
|
|
useTypeMap: {},
|
|
|
sourceTypeMap: {},
|
|
|
treeData: [],
|
|
|
+ sbPositionData: [],
|
|
|
+
|
|
|
// 表头
|
|
|
columns: [
|
|
|
{
|
|
|
@@ -208,6 +224,9 @@ export default {
|
|
|
this.unitMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_UNIT)
|
|
|
this.sourceTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBTYPE_SOURCETYPE)
|
|
|
this.useTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_UES_TYPE)
|
|
|
+ querySbPosition().then(res => {
|
|
|
+ this.sbPositionData = res.data
|
|
|
+ })
|
|
|
},
|
|
|
methods: {
|
|
|
tableOption () {
|
