|
|
@@ -68,6 +68,8 @@
|
|
|
style="width: 280px"
|
|
|
>
|
|
|
</el-input>
|
|
|
+ <DeptSelect v-model="postId" placeholder="使用单位" style="width: 280px" @input="selectChange" />
|
|
|
+
|
|
|
<el-button type="primary" @click="handleSearch">搜索</el-button>
|
|
|
<el-button @click="handleReset">重置</el-button>
|
|
|
</div>
|
|
|
@@ -95,7 +97,9 @@
|
|
|
@click="details(item)"
|
|
|
>
|
|
|
<div class="card-header">
|
|
|
- <div class="device-name">{{ item.name }}</div>
|
|
|
+ <div class="device-name">{{
|
|
|
+ item.name + '/' + item.code
|
|
|
+ }}</div>
|
|
|
<div class="card-actions">
|
|
|
<el-tag
|
|
|
:type="getStatusType(item.status, 1)"
|
|
|
@@ -166,10 +170,11 @@
|
|
|
import { getTreeByPid } from '@/api/classifyManage';
|
|
|
import { basicAreaPageAPI } from '@/api/factoryModel';
|
|
|
import { businessStatus } from '@/utils/dict/warehouse';
|
|
|
- import { data } from 'ele-admin/lib/ele-pro-table';
|
|
|
- import d from 'highlight.js/lib/languages/d';
|
|
|
+ import DeptSelect from '@/components/CommomSelect/dept-select.vue';
|
|
|
+
|
|
|
export default {
|
|
|
mixins: [dictMixins, tableColumnsMixin],
|
|
|
+ components: { DeptSelect },
|
|
|
data() {
|
|
|
return {
|
|
|
// 搜索表单
|
|
|
@@ -179,7 +184,7 @@
|
|
|
deviceStatus: ''
|
|
|
},
|
|
|
businessStatus,
|
|
|
-
|
|
|
+postId:'',
|
|
|
// 当前激活的标签页
|
|
|
activeTab: 'org',
|
|
|
// 更新时间
|
