Merge branch 'dev-fangyi' into dev

src/views/modules/base/epidemic/natInfo/natForm.vue

@@ -165,8 +165,8 @@
           <el-checkbox-group v-model="formData.channel">
             <el-checkbox key="0"
                          label="0">小程序通知</el-checkbox>
-            <el-checkbox key="1"
-                         label="1">短信通知</el-checkbox>
+            <!-- <el-checkbox key="1"
+                         label="1">短信通知</el-checkbox> -->
 
           </el-checkbox-group>
         </el-form-item>

src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue

@@ -67,8 +67,8 @@
               <el-checkbox-group v-model="formData1.channel">
                 <el-checkbox key="1"
                              label="1">小程序通知</el-checkbox>
-                <el-checkbox key="2"
-                             label="2">短信通知</el-checkbox>
+                <!-- <el-checkbox key="2"
+                             label="2">短信通知</el-checkbox> -->
 
               </el-checkbox-group>
             </el-form-item>

src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue

@@ -66,8 +66,8 @@
             <el-checkbox-group v-model="formData.channel">
               <el-checkbox key="0"
                            label="0">小程序通知</el-checkbox>
-              <el-checkbox key="1"
-                           label="1">短信通知</el-checkbox>
+              <!-- <el-checkbox key="1"
+                           label="1">短信通知</el-checkbox> -->
 
             </el-checkbox-group>
           </el-form-item>

src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue

@@ -15,8 +15,8 @@
           <el-checkbox-group v-model="formData.channel">
             <el-checkbox key="1"
                          label="1">小程序通知</el-checkbox>
-            <el-checkbox key="2"
-                         label="2">短信通知</el-checkbox>
+            <!-- <el-checkbox key="2"
+                         label="2">短信通知</el-checkbox> -->
 
           </el-checkbox-group>
         </el-form-item>
@@ -79,9 +79,6 @@ export default {
       },
       selectionAll: []
 
-
-
-
     }
   },
   components: {},
@@ -94,7 +91,7 @@ export default {
     async initForm (selectionAll) {
 
       this.$refs['ref_form1'].resetFields();
-      this.selectionAll = selectionAll
+      this.formData.userList = selectionAll
 
     },