Sfoglia il codice sorgente

添加级联查询

zhangyu 5 anni fa
parent
commit
329b37fc8a
1 ha cambiato i file con 8 aggiunte e 4 eliminazioni
  1. 8 4
      src/views/ledger/facility/batchlink.vue

+ 8 - 4
src/views/ledger/facility/batchlink.vue

@@ -16,10 +16,12 @@
           <el-table-column prop="EquipLocalID" label="设备本地编码" show-overflow-tooltip max-width="150">
             <!-- <template slot-scope="scope">{{ scope.row.EquipLocalID?scope.row.EquipLocalID:scope.row.EquipID }}</template> -->
           </el-table-column>
-          <el-table-column prop="Category" label="设备类" show-overflow-tooltip width="100"></el-table-column>
+          <el-table-column prop="EquipCategory.EquipName" label="设备类" show-overflow-tooltip width="100"></el-table-column>
           <el-table-column prop="CADID" label="设计图纸中编码" show-overflow-tooltip max-width="150"></el-table-column>
           <el-table-column label="所属建筑楼层">
-            <template slot-scope="scope">{{ scope.row.BuildingId }}-{{ scope.row.FloorId }}</template>
+            <template slot-scope="scope">
+              {{ scope.row.Building?scope.row.Building.BuildLocalName:'' }}-{{ scope.row.Floor?scope.row.Floor.FloorLocalName:'' }}
+            </template>
           </el-table-column>
           <el-table-column prop="PropertyItem.EquipLocalName" label="资产本地名称" show-overflow-tooltip max-width="150">
             <!-- <template slot-scope="scope">{{ scope.row.AssetsLocalName }}</template> -->
@@ -27,10 +29,12 @@
           <el-table-column prop="PropertyItem.EquipLocalID" label="资产本地编码" show-overflow-tooltip max-width="150">
             <!-- <template slot-scope="scope">{{ scope.row.AssetsLocalId }}</template> -->
           </el-table-column>
-          <el-table-column prop="PropertyItem.Family" label="设备族" show-overflow-tooltip width="100"></el-table-column>
+          <el-table-column prop="PropertyItem.FamilyName.Name" label="设备族" show-overflow-tooltip width="100"></el-table-column>
           <el-table-column prop="PropertyItem.CADID" label="设计图纸中编码" show-overflow-tooltip max-width="150"></el-table-column>
           <el-table-column label="所属建筑楼层" show-overflow-tooltip width="200">
-            <template slot-scope="scope">{{ scope.row.PropertyItem.BuildingId }}-{{ scope.row.PropertyItem.FloorId }}</template>
+            <template slot-scope="scope">
+              {{ scope.row.PropertyItem.Building?scope.row.PropertyItem.Building.BuildLocalName:'' }}-{{ scope.row.PropertyItem.Floor?scope.row.PropertyItem.Floor.FloorLocalName:'' }}
+            </template>
           </el-table-column>
           <el-table-column prop="address" label="操作" width="100">
             <template slot-scope="scope">