|
|
@@ -20,7 +20,6 @@
|
|
|
@keyup.enter.native="handleQuery"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="资产类别" prop="assetType" label-width="80">
|
|
|
-
|
|
|
<el-select style="width: 100%;" v-model="queryParams.assetType" placeholder="请选择资产类别"
|
|
|
@change="assetSelectChange" @clear="clearAsset" clearable>
|
|
|
<el-option v-for="item in getAssetDict('AssetDeviceType',-1)" :key="item.id" :label="item.name"
|
|
|
@@ -73,18 +72,8 @@
|
|
|
<el-table-column label="地区" align="left" prop="affiliatedArea"/>
|
|
|
<el-table-column label="行社" align="left" prop="affiliatedBank"/>
|
|
|
<el-table-column label="所属机构" align="left" prop="orgName"/>
|
|
|
-
|
|
|
- <el-table-column label="设备类别" align="center" key="assetType" prop="assetType">
|
|
|
- <template slot-scope="scope">
|
|
|
- <dict-tag :options="dict.type.sys_asset_type" :value="scope.row.assetType"/>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
-
|
|
|
- <el-table-column label="设备分类" align="center" key="deviceType" prop="deviceType">
|
|
|
- <template slot-scope="scope">
|
|
|
- <dict-tag :options="dict.type.sys_device_type" :value="scope.row.deviceType"/>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
+ <el-table-column label="设备类别" align="center" key="assetType" prop="assetType"/>
|
|
|
+ <el-table-column label="设备分类" align="center" key="deviceType" prop="deviceType"/>
|
|
|
<el-table-column label="设备名称" align="center" prop="deviceName"/>
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
@@ -386,8 +375,7 @@ export default {
|
|
|
single: true,
|
|
|
//搜索tree
|
|
|
deptName: null,
|
|
|
- // 非多个停用
|
|
|
- multiple: true,
|
|
|
+
|
|
|
// 显示搜索条件
|
|
|
showSearch: true,
|
|
|
// 总条数
|
|
|
@@ -473,7 +461,10 @@ export default {
|
|
|
created() {
|
|
|
this.getDeptTree();
|
|
|
//this.getList();
|
|
|
- this.assetSelectChange(1);
|
|
|
+
|
|
|
+
|
|
|
+ },
|
|
|
+ mounted() {
|
|
|
this.initDictionaryTreeList();
|
|
|
},
|
|
|
|
|
|
@@ -653,7 +644,6 @@ export default {
|
|
|
this.ids = selection.map((item) => item.id);
|
|
|
this.names = selection.map((item) => item.deviceName);
|
|
|
this.single = selection.length !== 1;
|
|
|
- this.multiple = !selection.length;
|
|
|
},
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd(val) {
|