考勤时间设置修改

src/views/base/alarmConfig-detail.vue

@@ -28,8 +28,7 @@
           <el-select-tree
             :props="props"
             :options="companyResult"
-            :value="formModel.companyId"
-            @getValue="getSelectedValue($event)"
+            v-model="formModel.companyId"
             height="200"
           ></el-select-tree>
         </el-form-item>
@@ -52,6 +51,9 @@
               :value="item.value"
             ></el-option>
           </el-select>
+          <!-- <el-checkbox-group v-model="formModel.weekdays" size="small">
+              <el-checkbox-button v-for="item in options" :label="item.value" :key="item.value">{{item.label}}</el-checkbox-button>
+            </el-checkbox-group> -->
         </el-form-item>
         <el-form-item label="开始时间" prop="startTime">
           <el-time-picker
@@ -204,10 +206,11 @@ export default {
         if (valid) {
           (function() {
             var id = self.formModel.id;
-
-            var weekdays = self.formModel.weekdays.join(",");
-            self.formModel.weekdays = weekdays;
             self.loading = true;
+            if (self.formModel.weekdays != null) {
+                var weekdays = self.formModel.weekdays.join(",");
+                self.formModel.weekdays = weekdays;
+            }
 
             if (self.formModel.companyId == null) {
               self.formModel.companyId = "";

src/views/base/alarmConfig-list.vue

@@ -33,8 +33,7 @@
           :props="props"
           aria-setsize="mini"
           :options="companyResult"
-          :value="queryModel.companyId"
-          @getValue="getSelectedValue($event)"
+          v-model="queryModel.companyId"
           height="200"
         ></el-select-tree>
       </el-form-item>