59815,59809

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

@@ -218,7 +218,16 @@
           <dict-tag :options="dict.type.street_town" :value="scope.row.street"/>
         </template>
       </el-table-column>
-      <el-table-column label="小区/村名称" align="center" prop="community" width="120" :show-overflow-tooltip="true"/>
+      <el-table-column label="居委会" align="center" prop="committee" width="120" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.committee" :value="scope.row.committee"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="小区/村名称" align="center" prop="community" width="120" :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" />
       <el-table-column label="单元号" align="center" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column label="门牌号" align="center" prop="doorplate" :show-overflow-tooltip="true"/>
@@ -540,7 +549,7 @@ import {getGlPlace} from "@/api/system/gldry";
 
 export default {
   name: "Fcry",
-  dicts: ['street_town', 'residential_area', 'sys_normal_disable','shelters'],
+  dicts: ['street_town', 'residential_area', 'sys_normal_disable','shelters','community','committee'],
   data() {
     var validateStartTime = (rule, value, callback) => {
       if (value === undefined || value === '' || value === null) {

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

@@ -133,7 +133,16 @@
           <dict-tag :options="dict.type.street_town" :value="scope.row.street"/>
         </template>
       </el-table-column>
-      <el-table-column label="小区名称" width="140" align="center" prop="community" :show-overflow-tooltip="true"/>
+      <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="committee" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.committee" :value="scope.row.committee"/>
+        </template>
+      </el-table-column>
       <el-table-column label="所在区" width="140" align="center" prop="area" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.residential_area" :value="scope.row.area"/>
@@ -204,10 +213,10 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="auto">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="小区名称" prop="community">
-              <el-select v-model="form.community" placeholder="请选择小区/村名称" :disabled="form.area !== '1'" style="width: 100%">
+            <el-form-item label="所在区" prop="area">
+              <el-select v-model="form.area" placeholder="请选择所在区" @change="quSelect" style="width: 100%">
                 <el-option
-                    v-for="dict in cun"
+                    v-for="dict in quList"
                     :key="dict.code"
                     :label="dict.name"
                     :value="dict.code"
@@ -216,13 +225,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="所在区" prop="area">
-              <el-select v-model="form.area" placeholder="请选择所在区" @change="quSelect" style="width: 100%">
+            <el-form-item label="小区名称" prop="community">
+              <el-select v-model="form.community" placeholder="请选择小区/村名称" :disabled="form.area !== '1'" style="width: 100%">
                 <el-option
-                    v-for="dict in quList"
-                    :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>
@@ -432,7 +441,7 @@ import { importTemplate, importExcel } from "@/api/system/fkqk";
 
 export default {
   name: "Fkqk",
-  dicts: ['street_town', 'residential_area', 'sys_normal_disable'],
+  dicts: ['street_town', 'residential_area', 'sys_normal_disable','community','committee'],
   data() {
     var validateStartTime = (rule, value, callback) => {
       if (value === undefined || value === '' || value === null) {

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

@@ -214,9 +214,16 @@
           <dict-tag :options="dict.type.street_town" :value="scope.row.street"/>
         </template>
       </el-table-column>
-      <el-table-column label="居委会" width="120" align="center" prop="committee" :show-overflow-tooltip="true"/>
-      <el-table-column label="小区/村名称" width="120" align="center" prop="community" :show-overflow-tooltip="true"/>
-      <el-table-column label="楼号" align="center" prop="buildingNo" />
+      <el-table-column label="居委会" width="120" align="center" prop="committee" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <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">
+        <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="buildingNo" />
       <el-table-column label="单元号" align="center" prop="unitNo" />
       <el-table-column label="门牌号" align="center" prop="houseNo" />
       <el-table-column label="转入时间" align="center" prop="zrTime" width="180">
@@ -491,7 +498,7 @@ import { getToken } from '@/utils/auth'
 import { importTemplate, importExcel } from "@/api/system/gldry";
 export default {
   name: "Gldry",
-  dicts: ['street_town', 'residential_area', 'sys_normal_disable','isolation_point'],
+  dicts: ['street_town', 'residential_area', 'sys_normal_disable','isolation_point','community','committee'],
   data() {
     var validateStartTime = (rule, value, callback) => {
       if (value === undefined || value === '' || value === null) {