Merge remote-tracking branch 'origin/main'

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: [{

src/views/smart/operationticketDetail.vue

@@ -77,7 +77,7 @@
                      驳回</el-button>
           <el-button type="primary"
                      size="small"
-                     @click="seachToUpdate"
+                     @click="searchToUpdate"
                      v-if="shouldShowButton">
                       修改</el-button>
           <el-button type="primary"
@@ -340,9 +340,9 @@ export default {
                 rules: [{
                   required: true,
                 }],
-                type: "date",
+                type: "datetime",
-                format: 'yyyy/MM/dd',
+                format: 'yyyy/MM/dd HH:mm:ss',
-                valueFormat: "yyyyMMdd",
+                valueFormat: "yyyyMMddHH:mm:ss",
                 span: 8,
                 maxlength: 20,
               },
@@ -352,9 +352,9 @@ export default {
                 rules: [{
                   required: true,
                 }],
-                type: "date",
+                type: "datetime",
-                format: 'yyyy/MM/dd',
+                format: 'yyyy/MM/dd HH:mm:ss',
-                valueFormat: "yyyyMMdd",
+                valueFormat: "yyyyMMddHH:mm:ss",
                 span: 8,
                 maxlength: 20,
               },
@@ -364,9 +364,9 @@ export default {
                 rules: [{
                   required: true,
                 }],
-                type: "date",
+                type: "datetime",
-                format: 'yyyy/MM/dd',
+                format: 'yyyy/MM/dd HH:mm:ss',
-                valueFormat: "yyyyMMdd",
+                valueFormat: "yyyyMMddHH:mm:ss",
                 span: 8,
                 maxlength: 20,
               },
@@ -613,7 +613,7 @@ export default {
   created () {
     this.type = this.option.column[0];
     // this.option.column.push({ label: '操作项目', prop: 'operationItem' });
-    if(this.$route.query.frameMode == "add"){
+    if(this.$route.query.frameMode === "add"){
       this.readonlyForm=false;
       this.shouldShowButton=false;
       this.addUpdateShowButton=true;
@@ -665,14 +665,14 @@ export default {
     },
     // 处理表单提交
     Submit() {
-      if(this.$route.query.frameMode=="add"){
+      if(this.$route.query.frameMode==="add"){
         this.$confirm("是否新增所填数据?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          this.tab1_form.reviewStatus="1"
+          this.tab1_form.reviewStatus="1";
-          this.tab1_form.sts= "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 {
+        if(this.$route.query.frameMode!=="add"){
+          this.updateToSearch()
         }else {
-        this.addUpdateShowButton=true;
+          this.addUpdateShowButton = this.type.prop !== 'operationItem';
+        }
       }
     },