Merge remote-tracking branch 'origin/master'

jiangping

2024-11-23 8ac30411bb33e406e0ed5a2b6e2edaf7ab59f11f

 admin/src/views/project/buildingList.vue

@@ -6,28 +6,26 @@
        <el-input v-model="searchForm.name" placeholder="请输入楼宇名称" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="所属项目" prop="projectId">
       <el-select v-model="searchForm.projectId">
        <el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
       </el-select>
        <el-select v-model="searchForm.projectId">
          <el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
        </el-select>
      </el-form-item>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button type="primary" :loading="isWorking.export" v-permissions="['business:ywbuilding:exportExcel']" @click="exportExcel">导出</el-button>
        <el-button type="primary" :loading="isWorking.export" v-permissions="['business:ywbuilding:exportExcel']"
          @click="exportExcel">导出</el-button>
        <el-button @click="reset">重置</el-button>
      </section>
    </el-form>
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:ywbuilding:create', 'business:ywbuilding:delete']">
        <li><el-button type="primary" @click="editClick()" icon="el-icon-plus" v-permissions="['business:ywbuilding:create']">新建</el-button></li>
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:ywbuilding:delete']">删除</el-button></li>
        <li><el-button type="primary" @click="editClick()" icon="el-icon-plus"
            v-permissions="['business:ywbuilding:create']">新建</el-button></li>
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete"
            v-permissions="['business:ywbuilding:delete']">删除</el-button></li>
      </ul>
      <el-table
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe
        @selection-change="handleSelectionChange"
      >
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="name" label="楼宇名称" min-width="100px">
          <template v-slot="scope">
@@ -39,30 +37,25 @@
        <el-table-column prop="area" label="建筑面积(m²)" min-width="80px"></el-table-column>
        <el-table-column prop="cqArea" label="管理面积(m²)" min-width="80px"></el-table-column>
        <el-table-column prop="" label="房间总数(间)" min-width="80px"></el-table-column>
        <el-table-column prop="" label="可招商房源数量(间)" min-width="100px"></el-table-column>     
        <el-table-column
          v-if="containPermissions(['business:ywbuilding:update', 'business:ywbuilding:delete'])"
          label="操作"
          min-width="120"
          fixed="right"
        >
        <el-table-column prop="" label="可招商房源数量(间)" min-width="100px"></el-table-column>
        <el-table-column v-if="containPermissions(['business:ywbuilding:update', 'business:ywbuilding:delete'])"
          label="操作" min-width="120" fixed="right">
          <template slot-scope="{row}">
            <el-button type="text" @click="editClick(row)" icon="el-icon-edit" v-permissions="['business:ywbuilding:update']">编辑</el-button>
            <el-button type="text" @click="editFloor(row)" v-permissions="['business:ywbuilding:update']">楼层管理</el-button>
            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:ywbuilding:delete']">删除</el-button>
            <el-button type="text" @click="editClick(row)" icon="el-icon-edit"
              v-permissions="['business:ywbuilding:update']">编辑</el-button>
            <el-button type="text" @click="editFloor(row)"
              v-permissions="['business:ywbuilding:update']">楼层管理</el-button>
            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
              v-permissions="['business:ywbuilding:delete']">删除</el-button>
          </template>
        </el-table-column>
      </el-table>
      <pagination
        @size-change="handleSizeChange"
        @current-change="handlePageChange"
        :pagination="tableData.pagination"
      >
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>
    </template>
    <!-- 新建/修改 -->
    <OperaYwBuildingWindow ref="operaYwBuildingWindow" @success="handlePageChange"/>
    <FloorLevel ref="FloorLevelRef" @success="handlePageChange"/>
    <OperaYwBuildingWindow ref="operaYwBuildingWindow" @success="handlePageChange" />
    <FloorLevel ref="FloorLevelRef" @success="handlePageChange" />
    <BuildingDetail ref="BuildingDetailRef" />
  </TableLayout>
</template>
@@ -78,18 +71,18 @@
export default {
  name: 'YwBuilding',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaYwBuildingWindow ,BuildingDetail, FloorLevel},
  data () {
  components: { TableLayout, Pagination, OperaYwBuildingWindow, BuildingDetail, FloorLevel },
  data() {
    return {
      // 搜索
      searchForm: { 
      searchForm: {
        name: '',
        projectId: ''
      },
      projectList: []
    }
  },
  created () {
  created() {
    this.config({
      module: '运维楼宇信息表',
      api: '/project/ywBuilding',
@@ -106,9 +99,9 @@
      })
    },
    editClick(row) {
      if(row && row.id){
      if (row && row.id) {
        this.$refs.operaYwBuildingWindow.open('编辑楼宇')
      }else{
      } else {
        this.$refs.operaYwBuildingWindow.open('新建楼宇')
      }
      this.$refs.operaYwBuildingWindow.getProject()