Ver código fonte

修复报错

yanliming 4 anos atrás
pai
commit
f2ab3245d1
1 arquivos alterados com 25 adições e 16 exclusões
  1. 25 16
      src/views/base/workShiftInfo-detail.vue

+ 25 - 16
src/views/base/workShiftInfo-detail.vue

@@ -192,15 +192,17 @@ export default {
       this.$emit("close", false);
     },
     handleClose(tag) {
-      if(this.formModel.companyList.length>1){
-        this.formModel.companyList.splice(this.formModel.companyList.indexOf(tag), 1);
+      if(this.formModel.companyList!=null){
+        if(this.formModel.companyList.length>1){
+          this.formModel.companyList.splice(this.formModel.companyList.indexOf(tag), 1);
+        }
+        else{
+          this.$message({
+            message: "关联部门至少保留一个部门",
+            type: "error"
+          });
+        } 
       }
-      else{
-        this.$message({
-          message: "关联部门至少保留一个部门",
-          type: "error"
-        });
-      } 
       
     },
     handleSubmit() {
@@ -213,10 +215,10 @@ export default {
 
             self.loading = true;
 
-            if(self.formModel.workTimeRange.length==2){
+            if(self.formModel.workTimeRange!=null&&self.formModel.workTimeRange.length==2){
               self.formModel.workTimeRange=self.formModel.workTimeRange[0]+","+self.formModel.workTimeRange[1];
             }
-            if(self.formModel.closingTimeRange.length==2){
+            if(self.formModel.closingTimeRange!=null&&self.formModel.closingTimeRange.length==2){
               self.formModel.closingTimeRange=self.formModel.closingTimeRange[0]+","+self.formModel.closingTimeRange[1];
             }
 
@@ -271,15 +273,22 @@ export default {
         if (jsonData.result) {
             self.formModel = jsonData.data;
 
+
+
             var workTimeArray = new Array()
-            workTimeArray[0]=jsonData.data.workStartTime;
-            workTimeArray[1]=jsonData.data.workEndTime;
-            self.formModel.workTimeRange = workTimeArray;
+            if(jsonData.data.workStartTime!=null&&jsonData.data.workEndTime!=null){
+              workTimeArray[0]=jsonData.data.workStartTime;
+              workTimeArray[1]=jsonData.data.workEndTime;
+              self.formModel.workTimeRange = workTimeArray;
+            }
 
             var closingTimeArray = new Array()
-            closingTimeArray[0]=jsonData.data.closingStartTime;
-            closingTimeArray[1]=jsonData.data.closingEndTime;
-            self.formModel.closingTimeRange = closingTimeArray;
+            if(jsonData.data.closingStartTime!=null&&jsonData.data.closingEndTime!=null){
+              closingTimeArray[0]=jsonData.data.closingStartTime;
+              closingTimeArray[1]=jsonData.data.closingEndTime;
+              self.formModel.closingTimeRange = closingTimeArray;
+            }
+            
 
         } else {
           self.$message.error(jsonData.message + "");