فهرست منبع

error换warning,反馈信息提示

qinhouyu 2 سال پیش
والد
کامیت
7ffedb7501
2فایلهای تغییر یافته به همراه46 افزوده شده و 44 حذف شده
  1. 24 23
      src/views/eventdetailsdialog.vue
  2. 22 21
      src/views/firespread.vue

+ 24 - 23
src/views/eventdetailsdialog.vue

@@ -1498,11 +1498,11 @@ export default {
       for (let i in this.dutysystemTableData) {
 
         if (!reg_user.test(this.dutysystemTableData[i].name)) {
-          this.$message.error(`请输入正确姓名!`)
+          this.$message.warning(`请输入正确姓名!`)
           return;
         }
         if (!reg_tel.test(this.dutysystemTableData[i].telphone)) {
-          this.$message.error(`请输入正确手机号码!`)
+          this.$message.warning(`请输入正确手机号码!`)
           return;
         }
 
@@ -1640,10 +1640,10 @@ export default {
     },
     updateYjYuAn() {
       if (this.eventStatusValue == 'forest_event_status_1' || this.eventStatusValue == 'forest_event_status_7') {
-        this.$message.error(`修改预案信息在签收后方可修改!`)
+        this.$message.warning(`修改预案信息在签收后方可修改!`)
         return
       } else if (this.eventStatusValue == 'forest_event_status_3') {
-        this.$message.error(`误报事件无法修改预案信息!`)
+        this.$message.warning(`误报事件无法修改预案信息!`)
         return
       } else {
         let param = {
@@ -1651,7 +1651,7 @@ export default {
           reserve: this.sendGuanLianYuAn
         }
         if (this.sendGuanLianYuAn == '' || this.sendGuanLianYuAn == null) {
-          this.$message.error(`请选择预案信息!`)
+          this.$message.warning(`请选择预案信息!`)
           return
         }
         updateYjYuAn(param).then(res => {
@@ -2108,24 +2108,24 @@ export default {
             }
           }
           if (that.sendTaskSource == '' || that.sendTaskSource == null) {
-            that.$message.error(`请选择任务来源!`)
+            that.$message.warning(`请选择任务来源!`)
             return
           }
           if (that.sendTaskContent == '' || that.sendTaskContent == null) {
-            that.$message.error(`请输入任务内容!`)
+            that.$message.warning(`请输入任务内容!`)
             return
           }
           if (that.sendTaskTitle == '' || that.sendTaskTitle == null) {
-            that.$message.error(`请输入任务标题!`)
+            that.$message.warning(`请输入任务标题!`)
             return
           }
           if (that.sendLianDongDept == '' || that.sendLianDongDept == null) {
-            that.$message.error(`请选择任务联动部门!`)
+            that.$message.warning(`请选择任务联动部门!`)
             return
           }
           if (that.sendDeptId == '' || that.sendDeptId == null || that.sendDeptName == '' || that.sendDeptName ==
             null) {
-            that.$message.error(`请选择任务发起部门!`)
+            that.$message.warning(`请选择任务发起部门!`)
             return
           }
           let eventState = "";
@@ -2169,23 +2169,23 @@ export default {
             let number = /^[+]{0,1}(\d+)$/g; //正整数
 
             if (!double.test(that.table2.areaTotal)) {
-              that.$message.error(`面积只能填写到小数后两位!`)
+              that.$message.warning(`面积只能填写到小数后两位!`)
               return
             }
             if (!number.test(that.table2.peopleTotal)) {
-              that.$message.error(`人员请填写正整数!`)
+              that.$message.warning(`人员请填写正整数!`)
               return
             }
             if (that.table2.forestComposition == '' || that.table2.forestComposition == null) {
-              that.$message.error(`林木组成不能为空!`)
+              that.$message.warning(`林木组成不能为空!`)
               return
             }
             if (that.table2.forestToken == '' || that.table2.forestToken == null) {
-              that.$message.error(`林令不能为空!`)
+              that.$message.warning(`林令不能为空!`)
               return
             }
             if (that.table2.porosities == '' || that.table2.porosities == null) {
-              that.$message.error(`疏密度不能为空!`)
+              that.$message.warning(`疏密度不能为空!`)
               return
             }
           }
@@ -2227,11 +2227,11 @@ export default {
         } else if (eventStatus == 'shtg') {
           that.eventStatusButton = 'sh'
           if (that.eventDescription == '' || that.eventDescription == null) {
-            that.$message.error(`请填写审核意见!`)
+            that.$message.warning(`请填写审核意见!`)
             return
           }
           if (that.attachExamine.length == 0 || that.attachExamine == null) {
-            that.$message.error(`请上传审核图片!`)
+            that.$message.warning(`请上传审核图片!`)
             return
           }
           //事件处理流程--审核通过
@@ -2263,11 +2263,11 @@ export default {
         } else if (eventStatus == 'shbtg') {
           that.eventStatusButton = 'sh'
           if (that.eventDescription == '' || that.eventDescription == null) {
-            that.$message.error(`请填写审核意见!`)
+            that.$message.warning(`请填写审核意见!`)
             return
           }
           if (that.attachExamine.length == 0 || that.attachExamine == null) {
-            that.$message.error(`请上传审核图片!`)
+            that.$message.warning(`请上传审核图片!`)
             return
           }
           //事件处理流程--审核不通过
@@ -2309,12 +2309,12 @@ export default {
           if (eventStatus == 'qs') {
             if (that.sendDeptId == '' || that.sendDeptId == null || that.sendDeptName == '' || that.sendDeptName ==
               null) {
-              that.$message.error(`请选择部门!`)
+              that.$message.warning(`请选择部门!`)
               return
             }
             if (eventStatus == 'qs') {
               if (that.sendEventType == '' || that.sendEventType == null) {
-                that.$message.error(`请选择事件类型!`)
+                that.$message.warning(`请选择事件类型!`)
                 return
               }
             }
@@ -2367,6 +2367,7 @@ export default {
     },
     sendEventLog() {
       if (this.eventLog == '' || this.eventLog == null) {
+        this.$message.warning("请录入反馈信息!")
         return;
       }
       //日志发送
@@ -2876,11 +2877,11 @@ export default {
       let reg_tel = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/; //11位手机号码正则
       for (let i in this.dutysystemTableData) {
         if (!reg_user.test(this.dutysystemTableData[i].name)) {
-          this.$message.error(`请输入正确姓名!`)
+          this.$message.warning(`请输入正确姓名!`)
           return;
         }
         if (!reg_tel.test(this.dutysystemTableData[i].telphone)) {
-          this.$message.error(`请输入正确手机号码!`)
+          this.$message.warning(`请输入正确手机号码!`)
           return;
         }
 

+ 22 - 21
src/views/firespread.vue

@@ -2280,11 +2280,11 @@ export default {
       let reg_tel = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/; //11位手机号码正则
       for (let i in this.dutysystemTableData) {
         if (!reg_user.test(this.dutysystemTableData[i].name)) {
-          this.$message.error(`请输入正确姓名!`)
+          this.$message.warning(`请输入正确姓名!`)
           return;
         }
         if (!reg_tel.test(this.dutysystemTableData[i].telphone)) {
-          this.$message.error(`请输入正确手机号码!`)
+          this.$message.warning(`请输入正确手机号码!`)
           return;
         }
 
@@ -2323,7 +2323,7 @@ export default {
     },
     updateYjYuAn() {
       if (this.eventStatusValue == 'forest_event_status_1') {
-        this.$message.error(`修改预案信息在签收后方可修改!`)
+        this.$message.warning(`修改预案信息在签收后方可修改!`)
         return
       } else {
         let param = {
@@ -2697,24 +2697,24 @@ export default {
             }
           }
           if (that.sendTaskSource == '' || that.sendTaskSource == null) {
-            that.$message.error(`请选择任务来源!`)
+            that.$message.warning(`请选择任务来源!`)
             return
           }
           if (that.sendTaskContent == '' || that.sendTaskContent == null) {
-            that.$message.error(`请输入任务内容!`)
+            that.$message.warning(`请输入任务内容!`)
             return
           }
           if (that.sendTaskTitle == '' || that.sendTaskTitle == null) {
-            that.$message.error(`请输入任务标题!`)
+            that.$message.warning(`请输入任务标题!`)
             return
           }
           if (that.sendLianDongDept == '' || that.sendLianDongDept == null) {
-            that.$message.error(`请选择任务联动部门!`)
+            that.$message.warning(`请选择任务联动部门!`)
             return
           }
           if (that.sendDeptId == '' || that.sendDeptId == null || that.sendDeptName == '' || that.sendDeptName ==
             null) {
-            that.$message.error(`请选择任务发起部门!`)
+            that.$message.warning(`请选择任务发起部门!`)
             return
           }
           let eventState = "";
@@ -2758,23 +2758,23 @@ export default {
             let number = /^[+]{0,1}(\d+)$/g; //正整数
 
             if (!double.test(that.table2.areaTotal)) {
-              that.$message.error(`面积只能填写到小数后两位!`)
+              that.$message.warning(`面积只能填写到小数后两位!`)
               return
             }
             if (!number.test(that.table2.peopleTotal)) {
-              that.$message.error(`人员请填写正整数!`)
+              that.$message.warning(`人员请填写正整数!`)
               return
             }
             if (that.table2.forestComposition == '' || that.table2.forestComposition == null) {
-              that.$message.error(`林木组成不能为空!`)
+              that.$message.warning(`林木组成不能为空!`)
               return
             }
             if (that.table2.forestToken == '' || that.table2.forestToken == null) {
-              that.$message.error(`林令不能为空!`)
+              that.$message.warning(`林令不能为空!`)
               return
             }
             if (that.table2.porosities == '' || that.table2.porosities == null) {
-              that.$message.error(`疏密度不能为空!`)
+              that.$message.warning(`疏密度不能为空!`)
               return
             }
           }
@@ -2815,11 +2815,11 @@ export default {
         } else if (eventStatus == 'shtg') {
           that.eventStatusButton = 'sh'
           if (that.eventDescription == '' || that.eventDescription == null) {
-            that.$message.error(`请填写审核意见!`)
+            that.$message.warning(`请填写审核意见!`)
             return
           }
           if (that.attachExamine.length == 0 || that.attachExamine == null) {
-            that.$message.error(`请上传审核图片!`)
+            that.$message.warning(`请上传审核图片!`)
             return
           }
           //事件处理流程--审核通过
@@ -2851,11 +2851,11 @@ export default {
         } else if (eventStatus == 'shbtg') {
           that.eventStatusButton = 'sh'
           if (that.eventDescription == '' || that.eventDescription == null) {
-            that.$message.error(`请填写审核意见!`)
+            that.$message.warning(`请填写审核意见!`)
             return
           }
           if (that.attachExamine.length == 0 || that.attachExamine == null) {
-            that.$message.error(`请上传审核图片!`)
+            that.$message.warning(`请上传审核图片!`)
             return
           }
           //事件处理流程--审核不通过
@@ -2902,12 +2902,12 @@ export default {
           if (eventStatus == 'qs') {
             if (that.sendDeptId == '' || that.sendDeptId == null || that.sendDeptName == '' || that.sendDeptName ==
               null) {
-              that.$message.error(`请选择部门!`)
+              that.$message.warning(`请选择部门!`)
               return
             }
             if (eventStatus == 'qs') {
               if (that.sendEventType == '' || that.sendEventType == null) {
-                that.$message.error(`请选择事件类型!`)
+                that.$message.warning(`请选择事件类型!`)
                 return
               }
             }
@@ -2961,6 +2961,7 @@ export default {
 
     sendEventLog() {
       if (this.eventLog == '' || this.eventLog == null) {
+        this.$message.warning("请录入反馈信息!")
         return;
       }
       //日志发送
@@ -3468,11 +3469,11 @@ export default {
       let reg_tel = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/; //11位手机号码正则
       for (let i in this.dutysystemTableData) {
         if (!reg_user.test(this.dutysystemTableData[i].name)) {
-          this.$message.error(`请输入正确姓名!`)
+          this.$message.warning(`请输入正确姓名!`)
           return;
         }
         if (!reg_tel.test(this.dutysystemTableData[i].telphone)) {
-          this.$message.error(`请输入正确手机号码!`)
+          this.$message.warning(`请输入正确手机号码!`)
           return;
         }