小区-1

src/views/zdsz/area/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="小区名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -18,12 +18,14 @@
         />
       </el-form-item>
       <el-form-item label="是否释放" prop="releaseIs">
-        <el-input
-          v-model="queryParams.releaseIs"
-          placeholder="请输入是否释放"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.releaseIs" placeholder="请选择是否释放">
+          <el-option
+            v-for="dict in dict.type.release_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="释放人" prop="releaseBy">
         <el-input
@@ -78,7 +80,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['zdsz:area:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -89,7 +92,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['zdsz:area:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -100,7 +104,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['zdsz:area:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -110,22 +115,23 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['zdsz:area:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="areaList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="" align="center" prop="id" v-if="true"/>
-      <el-table-column label="小区名称" align="center" prop="name" />
-      <el-table-column label="小区规模" align="center" prop="scale" />
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="id" align="center" prop="id"/>
+      <el-table-column label="小区名称" align="center" prop="name"/>
+      <el-table-column label="小区规模" align="center" prop="scale"/>
       <el-table-column label="是否释放" align="center" prop="releaseIs">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.release_status" :value="scope.row.releaseIs"/>
         </template>
       </el-table-column>
-      <el-table-column label="释放人" align="center" prop="releaseBy" />
+      <el-table-column label="释放人" align="center" prop="releaseBy"/>
       <el-table-column label="行政区" align="center" prop="district">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.district" :value="scope.row.district"/>
@@ -141,7 +147,7 @@
           <dict-tag :options="dict.type.belonging_pack" :value="scope.row.belongingPack"/>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -150,14 +156,16 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['zdsz:area:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['zdsz:area:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -171,53 +179,84 @@
     />
 
     <!-- 添加或修改小区管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="小区名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入小区名称" />
-        </el-form-item>
-        <el-form-item label="小区规模" prop="scale">
-          <el-input v-model="form.scale" placeholder="请输入小区规模" />
-        </el-form-item>
-        <el-form-item label="是否释放" prop="releaseIs">
-          <el-input v-model="form.releaseIs" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="释放人" prop="releaseBy">
-          <el-input v-model="form.releaseBy" placeholder="请输入释放人" />
-        </el-form-item>
-        <el-form-item label="行政区" prop="district">
-          <el-select v-model="form.district" placeholder="请选择行政区">
-            <el-option
-              v-for="dict in dict.type.district"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="核算行政区" prop="calculateDistrict">
-          <el-select v-model="form.calculateDistrict" placeholder="请选择核算行政区">
-            <el-option
-              v-for="dict in dict.type.district"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="所属包" prop="belongingPack">
-          <el-select v-model="form.belongingPack" placeholder="请选择所属包">
-            <el-option
-              v-for="dict in dict.type.belonging_pack"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="小区名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入小区名称"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="小区规模" prop="scale">
+              <el-input v-model="form.scale" placeholder="请输入小区规模"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="是否释放" prop="releaseIs">
+              <el-select v-model="form.releaseIs" placeholder="请选择是否释放">
+                <el-option
+                  v-for="dict in dict.type.release_status"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="释放人" prop="releaseBy">
+              <el-input v-model="form.releaseBy" placeholder="请输入释放人"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="行政区" prop="district">
+              <el-select v-model="form.district" placeholder="请选择行政区">
+                <el-option
+                  v-for="dict in dict.type.district"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="核算行政区" prop="calculateDistrict">
+              <el-select v-model="form.calculateDistrict" placeholder="请选择核算行政区">
+                <el-option
+                  v-for="dict in dict.type.district"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="所属包" prop="belongingPack">
+              <el-select v-model="form.belongingPack" placeholder="请选择所属包">
+                <el-option
+                  v-for="dict in dict.type.belonging_pack"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -228,11 +267,11 @@
 </template>
 
 <script>
-import { listArea, getArea, delArea, addArea, updateArea } from "@/api/zdsz/area";
+import {listArea, getArea, delArea, addArea, updateArea} from "@/api/zdsz/area";
 
 export default {
   name: "Area",
-  dicts: ['belonging_pack', 'district'],
+  dicts: ['belonging_pack', 'district', 'release_status'],
   data() {
     return {
       // 按钮loading
@@ -272,31 +311,31 @@ export default {
       // 表单校验
       rules: {
         id: [
-          { required: true, message: "不能为空", trigger: "blur" }
+          {required: true, message: "不能为空", trigger: "blur"}
         ],
         name: [
-          { required: true, message: "小区名称不能为空", trigger: "blur" }
+          {required: true, message: "小区名称不能为空", trigger: "blur"}
         ],
         scale: [
-          { required: true, message: "小区规模不能为空", trigger: "blur" }
+          {required: true, message: "小区规模不能为空", trigger: "blur"}
         ],
         releaseIs: [
-          { required: true, message: "是否释放不能为空", trigger: "blur" }
+          {required: true, message: "是否释放不能为空", trigger: "blur"}
         ],
         releaseBy: [
-          { required: true, message: "释放人不能为空", trigger: "blur" }
+          {required: true, message: "释放人不能为空", trigger: "blur"}
         ],
         district: [
-          { required: true, message: "行政区不能为空", trigger: "change" }
+          {required: true, message: "行政区不能为空", trigger: "change"}
         ],
         calculateDistrict: [
-          { required: true, message: "核算行政区不能为空", trigger: "change" }
+          {required: true, message: "核算行政区不能为空", trigger: "change"}
         ],
         belongingPack: [
-          { required: true, message: "所属包不能为空", trigger: "change" }
+          {required: true, message: "所属包不能为空", trigger: "change"}
         ],
         remark: [
-          { required: true, message: "备注不能为空", trigger: "blur" }
+          {required: true, message: "备注不能为空", trigger: "blur"}
         ],
       }
     };
@@ -352,7 +391,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */