From 7494428859781b3e6a03804c766158316edb4af2 Mon Sep 17 00:00:00 2001 From: zhen <1173776308@qq.com> Date: Tue, 16 Jul 2024 17:17:47 +0800 Subject: [PATCH 1/6] =?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/smart/operationticketDetail.vue | 172 +++++++++++++++++++--- 1 file changed, 148 insertions(+), 24 deletions(-) diff --git a/src/views/smart/operationticketDetail.vue b/src/views/smart/operationticketDetail.vue index e660bf5..342fd10 100644 --- a/src/views/smart/operationticketDetail.vue +++ b/src/views/smart/operationticketDetail.vue @@ -5,14 +5,15 @@ 审核状态: - - - - + + + + + + + + + @@ -59,6 +60,11 @@ @click="back" v-if="addUpdateShowButton"> 取消 + + 关票 + + + +
+ + 取消 + + 关票 + + +
+ From a8ad498a60c7b171000d7338a40702704bdbe40b Mon Sep 17 00:00:00 2001 From: zhen <1173776308@qq.com> Date: Wed, 17 Jul 2024 09:21:10 +0800 Subject: [PATCH 3/6] =?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/smart/operationticket.vue | 2 ++ src/views/smart/operationticketDetail.vue | 18 +++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/views/smart/operationticket.vue b/src/views/smart/operationticket.vue index edc7786..6d0be57 100644 --- a/src/views/smart/operationticket.vue +++ b/src/views/smart/operationticket.vue @@ -254,6 +254,7 @@ import {getList, getDetail, add, update, remove, closeticket} from "@/api/smart/ { label: "计划结束时间", prop: "plannedEndTime", + type: "date", format: 'yyyy/MM/dd', valueFormat: "yyyyMMdd", rules: [{ @@ -265,6 +266,7 @@ import {getList, getDetail, add, update, remove, closeticket} from "@/api/smart/ { label: "签发时间", prop: "workIssuanceTime", + type: "date", format: 'yyyy/MM/dd', valueFormat: "yyyyMMdd", rules: [{ diff --git a/src/views/smart/operationticketDetail.vue b/src/views/smart/operationticketDetail.vue index 342fd10..941056d 100644 --- a/src/views/smart/operationticketDetail.vue +++ b/src/views/smart/operationticketDetail.vue @@ -340,9 +340,9 @@ export default { rules: [{ required: true, }], - type: "date", - format: 'yyyy/MM/dd', - valueFormat: "yyyyMMdd", + type: "datetime", + format: 'yyyy/MM/dd HH:mm:ss', + valueFormat: "yyyyMMddHH:mm:ss", span: 8, maxlength: 20, }, @@ -352,9 +352,9 @@ export default { rules: [{ required: true, }], - type: "date", - format: 'yyyy/MM/dd', - valueFormat: "yyyyMMdd", + type: "datetime", + format: 'yyyy/MM/dd HH:mm:ss', + valueFormat: "yyyyMMddHH:mm:ss", span: 8, maxlength: 20, }, @@ -364,9 +364,9 @@ export default { rules: [{ required: true, }], - type: "date", - format: 'yyyy/MM/dd', - valueFormat: "yyyyMMdd", + type: "datetime", + format: 'yyyy/MM/dd HH:mm:ss', + valueFormat: "yyyyMMddHH:mm:ss", span: 8, maxlength: 20, }, From 19924726b3be760a27d4d736f413d982ef53256c Mon Sep 17 00:00:00 2001 From: zhen <1173776308@qq.com> Date: Wed, 17 Jul 2024 10:10:06 +0800 Subject: [PATCH 4/6] =?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/smart/operationticketDetail.vue | 26 ++++++++++++++--------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/views/smart/operationticketDetail.vue b/src/views/smart/operationticketDetail.vue index 941056d..f86478a 100644 --- a/src/views/smart/operationticketDetail.vue +++ b/src/views/smart/operationticketDetail.vue @@ -77,7 +77,7 @@ 驳回 修改 { - this.tab1_form.reviewStatus="1" - this.tab1_form.sts= "1" + this.tab1_form.reviewStatus="1"; + this.tab1_form.sts= "1" ; add(this.tab1_form).then(()=>{ this.$router.push({ path: "/smart/operationticket", @@ -697,7 +697,7 @@ export default { type: "warning" }).then(() => { this.tab1_form.reviewStatus="1" - add(this.tab1_form).then(() => { + update(this.tab1_form).then(() => { this.$router.push({ path: "/smart/operationticket", query: {}, @@ -716,14 +716,14 @@ export default { } }, back() { - if(this.$route.query.frameMode=="add") { + if(this.$route.query.frameMode==="add") { this.$router.push({path: "/smart/operationticket"}); }else{ this.updateToSearch(); this.SearchDetail(); } }, - seachToUpdate () { + searchToUpdate () { this.shouldShowButton=false; this.addUpdateShowButton=true; this.readonlyForm=false; @@ -740,9 +740,15 @@ export default { this.item_form.operationTicketNo = this.tab1_form.operationTicketNo; this.item_onLoad(); if(this.type.prop==='operationItem'){ + this.shouldShowButton=false; this.addUpdateShowButton=false; - }else { - this.addUpdateShowButton=true; + } + else { + if(this.$route.query.frameMode!=="add"){ + this.updateToSearch() + }else { + this.addUpdateShowButton = this.type.prop !== 'operationItem'; + } } }, From a2349133d848d95ada19295360def84c8be19890 Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Wed, 17 Jul 2024 10:16:49 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=9C=BA=E7=AB=99=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inspection/inspectionPlanDetail.vue | 16 ---------------- src/views/inspection/inspectionplan.vue | 11 ----------- src/views/inspection/inspectionroute.vue | 11 ----------- src/views/inspection/inspectionrouteDetail.vue | 16 ---------------- 4 files changed, 54 deletions(-) diff --git a/src/views/inspection/inspectionPlanDetail.vue b/src/views/inspection/inspectionPlanDetail.vue index 9f8e359..1133e82 100644 --- a/src/views/inspection/inspectionPlanDetail.vue +++ b/src/views/inspection/inspectionPlanDetail.vue @@ -67,22 +67,6 @@ trigger: "blur" }] }, - { - label: "场站", - prop: "station", - type: "select", - span: 8, - dicUrl: "/api/daf-system/dict/dictionary?code=station", - props: { - label: "dictValue", - value: "dictKey" - }, - rules: [{ - required: true, - message: "请输入场站", - trigger: "blur" - }] - }, { label: "计划类型", prop: "planType", diff --git a/src/views/inspection/inspectionplan.vue b/src/views/inspection/inspectionplan.vue index f86c52d..fe10031 100644 --- a/src/views/inspection/inspectionplan.vue +++ b/src/views/inspection/inspectionplan.vue @@ -118,17 +118,6 @@ prop: "planName", search: true }, - { - label: "场站", - prop: "station", - type: "select", - search: true, - dicUrl: "/api/daf-system/dict/dictionary?code=station", - props: { - label: "dictValue", - value: "dictKey" - } - }, { label: "计划类型", prop: "planType" diff --git a/src/views/inspection/inspectionroute.vue b/src/views/inspection/inspectionroute.vue index 6490ca4..da181dc 100644 --- a/src/views/inspection/inspectionroute.vue +++ b/src/views/inspection/inspectionroute.vue @@ -118,17 +118,6 @@ prop: "routeName", search: true }, - { - label: "场站", - prop: "stations", - type: "select", - search: true, - dicUrl: "/api/daf-system/dict/dictionary?code=station", - props: { - label: "dictValue", - value: "dictKey" - } - }, { label: "类型", prop: "type", diff --git a/src/views/inspection/inspectionrouteDetail.vue b/src/views/inspection/inspectionrouteDetail.vue index 018c087..49538f7 100644 --- a/src/views/inspection/inspectionrouteDetail.vue +++ b/src/views/inspection/inspectionrouteDetail.vue @@ -58,22 +58,6 @@ trigger: "blur" }] }, - { - label: "场站", - prop: "stations", - type: "select", - span: 8, - dicUrl: "/api/daf-system/dict/dictionary?code=station", - props: { - label: "dictValue", - value: "dictKey" - }, - rules: [{ - required: true, - message: "请输入场站", - trigger: "blur" - }] - }, { label: "类型", prop: "type", From fb6850c5a26131b12a8307da8c6a598ea7575ed2 Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Wed, 17 Jul 2024 10:45:33 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=B7=A5=E5=99=A8=E5=85=B7=E7=94=BB?= =?UTF-8?q?=E9=9D=A2=E5=85=B3=E8=81=94=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inspection/inspectiontasks.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/api/inspection/inspectiontasks.js b/src/api/inspection/inspectiontasks.js index cb03e19..7aae4e0 100644 --- a/src/api/inspection/inspectiontasks.js +++ b/src/api/inspection/inspectiontasks.js @@ -69,3 +69,14 @@ export const stop = (ids, reason) => { }) } + +export const task_getListByToolsCodeId = (legerId) => { + return request({ + url: '/api/inspection/inspectiontasks/getListByToolsCodeId', + method: 'get', + params: { + legerId: legerId + } + }) +} +