Merge branch 'dev-tuceng0616'

3 years ago · 49ae938093
4 changed files with 9 additions and 5 deletions
--- a/src/views/modules/communityService/sqzzz/cpts/edit.vue
+++ b/src/views/modules/communityService/sqzzz/cpts/edit.vue
@ -314,6 +314,9 @@ export default {
        principalPhone: [
          { required: true, message: "联系电话不能为空", trigger: "blur" },
        ],
+        address: [
+          { required: true, message: "地址不能为空", trigger: "blur" },
+        ],
        longitude: [
          { required: true, message: "请拖动地图选择坐标点", trigger: "blur" },
        ],
--- a/src/views/modules/communityService/sqzzz/index.vue
+++ b/src/views/modules/communityService/sqzzz/index.vue
@ -131,6 +131,8 @@
        </el-table-column>
        <el-table-column prop="principalPhone" align="center" label="联系电话">
        </el-table-column>
+        <el-table-column prop="address" align="center" label="地址">
+        </el-table-column>
        <el-table-column prop="remark" align="center" label="备注">
        </el-table-column>
        <el-table-column
--- a/src/views/modules/shequzhili/csgltc/csgl.vue
+++ b/src/views/modules/shequzhili/csgltc/csgl.vue
@ -102,8 +102,7 @@
                         header-align="center"
                         align="center"
                         label="占地面积"
-                         show-overflow-tooltip
-                         min-width="250">
+                         max-width="100">

        </el-table-column>
        <el-table-column prop="capacity"
@ -117,7 +116,7 @@
                         align="center"
                         show-overflow-tooltip
                         label="地址"
-                         width="120">
+                         mix-width="230">
        </el-table-column>

        <el-table-column label="操作"
--- a/src/views/modules/shequzhili/ggfwtc/ggfw.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
@ -101,7 +101,7 @@
                         align="center"
                         label="占地面积"
                         show-overflow-tooltip
-                         min-width="250">
+                         max-width="100">
        </el-table-column>
        <el-table-column prop="capacity"
                         header-align="center"
@ -114,7 +114,7 @@
                         align="center"
                         show-overflow-tooltip
                         label="地址"
-                         width="120">
+                         mix-width="230">
        </el-table-column>
        <el-table-column label="操作"
                         fixed="right"