完善

src/views/sb/info/ParentSbInfo.vue

@@ -16,9 +16,23 @@
                     <a-input v-model="queryParam.zbh" placeholder="请输入设备旧号"/>
                   </a-form-item>
                 </a-col>
-                <a-col :md="8" :sm="24">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="设备类型">
+                    <a-tree-select
+                      style="width: 100%"
+                      :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+                      :treeData="treeData"
+                      :treeNodeFilterProp="'title'"
+                      :showSearch="true"
+                      v-model="queryParam.typeId"
+                      placeholder="请选择"
+                    >
+                    </a-tree-select>
+                  </a-form-item>
+                </a-col>
+                <a-col :md="6" :sm="24">
                   <a-form-item label="设备状态">
-                    <a-select @change="handleDeptChange" v-model="queryParam.status" placeholder="请选择">
+                    <a-select v-model="queryParam.status" placeholder="请选择">
                       <a-select-option
                         v-for="(label,value) in statusMap"
                         :key="value"
@@ -28,6 +42,15 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="主子设备">
+                    <a-select v-model="queryParam.isChild" placeholder="请选择">
+                      <a-select-option value="1">子设备</a-select-option>
+                      <a-select-option value="2">父设备</a-select-option>
+                      <a-select-option value="3">普通设备</a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6 || 24" :sm="24">
                   <span class="table-page-search-submitButtons">
                     <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
@@ -115,7 +138,7 @@ import BaseForm from './modules/BaseForm'
 import Detail from './modules/Detail'
 import DownloadModal from '@/views/download/DownloadModal'
 import PreviewModal from '@/views/preview/PreviewModal'
-import {updateSbInfo, getSbInfoPage, deleteSbInfos, fetchSbInfo, exportSbInfo, getSbInfoTree} from '@/api/sb/info'
+import {updateSbInfo, getSbInfoPage, deleteSbInfos, fetchSbInfo, exportSbInfo} from '@/api/sb/info'
 import { queryDept, getDeptsAllByParentId } from '@/api/upms/dept'
 import BaseTool from '../../../utils/tool'
 import { fetchSbTypeTree } from '@/api/sb/type'
@@ -194,7 +217,7 @@ export default {
           title: '设备类型',
           checked: true,
           dataIndex: 'type',
-          width: 120,
+          width: 200,
           customRender: (text, record, index) => {
             return record.typeName
           }
@@ -467,7 +490,7 @@ export default {
       queryDept({ nature: this.DictCache.VALUE.SYS_DEPT_NATURE.JITUAN }).then(res => {
         this.areaList = res.data
       })
-      getSbInfoTree().then(res => {
+      fetchSbTypeTree().then(res => {
         this.treeData = res.data
       })
     },

src/views/sb/info/SbInfo.vue

@@ -34,7 +34,7 @@
                       :treeData="treeData"
                       :treeNodeFilterProp="'title'"
                       :showSearch="true"
-                      v-model="queryParam.parentId"
+                      v-model="queryParam.typeId"
                       placeholder="请选择"
                     >
                     </a-tree-select>
@@ -149,7 +149,6 @@
             </span>
           </s-table>
         </div>
-
       </a-col>
     </a-row>
     <base-form ref="baseModal" @ok="handleOk"/>