解决冲突

MrShi

2026-04-02 a29e0df3c165dfe2ddd825bb340ed480a64865db

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

@@ -249,14 +249,14 @@
            { required: true, message: '请输入', trigger: 'blur' }
          ]
        },
        

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

        receivable: '',
        meet: '',
        

        loading: false
      }
    },
@@ -515,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 {