From d16d10d94fddff86bdfd87113e7fd2cebe8b7cd7 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 24 Jan 2024 18:15:06 +0800
Subject: [PATCH] 居民监管样式调整

---
 src/views/place/index.vue |  149 +++++++++++++++++++++++++++----------------------
 1 files changed, 83 insertions(+), 66 deletions(-)

diff --git a/src/views/place/index.vue b/src/views/place/index.vue
index 0f44eb8..6116248 100644
--- a/src/views/place/index.vue
+++ b/src/views/place/index.vue
@@ -38,8 +38,8 @@
             </template>
 
             <template slot-scope="{row, size}" slot="menu">
-                <el-button :size="size" type="text" :disabled="row.confirmFlag == 2 || row.confirmFlag == 4"
-                    icon="el-icon-s-check" v-if="permission.place_audit_cur" @click="auditCur(row)">审核
+                <el-button :size="size" type="text" icon="el-icon-s-check" v-if="permission.place_audit_cur"
+                    @click="auditCur({ ...row, confirmFlag: 1 })">审核
                 </el-button>
 
                 <el-button :size="size" type="text" icon="el-icon-edit" v-if="permission.place_manage_tenants"
@@ -48,9 +48,7 @@
             </template>
         </avue-crud>
 
-        <el-dialog class="place-info-box" title="场所维护" append-to-body :visible.sync="roleBox" center @close="roleBoxClose">
-            <baseAllInfo></baseAllInfo>
-        </el-dialog>
+        <baseAllInfo ref="BaseAllInfo"></baseAllInfo>
 
         <el-dialog class="place-info-box audit-info-box" title="审核" append-to-body :visible.sync="auditBasePopup"
             width="30%">
@@ -93,9 +91,6 @@
         }
 
         return {
-            curRow: {},
-            roleBox: false,
-
             form: {},
             query: {},
             loading: true,
@@ -143,38 +138,22 @@
                     },
 
                     {
-                        span: 7,
-                        label: "场所标签",
-                        prop: "label",
-                        type: "cascader",
-                        dicUrl: "/api/blade-category/category/getCategory?level=2",
-                        cascader: ["smallLabel"],
-                        props: {
-                            label: "categoryName",
-                            value: "categoryNo"
-                        },
+                        width: 156,
+                        overHidden: true,
+                        slot: true,
+                        label: "地址",
+                        prop: "location",
+                        type: 'map',
                         dataType: "string",
-                        hide: true,
-                        rules: [{
-                            required: true,
-                            message: "请输入场所标签",
-                            trigger: "blur",
-                        },],
-                    },
-
-                    {
-                        span: 5,
-                        label: "",
-                        labelWidth: 20,
-                        prop: "smallLabel",
-                        type: "cascader",
-                        dicUrl: "/api/blade-category/category/getCategory?parentNo={{label}}",
-                        props: {
-                            label: "categoryName",
-                            value: "categoryNo"
-                        },
-                        dataType: "string",
-                        hide: true,
+                        span: 12,
+                        value: [117.966460, 28.431002, ""],
+                        rules: [
+                            {
+                                required: true,
+                                message: "请选择地址",
+                                trigger: "blur",
+                            },
+                        ],
                     },
 
                     {
@@ -248,7 +227,7 @@
                             label: "name",
                             value: "id",
                         },
-                        cascader: ["gridId"],
+                        cascader: ["gridCode"],
                         rules: [
                             {
                                 required: true,
@@ -277,12 +256,12 @@
                     {
                         hide: true,
                         label: "所属网格",
-                        prop: "gridId",
+                        prop: "gridCode",
                         type: "tree",
                         cell: true,
                         props: {
                             label: "gridName",
-                            value: "id",
+                            value: "gridCode",
                         },
                         dicUrl:
                             "/api/blade-grid/grid/getGridList?communityCode={{neiCode}}",
@@ -294,6 +273,67 @@
                             },
                         ],
                     },
+
+
+                    {
+                        span: 7,
+                        label: "场所标签",
+                        prop: "label",
+                        type: "select",
+                        dicUrl: "/api/blade-category/category/getCategory?level=2",
+                        cascader: ["smallLabel"],
+                        props: {
+                            label: "categoryName",
+                            value: "categoryNo"
+                        },
+                        dataType: "string",
+                        hide: true,
+                        rules: [{
+                            required: true,
+                            message: "请输入场所标签",
+                            trigger: "blur",
+                        },],
+                    },
+
+                    {
+                        span: 5,
+                        label: "",
+                        labelWidth: 20,
+                        prop: "smallLabel",
+                        type: "select",
+                        dicUrl: "/api/blade-category/category/getCategory?parentNo={{label}}",
+                        props: {
+                            label: "categoryName",
+                            value: "categoryNo"
+                        },
+                        dataType: "string",
+                        hide: true,
+                    },
+
+                    {
+                        span: 12,
+                        label: "标签颜色",
+                        prop: "color",
+                        type: "select",
+                        dicData: [
+                            {
+                                label: '绿',
+                                value: 'green'
+                            }, {
+                                label: '黄',
+                                value: 'yellow'
+                            }, {
+                                label: '红',
+                                value: 'red'
+                            }
+                        ],
+                        props: {
+                            label: "label",
+                            value: "value"
+                        },
+                        hide: true,
+                    },
+
                     {
                         width: 110,
                         label: "场所照片",
@@ -311,24 +351,6 @@
                         span: 24,
                     },
 
-                    {
-                        width: 156,
-                        overHidden: true,
-                        slot: true,
-                        label: "位置",
-                        prop: "location",
-                        type: 'map',
-                        dataType: "string",
-                        span: 24,
-                        value: [117.966460, 28.431002, ""],
-                        rules: [
-                            {
-                                required: true,
-                                message: "请选择位置",
-                                trigger: "blur",
-                            },
-                        ],
-                    },
 
                     {
                         width: 96,
@@ -521,13 +543,8 @@
             this.auditBasePopup = true
         },
 
-        roleBoxClose () {
-            this.curRow = {}
-        },
-
         ManageTenants (item) {
-            this.curRow = item
-            this.roleBox = true
+            this.$refs.BaseAllInfo.initOpen(item)
         },
 
         rowSave (row, done, loading) {

--
Gitblit v1.9.3