From d00bd9a764eef05204d072a7cf91f4a2b18c4d71 Mon Sep 17 00:00:00 2001 From: xiangxy Date: Mon, 11 Sep 2023 16:24:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=A6=E6=BB=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/device/CheckWork.vue | 26 +++++++++++++++++--------- pages/device/LubricateWork.vue | 18 +++++++++++++----- pages/device/MaintainWork.vue | 2 +- pages/device/RepairWork.vue | 8 -------- 4 files changed, 31 insertions(+), 23 deletions(-) diff --git a/pages/device/CheckWork.vue b/pages/device/CheckWork.vue index ad7543f..b8dcfc7 100644 --- a/pages/device/CheckWork.vue +++ b/pages/device/CheckWork.vue @@ -21,12 +21,12 @@ - + - + @@ -44,8 +44,8 @@ - - + + @@ -86,10 +86,10 @@ this.$set(el, 'invstatus_name', '提交') } if(el.invstatus === '03') { - this.$set(el, 'invstatus_name', '保养开始') + this.$set(el, 'invstatus_name', '点检开始') } if(el.invstatus === '06') { - this.$set(el, 'invstatus_name', '保养结束') + this.$set(el, 'invstatus_name', '点检结束') } if(el.invstatus === '99') { this.$set(el, 'invstatus_name', '审核完毕') @@ -103,6 +103,10 @@ this.disabled = false return } + if (this.pkObj.invstatus !== '02') { + this.disabled = false + return + } try { let res = await sportcheckbegin(this.pkObj) this.disabled = false @@ -122,12 +126,16 @@ this.pkObj = this.pkId === e.maint_code ? e : {} }, toJump () { - if (this.pkId) { + if (!this.pkId) { + return + } + if (this.pkObj.invstatus !== '03') { + return + } this.$store.dispatch('setPublicObj', this.pkObj) uni.navigateTo({ - url: '/pages/device/CheckFill' + url: '/pages/device/RepairFill' }) - } } } } diff --git a/pages/device/LubricateWork.vue b/pages/device/LubricateWork.vue index 3464a1d..1235ddc 100644 --- a/pages/device/LubricateWork.vue +++ b/pages/device/LubricateWork.vue @@ -44,8 +44,8 @@ - - + + @@ -103,6 +103,10 @@ this.disabled = false return } + if (this.pkObj.invstatus !== '02') { + this.disabled = false + return + } try { let res = await lubricatebegin(this.pkObj) this.disabled = false @@ -122,12 +126,16 @@ this.pkObj = this.pkId === e.maint_code ? e : {} }, toJump () { - if (this.pkId) { + if (!this.pkId) { + return + } + if (this.pkObj.invstatus !== '03') { + return + } this.$store.dispatch('setPublicObj', this.pkObj) uni.navigateTo({ - url: '/pages/device/LubricateFill' + url: '/pages/device/RepairFill' }) - } } } } diff --git a/pages/device/MaintainWork.vue b/pages/device/MaintainWork.vue index fdea881..1705211 100644 --- a/pages/device/MaintainWork.vue +++ b/pages/device/MaintainWork.vue @@ -134,7 +134,7 @@ } this.$store.dispatch('setPublicObj', this.pkObj) uni.navigateTo({ - url: '/pages/device/MaintainFill' + url: '/pages/device/RepairFill' }) } } diff --git a/pages/device/RepairWork.vue b/pages/device/RepairWork.vue index 9a48f45..cf67547 100644 --- a/pages/device/RepairWork.vue +++ b/pages/device/RepairWork.vue @@ -107,10 +107,6 @@ } if (this.pkObj.invstatus !== '02') { this.disabled = false - uni.showToast({ - title: '请选择提交状态行数据', - icon: 'none' - }) return } try { @@ -136,10 +132,6 @@ return } if (this.pkObj.invstatus !== '03') { - uni.showToast({ - title: '请选择维修开始状态行数据', - icon: 'none' - }) return } this.$store.dispatch('setPublicObj', this.pkObj)
保养单点检单 设备编号 设备名称 状态 类型计划保养日期计划点检日期