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 1/2] =?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 2/2] =?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';
+ }
}
},