导出Excel模板修改,批量创建资产改为关联查询

src/views/ledger/property/addpropertys.vue

@@ -17,9 +17,9 @@
           <el-table-column label="设备本地编码" show-overflow-tooltip>
             <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="200"></el-table-column>
-          <el-table-column prop="BuildingId" label="所属建筑"></el-table-column>
-          <el-table-column prop="FloorId" label="所属楼层"></el-table-column>
+          <el-table-column prop="EquipCategory.EquipName" label="设备类型" show-overflow-tooltip width="200"></el-table-column>
+          <el-table-column prop="Building.BuildLocalName" label="所属建筑"></el-table-column>
+          <el-table-column prop="Floor.FloorLocalName" label="所属楼层"></el-table-column>
           <el-table-column prop="address" label="操作" width="100">
             <template slot-scope="scope">
               <el-button @click.native.prevent="handleOpenDetail(scope.row, tableData)" type="text" size="small">详情</el-button>
@@ -106,6 +106,7 @@ export default {
       } else {
         this.params.category = ''
       }
+      this.page.pageNumber = 1
       this.getTableData()
     },
     //选择建筑楼层
@@ -118,6 +119,7 @@ export default {
       } else {
         this.params.floorId = ''
       }
+      this.page.pageNumber = 1
       this.getTableData()
     },
     //获取表格数据
@@ -133,6 +135,20 @@ export default {
     //格式化条件
     formatFilter() {
       let param = {
+        Cascade: [
+          {
+            Name: "equipCategory",
+            Projection: ["EquipCode", "EquipName"]
+          },
+          {
+            Name: "building",
+            Projection: [ "BuildLocalName", "BuildName", "BuildID" ]
+          },
+          {
+            Name: "floor",
+            Projection: [ "FloorLocalName", "FloorName", "FloorID" ]
+          }
+        ],
         Filters: `category='${this.params.category}';PropertyId isNull`,
         Orders: "createTime desc, EquipID asc",
         PageNumber: this.page.pageNumber,

src/views/ledger/report/index.vue

@@ -94,6 +94,24 @@ export default {
       }, {
         fieldName: "BIMID",
         headerName: "设备BIMID"
+      }, {
+        fieldName: "Property.EquipFamilyList.0.FamilyName",
+        headerName: "资产设备族"
+      }, {
+        fieldName: "Property.EquipLocalName",
+        headerName: "资产本地名称"
+      }, {
+        fieldName: "Property.EquipLocalID",
+        headerName: "资产本地编码"
+      }, {
+        fieldName: "Property.EquipID",
+        headerName: "资产id"
+      }, {
+        fieldName: "Property.CreateTime",
+        headerName: "资产创建时间"
+      }, {
+        fieldName: "Property.CodeType",
+        headerName: "资产现场验证状态"
       }],
       header3: [{
         fieldName: "Building.BuildLocalName",
@@ -102,6 +120,21 @@ export default {
         fieldName: "Floor.FloorLocalName",
         headerName: "楼层"
       }, {
+        fieldName: "Equipment.EquipCategory.EquipName",
+        headerName: "设备类"
+      }, {
+        fieldName: "Equipment.EquipLocalName",
+        headerName: "设备本地名称"
+      }, {
+        fieldName: "Equipment.EquipLocalID",
+        headerName: "设备本地编码"
+      }, {
+        fieldName: "Equipment.EquipID",
+        headerName: "设备id"
+      }, {
+        fieldName: "Equipment.BIMID",
+        headerName: "设备BIMID"
+      }, {
         fieldName: "EquipFamilyList.0.FamilyName",
         headerName: "资产设备族"
       }, {