Merge remote-tracking branch 'origin/main'

src/views/inspection/inspectionPlanDetail.vue

@@ -31,11 +31,24 @@
   export default {
     name: "inspectionPlanDetail",
     data() {
-      var validateTime = (rule, value, callback) => {
+      var validateStart = (rule, value, callback) => {
+        if (value === '') {
+          callback(new Error('请输入计划开始时间'));
+        } else if(this.form.endTime !== null && this.form.endTime !== '') {
+          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) {
-          callback(new Error('输入的计划起始时间大于计划终了时间'));
+        } else if(this.form.startTime !== null && this.form.startTime !== '') {
+          if(this.form.startTime > value) {
+            callback(new Error('输入的计划终了时间小于计划起始时间'));
+          }
         } else {
           callback();
         }
@@ -105,11 +118,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 +128,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/inspection/inspectionobject.vue

@@ -24,36 +24,39 @@
                    size="small"
                    icon="el-icon-delete"
                    plain
-                   v-if="permission.inspectionroute_delete"
+                   v-if="permission.inspectionobject_delete"
                    @click="handleDelete">批量删除
         </el-button>
       </template>
       <template slot="menuRight">
         <el-button type="primary"
                    size="small"
-                   v-if="permission.inspectionroute_add"
+                   v-if="permission.inspectionobject_add"
                    plain
                    @click="handleDetailAdd">新增
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.inspectionobject_effect"
                    @click="handleTakeEffect">生效
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.inspectionobject_lapse"
                    @click="handleLapse">失效
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.inspectionobject_export"
                    @click="handleExport">导出
         </el-button>
       </template>
       <template #menu="{row,index,size}">
-        <el-button v-if="permission.inspectionroute_view" @click="handleDetailSearch(row,index)" type="text">查看</el-button>
-        <el-button v-if="permission.inspectionroute_delete" @click="rowDel(row)" type="text">删除</el-button>
+        <el-button v-if="permission.inspectionobject_view" @click="handleDetailSearch(row,index)" type="text">查看</el-button>
+        <el-button v-if="permission.inspectionobject_delete" @click="rowDel(row)" type="text">删除</el-button>
       </template>
     </avue-crud>
     <el-dialog title="失效"
@@ -232,7 +235,7 @@
       ...mapGetters(["permission"]),
       permissionList() {
           // this.option.column = this.option.column.filter(v => {
-          //     return this.permission['inspectionroute_col_' + v.prop]
+          //     return this.permission['inspectionobject_col_' + v.prop]
           // })
         return {
           addBtn: false,

src/views/inspection/inspectionobjectDetail.vue

@@ -9,14 +9,14 @@
     <div class="container">
        <span >
           <el-button type="primary"
-                     size="large"
+                     size="small"
                      @click="handleFormSubmit"
-                     v-if="addUpdateShowButton">
+                     v-if="addUpdateShowButton && permission.inspectionobject_add">
                      确定</el-button>
          <el-button type="primary"
                     size="small"
                     @click="seachToUpdate"
-                    v-if="shouldShowButton">
+                    v-if="shouldShowButton && permission.inspectionobject_edit">
                       修改</el-button>
        </span>
     </div>
@@ -30,7 +30,7 @@ import {getToken} from "@/util/auth";
 import request from "@/router/axios";
 
 export default {
-  name: "inspectionrouteDetail",
+  name: "inspectionobjectDetail",
   data() {
     return {
       addUpdateShowButton:{},
@@ -233,7 +233,7 @@ export default {
     ...mapGetters(["permission"]),
     permissionList() {
       // this.option.column = this.option.column.filter(v => {
-      //     return this.permission['inspectionroute_col_' + v.prop]
+      //     return this.permission['inspectionobject_col_' + v.prop]
       // })
       return {
         addBtn: false,

src/views/inspection/inspectiontasks.vue

@@ -109,6 +109,10 @@
           callback(new Error('请输入任务执行开始时间'));
         } else if(this.currStartDate > value.replaceAll('/','').slice(0, 8)) {
           callback(new Error('输入的任务执行开始时间小于任务开始日期'));
+        }else if(this.resultForm.executeEndDate !== '' && this.resultForm.executeEndDate !== null) {
+          if(this.resultForm.executeEndDate.trim().replaceAll('/','') < value.trim().replaceAll('/','')) {
+            callback(new Error('输入的任务执行开始时间大于任务执行结束时间'));
+          }
         } else {
           callback();
         }
@@ -559,26 +563,33 @@
           return;
         }
         this.stopBox = true;
+        this.$refs.stopForm.resetForm();
       },
       submitStop(){
-        this.$confirm("是否将选择巡检任务停止?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+        this.$refs.stopForm.validate((valid, done, msg) => {
+            if (valid) {
+              done()
+              this.$confirm("是否将选择巡检任务停止?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+              })
+                .then(() => {
+                  return stop(this.ids, this.stopForm.cancelReason);
+                })
+                .then(() => {
+                  this.$refs.stopForm.resetForm();
+                  this.stopBox = false;
+                  this.onLoad(this.page);
+                  this.$message({
+                    type: "success",
+                    message: "操作成功!"
+                  });
+                  this.$refs.crud.toggleSelection();
+                });
+            }
         })
-          .then(() => {
-            return stop(this.ids, this.stopForm.cancelReason);
-          })
-          .then(() => {
-            this.stopForm.cancelReason = '';
-            this.stopBox = false;
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
+
       },
       handleExport() {
         this.$confirm("是否导出数据?", "提示", {

src/views/inspection/inspectiontasksDetail.vue

@@ -52,7 +52,18 @@ import request from "@/router/axios";
 export default {
   name: "inspectiontasksDetail",
   data () {
-    var validateTime = (rule, value, callback) => {
+    var validateStartTime = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请输入任务开始日期'));
+      } else if(this.information_form.taskEndDate !== '' && this.information_form.taskEndDate !== null) {
+        if(this.information_form.taskEndDate < value) {
+          callback(new Error('输入的任务开始日期大于任务完成日期'));
+        }
+      } else {
+        callback();
+      }
+    };
+    var validateEndTime = (rule, value, callback) => {
       if (value === '') {
         callback(new Error('请输入任务完成日期'));
       } else if(this.information_form.taskStartDate > value) {
@@ -132,11 +143,7 @@ export default {
             labelWidth: 120,
             format: 'yyyy年MM月dd日',
             valueFormat: "yyyyMMdd",
-            rules: [{
-              required: true,
-              message: "请输入任务开始日期",
-              trigger: "blur"
-            }]
+            rules: [{required: true, validator: validateStartTime, trigger: 'blur' }]
           },
           {
             label: "任务完成日期",
@@ -146,7 +153,7 @@ export default {
             labelWidth: 120,
             format: 'yyyy年MM月dd日',
             valueFormat: "yyyyMMdd",
-            rules: [{required: true, validator: validateTime, trigger: 'blur' }]
+            rules: [{required: true, validator: validateEndTime, trigger: 'blur' }]
           },
           {
             label: "对象编号",

src/views/leger/equipmentledger.vue

@@ -32,27 +32,31 @@
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.equipmentledger_add"
                    @click="handleDetailAdd">新增
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.equipmentledger_audit"
                    @click="handleAuditing">批量审核
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.equipmentledger_reject"
                    @click="handleReject">批量驳回
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.equipmentledger_export"
                    @click="handleExport()">导出
         </el-button>
       </template>
       <template #menu="{row,index,size}">
-        <el-button @click="handleDetailSearch(row,index)" type="text">查看详情</el-button>
-        <el-button @click="rowDel(row)" type="text">删除</el-button>
+        <el-button @click="handleDetailSearch(row,index)" type="text" v-if="permission.equipmentledger_view">查看详情</el-button>
+        <el-button @click="rowDel(row)" type="text" v-if="permission.equipmentledger_delete">删除</el-button>
       </template>
     </avue-crud>
   </basic-container>

src/views/leger/equipmentledgerDetail.vue

@@ -75,32 +75,32 @@
           <el-button type="primary"
                      size="large"
                      @click="handleFormSubmit"
-                     v-if="addUpdateShowButton">
+                     v-if="addUpdateShowButton && permission.equipmentledger_add">
                      确定</el-button>
           <el-button type="text"
                      size="large"
                      @click="back"
-                     v-if="addUpdateShowButton">
+                     v-if="addUpdateShowButton ">
                      取消</el-button>
           <el-button type="primary"
                      size="small"
                       @click="auditing"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.equipmentledger_audit">
                      审核</el-button>
           <el-button type="primary"
                      size="small"
                      @click="reject"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.equipmentledger_reject">
                      驳回</el-button>
           <el-button type="primary"
                      size="small"
                      @click="seachToUpdate"
-                     v-if="UpdateShowButton">
+                     v-if="UpdateShowButton && permission.equipmentledger_edit">
                       修改</el-button>
           <el-button type="primary"
                      size="small"
                      @click="del"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.equipmentledger_delete">
                      删除</el-button>
        </span>
     </div>
@@ -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: [{
@@ -615,11 +627,7 @@
               label: "页数",
               prop: "page",
               span: 20,
-              rules: [{
-                required: true,
-                message: "请输入页数",
-                trigger: "blur"
-              }],
+              rules: [{required: true, validator: validatePage, trigger: 'blur' }]
             },
             {
               label: "关键字",

src/views/leger/toolinventoryrecord.vue

@@ -31,27 +31,31 @@
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.toolinventoryrecord_add"
                    @click="handleDetailAdd">新增
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.toolinventoryrecord_audit"
                    @click="handleAuditing">批量审核
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.toolinventoryrecord_reject"
                    @click="handleReject">批量驳回
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
-                   @click="handleExport">导出
+                   v-if="permission.toolinventoryrecord_export"
+                   @click="handleExport()">导出
         </el-button>
       </template>
       <template #menu="{row,index,size}">
-        <el-button @click="handleDetailSearch(row,index)" type="text">查看</el-button>
-        <el-button @click="rowDel(row)" type="text">删除</el-button>
+        <el-button @click="handleDetailSearch(row,index)" type="text" v-if="permission.toolinventoryrecord_view">查看详情</el-button>
+        <el-button @click="rowDel(row)" type="text" v-if="permission.toolinventoryrecord_delete">删除</el-button>
       </template>
     </avue-crud>
   </basic-container>

src/views/leger/toolinventoryrecordDetail.vue

@@ -100,35 +100,35 @@
       </span>
     <div class="container">
        <span >
+          <el-button type="primary"
+                     size="large"
+                     @click="handleFormSubmit"
+                     v-if="addUpdateShowButton && permission.toolinventoryrecord_add">
+                     确定</el-button>
           <el-button type="text"
                      size="large"
                      @click="back"
-                     v-if="addUpdateShowButton">
+                     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="auditing"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.toolinventoryrecord_audit">
                      审核</el-button>
           <el-button type="primary"
                      size="small"
                      @click="reject"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.toolinventoryrecord_reject">
                      驳回</el-button>
           <el-button type="primary"
                      size="small"
                      @click="seachToUpdate"
-                     v-if="UpdateShowButton">
+                     v-if="UpdateShowButton && permission.toolinventoryrecord_edit">
                       修改</el-button>
           <el-button type="primary"
                      size="small"
                      @click="del"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.toolinventoryrecord_delete">
                      删除</el-button>
        </span>
     </div>
@@ -173,8 +173,20 @@ import {readonly} from "vue";
 import {getToken} from "@/util/auth";
 import {getListByTaskNo} from "@/api/inspection/inspectionresult";
 export default {
-  name: "equipmentledgerDetail",
+  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,11 +564,7 @@ export default {
             label: "页数",
             prop: "page",
             span: 20,
-            rules: [{
-              required: true,
-              message: "请输入页数",
-              trigger: "blur"
-            }],
+            rules: [{required: true, validator: validatePage, trigger: 'blur' }]
           },
           {
             label: "关键字",

src/views/release/productioninformation.vue

@@ -31,35 +31,40 @@
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.productioninformation_add"
                    @click="$refs.crud.rowAdd()">新增</el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.productioninformation_release"
                    @click="handleRelease">发布
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.productioninformation_stop"
                    @click="handleStop">停用
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.productioninformation_reject"
                    @click="handleReject">批量驳回
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.productioninformation_audit"
                    @click="handleAuditing">批量审核
         </el-button>
       </template>
       <template #menu="{row,index,size}">
         <el-button type="text" size="small"
-                   @click="$refs.crud.rowEdit(row,index)">编辑</el-button>
+                   @click="$refs.crud.rowEdit(row,index)" v-if="permission.productioninformation_edit">修改</el-button>
         <el-button type="text" size="small"
-                   @click="$refs.crud.rowDel(row,index)">删除</el-button>
-        <el-button @click="auditing(row,index)" type="text" size="small" plain>审核</el-button>
-        <el-button @click="reject(row,index)" type="text" size="small" plain >驳回</el-button>
+                   @click="$refs.crud.rowDel(row,index)" v-if="permission.productioninformation_delete">删除</el-button>
+        <el-button @click="auditing(row,index)" type="text" size="small" plain v-if="permission.productioninformation_audit">审核</el-button>
+        <el-button @click="reject(row,index)" type="text" size="small" plain v-if="permission.productioninformation_reject">驳回</el-button>
       </template>
     </avue-crud>
   </basic-container>

src/views/smart/operationticket.vue

@@ -32,29 +32,33 @@
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.operationticket_add"
                    @click="handleDetailAdd">新增
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.operationticket_reject"
                    @click="handleReject">批量驳回
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.operationticket_audit"
                    @click="handleAuditing">批量审核
         </el-button>
 
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.operationticket_export"
                    @click="handleExport()">导出
         </el-button>
       </template>
       <template #menu="{row,index,size}">
-        <el-button @click="handleDetailSearch(row,index)" type="text">查看</el-button>
-        <el-button @click="handleDetailcls(row,index)" type="text">关票</el-button>
-        <el-button @click="rowDel(row)" type="text">删除</el-button>
+        <el-button @click="handleDetailSearch(row,index)" v-if="permission.operationticket_view" type="text">查看</el-button>
+        <el-button @click="handleDetailcls(row,index)"  v-if="permission.operationticket_close" type="text">关票</el-button>
+        <el-button @click="rowDel(row)" v-if="permission.operationticket_delete" type="text">删除</el-button>
       </template>
     </avue-crud>
     <el-dialog title="关票提醒"
@@ -66,9 +70,9 @@
       <div class="container">
          <span>
            <el-button type="primary"
-                                  size="small"
-                                  plain
-                                  @click="handleDetailCancel">取消
+                      size="small"
+                      plain
+                      @click="handleDetailCancel">取消
             </el-button>
             <el-button type="submit"
                        size="small"

src/views/smart/operationticketDetail.vue

@@ -43,6 +43,7 @@
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.operationticket_add"
                    @click="addrow">新增</el-button>
             </template>
           </avue-crud>
@@ -50,7 +51,7 @@
       </span>
     <div class="container">
        <span >
-         <el-button type="primary"
+         <el-button type="text"
                               size="large"
                               @click="back"
                               v-if="addUpdateShowButton">
@@ -63,27 +64,27 @@
          <el-button type="primary"
                     size="small"
                     @click="handleDetailcls"
-                    v-if="shouldShowButton">
+                    v-if="shouldShowButton && permission.operationticket_close">
                      关票</el-button>
           <el-button type="primary"
                      size="small"
                      @click="auditing"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton  && permission.operationticket_audit">
                      审核</el-button>
           <el-button type="primary"
                      size="small"
                      @click="reject"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.operationticket_reject">
                      驳回</el-button>
           <el-button type="primary"
                      size="small"
                      @click="searchToUpdate"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.operationticket_edit">
                       修改</el-button>
           <el-button type="primary"
                      size="small"
                      @click="del"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.operationticket_delete">
                      删除</el-button>
        </span>
     </div>
@@ -95,7 +96,7 @@
       </avue-form>
       <div class="container">
          <span>
-           <el-button type="primary"
+           <el-button type="text"
                       size="small"
                       plain
                       @click="handleDetailCancel">取消

src/views/smart/workpermit.vue

@@ -23,7 +23,7 @@
                    size="small"
                    icon="el-icon-delete"
                    plain
-                   v-if="permission.equipmentledger_delete"
+                   v-if="permission.workpermit_delete"
                    @click="handleDelete">批量删除
         </el-button>
       </template>
@@ -31,28 +31,32 @@
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.workpermit_add"
                    @click="handleDetailAdd">新增
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.workpermit_audit"
                    @click="handleAuditing">批量审核
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.workpermit_reject"
                    @click="handleReject">批量驳回
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.workpermit_export"
                    @click="handleExport()">导出
         </el-button>
       </template>
       <template #menu="{row,index,size}">
-        <el-button @click="handleDetailSearch(row,index)" type="text">查看详情</el-button>
-        <el-button @click="handleCloseTicket(row)" type="text">关票</el-button>
-        <el-button @click="rowDel(row)" type="text">删除</el-button>
+        <el-button @click="handleDetailSearch(row,index)" type="text" v-if="permission.workpermit_view">查看详情</el-button>
+        <el-button @click="handleCloseTicket(row)" type="text" v-if="permission.workpermit_close">关票</el-button>
+        <el-button @click="rowDel(row)" type="text" v-if="permission.workpermit_delete">删除</el-button>
       </template>
     </avue-crud>
     <el-dialog title="关票提醒"

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>
@@ -42,7 +48,7 @@
           <el-button type="primary"
                      size="large"
                      @click="handleFormSubmit"
-                     v-if="addUpdateShowButton">
+                     v-if="addUpdateShowButton && permission.workpermit_add">
                      确定</el-button>
           <el-button type="text"
                      size="large"
@@ -52,27 +58,27 @@
          <el-button type="primary"
                     size="small"
                     @click="closeTicket"
-                    v-if="shouldShowButton">
+                    v-if="shouldShowButton && permission.workpermit_close">
                     关票</el-button>
           <el-button type="primary"
                      size="small"
                       @click="auditing"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.workpermit_audit">
                      审核</el-button>
           <el-button type="primary"
                      size="small"
                      @click="reject"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.workpermit_reject">
                      驳回</el-button>
           <el-button type="primary"
                      size="small"
                      @click="seachToUpdate"
-                     v-if="UpdateShowButton">
+                     v-if="UpdateShowButton && permission.workpermit_edit">
                       修改</el-button>
           <el-button type="primary"
                      size="small"
                      @click="del"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.workorder_delete">
                      删除</el-button>
        </span>
     </div>
@@ -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;

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: [{
-                required: true,
-                message: "请输入入库数量",
-                trigger: "blur"
-              }]
+              rules: [{required: true, validator: validateInCount, trigger: 'blur' }]
             },
             {
               label: "入库申领人",

src/views/spares/materialDetail.vue

@@ -442,6 +442,7 @@
     },
     methods: {
       test(val) {
+        this.$refs.diaForm.resetForm();
         this.dialogVisible = true;
       },
       handleFormSubmit() {