merge develop

src/api/auxiliary-police-manage.js

@@ -0,0 +1,12 @@
+// 辅警管理
+import axios from "@/utils/req";
+export const old_base = "/usersvr/v2/auxiliary";
+
+// TODO ES版本201218
+export const new_base = "/usersvr/v2/esquery/auxiliary";
+
+// 获取详情
+export function detail(id) {
+    return axios.get(`${old_base}/${id}`);
+}
+

src/components/org/index.vue

@@ -14,7 +14,11 @@ export default {
     },
     props: {
         value: [String, Array],
-        translateData: Array
+        translateData: Array,
+        type: {
+            type: String,
+            default: "USER"
+        }
     },
     data() {
         const that = this;
@@ -45,7 +49,7 @@ export default {
         // 获取树形结构
         getOrgMtTree(id) {
             return commonApi
-                .getTree({ id, type: "USER" })
+                .getTree({ id, type: this.type })
                 .then((res) => {
                     return res || [];
                 })

src/pages/admin-manage/add.vue

@@ -35,7 +35,7 @@
                     </dg-col>
                     <dg-col :span="12">
                         <el-form-item label="所属单位">
-                            <org v-model="tempOrgId" />
+                            <org v-model="tempOrgId" :key="orgKey" type="APP" />
                         </el-form-item>
                     </dg-col>
                 </dg-col>
@@ -117,7 +117,8 @@ export default {
             optList: [{ icon: "el-icon-edit", tooltip: "管理范围", on: that.handleDetail }],
             selectionList: [],
             orgSave: false,
-            menuSave: false
+            menuSave: false,
+            orgKey: 0
         };
     },
     methods: {
@@ -145,7 +146,10 @@ export default {
             this.$emit("success", bool);
         },
         handleReset() {
-            this.tempOrgId = "";
+            if (this.tempOrgId) {
+                this.tempOrgId = "";
+                this.orgKey++;
+            }
             this.$set(this.reportPersonFrom.orgId, "value", "");
             this.$refs.form.resetFields();
         },
@@ -161,7 +165,7 @@ export default {
                 userIds: ""
             };
             if (selectionList.length) {
-                selectionList.some(item => {
+                selectionList.some((item) => {
                     if (!item.orgSave) {
                         this.$message({ type: "error", message: item.name + "未分配管理范围" });
                         flag = true;
@@ -173,13 +177,13 @@ export default {
                     //     return true;
                     // }
                 });
-                selectionList.forEach(item => {
+                selectionList.forEach((item) => {
                     ids.push(item.id);
                 });
                 params["userIds"] = ids.join(",");
                 if (!flag) {
                     Api.addAdmin(params)
-                        .then(res => {
+                        .then((res) => {
                             that.success();
                             that.$emit("success", true);
                         })

src/pages/admin-manage/tab-first.vue

@@ -48,7 +48,7 @@
                     :condition="reportPersonFrom"
                     :lazyLoad="true"
                 >
-                    <dg-table-column fixed="right" label="操作" width="120" align="center">
+                    <dg-table-column label="操作" width="120" align="center">
                         <template slot-scope="scope">
                             <div class="u-table__operation">
                                 <el-tooltip
@@ -75,10 +75,10 @@ import Table from "@/pages/common/table";
 // import Import from "@/pages/common/import";
 import Add from "./add";
 import Editor from "./noBindEditor";
-import Detail from "@/pages/user-manage/police-manage/detail";
+import PoliceDetail from "@/pages/user-manage/police-manage/detail";
+import AuxiliaryDetail from "@/pages/user-manage/auxiliary-police-manage/detail";
 import * as api from "@/api/admin-manage";
 import { downloadBlob } from "@/utils/download";
-import * as policeManageApi from "@/api/police-manage";
 const area = ["950px", "660px"];
 export default {
     name: "TabFirst",
@@ -137,7 +137,7 @@ export default {
                 { label: "警号", prop: "policeNumber" },
                 { label: "身份证", prop: "idcard" },
                 { label: "警种", prop: "policeCategory", code: "T_MD_POLICE_TYPE" },
-                { label: "人员类型", prop: "userType", enum: "UserTypeEnum" }
+                { label: "用户类型", prop: "userType", enum: "UserTypeEnum" }
             ]
         };
     },
@@ -203,27 +203,19 @@ export default {
                 }
             });
         },
-        handleDetail({ id }) {
-            const that = this;
-            policeManageApi
-                .detail(id)
-                .then(res => {
-                    const layer = that.$dgLayer({
-                        title: "详情",
-                        shade: [0.4, "#FFF"],
-                        content: Detail,
-                        area,
-                        props: { sizeForm: res },
-                        on: {
-                            success() {
-                                layer.close(layer.dialogIndex);
-                            }
-                        }
-                    });
-                })
-                .catch(error => {
-                    that.fail("详情获取失败!", error);
-                });
+        handleDetail(row) {
+            const layer = this.$dgLayer({
+                title: "详情",
+                shade: [0.4, "#FFF"],
+                content: row.userType == "10" ? PoliceDetail : AuxiliaryDetail,
+                area,
+                props: { sizeForm: row },
+                on: {
+                    success() {
+                        layer.close(layer.dialogIndex);
+                    }
+                }
+            });
         },
         handleDelete({ id }) {
             const that = this;
@@ -237,7 +229,7 @@ export default {
                         that.reloadTable();
                         that.success("撤销成功!");
                     })
-                    .catch(error => {
+                    .catch((error) => {
                         that.fail("撤销失败!", error);
                     });
             });
@@ -269,10 +261,10 @@ export default {
                 method: "post",
                 headers: { "Content-Type": "application/x-www-form-urlencoded" }
             })
-                .then(res => {
+                .then((res) => {
                     downloadBlob("管理员信息.xls", res.data);
                 })
-                .catch(error => {
+                .catch((error) => {
                     console.error("[Error]", error);
                     that.fail("下载失败!", error);
                 });

src/pages/admin-manage/tab-second.vue

@@ -19,7 +19,7 @@
                     :condition="reportPersonFrom"
                     :lazyLoad="true"
                 >
-                    <dg-table-column fixed="right" label="操作" width="120" align="center">
+                    <dg-table-column label="操作" width="120" align="center">
                         <template slot-scope="scope">
                             <div class="u-table__operation">
                                 <el-tooltip
@@ -45,7 +45,8 @@ import Tree from "@/pages/common/tree";
 import Table from "@/pages/common/table";
 // import Import from "@/pages/common/import";
 import Editor from "./noBindEditor";
-import Detail from "@/pages/user-manage/police-manage/detail";
+import PoliceDetail from "@/pages/user-manage/police-manage/detail";
+import AuxiliaryDetail from "@/pages/user-manage/auxiliary-police-manage/detail";
 import * as api from "@/api/admin-manage";
 import { downloadBlob } from "@/utils/download";
 import * as policeManageApi from "@/api/police-manage";
@@ -102,7 +103,7 @@ export default {
                 { label: "姓名", prop: "name" },
                 { label: "警号", prop: "policeNumber" },
                 { label: "身份证", prop: "idcard" },
-                { label: "人员类型", prop: "userType", enum: "UserTypeEnum" }
+                { label: "用户类型", prop: "userType", enum: "UserTypeEnum" }
             ]
         };
     },
@@ -167,27 +168,19 @@ export default {
                 }
             });
         },
-        handleDetail({ id }) {
-            const that = this;
-            policeManageApi
-                .detail(id)
-                .then(res => {
-                    const layer = that.$dgLayer({
-                        title: "详情",
-                        shade: [0.4, "#FFF"],
-                        content: Detail,
-                        area,
-                        props: { sizeForm: res },
-                        on: {
-                            success() {
-                                layer.close(layer.dialogIndex);
-                            }
-                        }
-                    });
-                })
-                .catch(error => {
-                    that.fail("详情获取失败!", error);
-                });
+        handleDetail(row) {
+            const layer = this.$dgLayer({
+                title: "详情",
+                shade: [0.4, "#FFF"],
+                content: row.userType == "10" ? PoliceDetail : AuxiliaryDetail,
+                area,
+                props: { sizeForm: row },
+                on: {
+                    success() {
+                        layer.close(layer.dialogIndex);
+                    }
+                }
+            });
         },
         handleDelete({ id }) {
             const that = this;
@@ -201,7 +194,7 @@ export default {
                         that.reloadTable();
                         that.success("撤销成功!");
                     })
-                    .catch(error => {
+                    .catch((error) => {
                         that.fail("撤销失败!", error);
                     });
             });
@@ -214,10 +207,10 @@ export default {
                 method: "post",
                 headers: { "Content-Type": "application/x-www-form-urlencoded" }
             })
-                .then(res => {
+                .then((res) => {
                     downloadBlob("管理员信息.xls", res.data);
                 })
-                .catch(error => {
+                .catch((error) => {
                     console.error("[Error]", error);
                     that.fail("下载失败!", error);
                 });

src/pages/application-manage/app-manage/editor.vue

@@ -205,7 +205,7 @@ import moment from "moment";
 import Org from "@/components/org";
 import Company from "@/components/company";
 import { mapGetters } from "vuex";
-import SearchTree from "@/pages/common/search-tree";
+import SearchTree from "@/pages/common/tree";
 export default {
     name: "register-dialog",
     components: { Org, Company },
@@ -359,16 +359,20 @@ export default {
         // 打开选择建设单位的弹窗
         openSearchTree() {
             const that = this;
-            const layer = that.$dgLayer({
+            const layer = this.$dgLayer({
                 title: "选择",
                 shade: [0.4, "#FFF"],
                 area: ["500px", "600px"],
                 content: SearchTree,
-                props: {},
+                 props: {
+                    search: true,
+                    expandOnClickNode: false,
+                    treeHeight: "auto"
+                },
                 on: {
-                    success(checkItem) {
+                    handleGetNode(checkItem) {
                         layer.close(layer.dialogIndex);
-                        that.$set(that.sizeForm, "orgName", checkItem.name);
+                        that.$set(that.sizeForm, "orgName", checkItem.name || checkItem.fullName);
                         that.$set(that.sizeForm, "orgId", checkItem.id);
                     }
                 }

src/pages/authorization-manage/author-source-manage.vue

@@ -218,6 +218,7 @@ export default {
                         that.$refs.myMenuTree.remove();
                         that.timer = new Date().getTime(); // 刷新树组件
                         that.getParentTree();
+                        this.$message.success("删除成功!");
                     })
                     .catch(err => {
                         that.$message.error("删除失败！");

src/pages/common/role-manage/index.vue

@@ -29,11 +29,10 @@
                 code="T_MD_POLICE_TYPE"
             ></dg-select>
         </el-form-item>
-        <el-form-item prop="roleBusiness" label="业务域">
+        <el-form-item prop="roleBusiness" label="业务域标签">
             <dg-tree-drop
-                v-if="tagTree.length > 0"
                 v-model="sizeForm.roleBusiness"
-                placeholder="请选择业务域"
+                placeholder="请选择业务域标签"
                 :props="{
                     value: 'code',
                     label: 'name',
@@ -146,7 +145,7 @@ export default {
                         this.$emit("success", true);
                     })
                     .catch((error) => {
-                        this.$notify.error({ title: "错误", message: error });
+                        this.$message.error(error);
                     });
             });
         },

src/pages/empower-manage/persional-empower-manage/persionView.vue

@@ -43,7 +43,7 @@
                         :lazyLoad="true"
                         @handleRowClick="handleRowClick"
                     >
-                        <dg-table-column prop="policeBusiness" label="业务域" align="center">
+                        <dg-table-column prop="policeBusiness" label="业务域标签" align="center">
                         <template slot-scope="{ row }">
                         <div>{{ transferBusinessTag(row.policeBusiness) }}</div>
                         </template>
@@ -87,6 +87,7 @@
                         :span-method="objectSpanMethod"
                         border
                         style="width: 100%"
+                         overflow="tooltip"
                         @selection-change="handleSelectChange"
                     >
                         <dg-table-column prop="appName" label="系统名称" min-width="120" align="center">
@@ -105,13 +106,14 @@
                         </dg-table-column>
                         <dg-table-column
                             prop="roleBusiness"
-                            label="角色业务域"
+                            label="业务域标签"
                             min-width="100"
                             code="DM_POLICE_BUSINESS"
                             align="center"
                         >
                            <template slot-scope="{ row }">
-                                {{ transferBusinessTag(row.roleBusiness) }}
+                                <!-- {{ transferBusinessTag(row.roleBusiness) }} -->
+                                {{row.roleBusiness}}
 
                            </template>
                         </dg-table-column>
@@ -168,7 +170,7 @@ export default {
                 { label: "角色名称" },
                 { label: "角色层级" },
                 { label: "警种" },
-                { label: "角色业务域" },
+                { label: "业务域标签" },
                 {
                     label: "有效期至",
                     "class-name": "a-link",

src/pages/empower-manage/persional-empower-manage/roleView.vue

@@ -63,7 +63,7 @@
                         :lazyLoad="true"
                         @handleRowClick="handleRoleRowClick"
                     >
-                        <!--<dg-table-column align="center" label="角色业务域">-->
+                        <!--<dg-table-column align="center" label="业务域标签">-->
                         <!--<template slot-scope="scope">-->
                         <!--<span>{{ tranformBusiness(scope.row) }}</span>-->
                         <!--</template>-->
@@ -117,7 +117,7 @@
                             code="T_MD_POLICE_TYPE"
                             label="警种"
                         ></dg-table-column>
-                        <dg-table-column prop="policeBusiness" align="center" label="业务域"></dg-table-column>
+                        <dg-table-column prop="policeBusiness" align="center" label="业务域标签"></dg-table-column>
                         <dg-table-column label="有效期至" width="120" align="center" fixed="right">
                             <template slot-scope="scope">
                                 <a href="javascript:;" @click="handleValidateChoose(scope.row)">{{
@@ -158,7 +158,7 @@ export default {
                 { label: "角色名称", prop: "name" },
                 { label: "角色层级", prop: "roleLevel", code: "DM_ROLE_LEVEL" },
                 { label: "警种", prop: "policeCategory", code: "T_MD_POLICE_TYPE" },
-                { label: "角色业务域", prop: "roleBusiness", code: "DM_POLICE_BUSINESS" }
+                { label: "业务域标签", prop: "roleBusiness", code: "DM_POLICE_BUSINESS" }
             ],
             role_formtable_url: roleAuthApi.getRoleListByAppid,
             roleForm: {
@@ -177,7 +177,7 @@ export default {
                     label: "警种"
                 },
                 {
-                    label: "业务域"
+                    label: "业务域标签"
                 },
                 {
                     label: "有效期至",

src/pages/log-report/persionnel-author-audit/index.vue

@@ -80,7 +80,7 @@
                                 <a href="javascript:;" @click="handleDetail(row)">{{ row.name }}</a>
                             </template>
                         </dg-table-column>
-                        <dg-table-column label="角色业务域" prop="roleBusiness" align="center" >
+                        <dg-table-column label="业务域标签" prop="roleBusiness" align="center" >
                             <template slot-scope="{ row }">
                                {{transferBusinessTag(row.roleBusiness)}}
                             </template>

src/pages/service-delegate/index.vue

@@ -90,7 +90,7 @@ export default {
                 {label: "创建时间", prop: "createTime"}
             ],
             optList: [
-                {icon: "el-icon-edit", tooltip: "修改", on: that.handleEditor},
+                // {icon: "el-icon-edit", tooltip: "修改", on: that.handleEditor},
                 {icon: "el-icon-document", tooltip: "详情", on: that.handleDetail},
                 {icon: "el-icon-delete", tooltip: "删除", on: that.handleDelete}
             ],

src/pages/user-manage/auxiliary-police-manage/detail.vue

@@ -0,0 +1,139 @@
+<template>
+    <div class="u-detail">
+        <el-form v-if="detailInfo.id" ref="ruleForm" label-width="120px" label-suffix=":" class="rule-form">
+            <dg-row :gutter="20">
+                <dg-col :span="12">
+                    <el-form-item label="姓名" prop="name">
+                        <div class="u-detail__text">{{ detailInfo.name }}</div>
+                    </el-form-item>
+                    <el-form-item label="身份证" prop="idcard">
+                        <div class="u-detail__text">{{ detailInfo.idcard }}</div>
+                    </el-form-item>
+                    <el-form-item label="性别" prop="sex">
+                        <div class="u-detail__text" v-translate="{ code: 'DM_SEX' }">{{ detailInfo.sex }}</div>
+                    </el-form-item>
+                    <el-form-item label="出生日期" prop="birth">
+                        <div class="u-detail__text">{{ detailInfo.birth }}</div>
+                    </el-form-item>
+                    <el-form-item label="辅警编号" prop="policeNumber">
+                        <div class="u-detail__text">{{ detailInfo.policeNumber }}</div>
+                    </el-form-item>
+                    <el-form-item label="单位名称" prop="orgId">
+                        <div class="u-detail__text">{{ detailInfo.orgName }}</div>
+                    </el-form-item>
+                    <el-form-item label="警种" prop="policeCategory">
+                        <div class="u-detail__text" v-translate="{ code: 'T_MD_POLICE_TYPE' }">
+                            {{ detailInfo.policeCategory }}
+                        </div>
+                    </el-form-item>
+
+                    <el-form-item label="人员类型" prop="auxiliaryType">
+                        <div class="u-detail__text" v-translate="{ code: 'DM_AUXILIARY_TYPE' }">
+                            {{ detailInfo.auxiliaryType }}
+                        </div>
+                    </el-form-item>
+                    <el-form-item label="座机" prop="phone">
+                        <div class="u-detail__text">{{ detailInfo.phone }}</div>
+                    </el-form-item>
+                    <el-form-item label="e-mail" prop="email">
+                        <div class="u-detail__text">{{ detailInfo.email }}</div>
+                    </el-form-item>
+                    <el-form-item label="联系地址" prop="address">
+                        <div class="u-detail__text">{{ detailInfo.address }}</div>
+                    </el-form-item>
+                    <el-form-item label="人员状态" prop="userStatus">
+                        <div class="u-detail__text" v-translate="{ code: 'DM_USER_STATUS' }">
+                            {{ detailInfo.userStatus }}
+                        </div>
+                    </el-form-item>
+                </dg-col>
+                <dg-col :span="12">
+                    <el-form-item label="" prop="file">
+                        <dg-upload
+                            v-model="detailInfo.file"
+                            disabled
+                            icon-zoom
+                            leaflet
+                            accept="image/*"
+                            server-url="/dcucauth"
+                            list-type="pictureList"
+                        ></dg-upload>
+                    </el-form-item>
+                    <el-form-item label="民族" prop="nation" class="form-nation-style">
+                        <div class="u-detail__text" v-translate="{ code: 'DM_NATION_CODE' }">
+                            {{ detailInfo.nation }}
+                        </div>
+                    </el-form-item>
+                    <el-form-item label="业务域标签" prop="policeBusiness">
+                        <div class="u-detail__text">{{ transferBusinessTag(detailInfo.policeBusiness) }}</div>
+                    </el-form-item>
+                    <el-form-item label="手机号码" prop="mobileWork">
+                        <div class="u-detail__text">{{ detailInfo.mobileWork }}</div>
+                    </el-form-item>
+
+                    <el-form-item label="QQ号">
+                        <div class="u-detail__text">{{ detailInfo.qqAccount }}</div>
+                    </el-form-item>
+                    <el-form-item label="微信号" prop="wxAccount">
+                        <div class="u-detail__text">{{ detailInfo.wxAccount }}</div>
+                    </el-form-item>
+                    <el-form-item label="创建时间" prop="createTime">
+                        <div class="u-detail__text">{{ detailInfo.createTime }}</div>
+                    </el-form-item>
+                </dg-col>
+            </dg-row>
+        </el-form>
+        <div class="dg-layer-demo" v-footer>
+            <dg-button @click="handleClose">取消</dg-button>
+        </div>
+    </div>
+</template>
+
+<script>
+import * as auxiliaryApi from "@/api/auxiliary-police-manage";
+import transferBusinessTag from "@/mixins/transfer-business-tag";
+
+export default {
+    name: "auxiliaryDetail",
+    props: {
+        sizeForm: {
+            type: Object,
+            required: true
+        }
+    },
+    mixins: [transferBusinessTag],
+    data() {
+        return {
+            detailInfo: {}
+        };
+    },
+    methods: {
+        handleClose() {
+            this.$emit("close");
+        }
+    },
+    created() {
+        auxiliaryApi
+            .detail(this.sizeForm.id)
+            .then((res) => {
+                this.detailInfo = res;
+            })
+            .catch((error) => {
+                that.fail("详情获取失败!", error);
+            });
+    }
+};
+</script>
+
+<style lang="scss">
+.u-detail {
+    .el-form-item {
+        margin-bottom: 10px;
+    }
+}
+.rule-form {
+    .form-nation-style {
+        margin-top: 38px;
+    }
+}
+</style>

src/pages/user-manage/police-manage/detail.vue

@@ -1,52 +1,52 @@
 <template>
     <div class="u-detail">
-        <el-form ref="ruleForm" label-width="120px" label-suffix=":">
+        <el-form v-if="detailInfo.id" ref="ruleForm" label-width="120px" label-suffix=":">
             <dg-row :gutter="20">
                 <dg-col :span="12">
                     <el-form-item label="姓名" prop="name">
-                        <div class="u-detail__text">{{ sizeForm.name }}</div>
+                        <div class="u-detail__text">{{ detailInfo.name }}</div>
                     </el-form-item>
                     <el-form-item label="身份证" prop="idcard">
-                        <div class="u-detail__text">{{ sizeForm.idcard }}</div>
+                        <div class="u-detail__text">{{ detailInfo.idcard }}</div>
                     </el-form-item>
                     <el-form-item label="省份" prop="area" class="form-area">
-                        <div class="u-detail__text" v-translate="{ code: 'DM_AREA_CODE' }">{{ sizeForm.area }}</div>
+                        <div class="u-detail__text" v-translate="{ code: 'DM_AREA_CODE' }">{{ detailInfo.area }}</div>
                     </el-form-item>
                     <el-form-item label="警号" prop="policeNumber">
-                        <div class="u-detail__text">{{ sizeForm.policeNumber }}</div>
+                        <div class="u-detail__text">{{ detailInfo.policeNumber }}</div>
                     </el-form-item>
                     <el-form-item label="性别" prop="sex">
-                        <div class="u-detail__text" v-translate="{ code: 'DM_SEX' }">{{ sizeForm.sex }}</div>
+                        <div class="u-detail__text" v-translate="{ code: 'DM_SEX' }">{{ detailInfo.sex }}</div>
                     </el-form-item>
                     <el-form-item label="出生日期" prop="birth">
-                        <div class="u-detail__text">{{ sizeForm.birth }}</div>
+                        <div class="u-detail__text">{{ detailInfo.birth }}</div>
                     </el-form-item>
                     <el-form-item label="警种" prop="policeCategory">
                         <div class="u-detail__text" v-translate="{ code: 'T_MD_POLICE_TYPE' }">
-                            {{ sizeForm.policeCategory }}
+                            {{ detailInfo.policeCategory }}
                         </div>
                     </el-form-item>
 
                     <el-form-item label="人员类型" prop="manType">
-                        <div class="u-detail__text" v-translate="{ code: 'DM_MAN_TYPE' }">{{ sizeForm.manType }}</div>
+                        <div class="u-detail__text" v-translate="{ code: 'DM_MAN_TYPE' }">{{ detailInfo.manType }}</div>
                     </el-form-item>
                     <el-form-item label="警衔" prop="rank">
-                        <div class="u-detail__text" v-translate="{ code: 'DM_POLICE_RANK' }">{{ sizeForm.rank }}</div>
+                        <div class="u-detail__text" v-translate="{ code: 'DM_POLICE_RANK' }">{{ detailInfo.rank }}</div>
                     </el-form-item>
                     <el-form-item label="手机号码(1)" prop="mobileWork">
-                        <div class="u-detail__text">{{ sizeForm.mobileWork }}</div>
+                        <div class="u-detail__text">{{ detailInfo.mobileWork }}</div>
                     </el-form-item>
                     <el-form-item label="QQ号">
-                        <div class="u-detail__text">{{ sizeForm.qqAccount }}</div>
+                        <div class="u-detail__text">{{ detailInfo.qqAccount }}</div>
                     </el-form-item>
                     <el-form-item label="微信号" prop="wxAccount">
-                        <div class="u-detail__text">{{ sizeForm.wxAccount }}</div>
+                        <div class="u-detail__text">{{ detailInfo.wxAccount }}</div>
                     </el-form-item>
                 </dg-col>
                 <dg-col :span="12">
                     <el-form-item label="" prop="file">
                         <dg-upload
-                            v-model="sizeForm.file"
+                            v-model="detailInfo.file"
                             disabled
                             icon-zoom
                             leaflet
@@ -56,14 +56,16 @@
                         ></dg-upload>
                     </el-form-item>
                     <el-form-item label="民族" prop="nation">
-                        <div class="u-detail__text" v-translate="{ code: 'DM_NATION_CODE' }">{{ sizeForm.nation }}</div>
+                        <div class="u-detail__text" v-translate="{ code: 'DM_NATION_CODE' }">
+                            {{ detailInfo.nation }}
+                        </div>
                     </el-form-item>
-                    <el-form-item label="业务域">
-                        <div class="u-detail__text">{{ policeBusinessLabel }}</div>
+                    <el-form-item label="业务域标签">
+                        <div class="u-detail__text">{{ transferBusinessTag(detailInfo.policeBusiness) }}</div>
                         <!--<dg-select-->
-                        <!--v-model="sizeForm.policeBusinessLabel"-->
+                        <!--v-model="detailInfo.policeBusinessLabel"-->
                         <!--:url="`/duacm/codeSon/v2/searchColumn?codeDicId=DM_POLICE_BUSINESS&columnName=police_type_id&columnValue=${-->
-                        <!--sizeForm.policeCategory || '01'-->
+                        <!--detailInfo.policeCategory || '01'-->
                         <!--}`"-->
                         <!--placeholder="请选择业务域"-->
                         <!--multiple-->
@@ -72,29 +74,26 @@
                     </el-form-item>
                     <el-form-item label="职级" prop="title">
                         <div class="u-detail__text" v-translate="{ code: 'DM_CERT_DUTY_LEVEL' }">
-                            {{ sizeForm.title }}
+                            {{ detailInfo.title }}
                         </div>
-                        <!--<div class="u-detail__text" v-for="item in treeData" :key="item.CODE">-->
-                        <!--<span v-if="item.CODE == sizeForm.title">{{item.NAME}}</span>-->
-                        <!--</div>-->
                     </el-form-item>
                     <el-form-item label="座机" prop="phone">
-                        <div class="u-detail__text">{{ sizeForm.phone }}</div>
+                        <div class="u-detail__text">{{ detailInfo.phone }}</div>
                     </el-form-item>
                     <el-form-item label="手机号码(2)" prop="mobilePrivate">
-                        <div class="u-detail__text">{{ sizeForm.mobilePrivate }}</div>
+                        <div class="u-detail__text">{{ detailInfo.mobilePrivate }}</div>
                     </el-form-item>
                     <el-form-item label="e-mail" prop="email">
-                        <div class="u-detail__text">{{ sizeForm.email }}</div>
+                        <div class="u-detail__text">{{ detailInfo.email }}</div>
                     </el-form-item>
                     <el-form-item label="联系地址" prop="address">
-                        <div class="u-detail__text">{{ sizeForm.address }}</div>
+                        <div class="u-detail__text">{{ detailInfo.address }}</div>
                     </el-form-item>
                 </dg-col>
             </dg-row>
             <dg-row>
                 <dg-col :span="24">
-                    <dg-table :data="sizeForm.postInfos" :pagination="false" stripe border style="width: 100%;">
+                    <dg-table :data="detailInfo.postInfos" :pagination="false" stripe border style="width: 100%">
                         <dg-table-column prop="orgName" label="单位名称" align="center">
                             <template slot-scope="scope">
                                 <span v-show="scope.row.type == '1'">
@@ -116,15 +115,16 @@
                     </dg-table>
                 </dg-col>
             </dg-row>
-            <div class="dg-layer-demo" v-footer>
-                <dg-button @click="handleClose">取消</dg-button>
-            </div>
         </el-form>
+        <div class="dg-layer-demo" v-footer>
+            <dg-button @click="handleClose">取消</dg-button>
+        </div>
     </div>
 </template>
 
 <script>
-import * as policeMsgApi from "@/api/police-manage";
+import { detail } from "@/api/police-manage";
+import transferBusinessTag from "@/mixins/transfer-business-tag";
 
 export default {
     name: "policeDetail",
@@ -132,15 +132,12 @@ export default {
         sizeForm: {
             type: Object,
             required: true
-        },
-        treeData: {
-            type: Array,
-            default: () => []
         }
     },
+    mixins: [transferBusinessTag],
     data() {
         return {
-            policeBusinessLabel: ""
+            detailInfo: {}
         };
     },
     methods: {
@@ -149,28 +146,9 @@ export default {
         }
     },
     created() {
-        const that = this;
-        const { sizeForm } = that;
-        let str = "";
-        policeMsgApi
-            .businessDetail({
-                codeDicId: "DM_POLICE_BUSINESS",
-                columnName: "police_type_id",
-                columnValue: sizeForm.policeCategory ? sizeForm.policeCategory : "01"
-            })
-            .then(res => {
-                if (sizeForm.policeBusiness) {
-                    if (res && res.length > 0) {
-                        res.forEach(item => {
-                            if (sizeForm.policeBusiness.indexOf(item.value) !== -1) {
-                                str += item.label + ",";
-                            }
-                        });
-                        str = str.slice(0, str.length - 1);
-                    }
-                    that.policeBusinessLabel = str;
-                }
-            });
+        detail(this.sizeForm.id).then((res) => {
+            this.detailInfo = res;
+        });
     }
 };
 </script>

src/router/index.js

@@ -99,20 +99,20 @@ export const asyncRouterMap = [{
     //统计报表
     statisticsManage,
     // 动态授权管理
-    {
-        path: "/dynamic-author-manage",
-        component: Layout,
-        redirect: "/dynamic-author-manage",
-        alwaysShow: true,
-        meta: { title: "动态授权管理", icon: "el-icon-time", noCache: true, permission: ["YHGLPT_DTSQGL"] },
-        children: [{
-            path: "dynamic-manage",
-            component: () =>
-                import ("@/pages/dynamic-author-manage"),
-            name: "dynamic-author-manage",
-            meta: { title: "动态授权管理", noCache: false, permission: ["YHGLPT_DTSQGL_DTSQGL"] }
-        }]
-    },
+    // {
+    //     path: "/dynamic-author-manage",
+    //     component: Layout,
+    //     redirect: "/dynamic-author-manage",
+    //     alwaysShow: true,
+    //     meta: { title: "动态授权管理", icon: "el-icon-time", noCache: true, permission: ["YHGLPT_DTSQGL"] },
+    //     children: [{
+    //         path: "dynamic-manage",
+    //         component: () =>
+    //             import ("@/pages/dynamic-author-manage"),
+    //         name: "dynamic-author-manage",
+    //         meta: { title: "动态授权管理", noCache: false, permission: ["YHGLPT_DTSQGL_DTSQGL"] }
+    //     }]
+    // },
     ...dataAuthModuleRouter
 ];