解除隔离人员添加字段

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

@@ -193,7 +193,10 @@
           <dict-tag :options="dict.type.community" :value="scope.row.community"/>
         </template>
       </el-table-column>
-      <el-table-column label="家庭住址" width="100" align="center" prop="address" :show-overflow-tooltip="true"/>
+      <el-table-column label="楼号" width="100" align="center" prop="building" :show-overflow-tooltip="true"/>
+      <el-table-column label="单元号" width="100" align="center" prop="unit" :show-overflow-tooltip="true"/>
+      <el-table-column label="门牌号" width="100" align="center" prop="house" :show-overflow-tooltip="true"/>
+      <el-table-column label="家庭住址" width="120" align="center" prop="address" :show-overflow-tooltip="true"/>
       <el-table-column label="转运状态" align="center" prop="zyStatus">
         <template slot-scope="scope">
           <span v-if="scope.row.zyStatus === '0'">是</span>
@@ -369,7 +372,7 @@
             <el-form-item label="所属小区"
                           prop="community"
                           :rules="[
-                            { required: form.area === '1' && cunList.map(item=> item.parent).includes(form.committee), message: '请选择小区/村名称', trigger: 'blur' }
+                            { required: form.isArea === '0' && cunList.map(item=> item.parent).includes(form.committee), message: '请选择小区/村名称', trigger: 'blur' }
                           ]">
               <el-select style="width: 90%" :disabled="form.isArea !== '0'" v-model="form.community"
                          placeholder="请选择所属小区" @blur="streetBlur('community')" @change="streetBlur('community')">
@@ -383,20 +386,39 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="家庭住址" prop="address">
-              <el-input style="width: 90%" v-model="form.address" placeholder="请输入家庭住址"/>
+            <el-form-item label="楼号" prop="building">
+              <el-input :disabled="form.isArea !== '0'" style="width: 90%" v-model="form.building" placeholder="请输入楼号"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="12">
+            <el-form-item label="单元号" prop="unit">
+              <el-input :disabled="form.isArea !== '0'" style="width: 90%" v-model="form.unit" placeholder="请输入单元号"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="门牌号" prop="house">
+              <el-input :disabled="form.isArea !== '0'" style="width: 90%" v-model="form.house" placeholder="请输入门牌号"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="家庭住址" prop="address">
+              <el-input style="width: 90%" v-model="form.address" placeholder="请输入家庭住址"/>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="转运状态" prop="arrangeDrivers">
-              <el-select style="width: 90%" v-model="form.zyStatus" placeholder="请选择转运状态">
+              <el-select :disabled="true" style="width: 90%" v-model="form.zyStatus" placeholder="请选择转运状态">
                 <el-option value="0" label="是"></el-option>
                 <el-option value="1" label="否"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="是否安排司机" prop="arrangeDrivers">
               <el-select style="width: 90%" v-model="form.arrangeDrivers" placeholder="请选择是否安排司机">
@@ -409,8 +431,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="备注街道" prop="bzStreet">
               <el-select :disabled="form.isArea !== '0'" style="width: 90%" v-model="form.bzStreet"
@@ -424,6 +444,8 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="备注住址" prop="bzAddress">
               <el-input :disabled="form.isArea !== '0'" style="width: 90%" v-model="form.bzAddress"