Merge remote-tracking branch 'origin/main'

src/views/leger/equipmentledgerDetail.vue

@@ -128,6 +128,18 @@
   export default {
     name: "equipmentledgerDetail",
     data () {
+      var validatePage = (rule, value, callback) => {
+        if (value === '') {
+          callback(new Error('请输入页数'));
+        } else {
+          var r = /^\+?[0-9][0-9]*$/;
+          if(!r.test(value)) {
+            callback(new Error('输入的页数不合法'));
+          } else {
+            callback();
+          }
+        }
+      };
       return {
         checkStatusValue: this.$route.query.checkstatus,
           optionCheckStatus: [{
@@ -614,14 +626,8 @@
             {
               label: "页数",
               prop: "page",
-              type: 'number',
-              step: 1,
               span: 20,
-              rules: [{
+              rules: [{required: true, validator: validatePage, trigger: 'blur' }]
-                required: true,
-                message: "请输入页数",
-                trigger: "blur"
-              }],
             },
             {
               label: "关键字",

src/views/leger/toolinventoryrecordDetail.vue

@@ -175,6 +175,18 @@ import {getListByTaskNo} from "@/api/inspection/inspectionresult";
 export default {
   name: "toolinventoryrecordDetail",
   data () {
+    var validatePage = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请输入页数'));
+      } else {
+        var r = /^\+?[0-9][0-9]*$/;
+        if(!r.test(value)) {
+          callback(new Error('输入的页数不合法'));
+        } else {
+          callback();
+        }
+      }
+    };
     return {
       checkStatusValue:{},
       optionCheckStatus: [{
@@ -552,13 +564,7 @@ export default {
             label: "页数",
             prop: "page",
             span: 20,
-            type: 'number',
+            rules: [{required: true, validator: validatePage, trigger: 'blur' }]
-            step: 1,
-            rules: [{
-              required: true,
-              message: "请输入页数",
-              trigger: "blur"
-            }],
           },
           {
             label: "关键字",

src/views/smart/operationticket.vue

@@ -70,9 +70,9 @@
       <div class="container">
          <span>
            <el-button type="primary"
-                                  size="small"
+                      size="small"
-                                  plain
+                      plain
-                                  @click="handleDetailCancel">取消
+                      @click="handleDetailCancel">取消
             </el-button>
             <el-button type="submit"
                        size="small"

src/views/smart/operationticketDetail.vue

@@ -51,7 +51,7 @@
       </span>
     <div class="container">
        <span >
-         <el-button type="primary"
+         <el-button type="text"
                               size="large"
                               @click="back"
                               v-if="addUpdateShowButton">
@@ -96,7 +96,7 @@
       </avue-form>
       <div class="container">
          <span>
-           <el-button type="primary"
+           <el-button type="text"
                       size="small"
                       plain
                       @click="handleDetailCancel">取消

src/views/spares/material.vue

@@ -103,13 +103,30 @@
 
   export default {
     data() {
+      var validateInCount = (rule, value, callback) => {
+        if (value === '') {
+          callback(new Error('请输入入库数量'));
+        } else {
+          var r = /^\+?[0-9][0-9]*$/;
+          if(!r.test(value)) {
+            callback(new Error('入库数量不合法'));
+          } else {
+            callback();
+          }
+        }
+      };
       var validateCount = (rule, value, callback) => {
         if (value === '') {
           callback(new Error('请输入出库数量'));
-        } else if(this.count < value) {
-          callback(new Error('输入的出库数量大于库存数量'));
         } else {
-          callback();
+          var r = /^\+?[0-9][0-9]*$/;
+          if(!r.test(value)) {
+            callback(new Error('出库数量不合法'));
+          } else if(this.count < value) {
+            callback(new Error('输入的出库数量大于库存数量'));
+          } else {
+            callback();
+          }
         }
       };
       return {
@@ -329,11 +346,7 @@
               label: "入库数量",
               prop: "inboundCount",
               span: 22,
-              rules: [{
+              rules: [{required: true, validator: validateInCount, trigger: 'blur' }]
-                required: true,
-                message: "请输入入库数量",
-                trigger: "blur"
-              }]
             },
             {
               label: "入库申领人",