Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

renkang

2025-01-09 62e8b7d51ecb749c3f38452af88c703ac86db9cd

 admin/src/views/project/housingList.vue

@@ -40,9 +40,9 @@
        <el-table-column prop="feeArea" label="计费面积(m²)" min-width="80px"></el-table-column>
        <el-table-column prop="" label="租赁状态" min-width="80px">
          <template v-slot="{row}">
            <span v-if="row.leaseStatus == 0">待租赁</span>
            <span v-if="row.leaseStatus == 1">已租赁</span>
            <span v-if="row.leaseStatus == 2">未开启租赁</span>
            <span v-if="row.leaseStatus == 0">待租</span>
            <span v-else-if="row.leaseStatus == 1">已租</span>
            <span v-else>-</span>
          </template>
        </el-table-column>
        <el-table-column prop="isInvestment" label="招商状态" min-width="60px">
@@ -52,8 +52,9 @@
          </template>
        </el-table-column>
        <el-table-column v-if="containPermissions(['business:ywroom:update', 'business:ywroom:delete'])" label="操作"
          min-width="100" fixed="right">
          min-width="140" fixed="right">
          <template slot-scope="{row}">
            <el-button type="text" @click="$refs.houseDetails.open('房源详情')">查看详情</el-button>
            <el-button type="text" @click="editClick(row)" icon="el-icon-edit"
              v-permissions="['business:ywroom:update']">编辑</el-button>
            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
@@ -66,6 +67,8 @@
    </template>
    <!-- 新建/修改 -->
    <OperaYwRoomWindow ref="operaYwRoomWindow" @success="handlePageChange" />
    <!--  详情  -->
    <houseDetails ref="houseDetails" />
  </TableLayout>
</template>

@@ -74,12 +77,13 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaYwRoomWindow from './components/OperaYwRoomWindow'
import houseDetails from './components/houseDetails'
import { getProjectList } from '@/api/project/ywProject'
import { getBuildList } from '@/api/project/ywBuilding'
export default {
  name: 'YwRoom',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaYwRoomWindow },
  components: { TableLayout, Pagination, OperaYwRoomWindow, houseDetails },
  data() {
    return {
      // 搜索