Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunw...

liukangdong

2025-01-24 bd370a168beab21696e1a72acfece672ba017884

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

@@ -37,6 +37,7 @@
                                type="daterange"
                                range-separator="至"
                                v-model="form.date"
                                :picker-options="pickerOptions"
                                @change="changeDate"
                                start-placeholder="开始日期"
                                end-placeholder="结束日期"
@@ -84,11 +85,9 @@
    extends: BaseOpera,
    data () {
      const validateArr = (rule, value, callback) => {
        if (value.length === 0 || !value) {
          callback(new Error('请选择'));
        } else {
          callback();
        }
        if (!value) return callback(new Error('请选择'));
        if (!value.length === 0) return callback(new Error('请选择'));
        callback();
      };
      return {
        form: {
@@ -109,6 +108,11 @@
          billTypeCopy: 0,
          date: []
        },
        pickerOptions: {},
        time: {
          startDate: '',
          endDate: ''
        },
        rules: {
          contractCode: [
            { required: true, message: '请输入', trigger: 'blur' }
@@ -120,7 +124,7 @@
            { required: true, message: '请选择', trigger: 'blur' }
          ],
          date: [
            { validator: validateArr, trigger: 'blur' }
            { required: true, validator: validateArr, trigger: 'blur' }
          ],
          receivableFee: [
            { required: true, message: '请输入', trigger: 'blur' }
@@ -136,8 +140,19 @@
      }
    },
    methods: {
      open (title, target) {
      open (title, target, time) {
        var that = this
        this.title = title
        this.time.startDate = time.startDate
        this.time.endDate = time.endDate
        this.pickerOptions = {
          disabledDate(time) {
            // 如果没有后面的 -8.64e7 就是不可以选择今天的
            const beginDate = new Date(that.time.startDate).getTime() - 8.64e7
            const endDate = new Date(that.time.endDate).getTime()
            return beginDate > time.getTime() || endDate < time.getTime()
          }
        }
        this.getCompany()
        this.visible = true
        // 新建