解决冲突

MrShi

2026-04-02 a29e0df3c165dfe2ddd825bb340ed480a64865db

 admin/src/views/roomStatus/index.vue

@@ -82,7 +82,7 @@
                                    <div class="xm_table">
                                        <div style="display: flex; align-items: center; margin-bottom: 15px;">
                                            <el-input v-model="form.code" style="width: 150px; margin-right: 15px;" placeholder="请输入合同编号"></el-input>
                                            <el-button type="primary" @click="getFetchList">搜索</el-button>
                                            <el-button type="primary" @click="getFetchList(1)">搜索</el-button>
                                            <el-button @click="clear">重置</el-button>
                                        </div>
                                        <el-table
@@ -197,7 +197,7 @@
                                <div class="xm_table">
                                    <div style="display: flex; align-items: center; margin-bottom: 15px;">
                                        <el-input v-model="form.code" style="width: 150px; margin-right: 15px;" placeholder="请输入合同编号"></el-input>
                                        <el-button type="primary" @click="getFetchList">搜索</el-button>
                                        <el-button type="primary" @click="getFetchList(1)">搜索</el-button>
                                        <el-button @click="clear">重置</el-button>
                                    </div>
                                    <el-table
@@ -288,7 +288,7 @@
                                            </div>
                                        </div>
                                        <div class="xm_house_list_right">
                                            <template v-for="(child, i) in item.roomsList" :key="i">
                                            <template v-for="(child, i) in item.roomsList" >
                                                <div class="xm_house_list_right_row" v-for="(childThree, a) in child" :key="a" :style="{ width: childThree.width + 'px', backgroundColor: ifBackground(childThree.roomStatus) }">
                                                    <div class="ft">
                                                        <span>{{childThree.roomCode}}</span>
@@ -305,7 +305,6 @@
                                                    <div class="xm_house_list_right_row_day" v-if="childThree.roomStatus === 0">未出租｜空置{{childThree.freeDayAmount}}天</div>
                                                </div>
                                            </template>
                                            
                                        </div>
                                    </div>
                                </div>
@@ -391,7 +390,7 @@
                                    <div class="xm_table">
                                        <div style="display: flex; align-items: center; margin-bottom: 15px;">
                                            <el-input v-model="form.code" style="width: 150px; margin-right: 15px;" placeholder="请输入合同编号"></el-input>
                                            <el-button type="primary" @click="getFetchList">搜索</el-button>
                                            <el-button type="primary" @click="getFetchList(1)">搜索</el-button>
                                            <el-button @click="clear">重置</el-button>
                                        </div>
                                        <el-table
@@ -498,7 +497,7 @@
                                        <el-table
                                            :data="tableData"
                                            border
                                            v-lading="loading"
                                            v-loading="loading"
                                            style="width: 100%">
                                            <el-table-column
                                                prop="categoryName"
@@ -571,13 +570,13 @@
                                    <div class="xm_table">
                                        <div class="xm_table_search">
                                            <div class="xm_table_search_left">
                                                <el-input v-model="form.name" placeholder="请输入设备名称/编码" style="width: 150px; margin-right: 15px;"></el-input>
                                                <el-input v-model="form.name" placeholder="请输入设备名称/编码" style="width: 200px; margin-right: 15px;"></el-input>
                                                <el-select v-model="form.status" style="width: 150px; margin-right: 15px;" placeholder="设备状态">
                                                    <el-option label="正常" :value="0"></el-option>
                                                    <el-option label="损坏" :value="1"></el-option>
                                                    <el-option label="报废" :value="2"></el-option>
                                                </el-select>
                                                <el-button type="primary" @click="getDevicePage">查询</el-button>
                                                <el-button type="primary" @click="getDevicePage(1)">查询</el-button>
                                                <el-button @click="clear">清空</el-button>
                                            </div>
                                            <el-button type="primary" @click="handleEdit">新增</el-button>
@@ -687,6 +686,7 @@
          label: '黄金糕'
        }],
        value: '',
        ids:[],
        form: {
          name: '',
          status: '',
@@ -924,7 +924,10 @@
        })
      },
      // 获取设备分页
      getDevicePage() {
      getDevicePage(type) {
        if (type === 1) {
          this.page = 1
        }
        this.loading = true
        devicePage({
          capacity: this.pageTotal,
@@ -1031,6 +1034,7 @@
        })
      },
      clear() {
        this.page = 1
        this.form.code = ''
        this.form.name = ''
        this.form.status = ''
@@ -1046,7 +1050,10 @@
        }
      },
      // 获取当前在租合同
      getFetchList() {
      getFetchList(type) {
        if (type === 1) {
          this.page = 1
        }
        this.loading = true
        fetchList({
          capacity: this.pageSize,
@@ -1239,7 +1246,7 @@
        .box_content {
            width: 100%;
            display: flex;
            align-items: start;
            align-items: flex-start;
            justify-content: space-between;
            .left {
                width: 300px;