Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/chongzhouRes...

13404089107

2025-04-07 3912d4c58a94df470412a560b8d56f7390cdfac5

Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/chongzhouResettle

 src/views/applicationBatchList/components/ApprovalDialog.vue

@@ -576,7 +576,7 @@

      const params = {
        applyId: Number(this.id), // 确保是数字类型
        reason: this.form.auditComment.trim()||'',
        reason: this.form.auditComment ? this.form.auditComment.trim() : "",
        status: Number(this.form.auditResult === "通过" ? 1 : 2), // 确保是数字类型
      };


 src/views/relocatablePersonnel/add.vue

@@ -251,7 +251,7 @@
            endDateOptions: {
                disabledDate: (time) => {
                    if (this.form.lastBeginTime) {
                        return time.getTime() < this.form.lastBeginTime.getTime()
                        return time.getTime() < new Date(this.form.lastBeginTime).getTime()
                    }
                    return false
                }

 src/views/relocatablePersonnel/detail.vue

@@ -283,7 +283,7 @@
            endDateOptions: {
                disabledDate: (time) => {
                    if (this.form.lastBeginTime) {
                        return time.getTime() < this.form.lastBeginTime.getTime()
                        return time.getTime() < new Date(this.form.lastBeginTime).getTime()
                    }
                    return false
                }