Merge remote-tracking branch 'origin/main'

src/views/smart/operationticket.vue

@@ -93,6 +93,7 @@ import {getList, getDetail, add, update, remove, closeticket} from "@/api/smart/
       return {
         form: {},
         updateid:0,
+        search:{},
         query: {},
         loading: true,
         closeTicketBox: false,
@@ -700,7 +701,7 @@ import {getList, getDetail, add, update, remove, closeticket} from "@/api/smart/
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          expUtil.excelExport(`/api/smart/operationticket/export?daf-auth=${getToken()}`, this.search);
+          expUtil.excelExportEasy(`/api/smart/operationticket/export?daf-auth=${getToken()}`, this.search);
         });
       },
     }

src/views/smart/operationticketDetail.vue

@@ -51,15 +51,15 @@
     <div class="container">
        <span >
          <el-button type="primary"
-                     size="large"
-                     @click="handleFormSubmit"
-                     v-if="addUpdateShowButton">
-                     确定</el-button>
-          <el-button type="text"
                               size="large"
                               @click="back"
                               v-if="addUpdateShowButton">
                      取消</el-button>
+          <el-button type="primary"
+                     size="large"
+                     @click="handleFormSubmit"
+                     v-if="addUpdateShowButton">
+                     确定</el-button>
          <el-button type="primary"
                     size="small"
                     @click="handleDetailcls"
@@ -339,6 +339,8 @@ export default {
                 prop: "plannedStartTime",
                 rules: [{
                   required: true,
+                  message: "请输入计划开始时间",
+                  trigger: "blur"
                 }],
                 type: "datetime",
                 format: 'yyyy/MM/dd HH:mm:ss',
@@ -351,6 +353,8 @@ export default {
                 prop: "plannedEndTime",
                 rules: [{
                   required: true,
+                  message: "请输入计划结束时间",
+                  trigger: "blur"
                 }],
                 type: "datetime",
                 format: 'yyyy/MM/dd HH:mm:ss',
@@ -363,6 +367,8 @@ export default {
                 prop: "workIssuanceTime",
                 rules: [{
                   required: true,
+                  message: "请输入计划工作签发时间",
+                  trigger: "blur"
                 }],
                 type: "datetime",
                 format: 'yyyy/MM/dd HH:mm:ss',