修改

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

@@ -132,11 +132,6 @@
           <dict-tag :options="dict.type.residential_area" :value="scope.row.area"/>
         </template>
       </el-table-column>
-      <el-table-column label="小区名称" width="140" align="center" prop="community" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.community" :value="scope.row.community"/>
-        </template>
-      </el-table-column>
       <el-table-column label="街道/镇名称" width="140" align="center" prop="street" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.street_town" :value="scope.row.street"/>
@@ -147,6 +142,11 @@
           <dict-tag :options="dict.type.committee" :value="scope.row.committee"/>
         </template>
       </el-table-column>
+      <el-table-column label="小区名称" width="140" align="center" prop="community" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.community" :value="scope.row.community"/>
+        </template>
+      </el-table-column>
       <el-table-column label="楼号" align="center" prop="floor"  :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ scope.row.floor ? scope.row.floor : '' }}</span>
@@ -245,15 +245,15 @@
           </el-col>
           <el-col :span="12">
             <el-form-item
-              label="小区名称"
-              prop="community"
+              label="街道/镇名称"
+              prop="street"
               :rules="[
-                { required: form.area === '1' && cunList.map(item=> item.parent).includes(form.committee), message: '请选择小区/村名称', trigger: ['blur','change'] }
+                { required: form.area === '1', 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-select v-model="form.street"  @blur="streetBlur('street')" placeholder="请选择街道/镇" :disabled="form.area !== '1'" @change="zhenSelect" style="width: 100%">
                 <el-option
-                  v-for="dict in cun"
+                  v-for="dict in zhen"
                   :key="dict.code"
                   :label="dict.name"
                   :value="dict.code"
@@ -265,15 +265,15 @@
         <el-row>
           <el-col :span="12">
             <el-form-item
-              label="街道/镇名称"
-              prop="street"
+              label="居委会"
+              prop="committee"
               :rules="[
-                { required: form.area === '1', message: '请选择街道/镇', trigger: ['blur','change'] }
+                { required: form.area === '1' && juList.map(item=> item.parent).includes(form.street), message: '请选择居委会', trigger: ['blur','change']  }
                 ]"
             >
-              <el-select v-model="form.street"  @blur="streetBlur('street')" placeholder="请选择街道/镇" :disabled="form.area !== '1'" @change="zhenSelect" 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 zhen"
+                  v-for="dict in ju"
                   :key="dict.code"
                   :label="dict.name"
                   :value="dict.code"
@@ -283,18 +283,18 @@
           </el-col>
           <el-col :span="12">
             <el-form-item
-              label="居委会"
-              prop="committee"
+              label="小区名称"
+              prop="community"
               :rules="[
-                { required: form.area === '1' && juList.map(item=> item.parent).includes(form.street), message: '请选择居委会', trigger: ['blur','change']  }
+                { required: form.area === '1' && cunList.map(item=> item.parent).includes(form.committee), message: '请选择小区/村名称', trigger: ['blur','change'] }
                 ]"
             >
-              <el-select v-model="form.committee"  @blur="streetBlur('committee')" placeholder="请选择居委会" :disabled="form.area !== '1'" @change="juSelect" 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 ju"
-                    :key="dict.code"
-                    :label="dict.name"
-                    :value="dict.code"
+                  v-for="dict in cun"
+                  :key="dict.code"
+                  :label="dict.name"
+                  :value="dict.code"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -1070,7 +1070,7 @@ export default {
           this.juSelect(response.data.committee)
         }
         this.form = response.data;
-        if(this.form.level.length > 0) {
+        if(this.form.level) {
           this.form.level = this.form.level.split(',')
         }
         this.title = "查看小区封控情况";
@@ -1091,7 +1091,7 @@ export default {
           this.juSelect(response.data.committee)
         }
         this.form = response.data;
-        if(this.form.level.length > 0) {
+        if(this.form.level) {
           this.form.level = this.form.level.split(',')
         }
         this.title = "修改小区封控情况";
@@ -1102,7 +1102,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if(this.form.level.length > 0) {
+          if(this.form.level) {
             this.form.level = this.form.level.toString()
           }
           if (this.form.id != null) {

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

@@ -459,10 +459,10 @@
             <el-form-item
               label="小区/村名称"
               prop="community"
-              :rules="[
-                { required: form.area === '1' && cunList.map(item=> item.parent).includes(form.committee), message: '请选择小区/村名称', trigger: 'blur' }
-                ]"
             >
+<!--              :rules="[-->
+<!--              { required: form.area === '1' && cunList.map(item=> item.parent).includes(form.committee), message: '请选择小区/村名称', trigger: 'blur' }-->
+<!--              ]"-->
               <el-select style="width: 100%" @blur="streetBlur('community')" @change="streetBlur('community')" v-model="form.community" placeholder="请选择小区/村名称" :disabled="form.area !== '1'">
                 <el-option
                   v-for="dict in cun"

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

@@ -203,11 +203,11 @@
           <span v-if="scope.row.zyStatus === '1'">否</span>
         </template>
       </el-table-column>
-      <el-table-column label="是否安排司机" align="center" prop="arrangeDrivers" width="140" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.arrange_drivers" :value="scope.row.arrangeDrivers"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="是否安排司机" align="center" prop="arrangeDrivers" width="140" :show-overflow-tooltip="true">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.arrange_drivers" :value="scope.row.arrangeDrivers"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="备注街道" align="center" prop="bzStreet" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.street_town" :value="scope.row.bzStreet"/>

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

@@ -460,7 +460,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="楼层" prop="floor">
-              <el-select style="width: 100%" v-model="form.floor" placeholder="请选择楼层">
+              <el-select style="width: 100%" v-model="form.floor" clearable placeholder="请选择楼层">
                 <el-option
                   v-for="item in floorOptions"
                   :key="item.value"
@@ -1298,7 +1298,7 @@ export default {
           this.juSelect(response.data.committee)
         }
         this.form = response.data;
-        if(this.form.floor.length > 0) {
+        if(this.form.floor) {
           this.form.floor = this.form.floor.split(',')
         }
         this.getInfoByCard()
@@ -1319,7 +1319,7 @@ export default {
           this.juSelect(response.data.committee)
         }
         this.form = response.data;
-        if(this.form.floor.length > 0) {
+        if(this.form.floor) {
           this.form.floor = this.form.floor.split(',')
         }
         this.getInfoByCard()
@@ -1344,7 +1344,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if(this.form.floor.length > 0) {
+          if(this.form.floor) {
             this.form.floor = this.form.floor.toString()
           }
           if (this.form.id != null) {