Merge branch 'bug_mk' into dev

src/views/modules/communityService/policy/addPolicy.vue

@@ -157,10 +157,10 @@
           label-width="150px"
         >
         <el-switch
-  v-model="value"
-  active-color="#409EFF"
-  inactive-color="#ff4949">
-</el-switch>
+          v-model="value"
+          active-color="#409EFF"
+          inactive-color="#ff4949">
+        </el-switch>
       </el-form-item>
         <el-form-item label="指派服务" label-width="150px">
           <el-switch
@@ -771,7 +771,7 @@ export default {
         this.formData.policyId = this.policyId;
         console.log(this.formData.assignInfo.serverOrgId);
         console.log(this.serviceOptiondList);
-        if(this.serviceOptiondList.findIndex(item=>item.id === this.formData.assignInfo.serverOrgId) != -1){
+        if(this.serviceOptiondList && this.serviceOptiondList.findIndex(item=>item.id === this.formData.assignInfo.serverOrgId) != -1){
           let {name,mobile} =  this.serviceOptiondList.filter(item=>item.id === this.formData.assignInfo.serverOrgId)[0]
           this.formData.serverOrgName = name
           this.formData.serverOrgMobile = mobile