From 4c42bd990db499da6b78f20afa8c1b0c8f900bfa Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Tue, 20 Feb 2024 14:05:23 +0800
Subject: [PATCH] 场所有关名称改首列展示

---
 src/views/publicSecurity/ninePlaceManage/patrolRecord.vue           |  186 +++++++++++++++---------------
 src/views/publicSecurity/ninePlaceManage/archivesManage.vue         |   20 +-
 src/views/publicSecurity/positionManage/TransactRegist.vue          |   83 +++++++------
 src/views/publicSecurity/ninePlaceManage/situationRectification.vue |    2 
 src/views/publicSecurity/positionManage/fileManage.vue              |   18 +-
 5 files changed, 154 insertions(+), 155 deletions(-)

diff --git a/src/views/publicSecurity/ninePlaceManage/archivesManage.vue b/src/views/publicSecurity/ninePlaceManage/archivesManage.vue
index a73a429..f28ded0 100644
--- a/src/views/publicSecurity/ninePlaceManage/archivesManage.vue
+++ b/src/views/publicSecurity/ninePlaceManage/archivesManage.vue
@@ -83,16 +83,6 @@
                 columnBtn: false,
                 dialogClickModal: false,
                 column: [{
-                    label: "地区",
-                    prop: "townStreetName",
-                    align: 'center',
-                    search: true,
-                    searchSpan: 3,
-                    searchLabelWidth: 46,
-                    labelWidth: 120,
-                    width: 156,
-                    searchPlaceholder: '请输入地区'
-                }, {
                     label: "场所名称",
                     prop: "placeName",
                     align: 'center',
@@ -142,6 +132,16 @@
                     slot: true,
                     width: 120
                 }, {
+                    label: "地区",
+                    prop: "townStreetName",
+                    align: 'center',
+                    search: true,
+                    searchSpan: 3,
+                    searchLabelWidth: 46,
+                    labelWidth: 120,
+                    width: 156,
+                    searchPlaceholder: '请输入地区'
+                }, {
                     label: "辖区派出所",
                     prop: "deptName",
                     align: 'center',
diff --git a/src/views/publicSecurity/ninePlaceManage/patrolRecord.vue b/src/views/publicSecurity/ninePlaceManage/patrolRecord.vue
index 5906e5d..71c64d2 100644
--- a/src/views/publicSecurity/ninePlaceManage/patrolRecord.vue
+++ b/src/views/publicSecurity/ninePlaceManage/patrolRecord.vue
@@ -185,100 +185,98 @@
                 searchShowBtn: false,
                 columnBtn: false,
                 dialogClickModal: false,
-                column: [{
-                    label: "所属街道",
-                    prop: "streetName",
-                    span: 24,
-                    row: true,
-                    searchSpan: 4,
-                    search: true,
-                    align: 'center'
-                },
-                {
-                    label: "所属社区",
-                    prop: "communityName",
-                    span: 24,
-                    row: true,
-                    searchSpan: 4,
-                    search: true,
-                    width: 160,
-                    overHidden: true,
-                    align: 'center'
-                },
-                {
-                    label: "所属网格",
-                    prop: "gridName",
-                    span: 24,
-                    row: true,
-                    searchSpan: 4,
-                    search: true,
-                    align: 'center'
-                },
-                {
-                    label: "场所名称",
-                    prop: "placeName",
-                    span: 24,
-                    row: true,
-                    searchSpan: 4,
-                    search: true,
-                    align: 'center'
-                },
-                {
-                    label: "场所隐患",
-                    prop: "remark",
-                    span: 24,
-                    row: true,
-                    searchSpan: 4,
-                    align: 'center'
-                },
-
-                {
-                    label: "场所负责人",
-                    prop: "principal",
-                    span: 24,
-                    row: true,
-                    searchSpan: 4,
-                    search: true,
-                    align: 'center'
-                },
-
-                {
-                    label: "场所负责人电话",
-                    prop: "principalPhone",
-                    span: 24,
-                    row: true,
-                    slot: true,
-                    searchSpan: 4,
-                    align: 'center'
-                },
-                {
-                    label: "场所地址",
-                    prop: "location",
-                    span: 24,
-                    row: true,
-                    searchSpan: 4,
-                    searchLabelWidth: 46,
-                    overHidden: true,
-                    align: 'center'
-                },
-                {
-                    width: 110,
-                    label: "签名",
-                    prop: "signaturePath",
-                    type: "upload",
-                    listType: "picture-img",
-                    span: 24,
-                    align: 'center'
-                },
-                {
-                    label: "创建时间",
-                    prop: "createTime",
-                    span: 24,
-                    row: true,
-                    searchSpan: 4,
-                    searchLabelWidth: 46,
-                    align: 'center'
-                },
+                column: [
+                    {
+                        label: "场所名称",
+                        prop: "placeName",
+                        span: 24,
+                        row: true,
+                        searchSpan: 4,
+                        search: true,
+                        align: 'center'
+                    },
+                    {
+                        label: "场所地址",
+                        prop: "location",
+                        span: 24,
+                        row: true,
+                        searchSpan: 4,
+                        searchLabelWidth: 46,
+                        overHidden: true,
+                        align: 'center'
+                    }, {
+                        label: "所属街道",
+                        prop: "streetName",
+                        span: 24,
+                        row: true,
+                        searchSpan: 4,
+                        search: true,
+                        align: 'center'
+                    },
+                    {
+                        label: "所属社区",
+                        prop: "communityName",
+                        span: 24,
+                        row: true,
+                        searchSpan: 4,
+                        search: true,
+                        width: 160,
+                        overHidden: true,
+                        align: 'center'
+                    },
+                    {
+                        label: "所属网格",
+                        prop: "gridName",
+                        span: 24,
+                        row: true,
+                        searchSpan: 4,
+                        search: true,
+                        align: 'center'
+                    },
+                    {
+                        label: "场所隐患",
+                        prop: "remark",
+                        span: 24,
+                        row: true,
+                        searchSpan: 4,
+                        align: 'center'
+                    },
+                    {
+                        label: "场所负责人",
+                        prop: "principal",
+                        span: 24,
+                        row: true,
+                        searchSpan: 4,
+                        search: true,
+                        align: 'center'
+                    },
+                    {
+                        label: "场所负责人电话",
+                        prop: "principalPhone",
+                        span: 24,
+                        row: true,
+                        slot: true,
+                        searchSpan: 4,
+                        align: 'center'
+                    },
+                    {
+                        width: 110,
+                        label: "签名",
+                        prop: "signaturePath",
+                        type: "upload",
+                        listType: "picture-img",
+                        span: 24,
+                        align: 'center'
+                    },
+                    {
+                        label: "创建时间",
+                        prop: "createTime",
+                        span: 24,
+                        row: true,
+                        searchSpan: 4,
+                        searchLabelWidth: 46,
+                        align: 'center'
+                    },
                 ],
             },
             data: [],
diff --git a/src/views/publicSecurity/ninePlaceManage/situationRectification.vue b/src/views/publicSecurity/ninePlaceManage/situationRectification.vue
index f400be5..da04a65 100644
--- a/src/views/publicSecurity/ninePlaceManage/situationRectification.vue
+++ b/src/views/publicSecurity/ninePlaceManage/situationRectification.vue
@@ -215,7 +215,7 @@
                     searchSpan: 4,
                     searchLabelWidth: 76,
                 }, {
-                    label: "地址名称",
+                    label: "场所地址",
                     prop: "addressName",
                     align: 'center',
                     search: true,
diff --git a/src/views/publicSecurity/positionManage/TransactRegist.vue b/src/views/publicSecurity/positionManage/TransactRegist.vue
index 322b7f4..1d09f72 100644
--- a/src/views/publicSecurity/positionManage/TransactRegist.vue
+++ b/src/views/publicSecurity/positionManage/TransactRegist.vue
@@ -167,6 +167,48 @@
                     {
                         width: 110,
                         span: 12,
+                        label: "场所名称",
+                        prop: "districtName",
+                        searchSpan: 4,
+                        searchLabelWidth: 100,
+                        search: true,
+                        align: 'center',
+                        labelWidth: 110,
+                    },
+                    {
+                        span: 12,
+                        label: "场所地址",
+                        prop: "localtion",
+                        searchSpan: 4,
+                        minWidth: 220,
+                        overHidden: true,
+                        // search: true,
+                        rules: [{
+                            required: true,
+                            message: "请输入地址",
+                            trigger: "blur",
+                        },],
+                        align: 'center',
+                        labelWidth: 110,
+                    },
+                    {
+                        label: "阵地类型",
+                        prop: "frontType",
+                        dicUrl: "/api/blade-system/dict-biz/tree?code=frontType",
+                        props: {
+                            label: "title",
+                            value: "key",
+                        },
+                        type: 'select',
+                        search: true,
+                        searchSpan: 4,
+                        align: 'center',
+                        width: 120,
+                        labelWidth: 110,
+                    },
+                    {
+                        width: 110,
+                        span: 12,
                         label: "场所负责人",
                         prop: "owner",
                         searchSpan: 4,
@@ -187,32 +229,6 @@
                         }],
                         align: 'center',
                         slot: true,
-                        labelWidth: 110,
-                    },
-                    {
-                        width: 110,
-                        span: 12,
-                        label: "场所名称",
-                        prop: "districtName",
-                        searchSpan: 4,
-                        searchLabelWidth: 100,
-                        search: true,
-                        align: 'center',
-                        labelWidth: 110,
-                    },
-                    {
-                        label: "阵地类型",
-                        prop: "frontType",
-                        dicUrl: "/api/blade-system/dict-biz/tree?code=frontType",
-                        props: {
-                            label: "title",
-                            value: "key",
-                        },
-                        type: 'select',
-                        search: true,
-                        searchSpan: 4,
-                        align: 'center',
-                        width: 120,
                         labelWidth: 110,
                     },
                     {
@@ -282,21 +298,6 @@
                         labelWidth: 110,
                     },
                     {
-                        span: 12,
-                        label: "地址",
-                        prop: "localtion",
-                        searchSpan: 4,
-                        minWidth: 220,
-                        overHidden: true,
-                        // search: true,
-                        rules: [{
-                            required: true,
-                            message: "请输入地址",
-                            trigger: "blur",
-                        },],
-                        align: 'center',
-                        labelWidth: 110,
-                    }, {
                         width: 110,
                         label: "所属街道",
                         // hide: true,
diff --git a/src/views/publicSecurity/positionManage/fileManage.vue b/src/views/publicSecurity/positionManage/fileManage.vue
index 6ca1e6d..9c80dc6 100644
--- a/src/views/publicSecurity/positionManage/fileManage.vue
+++ b/src/views/publicSecurity/positionManage/fileManage.vue
@@ -83,15 +83,6 @@
                 columnBtn: false,
                 dialogClickModal: false,
                 column: [{
-                    label: "地区",
-                    prop: "townStreetName",
-                    align: 'center',
-                    search: true,
-                    searchSpan: 3,
-                    searchLabelWidth: 46,
-                    labelWidth: 120,
-                    width: 156
-                }, {
                     label: "场所名称",
                     prop: "placeName",
                     align: 'center',
@@ -145,6 +136,15 @@
                     searchSpan: 4,
                     searchLabelWidth: 96
                 }, {
+                    label: "地区",
+                    prop: "townStreetName",
+                    align: 'center',
+                    search: true,
+                    searchSpan: 3,
+                    searchLabelWidth: 46,
+                    labelWidth: 120,
+                    width: 156
+                }, {
                     label: "责任民警",
                     prop: "policeName",
                     align: 'center',

--
Gitblit v1.9.3