From dca44ad83978aa2e2c5bcf4cf1a2e92af86c3f0b Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Mon, 26 Jan 2026 13:55:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=9C=80=E6=B1=82=E6=8A=8A?= =?UTF-8?q?=E6=B6=89=E5=8F=8A=E5=88=B0=E6=95=B0=E9=87=8F=E7=9A=84=E5=9C=B0?= =?UTF-8?q?=E6=96=B9=E5=85=A8=E9=83=A8=E6=94=B9=E4=B8=BA=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E8=BE=93=E5=85=A50?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../planMange/dailyPlan/forms/projectForm.vue | 6 +++--- .../planMange/dailyPlan/forms/repairForm.vue | 6 +++--- src/views/planMange/dailyPlan/forms/runForm.vue | 6 +++--- src/views/planMange/monthlyPlan/edit.vue | 16 ++++++++-------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/views/planMange/dailyPlan/forms/projectForm.vue b/src/views/planMange/dailyPlan/forms/projectForm.vue index 701aa8b..013f49a 100644 --- a/src/views/planMange/dailyPlan/forms/projectForm.vue +++ b/src/views/planMange/dailyPlan/forms/projectForm.vue @@ -640,7 +640,7 @@ const rules = computed(() => ({ ], proposedProficientDay: [ { required: true, message: '请输入计划投入工日', trigger: 'blur' }, - { pattern: positiveIntegerPattern, message: '请输入正整数', trigger: 'blur' }, + { pattern: nonNegativeIntegerPattern, message: '请输入非负整数', trigger: 'blur' }, ], proposedAssistancePersonnel: [ { required: true, message: '请输入计划投入辅助工人员数量', trigger: 'blur' }, @@ -648,7 +648,7 @@ const rules = computed(() => ({ ], proposedAssistanceDay: [ { required: true, message: '请输入计划投入工日', trigger: 'blur' }, - { pattern: positiveIntegerPattern, message: '请输入正整数', trigger: 'blur' }, + { pattern: nonNegativeIntegerPattern, message: '请输入非负整数', trigger: 'blur' }, ], proposedLongTimeCar: [ { required: true, message: '请输入拟投入长租车数量', trigger: 'blur' }, @@ -694,7 +694,7 @@ const actualRules = computed(() => ({ actualWorkContent: [{ required: true, message: '请输入实际完成工作内容', trigger: 'blur' }], actualWorkload: [ { required: true, message: '请输入实际完成工作量', trigger: 'blur' }, - { pattern: positiveIntegerPattern, message: '请输入正整数', trigger: 'blur' }, + { pattern: nonNegativeIntegerPattern, message: '请输入非负整数', trigger: 'blur' }, ], completionPercentage: [ { diff --git a/src/views/planMange/dailyPlan/forms/repairForm.vue b/src/views/planMange/dailyPlan/forms/repairForm.vue index a202ff2..a02417a 100644 --- a/src/views/planMange/dailyPlan/forms/repairForm.vue +++ b/src/views/planMange/dailyPlan/forms/repairForm.vue @@ -725,7 +725,7 @@ const rules = computed(() => ({ ], proposedProficientDay: [ { required: true, message: '请输入计划投入工日', trigger: 'blur' }, - { pattern: positiveIntegerPattern, message: '请输入正整数', trigger: 'blur' }, + { pattern: nonNegativeIntegerPattern, message: '请输入非负整数', trigger: 'blur' }, ], proposedAssistancePersonnel: [ { required: true, message: '请输入计划投入辅助工人员数量', trigger: 'blur' }, @@ -733,7 +733,7 @@ const rules = computed(() => ({ ], proposedAssistanceDay: [ { required: true, message: '请输入计划投入工日', trigger: 'blur' }, - { pattern: positiveIntegerPattern, message: '请输入正整数', trigger: 'blur' }, + { pattern: nonNegativeIntegerPattern, message: '请输入非负整数', trigger: 'blur' }, ], proposedLongTimeCar: [ { required: true, message: '请输入拟投入长租车数量', trigger: 'blur' }, @@ -780,7 +780,7 @@ const actualRules = computed(() => { ], actualWorkload: [ { required: true, message: '请输入实际完成工作量', trigger: 'blur' }, - { pattern: positiveIntegerPattern, message: '请输入正整数', trigger: 'blur' }, + { pattern: nonNegativeIntegerPattern, message: '请输入非负整数', trigger: 'blur' }, ], completionPercentage: [ { diff --git a/src/views/planMange/dailyPlan/forms/runForm.vue b/src/views/planMange/dailyPlan/forms/runForm.vue index 208f677..e330a83 100644 --- a/src/views/planMange/dailyPlan/forms/runForm.vue +++ b/src/views/planMange/dailyPlan/forms/runForm.vue @@ -434,16 +434,16 @@ const actualRules = computed(() => ({ actualPersonnelList: [{ required: true, message: '请选择实际入作业人员', trigger: 'change' }], actualLongTimeCar: [ { required: true, message: '请输入实际入长租车数量', trigger: 'blur' }, - { pattern: positiveIntegerPattern, message: '请输入非负整数', trigger: 'blur' }, + { pattern: nonNegativeIntegerPattern, message: '请输入非负整数', trigger: 'blur' }, ], actualTemporaryCar: [ { required: true, message: '请输入实际入临租车数量', trigger: 'blur' }, - { pattern: positiveIntegerPattern, message: '请输入非负整数', trigger: 'blur' }, + { pattern: nonNegativeIntegerPattern, message: '请输入非负整数', trigger: 'blur' }, ], actualWorkContent: [{ required: true, message: '请输入实际完成工作内容', trigger: 'blur' }], actualWorkload: [ { required: true, message: '请输入实际完成工作量', trigger: 'blur' }, - { pattern: positiveIntegerPattern, message: '请输入正整数', trigger: 'blur' }, + { pattern: nonNegativeIntegerPattern, message: '请输入非负整数', trigger: 'blur' }, ], completionPercentage: [ { diff --git a/src/views/planMange/monthlyPlan/edit.vue b/src/views/planMange/monthlyPlan/edit.vue index b50aa7e..d50b1ce 100644 --- a/src/views/planMange/monthlyPlan/edit.vue +++ b/src/views/planMange/monthlyPlan/edit.vue @@ -706,7 +706,7 @@ const rules = computed(() => { planCategoryId: [{ required: true, message: '请选择类别', trigger: 'change' }], towerBaseNumber: [ { required: true, message: '请输入 塔基数', trigger: 'blur' }, - { pattern: /^[1-9]\d*$/, message: '请输入正整数', trigger: 'blur' }, + { pattern: /^(0|[1-9]\d*)$/, message: '请输入非负整数', trigger: 'blur' }, ], planPersonnelList: [{ required: true, message: '请选择计划投入管理人员', trigger: 'blur' }], } @@ -717,18 +717,18 @@ const rules = computed(() => { workloadCategoryId: [{ required: true, message: '请选择工作量类别', trigger: 'change' }], workloadNum: [ { required: true, message: '请输入工作量', trigger: 'blur' }, - { pattern: /^[1-9]\d*$/, message: '请输入正整数', trigger: 'blur' }, + { pattern: /^(0|[1-9]\d*)$/, message: '请输入非负整数', trigger: 'blur' }, ], })) // 添加其他字段的规则 baseRules.planCarNum = [ { required: true, message: '请输入管理人员车辆数', trigger: 'blur' }, - { pattern: /^[1-9]\d*$/, message: '请输入正整数', trigger: 'blur' }, + { pattern: /^(0|[1-9]\d*)$/, message: '请输入非负整数', trigger: 'blur' }, ] baseRules.planSkilledWorkerNum = [ { required: true, message: '请输入熟练工人员数量', trigger: 'blur' }, - { pattern: /^[1-9]\d*$/, message: '请输入正整数', trigger: 'blur' }, + { pattern: /^(0|[1-9]\d*)$/, message: '请输入非负整数', trigger: 'blur' }, ] baseRules.planAuxiliaryWorkerNum = [ { required: true, message: '请输入辅助工人员数量', trigger: 'blur' }, @@ -736,19 +736,19 @@ const rules = computed(() => { ] baseRules.planSkilledWorkerDay = [ { required: true, message: '请输入工日', trigger: 'blur' }, - { pattern: /^[1-9]\d*$/, message: '请输入正整数', trigger: 'blur' }, + { pattern: /^(0|[1-9]\d*)$/, message: '请输入非负整数', trigger: 'blur' }, ] baseRules.planAuxiliaryWorkerDay = [ { required: true, message: '请输入工日', trigger: 'blur' }, - { pattern: /^[1-9]\d*$/, message: '请输入正整数', trigger: 'blur' }, + { pattern: /^(0|[1-9]\d*)$/, message: '请输入非负整数', trigger: 'blur' }, ] baseRules.planSubCarNum = [ { required: true, message: '请输入分包车辆数', trigger: 'blur' }, - { pattern: /^[1-9]\d*$/, message: '请输入正整数', trigger: 'blur' }, + { pattern: /^(0|[1-9]\d*)$/, message: '请输入非负整数', trigger: 'blur' }, ] baseRules.actualWorkingDay = [ { required: true, message: '请输入实际工作天数', trigger: 'blur' }, - { pattern: /^[1-9]\d*$/, message: '请输入正整数', trigger: 'blur' }, + { pattern: /^(0|[1-9]\d*)$/, message: '请输入非负整数', trigger: 'blur' }, ] return baseRules