linwenling
2023-09-21 79462dc491293a9d1b3d0c512772ebb02522a958
ruoyi-ui/src/views/note/index.vue
@@ -141,6 +141,9 @@
      <el-table-column label="备注" prop="remark" sortable width="130" >
        <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
      </el-table-column>
      <el-table-column label="是否是本家庭记录" prop="ownData" sortable width="150px" >
        <template slot-scope="scope">{{scope.row.ownData === 0 ? '否': '是'}}</template>
      </el-table-column>
      <!-- <el-table-column label="家庭号" prop="familyId" sortable width="100" /> -->
      <el-table-column label="发生时间" prop="happenTime" sortable width="150" align="center">
        <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
@@ -661,7 +664,7 @@
        }, `property_${new Date().getTime()}.xlsx`)
      }
      else{
        this.download('/zfEquipment/export1/'+Ids, {
        this.download('family/property/export1/'+Ids, {
        }, `property_${new Date().getTime()}.xlsx`)
      }
    },