删除非空校验

src/views/eventdetailsdialog.vue

@@ -2546,11 +2546,11 @@ export default {
         /^(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;
         }
 
@@ -2667,10 +2667,10 @@ export default {
         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 = {
@@ -2678,7 +2678,7 @@ export default {
           reserve: this.sendGuanLianYuAn,
         };
         if (this.sendGuanLianYuAn == "" || this.sendGuanLianYuAn == null) {
-          this.$message.error(`请选择预案信息！`);
+          this.$message.warning(`请选择预案信息！`);
           return;
         }
         updateYjYuAn(param).then((res) => {
@@ -3159,19 +3159,19 @@ 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 (
@@ -3180,7 +3180,7 @@ export default {
             that.sendDeptName == "" ||
             that.sendDeptName == null
           ) {
-            that.$message.error(`请选择任务发起部门!`);
+            that.$message.warning(`请选择任务发起部门!`);
             return;
           }
           let eventState = "";
@@ -3224,32 +3224,32 @@ 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;
             }
           }
@@ -3290,11 +3290,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;
           }
           //事件处理流程--审核通过
@@ -3326,11 +3326,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;
           }
           //事件处理流程--审核不通过
@@ -3376,12 +3376,12 @@ export default {
               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;
               }
             }
@@ -4020,11 +4020,11 @@ export default {
         /^(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;
         }
 

src/views/firespread.vue

@@ -2144,14 +2144,14 @@ export default {
                   '<span>' +
                   '                  <div class="d-l-con">' +
                   '                  <div class="d-l-l-text">' +
-                  '                  <h4>联系人：' + res.data.pointList[i].contacts + '</h4>' +
+                  '                  <h4>联系人：' + (res.data.pointList[i].contacts ?res.data.pointList[i].contacts :'无')+ '</h4>' +
                   '                </div>' +
                   '                </div>' +
                   '                </span>' +
                   '<span>' +
                   '                  <div class="d-l-con">' +
                   '                  <div class="d-l-l-text">' +
-                  '                  <h4>电话：' + res.data.pointList[i].phone + '</h4>' +
+                  '                  <h4>电话：' +(res.data.pointList[i].phone ?res.data.pointList[i].phone :'无') + '</h4>' +
                   '                </div>' +
                   '                </div>' +
                   '                </span>' +