From a3a667912e5268ebc49864cb57b028d849a36f25 Mon Sep 17 00:00:00 2001 From: zhen <1173776308@qq.com> Date: Fri, 19 Jul 2024 10:47:33 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=8F=96=E5=80=BC?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/smart/operationticket.vue | 1 - src/views/smart/operationticketDetail.vue | 26 +++++++++++----------- src/views/smart/workpermit.vue | 1 - src/views/smart/workpermitDetail.vue | 27 +++++++++++------------ 4 files changed, 26 insertions(+), 29 deletions(-) diff --git a/src/views/smart/operationticket.vue b/src/views/smart/operationticket.vue index 6e4bc31..81702d7 100644 --- a/src/views/smart/operationticket.vue +++ b/src/views/smart/operationticket.vue @@ -651,7 +651,6 @@ import {getList, getDetail, add, update, remove, closeticket} from "@/api/smart/ frameMode:"search", id: row.id, operationTicketNo:row.operationTicketNo, - reviewStatus: row.reviewStatus }, }); }, diff --git a/src/views/smart/operationticketDetail.vue b/src/views/smart/operationticketDetail.vue index 54e5a47..204159c 100644 --- a/src/views/smart/operationticketDetail.vue +++ b/src/views/smart/operationticketDetail.vue @@ -634,19 +634,6 @@ export default { this.frame_class = 'frame_class1'; this.SearchDetail(); } - switch (this.$route.query.reviewStatus){ - case 1: - this.form = "审核中"; - break; - case 2: - this.form = "已审核"; - break; - case 3: - this.form = "未通过"; - break; - default: - this.form =" "; - } // if(this.$route.query.reviewStatus ===1){ // this.form = "审核中"; // }else if(this.$route.query.reviewStatus ===2){ @@ -842,6 +829,19 @@ export default { getDetail(this.$route.query.id).then(res => { console.log(res); this.tab1_form = res.data.data; + switch (this.tab1_form.reviewStatus){ + case 1: + this.form = "审核中"; + break; + case 2: + this.form = "已审核"; + break; + case 3: + this.form = "未通过"; + break; + default: + this.form =" "; + } }); }, auditing() { diff --git a/src/views/smart/workpermit.vue b/src/views/smart/workpermit.vue index 945cb31..56342c2 100644 --- a/src/views/smart/workpermit.vue +++ b/src/views/smart/workpermit.vue @@ -435,7 +435,6 @@ query: { frameMode:"search", id: row.id, - checkstatus: row.checkStatus, ticketCode:row.ticketCode }, }); diff --git a/src/views/smart/workpermitDetail.vue b/src/views/smart/workpermitDetail.vue index 612108e..93c71d2 100644 --- a/src/views/smart/workpermitDetail.vue +++ b/src/views/smart/workpermitDetail.vue @@ -547,20 +547,6 @@ create_date.display = false; const ticketCode = this.findObject(this.optionParam.column, "ticketCode"); ticketCode.display = false; - - switch (this.$route.query.checkstatus){ - case 1: - this.form = "审核中"; - break; - case 2: - this.form = "已审核"; - break; - case 3: - this.form = "未通过"; - break; - default: - this.form =" "; - } }, methods: { handleFormSubmit() { @@ -714,6 +700,19 @@ getDetail(this.$route.query.id).then(res => { console.log(res); this.tab1_form = res.data.data; + switch (this.tab1_form.checkStatus){ + case 1: + this.form = "审核中"; + break; + case 2: + this.form = "已审核"; + break; + case 3: + this.form = "未通过"; + break; + default: + this.form =" "; + } }); }, closeTicket() { From 5e50fd9e4488e0df1c51e3d34688b884a239cf7b Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Fri, 19 Jul 2024 10:48:23 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=8F=96=E5=BE=97=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/leger/equipmentledger.vue | 3 +- src/views/leger/equipmentledgerDetail.vue | 52 ++++++----------------- src/views/smart/workorder.vue | 3 +- src/views/smart/workorderDetail.vue | 21 ++++++--- 4 files changed, 32 insertions(+), 47 deletions(-) diff --git a/src/views/leger/equipmentledger.vue b/src/views/leger/equipmentledger.vue index 9a955d5..e11e975 100644 --- a/src/views/leger/equipmentledger.vue +++ b/src/views/leger/equipmentledger.vue @@ -562,8 +562,7 @@ import {getList, getDetail, add, update, remove, reject, auditing} from "@/api/l path: "/leger/equipmentledgerDetail", query: { frameMode:"search", - id: row.id, - checkstatus: row.checkStatus + id: row.id }, }); }, diff --git a/src/views/leger/equipmentledgerDetail.vue b/src/views/leger/equipmentledgerDetail.vue index 4c4bbcf..8e92c3a 100644 --- a/src/views/leger/equipmentledgerDetail.vue +++ b/src/views/leger/equipmentledgerDetail.vue @@ -6,15 +6,7 @@ 审核状态: - - - - - - - - - + @@ -141,20 +133,6 @@ } }; return { - checkStatusValue: this.$route.query.checkstatus, - optionCheckStatus: [{ - value: 1, - label: '审核中' - }, { - value: 2, - label: '已审核' - }, { - value: 3, - label: '未通过' - }, { - value: 4, - label: ' ' - }], frame_class: '', type: {}, shouldShowButton:{}, @@ -699,7 +677,6 @@ this.addUpdateShowButton=false; this.UpdateShowButton=true; this.frame_class = 'frame_class1'; - this.checkStatusValue = this.$route.query.checkstatus; this.SearchDetail(); }else{ this.readonlyForm=false; @@ -707,20 +684,6 @@ this.UpdateShowButton=false; this.addUpdateShowButton=true; this.frame_class = null; - this.checkStatusValue = 4; - } - switch (this.$route.query.checkstatus){ - case 1: - this.form = "审核中"; - break; - case 2: - this.form = "已审核"; - break; - case 3: - this.form = "未通过"; - break; - default: - this.form =" "; } }, methods: { @@ -922,6 +885,19 @@ getDetail(this.$route.query.id).then(res => { console.log(res); this.tab1_form = res.data.data; + switch (this.tab1_form.checkStatus){ + case 1: + this.form = "审核中"; + break; + case 2: + this.form = "已审核"; + break; + case 3: + this.form = "未通过"; + break; + default: + this.form =" "; + } }); }, auditing() { diff --git a/src/views/smart/workorder.vue b/src/views/smart/workorder.vue index 0b8b363..60e425d 100644 --- a/src/views/smart/workorder.vue +++ b/src/views/smart/workorder.vue @@ -493,8 +493,7 @@ path: "/workorder/detail", query: { frameMode:"search", - id: row.id, - checkstatus: row.approvalStatus + id: row.id }, }); }, diff --git a/src/views/smart/workorderDetail.vue b/src/views/smart/workorderDetail.vue index e82638d..22b96b9 100644 --- a/src/views/smart/workorderDetail.vue +++ b/src/views/smart/workorderDetail.vue @@ -4,8 +4,9 @@
- - {{ getOptionCheckStatusLabel($route.query.checkstatus) }} + + 审核状态: +
@@ -58,7 +59,6 @@ value: 4, label: '' }], - checkStatusValue: this.$route.query.checkstatus, item_form: {}, option: { column: [{ @@ -316,7 +316,6 @@ this.shouldShowButton = false; this.addupdateShowButton = true; this.frame_class = null; - this.checkStatusValue = this.$route.query.checkstatus; this.searchDetail(); } else if (this.$route.query.frameMode == "search") { this.tab1_option.column[1].disabled = false; @@ -326,7 +325,6 @@ this.addupdateShowButton = false; this.frame_class = 'frame_class1'; this.searchDetail(); - this.checkStatusValue = 4; } }, methods: { @@ -363,6 +361,19 @@ searchDetail() { getDetail(this.$route.query.id).then(res => { this.tab1_form = res.data.data; + switch (this.tab1_form.approvalStatus){ + case 1: + this.form = "审核中"; + break; + case 2: + this.form = "已审核"; + break; + case 3: + this.form = "未通过"; + break; + default: + this.form =" "; + } }); }, submitForm() { From fa8236607c73bb7633fb91f64cd6b9fe2128c4e0 Mon Sep 17 00:00:00 2001 From: zhen <1173776308@qq.com> Date: Fri, 19 Jul 2024 11:16:08 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=8F=B0=E8=B4=A6?= =?UTF-8?q?=E8=AF=A6=E7=BB=86=E8=B7=AF=E7=94=B1=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/views/index.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/router/views/index.js b/src/router/views/index.js index bdc3584..15eaff1 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -180,5 +180,19 @@ export default [{ import( /* webpackChunkName: "views" */ '@/views/smart/operationticketDetail') }] }, + { + path: '/leger', + component: Layout, + redirect: '/leger/index', + children: [{ + path: 'dynamicledgerDetail', + name: '动态台账详情', + meta: { + menu: false + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/leger/dynamicledgerDetail') + }] + }, ] From e1b1a0934d59162c228f3fe64c3661bd99e0b205 Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Fri, 19 Jul 2024 13:39:01 +0800 Subject: [PATCH 4/8] =?UTF-8?q?bug=20=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inspection/inspectiontasks.vue | 21 +++++++++++++------ .../inspection/inspectiontasksDetail.vue | 12 +++++------ 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/views/inspection/inspectiontasks.vue b/src/views/inspection/inspectiontasks.vue index ddebc78..9d70f11 100644 --- a/src/views/inspection/inspectiontasks.vue +++ b/src/views/inspection/inspectiontasks.vue @@ -21,7 +21,7 @@