解决冲突

MrShi

2026-04-02 a29e0df3c165dfe2ddd825bb340ed480a64865db

 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="请选择">
@@ -248,14 +249,14 @@
            { required: true, message: '请输入', trigger: 'blur' }
          ]
        },
        
        list: [],

        list: [],
        pickerOptions: {},
        agentList: [],

        receivable: '',
        meet: '',
        

        loading: false
      }
    },
@@ -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
@@ -506,7 +515,7 @@
        .main_box {
            width: 100%;
            display: flex;
            align-items: start;
            align-items: flex-start;
            margin-bottom: 15px;
            justify-content: space-between;
            .main_box_form {