From 0afd65f44ac1e4b7c3599e5e3f9bfecdf8b7773d Mon Sep 17 00:00:00 2001
From: weitingdong <2480899115@qq.com>
Date: Thu, 18 Jul 2024 14:46:53 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=A5=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/smart/workpermitDetail.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/views/smart/workpermitDetail.vue b/src/views/smart/workpermitDetail.vue
index 1343291..5df1678 100644
--- a/src/views/smart/workpermitDetail.vue
+++ b/src/views/smart/workpermitDetail.vue
@@ -34,6 +34,12 @@
                      @row-del="attachment_rowDel"
                      @row-update="attachment_rowUpdate"
                      @row-save="attachment_rowSave">
+                      <template slot="menuRight">
+                      <el-button type="primary"
+                                 size="small"
+                                 plain
+                                 @click="addrow()">新增</el-button>
+                              </template>
           </avue-crud>
         </div>
       </span>
@@ -505,7 +511,7 @@
       ...mapGetters(["permission"]),
       permissionList() {
         return {
-          addBtn:  true,
+          addBtn:  false,
           viewBtn: false,
           delBtn: true,
           editBtn: true
@@ -634,6 +640,10 @@
         this.readonlyForm=false;
         this.frame_class = null;
       },
+      addrow(){
+        this.attachment_form.ticketCode = this.tab1_form.workTicketNo;
+        this.$refs.crud.rowAdd()
+      },
       updateToSearch () {
         this.readonlyForm=true;
         this.shouldShowButton=true;

From ea3f75bf35a6912fe8efbdc922f0163df1b325aa Mon Sep 17 00:00:00 2001
From: Dayu <1010@qq.com>
Date: Thu, 18 Jul 2024 15:28:44 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=A1=B5=E6=95=B0=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/leger/equipmentledgerDetail.vue     | 2 ++
 src/views/leger/toolinventoryrecordDetail.vue | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/views/leger/equipmentledgerDetail.vue b/src/views/leger/equipmentledgerDetail.vue
index b0b880c..7ab5584 100644
--- a/src/views/leger/equipmentledgerDetail.vue
+++ b/src/views/leger/equipmentledgerDetail.vue
@@ -614,6 +614,8 @@
             {
               label: "页数",
               prop: "page",
+              type: 'number',
+              step: 1,
               span: 20,
               rules: [{
                 required: true,
diff --git a/src/views/leger/toolinventoryrecordDetail.vue b/src/views/leger/toolinventoryrecordDetail.vue
index 22e5151..460e0d1 100644
--- a/src/views/leger/toolinventoryrecordDetail.vue
+++ b/src/views/leger/toolinventoryrecordDetail.vue
@@ -552,6 +552,8 @@ export default {
             label: "页数",
             prop: "page",
             span: 20,
+            type: 'number',
+            step: 1,
             rules: [{
               required: true,
               message: "请输入页数",

From 71ecb9851b1c8f8853ad46fd4fbf4540c40f3f5a Mon Sep 17 00:00:00 2001
From: yangzhicheng <dayu123@qq.com>
Date: Thu, 18 Jul 2024 15:38:19 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=BC=80=E5=A7=8B=20chec?=
 =?UTF-8?q?k=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inspection/inspectionPlanDetail.vue | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/views/inspection/inspectionPlanDetail.vue b/src/views/inspection/inspectionPlanDetail.vue
index a8578f0..e9f74ec 100644
--- a/src/views/inspection/inspectionPlanDetail.vue
+++ b/src/views/inspection/inspectionPlanDetail.vue
@@ -31,7 +31,16 @@
   export default {
     name: "inspectionPlanDetail",
     data() {
-      var validateTime = (rule, value, callback) => {
+      var validateStart = (rule, value, callback) => {
+        if (value === '') {
+          callback(new Error('请输入计划开始时间'));
+        } else if(value > this.form.endTime) {
+          callback(new Error('输入的计划起始时间大于计划终了时间'));
+        } else {
+          callback();
+        }
+      };
+      var validateEnd = (rule, value, callback) => {
         if (value === '') {
           callback(new Error('请输入计划终了时间'));
         } else if(this.form.startTime > value) {
@@ -105,11 +114,7 @@
               labelWidth: 120,
               format: 'yyyy年MM月dd日',
               valueFormat: "yyyyMMdd",
-              rules: [{
-                required: true,
-                message: "请输入计划起始时间",
-                trigger: "blur"
-              }]
+              rules: [{required: true, validator: validateStart, trigger: 'blur' }]
             },
             {
               label: "计划终了时间",
@@ -119,7 +124,7 @@
               labelWidth: 120,
               format: 'yyyy年MM月dd日',
               valueFormat: "yyyyMMdd",
-              rules: [{required: true, validator: validateTime, trigger: 'blur' }]
+              rules: [{required: true, validator: validateEnd, trigger: 'blur' }]
             },
             {
               label: "状态",