Merge remote-tracking branch 'origin/main'

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: "状态",

src/views/leger/equipmentledgerDetail.vue

@@ -614,6 +614,8 @@
             {
               label: "页数",
               prop: "page",
+              type: 'number',
+              step: 1,
               span: 20,
               rules: [{
                 required: true,

src/views/leger/toolinventoryrecordDetail.vue

@@ -552,6 +552,8 @@ export default {
             label: "页数",
             prop: "page",
             span: 20,
+            type: 'number',
+            step: 1,
             rules: [{
               required: true,
               message: "请输入页数",

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;