修改

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

@@ -242,6 +242,26 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="小区名称"
+              prop="community"
+              :rules="[
+                { required: form.area === '1' && cunList.map(item=> item.parent).includes(form.committee), message: '请选择小区/村名称', trigger: ['blur','change'] }
+                ]"
+            >
+              <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"
+                  :label="dict.name"
+                  :value="dict.code"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item
               label="街道/镇名称"
@@ -260,8 +280,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item
               label="居委会"
@@ -280,24 +298,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item
-              label="小区名称"
-              prop="community"
-              :rules="[
-                { required: form.area === '1' && cunList.map(item=> item.parent).includes(form.committee), message: '请选择小区/村名称', trigger: ['blur','change'] }
-                ]"
-            >
-              <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"
-                  :label="dict.name"
-                  :value="dict.code"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -312,23 +312,37 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="12">
+            <el-form-item label="楼层" prop="level">
+              <el-select style="width: 100%" multiple v-model="form.level" clearable placeholder="请选择楼层">
+                <el-option
+                  v-for="item in floorOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="封控明细" prop="fkDetailed">
               <el-input v-model.trim="form.fkDetailed" maxlength="80" show-word-limit  placeholder="请输入封控明细" />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="涉及封控户数" prop="fkHs">
               <el-input-number style="width: 100%" v-model.trim="form.fkHs" placeholder="请输入涉及封控户数" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="涉及封控人数" prop="fkRs">
               <el-input-number style="width: 100%" v-model.trim="form.fkRs" placeholder="请输入涉及封控人数" />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="封控时间" prop="fkTime">
               <el-date-picker clearable
@@ -342,8 +356,6 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="拟解封时间" prop="jfTime">
               <el-date-picker clearable
@@ -357,6 +369,8 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="是否解封" prop="isJf">
               <el-select v-model="form.isJf" placeholder="请选择是否解封" style="width: 100%">
@@ -365,8 +379,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="实际解封时间" prop="realTime">
               <el-date-picker clearable
@@ -380,6 +392,8 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="封控后最近一次核酸检测时间" prop="hsTime">
               <el-date-picker clearable
@@ -393,37 +407,12 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input v-model.trim="form.remark" maxlength="200" show-word-limit  placeholder="请输入备注" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-
-          </el-col>
         </el-row>
-
-
-
-
-
-
-
-<!--        <el-form-item label="状态">-->
-<!--          <el-radio-group v-model="form.status">-->
-<!--            <el-radio-->
-<!--              v-for="dict in dict.type.sys_normal_disable"-->
-<!--              :key="dict.value"-->
-<!--:label="dict.value"-->
-<!--            >{{dict.label}}</el-radio>-->
-<!--          </el-radio-group>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="删除标志" prop="delFlag">-->
-<!--          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />-->
-<!--        </el-form-item>-->
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -567,8 +556,44 @@ export default {
         floor: null,
       },
       formLoading: false,
+      floorOptions: [
+        {label: '1', value: '1'},
+        {label: '2', value: '2'},
+        {label: '3', value: '3'},
+        {label: '4', value: '4'},
+        {label: '5', value: '5'},
+        {label: '6', value: '6'},
+        {label: '7', value: '7'},
+        {label: '8', value: '8'},
+        {label: '9', value: '9'},
+        {label: '10', value: '10'},
+        {label: '11', value: '11'},
+        {label: '12', value: '12'},
+        {label: '13', value: '13'},
+        {label: '14', value: '14'},
+        {label: '15', value: '15'},
+        {label: '16', value: '16'},
+        {label: '17', value: '17'},
+        {label: '18', value: '18'},
+        {label: '19', value: '19'},
+        {label: '20', value: '20'},
+        {label: '21', value: '21'},
+        {label: '22', value: '22'},
+        {label: '23', value: '23'},
+        {label: '24', value: '24'},
+        {label: '25', value: '25'},
+        {label: '26', value: '26'},
+        {label: '27', value: '27'},
+        {label: '28', value: '28'},
+        {label: '29', value: '29'},
+        {label: '30', value: '30'},
+        {label: '31', value: '31'},
+        {label: '32', value: '32'},
+      ],
       // 表单参数
-      form: {},
+      form: {
+        level:[],
+      },
       // 表单校验
       rules: {
         // community: [{ required: true, message: '请输入小区名称', trigger: 'blur' }],
@@ -973,6 +998,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        level:[],
         id: null,
         street: null,
         committee: null,
@@ -1043,6 +1069,9 @@ export default {
           this.juSelect(response.data.committee)
         }
         this.form = response.data;
+        if(this.form.level.length > 0) {
+          this.form.level = this.form.level.split(',')
+        }
         this.title = "查看小区封控情况";
         this.formLoading = false
       });
@@ -1061,6 +1090,9 @@ export default {
           this.juSelect(response.data.committee)
         }
         this.form = response.data;
+        if(this.form.level.length > 0) {
+          this.form.level = this.form.level.split(',')
+        }
         this.title = "修改小区封控情况";
         this.formLoading = false
       });
@@ -1069,6 +1101,9 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          if(this.form.level.length > 0) {
+            this.form.level = this.form.level.toString()
+          }
           if (this.form.id != null) {
             updateFkqk(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");

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

@@ -460,7 +460,14 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="楼层" prop="floor">
-              <el-input v-model="form.floor" maxlength="4" show-word-limit placeholder="请输入单元号" />
+              <el-select style="width: 100%" v-model="form.floor" placeholder="请选择楼层">
+                <el-option
+                  v-for="item in floorOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -953,8 +960,42 @@ export default {
       },
       // 表单参数
       formLoading: false,
+      floorOptions: [
+        {label: '1', value: '1'},
+        {label: '2', value: '2'},
+        {label: '3', value: '3'},
+        {label: '4', value: '4'},
+        {label: '5', value: '5'},
+        {label: '6', value: '6'},
+        {label: '7', value: '7'},
+        {label: '8', value: '8'},
+        {label: '9', value: '9'},
+        {label: '10', value: '10'},
+        {label: '11', value: '11'},
+        {label: '12', value: '12'},
+        {label: '13', value: '13'},
+        {label: '14', value: '14'},
+        {label: '15', value: '15'},
+        {label: '16', value: '16'},
+        {label: '17', value: '17'},
+        {label: '18', value: '18'},
+        {label: '19', value: '19'},
+        {label: '20', value: '20'},
+        {label: '21', value: '21'},
+        {label: '22', value: '22'},
+        {label: '23', value: '23'},
+        {label: '24', value: '24'},
+        {label: '25', value: '25'},
+        {label: '26', value: '26'},
+        {label: '27', value: '27'},
+        {label: '28', value: '28'},
+        {label: '29', value: '29'},
+        {label: '30', value: '30'},
+        {label: '31', value: '31'},
+        {label: '32', value: '32'},
+      ],
       form: {
-        floor: null,
+        floor: [],
         sbDate:  moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
         cyTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
         zyTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
@@ -1205,7 +1246,7 @@ export default {
         community: null,
         building: null,
         unit: null,
-        floor: null,
+        floor: [],
         house: null,
         hasAcid: null,
         isHome: null,
@@ -1257,6 +1298,9 @@ export default {
           this.juSelect(response.data.committee)
         }
         this.form = response.data;
+        if(this.form.floor.length > 0) {
+          this.form.floor = this.form.floor.split(',')
+        }
         this.getInfoByCard()
         this.formLoading = false
       });
@@ -1275,6 +1319,9 @@ export default {
           this.juSelect(response.data.committee)
         }
         this.form = response.data;
+        if(this.form.floor.length > 0) {
+          this.form.floor = this.form.floor.split(',')
+        }
         this.getInfoByCard()
         this.title = "修改阳性人员";
         this.formLoading = false
@@ -1297,6 +1344,9 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          if(this.form.floor.length > 0) {
+            this.form.floor = this.form.floor.toString()
+          }
           if (this.form.id != null) {
             updateYxry(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");