From ea3f75bf35a6912fe8efbdc922f0163df1b325aa Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Thu, 18 Jul 2024 15:28:44 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=A1=B5=E6=95=B0=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E9=99=90=E5=88=B6=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/leger/equipmentledgerDetail.vue | 2 ++ src/views/leger/toolinventoryrecordDetail.vue | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/views/leger/equipmentledgerDetail.vue b/src/views/leger/equipmentledgerDetail.vue index b0b880c..7ab5584 100644 --- a/src/views/leger/equipmentledgerDetail.vue +++ b/src/views/leger/equipmentledgerDetail.vue @@ -614,6 +614,8 @@ { label: "页数", prop: "page", + type: 'number', + step: 1, span: 20, rules: [{ required: true, diff --git a/src/views/leger/toolinventoryrecordDetail.vue b/src/views/leger/toolinventoryrecordDetail.vue index 22e5151..460e0d1 100644 --- a/src/views/leger/toolinventoryrecordDetail.vue +++ b/src/views/leger/toolinventoryrecordDetail.vue @@ -552,6 +552,8 @@ export default { label: "页数", prop: "page", span: 20, + type: 'number', + step: 1, rules: [{ required: true, message: "请输入页数", From 71ecb9851b1c8f8853ad46fd4fbf4540c40f3f5a Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Thu, 18 Jul 2024 15:38:19 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=BC=80=E5=A7=8B=20chec?= =?UTF-8?q?k=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inspection/inspectionPlanDetail.vue | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/views/inspection/inspectionPlanDetail.vue b/src/views/inspection/inspectionPlanDetail.vue index a8578f0..e9f74ec 100644 --- a/src/views/inspection/inspectionPlanDetail.vue +++ b/src/views/inspection/inspectionPlanDetail.vue @@ -31,7 +31,16 @@ export default { name: "inspectionPlanDetail", data() { - var validateTime = (rule, value, callback) => { + var validateStart = (rule, value, callback) => { + if (value === '') { + callback(new Error('请输入计划开始时间')); + } else if(value > this.form.endTime) { + callback(new Error('输入的计划起始时间大于计划终了时间')); + } else { + callback(); + } + }; + var validateEnd = (rule, value, callback) => { if (value === '') { callback(new Error('请输入计划终了时间')); } else if(this.form.startTime > value) { @@ -105,11 +114,7 @@ labelWidth: 120, format: 'yyyy年MM月dd日', valueFormat: "yyyyMMdd", - rules: [{ - required: true, - message: "请输入计划起始时间", - trigger: "blur" - }] + rules: [{required: true, validator: validateStart, trigger: 'blur' }] }, { label: "计划终了时间", @@ -119,7 +124,7 @@ labelWidth: 120, format: 'yyyy年MM月dd日', valueFormat: "yyyyMMdd", - rules: [{required: true, validator: validateTime, trigger: 'blur' }] + rules: [{required: true, validator: validateEnd, trigger: 'blur' }] }, { label: "状态", From 62df539108d637fea8740678e78f84e95c148c14 Mon Sep 17 00:00:00 2001 From: zhen <1173776308@qq.com> Date: Thu, 18 Jul 2024 15:51:05 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=9C=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/release/productioninformation.vue | 13 +++++++++---- src/views/smart/operationticket.vue | 10 +++++++--- src/views/smart/operationticketDetail.vue | 11 ++++++----- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/views/release/productioninformation.vue b/src/views/release/productioninformation.vue index cb0ae68..6890535 100644 --- a/src/views/release/productioninformation.vue +++ b/src/views/release/productioninformation.vue @@ -31,35 +31,40 @@ 新增 发布 停用 批量驳回 批量审核 diff --git a/src/views/smart/operationticket.vue b/src/views/smart/operationticket.vue index 811af90..6a55c54 100644 --- a/src/views/smart/operationticket.vue +++ b/src/views/smart/operationticket.vue @@ -32,29 +32,33 @@ 新增 批量驳回 批量审核 导出 新增 @@ -63,27 +64,27 @@ + v-if="shouldShowButton && permission.operationticket_close"> 关票 + v-if="shouldShowButton && permission.operationticket_audit"> 审核 + v-if="shouldShowButton && permission.operationticket_reject"> 驳回 + v-if="shouldShowButton && permission.operationticket_edit"> 修改 + v-if="shouldShowButton && permission.operationticket_delete"> 删除 From 036ade140b054ca635800c0aeae94dcba4e31dd0 Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Thu, 18 Jul 2024 15:52:04 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=BC=80=E5=A7=8B=E7=BB=88=E4=BA=86=20chec?= =?UTF-8?q?k=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inspection/inspectionPlanDetail.vue | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/views/inspection/inspectionPlanDetail.vue b/src/views/inspection/inspectionPlanDetail.vue index e9f74ec..e52e3bf 100644 --- a/src/views/inspection/inspectionPlanDetail.vue +++ b/src/views/inspection/inspectionPlanDetail.vue @@ -34,8 +34,10 @@ var validateStart = (rule, value, callback) => { if (value === '') { callback(new Error('请输入计划开始时间')); - } else if(value > this.form.endTime) { - callback(new Error('输入的计划起始时间大于计划终了时间')); + } else if(this.form.endTime !== null && this.form.endTime !== '') { + if(value > this.form.endTime) { + callback(new Error('输入的计划起始时间大于计划终了时间')); + } } else { callback(); } @@ -43,8 +45,10 @@ var validateEnd = (rule, value, callback) => { if (value === '') { callback(new Error('请输入计划终了时间')); - } else if(this.form.startTime > value) { - callback(new Error('输入的计划起始时间大于计划终了时间')); + } else if(this.form.startTime !== null && this.form.startTime !== '') { + if(this.form.startTime > value) { + callback(new Error('输入的计划终了时间小于计划起始时间')); + } } else { callback(); } From 9870db3da05ce73175615914f7a2fc6c7f7c8837 Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Thu, 18 Jul 2024 15:54:37 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=97=A5=E6=9C=9Fcheck=20=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inspection/inspectiontasks.vue | 4 ++++ .../inspection/inspectiontasksDetail.vue | 21 ++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/views/inspection/inspectiontasks.vue b/src/views/inspection/inspectiontasks.vue index 04fdae2..cff2358 100644 --- a/src/views/inspection/inspectiontasks.vue +++ b/src/views/inspection/inspectiontasks.vue @@ -109,6 +109,10 @@ callback(new Error('请输入任务执行开始时间')); } else if(this.currStartDate > value.replaceAll('/','').slice(0, 8)) { callback(new Error('输入的任务执行开始时间小于任务开始日期')); + }else if(this.resultForm.executeEndDate !== '' && this.resultForm.executeEndDate !== null) { + if(this.resultForm.executeEndDate.trim().replaceAll('/','') < value.trim().replaceAll('/','')) { + callback(new Error('输入的任务执行开始时间大于任务执行结束时间')); + } } else { callback(); } diff --git a/src/views/inspection/inspectiontasksDetail.vue b/src/views/inspection/inspectiontasksDetail.vue index c3c4970..63769ec 100644 --- a/src/views/inspection/inspectiontasksDetail.vue +++ b/src/views/inspection/inspectiontasksDetail.vue @@ -52,7 +52,18 @@ import request from "@/router/axios"; export default { name: "inspectiontasksDetail", data () { - var validateTime = (rule, value, callback) => { + var validateStartTime = (rule, value, callback) => { + if (value === '') { + callback(new Error('请输入任务开始日期')); + } else if(this.information_form.taskEndDate !== '' && this.information_form.taskEndDate !== null) { + if(this.information_form.taskEndDate < value) { + callback(new Error('输入的任务开始日期大于任务完成日期')); + } + } else { + callback(); + } + }; + var validateEndTime = (rule, value, callback) => { if (value === '') { callback(new Error('请输入任务完成日期')); } else if(this.information_form.taskStartDate > value) { @@ -132,11 +143,7 @@ export default { labelWidth: 120, format: 'yyyy年MM月dd日', valueFormat: "yyyyMMdd", - rules: [{ - required: true, - message: "请输入任务开始日期", - trigger: "blur" - }] + rules: [{required: true, validator: validateStartTime, trigger: 'blur' }] }, { label: "任务完成日期", @@ -146,7 +153,7 @@ export default { labelWidth: 120, format: 'yyyy年MM月dd日', valueFormat: "yyyyMMdd", - rules: [{required: true, validator: validateTime, trigger: 'blur' }] + rules: [{required: true, validator: validateEndTime, trigger: 'blur' }] }, { label: "对象编号",