Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/FcryController.java

@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DataUtils;
 import com.ruoyi.common.utils.DictUtils;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -155,6 +156,11 @@ public class FcryController extends BaseController
         ExcelUtil<FcryDTO> util = new ExcelUtil<FcryDTO>(FcryDTO.class);
         Class<? extends FcryDTO>  clazz = new FcryDTO().getClass();
         //
+        // 获取当前登陆人所属方舱
+        SysUser loginUser = getLoginUser().getUser();
+        String fcPlace = loginUser.getNickName();
+        String[] fcPlaces={fcPlace};
+        ExcelUtil.setClassExcelAttribute(clazz,"fcPlace","combo",fcPlaces);
         String[] isPositive = {"是","否"};
         ExcelUtil.setClassExcelAttribute( clazz,"isPositive","combo",isPositive);
         String[] positiveOnly = {"是","否"};

ruoyi-system/src/main/java/com/ruoyi/system/domain/FcryDTO.java

@@ -22,7 +22,7 @@ public class FcryDTO extends BaseEntity
         private Long id;
 
         /** 方舱名称 */
-        @Excel(name = "方舱名称")
+        @Excel(name = "方舱名称" ,dictType = "fcPlace")
         private String fcPlace;
 
         /** 房间号 */

ruoyi-ui/src/views/system/fcry/index.vue

@@ -363,7 +363,7 @@
                 { required: form.area === '1', message: '请选择街道/镇', trigger: ['blur','change'] }
                 ]"
            >
-              <el-select v-model="form.street" placeholder="请选择街道/镇" :disabled="form.area !== '1'" @change="zhenSelect" style="width: 100%"
+              <el-select v-model="form.street" placeholder="请选择街道/镇"  @blur="streetBlur('street')" :disabled="form.area !== '1'" @change="zhenSelect" style="width: 100%"
 
               >
                 <el-option
@@ -385,7 +385,7 @@
                 { required: form.area === '1', message: '请选择居委会', trigger: ['blur','change']  }
                 ]"
             >
-              <el-select v-model="form.committee" placeholder="请选择居委会" :disabled="form.area !== '1'"  @change="juSelect" style="width: 100%">
+              <el-select v-model="form.committee"  @blur="streetBlur('committee')" placeholder="请选择居委会" :disabled="form.area !== '1'"  @change="juSelect" style="width: 100%">
                 <el-option
                     v-for="dict in ju"
                     :key="dict.code"
@@ -403,7 +403,7 @@
                 { required: form.area === '1', message: '请选择小区/村名称', trigger: ['blur','change'] }
                 ]"
             >
-              <el-select v-model="form.community" placeholder="请选择小区/村名称" :disabled="form.area !== '1'" style="width: 100%">
+              <el-select v-model="form.community" @blur="streetBlur('community')" @chang="streetBlur('community')"  placeholder="请选择小区/村名称" :disabled="form.area !== '1'" style="width: 100%">
                 <el-option
                     v-for="dict in cun"
                     :key="dict.code"
@@ -926,6 +926,9 @@ export default {
     this.getList();
   },
   methods: {
+    streetBlur(val) {
+      this.$refs.form.validateField(val)
+    },
     quSelect(val){
       this.zhen = []
       this.form.community = ''

ruoyi-ui/src/views/system/gldry/index.vue

@@ -221,7 +221,7 @@
           <dict-tag :options="dict.type.committee" :value="scope.row.committee"/>
         </template>
       </el-table-column>
-      <el-table-column label="小区名称" width="120" align="center" prop="community" :show-overflow-tooltip="true">
+      <el-table-column label="小区/村名称" width="120" align="center" prop="community" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.community" :value="scope.row.community"/>
         </template>