Merge remote-tracking branch 'origin/master'

jiangping

2024-11-30 d87b6ff6bf0681854bb431e8f8e93652a6540691

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

@@ -10,7 +10,7 @@
            <div class="main_content">
                <el-form :model="form" label-position="top" ref="form" :rules="rules">
                    <div class="head">
                        <div class="m_title">基础信息</div>
                        <div class="m_title">基础信息-{{time.startDate}}~{{time.endDate}}</div>
                        <div class="tabs">
                            <div class="tab" :class="{ active: form.feeType === 0 }" @click="timeTabClick(0)">周期费用</div>
                            <div class="tab" :class="{ active: form.feeType === 1 }" @click="timeTabClick(1)">一次性费用</div>
@@ -37,6 +37,8 @@
                                type="daterange"
                                range-separator="至"
                                v-model="form.date"
                                :min-date="new Date(time.startDate)"
                                :max-date="new Date(time.endDate)"
                                @change="changeDate"
                                start-placeholder="开始日期"
                                end-placeholder="结束日期"
@@ -109,6 +111,10 @@
          billTypeCopy: 0,
          date: []
        },
        time: {
          startDate: '',
          endDate: ''
        },
        rules: {
          contractCode: [
            { required: true, message: '请输入', trigger: 'blur' }
@@ -136,8 +142,10 @@
      }
    },
    methods: {
      open (title, target) {
      open (title, target, time) {
        this.title = title
        this.time.startDate = time.startDate
        this.time.endDate = time.endDate
        this.getCompany()
        this.visible = true
        // 新建