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

jiangping

2025-06-06 77946261ec663aa1fe7f6f97e550532ed879f982

 admin/src/views/contract/components/terminateLease.vue

@@ -27,6 +27,7 @@
                            <el-date-picker
                                v-model="form.btDate"
                                type="date"
                                :picker-options="pickerOptions"
                                @change="changeBtDate"
                                value-format="yyyy-MM-dd"
                                placeholder="请选择">
@@ -56,12 +57,12 @@
                        <el-table-column prop="projectName" label="项目名称" show-overflow-tooltip />
                        <el-table-column label="房源名称" show-overflow-tooltip>
                            <template slot-scope="{row}">
                                {{row.buildingName}}/{{row.code}}
                                {{row.buildingName}}/{{row.roomNum}}
                            </template>
                        </el-table-column>
                        <el-table-column label="租赁面积(㎡)" show-overflow-tooltip>
                            <template slot-scope="{row}">
                                {{row.area}}㎡
                                {{row.rentArea}}㎡
                            </template>
                        </el-table-column>
                    </el-table>
@@ -96,7 +97,7 @@
                            <i class="el-icon-delete"
                               style="color: red; margin-left: 10px; font-size: 18px; cursor: pointer;"
                               @click="deleRow(scope.$index)"
                               v-if="scope.row.date && scope.row.date.length !==0">
                               v-if="scope.row.isDele">
                            </i>
                        </div>
                    </template>
@@ -250,7 +251,7 @@
        },
        
        list: [],

        pickerOptions: {},
        agentList: [],

        receivable: '',
@@ -263,6 +264,14 @@
      open (title, info) {
        this.title = title
        this.info = info
        this.pickerOptions = {
          disabledDate(time) {
            // 如果没有后面的 -8.64e7 就是不可以选择今天的
            const beginDate = new Date(info.startDate).getTime() - 8.64e7
            const endDate = new Date(info.endDate).getTime()
            return beginDate > time.getTime() || endDate < time.getTime()
          }
        }
        this.form.id = info.id
        this.form.btSignDate = this.getDay()
        this.form.btUserId = this.userInfo.id
@@ -370,9 +379,9 @@
        })
      },
      getObjS (obj) {
        console.log(obj)
        obj.startDate = obj.startDate.substring(0, 10)
        obj.endDate = obj.endDate.substring(0, 10)
        obj.isDele = true
        this.info.terminateList.push(obj)
        this.countData()
      },