From 9e1f4bdd90924d4e286c49275cad22b4b8f4cefe Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 06 Jan 2022 10:57:05 +0800
Subject: [PATCH] 公司管理列表修改,单位详情修改

---
 src/api/securityCompany/security.js               |  144 +-
 src/views/securityCompany/security.vue            |    5 
 src/views/securityGuardManagement/register.vue    |   43 
 src/views/securityCompany/armed.vue               |    5 
 src/api/securityCompany/companyDetails.js         |  146 +-
 src/page/index/top/index.vue                      |    8 
 src/views/securityCompany/column.js               |  619 +++++++++
 src/views/securityCompany/companyDetails copy.vue |  752 ++++++++++++
 src/views/securityCompany/companyDetails.vue      | 1781 ++++++++++++++++++-----------
 src/views/securityCompany/train.vue               |    5 
 src/views/securityCompany/confess.vue             |   44 
 src/views/securityCompany/securityCrossRegion.vue |   23 
 12 files changed, 2,677 insertions(+), 898 deletions(-)

diff --git a/src/api/securityCompany/companyDetails.js b/src/api/securityCompany/companyDetails.js
index 13a33a0..d01fa24 100644
--- a/src/api/securityCompany/companyDetails.js
+++ b/src/api/securityCompany/companyDetails.js
@@ -1,90 +1,110 @@
 import request from '@/router/axios';
 
 export const manifestationList = (securityid) => {
-  return request({
-    url: '/api/performance/list',
-    method: 'get',
-    params: {
-      securityid
-    }
-  })
+    return request({
+        url: '/api/performance/list',
+        method: 'get',
+        params: {
+            securityid
+        }
+    })
 }
 
 export const dispatchList = (cardid) => {
-  return request({
-    url: '/api/dispatcher/page',
-    method: 'get',
-    params: {
-      cardid
-    }
-  })
+    return request({
+        url: '/api/dispatcher/page',
+        method: 'get',
+        params: {
+            cardid
+        }
+    })
 }
 
 export const honorchList = (cardid) => {
-  return request({
-    url: '/api/honor/list',
-    method: 'get',
-    params: {
-      cardid
-    }
-  })
+    return request({
+        url: '/api/honor/list',
+        method: 'get',
+        params: {
+            cardid
+        }
+    })
 }
 
 
 export const trainList = (cardid) => {
-  return request({
-    url: '/api/train/selectTrainInfo',
-    method: 'post',
-    params: {
-      cardid
-    }
-  })
+    return request({
+        url: '/api/train/selectTrainInfo',
+        method: 'post',
+        params: {
+            cardid
+        }
+    })
 }
 
 export const examinationList = (cardid) => {
-  return request({
-    url: '/api/examination/selectExaminationInfo',
-    method: 'post',
-    params: {
-      cardid
-    }
-  })
+    return request({
+        url: '/api/examination/selectExaminationInfo',
+        method: 'post',
+        params: {
+            cardid
+        }
+    })
 }
 
 export const getInvestorList = (current, size, params) => {
-  return request({
-    url: '/api/shareholder/selectShareholderInfo',
-    method: 'post',
-    params: {
-      ...params,
-      current,
-      size,
-    }
-  })
+    return request({
+        url: '/api/shareholder/selectShareholderInfo',
+        method: 'post',
+        params: {
+            ...params,
+            current,
+            size,
+        }
+    })
 }
 
 export const getManageList = (current, size, params) => {
-  return request({
-    url: '/api/member/selectMemberInfo',
-    method: 'post',
-    params: {
-      ...params,
-      current,
-      size
-    }
-  })
+    return request({
+        url: '/api/member/selectMemberInfo',
+        method: 'post',
+        params: {
+            ...params,
+            current,
+            size
+        }
+    })
 }
 
 
 export const usejurisdiction = () => {
-  return request({
-    url: '/api/jurisdiction/lazy-tree',
-    method: 'get',
-    // params: {
-    //   ...params,
-    //   current,
-    //   size,
-    //   creditcode,
-    // }
-  })
+    return request({
+        url: '/api/jurisdiction/lazy-tree',
+        method: 'get',
+        // params: {
+        //   ...params,
+        //   current,
+        //   size,
+        //   creditcode,
+        // }
+    })
 }
+
+export const getBusinessInfo = (deptId) => {
+    return request({
+        url: '/api/business/getBusinessInfo',
+        method: 'get',
+        params: {
+            deptId,
+        }
+    })
+}
+
+export const getLicenceDetail = (deptId) => {
+    return request({
+        url: '/api/licencePaper/detail',
+        method: 'get',
+        params: {
+            deptId,
+        }
+    })
+}
\ No newline at end of file
diff --git a/src/api/securityCompany/security.js b/src/api/securityCompany/security.js
index d4e7c9c..33bc01d 100644
--- a/src/api/securityCompany/security.js
+++ b/src/api/securityCompany/security.js
@@ -1,96 +1,104 @@
 import request from '@/router/axios';
 
 export const getList = (current, size, params, stats) => {
-  return request({
-    url: '/api/information/page',
-    method: 'get',
-    params: {
-      ...params,
-      current,
-      size,
-      stats
-    }
-  })
+    return request({
+        url: '/api/information/page',
+        method: 'get',
+        params: {
+            ...params,
+            current,
+            size,
+            stats
+        }
+    })
 }
 
-export const getListold = (current, size, params, stats) => {//2021.8.25因内网公司接口需要同步成外网公司接口 舍弃
-  return request({
-    url: '/api/information/list',
-    method: 'get',
-    params: {
-      ...params,
-      current,
-      size,
-      stats
-    }
-  })
+export const getListold = (current, size, params, stats) => { //2021.8.25因内网公司接口需要同步成外网公司接口 舍弃
+    return request({
+        url: '/api/information/list',
+        method: 'get',
+        params: {
+            ...params,
+            current,
+            size,
+            stats
+        }
+    })
 }
 
 export const getPostList = (tenantId) => {
-  return request({
-    url: '/api/blade-system/post/select',
-    method: 'get',
-    params: {
-      tenantId
-    }
-  })
+    return request({
+        url: '/api/blade-system/post/select',
+        method: 'get',
+        params: {
+            tenantId
+        }
+    })
 }
 
 export const getDetail = (id) => {
-  return request({
-    url: '/api/blade-system/post/detail',
-    method: 'get',
-    params: {
-      id
-    }
-  })
+    return request({
+        url: '/api/blade-system/post/detail',
+        method: 'get',
+        params: {
+            id
+        }
+    })
 }
 
 export const remove = (ids) => {
-  return request({
-    url: '/api/blade-system/post/remove',
-    method: 'post',
-    params: {
-      ids,
-    }
-  })
+    return request({
+        url: '/api/blade-system/post/remove',
+        method: 'post',
+        params: {
+            ids,
+        }
+    })
+}
+
+export const getInformationDetails = (data) => {
+    return request({
+        url: '/api/information/getInformationDetails',
+        method: 'get',
+        params: data
+    })
 }
 
 export const add = (row) => {
-  return request({
-    url: '/api/blade-system/post/submit',
-    method: 'post',
-    data: row
-  })
+    return request({
+        url: '/api/blade-system/post/submit',
+        method: 'post',
+        data: row
+    })
 }
 
 export const update = (row) => {
-  return request({
-    url: '/api/blade-system/post/submit',
-    method: 'post',
-    data: row
-  })
+    return request({
+        url: '/api/blade-system/post/submit',
+        method: 'post',
+        data: row
+    })
 }
 
 
 export const getListPunish = (current, size, params, deptid) => {
-  return request({
-    url: '/api/punish/list',
-    method: 'get',
-    params: {
-      ...params,
-      current,
-      size,
-      deptid
-    }
-  })
+    return request({
+        url: '/api/punish/list',
+        method: 'get',
+        params: {
+            ...params,
+            current,
+            size,
+            deptid
+        }
+    })
 }
 
 
 export const savePunish = (row) => {
-  return request({
-    url: '/api/punish/save',
-    method: 'post',
-    data: row
-  })
-}
+    return request({
+        url: '/api/punish/save',
+        method: 'post',
+        data: row
+    })
+}
\ No newline at end of file
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 72be84b..fd4ebac 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -19,7 +19,7 @@
       </span>
     </div>
     <div class="top-bar__right">
-      <el-tooltip v-if="showColor"
+      <!-- <el-tooltip v-if="showColor"
                   effect="dark"
                   :content="$t('navbar.color')"
                   placement="bottom">
@@ -50,7 +50,7 @@
         <div class="top-bar__item top-bar__item--show">
           <top-theme></top-theme>
         </div>
-      </el-tooltip>
+      </el-tooltip> -->
       <!-- <el-tooltip effect="dark"
                   :content="$t('navbar.notice')"
                   placement="bottom">
@@ -58,13 +58,13 @@
           <top-notice></top-notice>
         </div>
       </el-tooltip> -->
-      <el-tooltip effect="dark"
+      <!-- <el-tooltip effect="dark"
                   :content="$t('navbar.language')"
                   placement="bottom">
         <div class="top-bar__item top-bar__item--show">
           <top-lang></top-lang>
         </div>
-      </el-tooltip>
+      </el-tooltip> -->
       <el-tooltip v-if="showFullScren"
                   effect="dark"
                   :content="isFullScren?$t('navbar.screenfullF'):$t('navbar.screenfull')"
diff --git a/src/views/securityCompany/armed.vue b/src/views/securityCompany/armed.vue
index efc7602..78b5e73 100644
--- a/src/views/securityCompany/armed.vue
+++ b/src/views/securityCompany/armed.vue
@@ -409,13 +409,12 @@
 
     // 行单击
     handleRowClick(row) {
-      // delete (row["name"]);
       var obj = row;
       obj["name"] = "保安公司详细信息";
-      // console.log(obj, "obj");
+      var data = JSON.stringify(obj);
       this.$router.push({
         path: `/securityCompany/index`,
-        query: obj,
+        query: {data:data},
       });
     },
   },
diff --git a/src/views/securityCompany/column.js b/src/views/securityCompany/column.js
index 3fdaa01..581eaf4 100644
--- a/src/views/securityCompany/column.js
+++ b/src/views/securityCompany/column.js
@@ -1,5 +1,179 @@
-export var companyColimn = [
+//保安公司详情基本信息列
+export var basecolumn = [{
+        label: "",
+        labelWidth: 20,
+        type: 'title',
+        prop: "title",
+        span: 24,
+        styles: {
+            fontSize: '24px'
+        }
+    },
     {
+        label: "企业名称",
+        prop: "enterprisename",
+        span: 12,
+        labelWidth: 145,
+        disabled: true,
+        rules: [{
+            required: true,
+            message: "请输入企业名称",
+            trigger: "blur",
+        }, ],
+    },
+    {
+        label: "所属辖区",
+        prop: "jurisdiction",
+        // multiple: true,
+        //父节点不能选
+        parent: false,
+        type: "tree",
+        dicUrl: "/api//jurisdiction/lazy-trees",
+        props: {
+            label: "title",
+            value: "id",
+        },
+        span: 12,
+        labelWidth: 145,
+        width: 110,
+        overHidden: true,
+        disabled: true,
+        rules: [{
+            required: true,
+            message: "请选择所属辖区",
+            trigger: "click",
+        }, ],
+    },
+    {
+        label: "法定代表人",
+        prop: "representative",
+        span: 12,
+        labelWidth: 145,
+        disabled: true,
+        rules: [{
+            required: true,
+            message: "请输入法定代表人",
+            trigger: "blur",
+        }, ],
+    }, {
+        label: "法定代表人电话",
+        prop: "representativecell",
+        span: 12,
+        labelWidth: 145,
+        disabled: true,
+        rules: [{
+            required: true,
+            message: "请输入法定代表人电话",
+            trigger: "blur",
+        }, ],
+    },
+    {
+        label: "联系人",
+        prop: "contacts",
+        span: 12,
+        labelWidth: 145,
+        disabled: true,
+        rules: [{
+            required: true,
+            message: "请输入联系人",
+            trigger: "blur",
+        }, ],
+    }, {
+        label: "联系电话",
+        prop: "contactscell",
+        span: 12,
+        labelWidth: 145,
+        disabled: true,
+        rules: [{
+            required: true,
+            message: "请输入联系电话",
+            trigger: "blur",
+        }, ],
+    },
+    {
+        label: "企业属性",
+        prop: "stats",
+        type: "tree",
+        dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
+        props: {
+            label: "dictValue",
+            value: "dictKey"
+        },
+        span: 12,
+        labelWidth: 145,
+        disabled: true,
+        rules: [{
+            required: true,
+            message: "请输入企业属性",
+            trigger: "blur",
+        }, ],
+    },
+    {
+        label: "注册地址",
+        prop: "address",
+        span: 12,
+        labelWidth: 145,
+        disabled: true,
+        // search: true,
+        rules: [{
+            required: true,
+            message: "请输入注册地址",
+            trigger: "blur",
+        }, ],
+    },
+    {
+        label: "办公地址",
+        prop: "industry",
+        span: 12,
+        labelWidth: 145,
+        disabled: true,
+        rules: [{
+            required: true,
+            message: "请选择办公地址",
+            trigger: "blur",
+        }, ],
+    },
+    {
+        label: "服务区域",
+        labelWidth: 145,
+        prop: "fregion",
+        display: false,
+        rules: [{
+            required: true,
+            message: "请输入服务区域",
+            trigger: "blur",
+        }, ],
+    },
+    {
+        label: "服务时间",
+        labelWidth: 145,
+        prop: "ftime",
+        type: "date",
+        format: "yyyy-MM-dd",
+        valueFormat: "yyyy-MM-dd",
+        display: false,
+        rules: [{
+            required: true,
+            message: "请选择服务时间",
+            trigger: "blur",
+        }, ],
+    },
+    {
+        label: "登记机关",
+        prop: "registration",
+        // span: 11,
+        labelWidth: 145,
+        disabled: true,
+        span: 12,
+        rules: [{
+            required: true,
+            message: "请输入登记机关",
+            trigger: "blur",
+        }, ],
+    },
+
+]
+export var companyColimn = [{
         label: "统一社会信用代码",
         prop: "creditcode",
         width: 140,
@@ -18,7 +192,6 @@
         width: 260,
         searchSpan: 4,
         labelWidth: 160,
-        // width: 130,
         overHidden: true
     },
 
@@ -33,39 +206,61 @@
             label: "dictValue",
             value: "dictKey"
         },
-        width: 130,
-        rules: [
-            {
-                required: true,
-                message: "请选择企业类型",
-                trigger: "click",
-            },
-        ],
+        rules: [{
+            required: true,
+            message: "请选择企业类型",
+            trigger: "click",
+        }, ],
+    },
+    {
+        label: "所属辖区",
+        prop: "jurisdiction",
+        labelWidth: 160,
+        // width: 110,
+        type: "tree",
+        dicUrl: "/api/jurisdiction/lazy-tree",
+        props: {
+            label: "title",
+            value: "id",
+        },
+        // search: true,
+        overHidden: true
+    },
+    {
+        label: "所属辖区",
+        prop: "jurisdictionName",
+        hide: true,
+        overHidden: true
     },
     {
         label: "法定代表人",
         labelWidth: 160,
         prop: "representative",
-        width: 110,
         search: true,
-        searchSpan: 4,
         searchLabelWidth: 100
     },
     {
         label: "法定代表人电话",
         labelWidth: 160,
         prop: "representativecell",
-        width: 120,
-        // search: true,
         searchSpan: 4,
         searchLabelWidth: 100
     },
-
+    {
+        label: "联系人",
+        prop: "contacts",
+        labelWidth: 160,
+        hide: true,
+    }, {
+        label: "联系电话",
+        prop: "contactscell",
+        labelWidth: 160,
+        hide: true,
+    },
     {
         label: "保安人数",
         labelWidth: 160,
         prop: "znum",
-        width: 73,
         // search: true,
         searchSpan: 4,
         searchLabelWidth: 100
@@ -74,7 +269,6 @@
         label: "派遣人数",
         labelWidth: 160,
         prop: "pnum",
-        width: 73,
         // search: true,
         searchSpan: 4,
         searchLabelWidth: 100
@@ -83,7 +277,6 @@
         label: "持证人数",
         labelWidth: 160,
         prop: "cnum",
-        width: 73,
         // search: true,
         searchSpan: 4,
         searchLabelWidth: 100
@@ -92,7 +285,6 @@
         label: "注册时间",
         prop: "establishtime",
         labelWidth: 160,
-        width: 130,
         overHidden: true,
         type: "date",
         format: "yyyy-MM-dd",
@@ -105,19 +297,8 @@
         hide: true,
         labelWidth: 160,
         // search: true,
-        width: 80,
     },
-    {
-        label: "联系人",
-        prop: "contacts",
-        labelWidth: 160,
-        width: 85,
-    }, {
-        label: "联系电话",
-        prop: "contactscell",
-        labelWidth: 160,
-        width: 95,
-    },
+
 
     {
         label: "注册地址",
@@ -135,20 +316,7 @@
         // width: 110,
         overHidden: true
     },
-    {
-        label: "所属辖区",
-        prop: "jurisdiction",
-        labelWidth: 160,
-        // width: 110,
-        type: "tree",
-        dicUrl: "/api/jurisdiction/lazy-tree",
-        props: {
-            label: "title",
-            value: "id",
-        },
-        // search: true,
-        overHidden: true
-    },
+
     {
         label: "登记机关",
         prop: "registration",
@@ -167,4 +335,365 @@
         // search: true,
         // width: 88,
     },
+    {
+        label: "服务区域",
+        labelWidth: 110,
+        prop: "fregion",
+        hide: true,
+    },
+    {
+        label: "服务时间",
+        labelWidth: 110,
+        prop: "ftime",
+        type: "date",
+        format: "yyyy-MM-dd",
+        valueFormat: "yyyy-MM-dd",
+        hide: true,
+    },
+]
+
+export var confessColumn = [{
+        label: "统一社会信用代码",
+        prop: "creditcode",
+        width: 140,
+        hide: true,
+
+        labelWidth: 160,
+        // hide: true,
+        // editDisplay: false,
+        // addDisplay: false
+    },
+
+    {
+        label: "企业名称",
+        prop: "enterprisename",
+        search: true,
+        width: 260,
+        searchSpan: 4,
+        labelWidth: 160,
+        overHidden: true
+    },
+
+    {
+        label: "企业类型",
+        prop: "stats",
+        type: "tree",
+        hide: true,
+        labelWidth: 160,
+        dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
+        props: {
+            label: "dictValue",
+            value: "dictKey"
+        },
+        rules: [{
+            required: true,
+            message: "请选择企业类型",
+            trigger: "click",
+        }, ],
+    },
+    {
+        label: "所属辖区",
+        prop: "jurisdiction",
+        labelWidth: 160,
+        // width: 110,
+        type: "tree",
+        dicUrl: "/api/jurisdiction/lazy-tree",
+        props: {
+            label: "title",
+            value: "id",
+        },
+        // search: true,
+        overHidden: true
+    },
+    {
+        label: "法定代表人",
+        labelWidth: 160,
+        prop: "representative",
+        search: true,
+        searchLabelWidth: 100
+    },
+    {
+        label: "法定代表人电话",
+        labelWidth: 160,
+        prop: "representativecell",
+        searchSpan: 4,
+        searchLabelWidth: 100
+    },
+    {
+        label: "联系人",
+        prop: "contacts",
+        labelWidth: 160,
+        hide: true,
+    }, {
+        label: "联系电话",
+        prop: "contactscell",
+        labelWidth: 160,
+        hide: true,
+    },
+    {
+        label: "保安人数",
+        labelWidth: 160,
+        prop: "znum",
+        // search: true,
+        searchSpan: 4,
+        searchLabelWidth: 100
+    },
+    {
+        label: "派遣人数",
+        labelWidth: 160,
+        prop: "pnum",
+        // search: true,
+        searchSpan: 4,
+        searchLabelWidth: 100
+    },
+    {
+        label: "持证人数",
+        labelWidth: 160,
+        prop: "cnum",
+        // search: true,
+        searchSpan: 4,
+        searchLabelWidth: 100
+    },
+    {
+        label: "注册时间",
+        prop: "establishtime",
+        labelWidth: 160,
+        overHidden: true,
+        type: "date",
+        format: "yyyy-MM-dd",
+        valueFormat: "timestamp",
+
+    },
+    {
+        label: "注册资本",
+        prop: "registeredcapital",
+        hide: true,
+        labelWidth: 160,
+        // search: true,
+    },
+
+
+    {
+        label: "注册地址",
+        prop: "address",
+        labelWidth: 160,
+        // search: true,
+        hide: true,
+    },
+    {
+        label: "经营范围",
+        prop: "business",
+        // search: true,
+        labelWidth: 160,
+        hide: true,
+        // width: 110,
+        overHidden: true
+    },
+
+    {
+        label: "登记机关",
+        prop: "registration",
+        // search: true,
+        labelWidth: 160,
+        // width: 88,
+        overHidden: true,
+        hide: true,
+    },
+
+    {
+        label: "所属行业",
+        prop: "industry",
+        labelWidth: 160,
+        hide: true,
+        // search: true,
+        // width: 88,
+    },
+    {
+        label: "服务区域",
+        labelWidth: 110,
+        prop: "fregion",
+        hide: true,
+    },
+    {
+        label: "服务时间",
+        labelWidth: 110,
+        prop: "ftime",
+        type: "date",
+        format: "yyyy-MM-dd",
+        valueFormat: "yyyy-MM-dd",
+        hide: true,
+    },
+]
+
+export var crossColumn = [{
+        label: "统一社会信用代码",
+        prop: "creditcode",
+        width: 140,
+        hide: true,
+
+        labelWidth: 160,
+        // hide: true,
+        // editDisplay: false,
+        // addDisplay: false
+    },
+
+    {
+        label: "企业名称",
+        prop: "enterprisename",
+        search: true,
+        width: 260,
+        searchSpan: 4,
+        labelWidth: 160,
+        overHidden: true
+    },
+
+    {
+        label: "企业类型",
+        prop: "stats",
+        type: "tree",
+        hide: true,
+        labelWidth: 160,
+        dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
+        props: {
+            label: "dictValue",
+            value: "dictKey"
+        },
+        rules: [{
+            required: true,
+            message: "请选择企业类型",
+            trigger: "click",
+        }, ],
+    },
+    {
+        label: "所属辖区",
+        prop: "jurisdiction",
+        labelWidth: 160,
+        // width: 110,
+        type: "tree",
+        dicUrl: "/api/jurisdiction/lazy-tree",
+        props: {
+            label: "title",
+            value: "id",
+        },
+        // search: true,
+        overHidden: true
+    },
+    {
+        label: "法定代表人",
+        labelWidth: 160,
+        prop: "representative",
+        search: true,
+        searchLabelWidth: 100
+    },
+    {
+        label: "法定代表人电话",
+        labelWidth: 160,
+        prop: "representativecell",
+        searchSpan: 4,
+        searchLabelWidth: 100
+    },
+    {
+        label: "联系人",
+        prop: "contacts",
+        labelWidth: 160,
+        hide: true,
+    }, {
+        label: "联系电话",
+        prop: "contactscell",
+        labelWidth: 160,
+        hide: true,
+    },
+    {
+        label: "保安人数",
+        labelWidth: 160,
+        prop: "znum",
+        // search: true,
+        searchSpan: 4,
+        searchLabelWidth: 100
+    },
+    {
+        label: "派遣人数",
+        labelWidth: 160,
+        prop: "pnum",
+        // search: true,
+        searchSpan: 4,
+        searchLabelWidth: 100
+    },
+    {
+        label: "持证人数",
+        labelWidth: 160,
+        prop: "cnum",
+        // search: true,
+        searchSpan: 4,
+        searchLabelWidth: 100
+    },
+    {
+        label: "注册时间",
+        prop: "establishtime",
+        labelWidth: 160,
+        overHidden: true,
+        type: "date",
+        format: "yyyy-MM-dd",
+        valueFormat: "timestamp",
+
+    },
+    {
+        label: "注册资本",
+        prop: "registeredcapital",
+        hide: true,
+        labelWidth: 160,
+        // search: true,
+    },
+
+
+    {
+        label: "注册地址",
+        prop: "address",
+        labelWidth: 160,
+        // search: true,
+        hide: true,
+    },
+    {
+        label: "经营范围",
+        prop: "business",
+        // search: true,
+        labelWidth: 160,
+        hide: true,
+        // width: 110,
+        overHidden: true
+    },
+
+    {
+        label: "登记机关",
+        prop: "registration",
+        // search: true,
+        labelWidth: 160,
+        // width: 88,
+        overHidden: true,
+        hide: true,
+    },
+
+    {
+        label: "所属行业",
+        prop: "industry",
+        labelWidth: 160,
+        hide: true,
+        // search: true,
+        // width: 88,
+    },
+    {
+        label: "服务区域",
+        labelWidth: 110,
+        prop: "fregion",
+        hide: true,
+    },
+    {
+        label: "服务时间",
+        labelWidth: 110,
+        prop: "ftime",
+        type: "date",
+        format: "yyyy-MM-dd",
+        valueFormat: "yyyy-MM-dd",
+        hide: true,
+    },
 ]
\ No newline at end of file
diff --git a/src/views/securityCompany/companyDetails copy.vue b/src/views/securityCompany/companyDetails copy.vue
new file mode 100644
index 0000000..e85892d
--- /dev/null
+++ b/src/views/securityCompany/companyDetails copy.vue
@@ -0,0 +1,752 @@
+/*
+ * @Author: Morpheus
+ * @Date: 2021-07-05 16:31:54
+ * @Last Modified by: Morpheus
+ * @Last Modified time: 2021-11-09 19:38:27
+ * menu-name 保安公司详细资料
+ */
+<template>
+    <el-row class="morpheus-box">
+        <el-col :span="24">
+            <el-card>
+                <div class="card-body">
+                    <el-tabs v-model="activeName"
+                             @tab-click="handleClick">
+                        <el-tab-pane label="基本信息"
+                                     name="first">
+                            <el-form :model="form"
+                                     label-position="right"
+                                     size="mini"
+                                     label-width="100px">
+                                <el-row>
+                                    <el-col span="12">
+                                        <el-form-item label="公司名称">
+                                            <el-input disabled="true"
+                                                      v-model="form.enterprisename"
+                                                      autocomplete="off"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col span="12">
+                                        <el-form-item label="法定代表人">
+                                            <el-input disabled="true"
+                                                      v-model="form.representative"
+                                                      autocomplete="off"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+                                <el-row>
+                                    <el-col span="24">
+                                        <el-form-item label="注册地址">
+                                            <el-input disabled="true"
+                                                      v-model="form.address"
+                                                      autocomplete="off"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+
+                                <el-row>
+                                    <el-col span="12">
+                                        <el-form-item label="所属辖区">
+                                            <el-input disabled="true"
+                                                      v-model="jurisdictionSee"
+                                                      autocomplete="off"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col span="12">
+                                        <el-form-item label="所属行业">
+                                            <el-input disabled="true"
+                                                      v-model="form.industry"
+                                                      autocomplete="off"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+
+                                <el-row>
+                                    <el-col span="12">
+                                        <el-form-item label="登记机关">
+                                            <el-input disabled="true"
+                                                      v-model="form.registration"
+                                                      autocomplete="off"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col span="12">
+                                        <el-form-item label="公司类型">
+                                            <el-input disabled="true"
+                                                      v-model="form.enterprises"
+                                                      autocomplete="off"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+
+                                <el-row>
+                                    <el-col span="24">
+                                        <el-form-item label="经营范围">
+                                            <el-input type="textarea"
+                                                      disabled="true"
+                                                      v-model="form.business"
+                                                      resize="none"
+                                                      autocomplete="off"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+                            </el-form>
+                        </el-tab-pane>
+                        <el-tab-pane label="工商信息"
+                                     name="second">
+                            <el-form :model="form"
+                                     label-position="right"
+                                     size="mini"
+                                     label-width="100px">
+                                <!-- <el-row>
+                  <el-col span="12">
+                    <el-form-item label="公司名称">
+                      <el-input
+                        disabled="true"
+                        v-model="form.enterprisename"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col span="12">
+                    <el-form-item label="法定代表人">
+                      <el-input
+                        disabled="true"
+                        v-model="form.representative"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row> -->
+
+                                <el-row>
+                                    <el-col span="12">
+                                        <el-form-item label="组织机构代码">
+                                            <el-input disabled="true"
+                                                      v-model="form.organizationcode"
+                                                      autocomplete="off"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+
+                                    <el-col span="12">
+                                        <el-form-item label="注册资金">
+                                            <el-input disabled="true"
+                                                      v-model="form.registeredcapital"
+                                                      autocomplete="off"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+
+                                <el-row>
+                                    <!-- <el-col span="12">
+                    <el-form-item label="实缴资金">
+                      <el-input
+                        disabled="true"
+                        v-model="form.capital"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col> -->
+                                    <el-col span="12">
+                                        <el-form-item label="注册时间">
+                                            <el-input disabled="true"
+                                                      v-model="form.establishtime"
+                                                      autocomplete="off"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col span="12">
+                                        <el-form-item label="工商注册号">
+                                            <el-input disabled="true"
+                                                      v-model="form.registrationnumber"
+                                                      autocomplete="off"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+
+                                <!-- <el-row>
+                  <el-col span="12">
+                    <el-form-item label="工商注册号">
+                      <el-input
+                        disabled="true"
+                        v-model="form.registrationnumber"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row> -->
+                            </el-form>
+                        </el-tab-pane>
+                        <el-tab-pane label="投资人信息"
+                                     name="third">
+                            <avue-crud class="company-box"
+                                       :option="investorOption"
+                                       :search.sync="investorSearch"
+                                       :table-loading="investorLoading"
+                                       :data="investorData"
+                                       ref="investorCrud"
+                                       :page.sync="investorPage"
+                                       @selection-change="investorSelectionChange"
+                                       @search-change="investorSearchChange"
+                                       @search-reset="investorSearchReset"
+                                       @current-change="investorCurrentChange"
+                                       @size-change="investorSizeChange"
+                                       @refresh-change="investorSizerefresh"
+                                       @on-load="investorOnLoad">
+                            </avue-crud>
+                        </el-tab-pane>
+                        <el-tab-pane label="管理人信息"
+                                     name="fourth">
+                            <avue-crud class="company-box"
+                                       :option="manageOption"
+                                       :search.sync="manageSearch"
+                                       :table-loading="manageLoading"
+                                       :data="manageData"
+                                       ref="manageCrud"
+                                       :page.sync="managePage"
+                                       @selection-change="manageSelectionChange"
+                                       @search-change="manageSearchChange"
+                                       @search-reset="manageSearchReset"
+                                       @current-change="manageCurrentChange"
+                                       @size-change="manageSizeChange"
+                                       @refresh-change="manageSizerefresh"
+                                       @on-load="manageOnLoad">
+                            </avue-crud>
+                        </el-tab-pane>
+                        <el-tab-pane label="装备信息"
+                                     name="fifth">
+                            <equipment :forms="forms"
+                                       v-if="seestaff"></equipment>
+                        </el-tab-pane>
+                        <el-tab-pane label="保安员信息"
+                                     name="sixth">
+                            <staff :forms="forms"
+                                   v-if="seestaff"
+                                   :doit="seestaff2"></staff>
+                        </el-tab-pane>
+                        <el-tab-pane label="处罚信息"
+                                     name="seventh">
+                            <punish :forms="forms"
+                                    v-if="seestaff"></punish>
+                        </el-tab-pane>
+                        <el-tab-pane label="服务对象"
+                                     name="eighth">
+                            <service :form="forms"
+                                     v-if="seestaff"
+                                     :refresh="seestaff3"></service>
+                        </el-tab-pane>
+                        <!-- <el-tab-pane label="其他附件" name="eighth">
+              <enclosure :form="form"></enclosure>
+            </el-tab-pane> -->
+                        <el-tab-pane label="营业执照"
+                                     name="ninth">
+                            <div class="businessLicenses">
+                                <el-container>
+                                    <el-main>
+                                        <div class="title"
+                                             v-if="businessLicenseUrl == ''">
+                                            未上传营业执照
+                                        </div>
+                                        <img class="businessLicensess"
+                                             :src="businessLicenseUrl"
+                                             alt=""
+                                             v-else />
+                                    </el-main>
+                                </el-container>
+                            </div>
+                        </el-tab-pane>
+                        <el-tab-pane label="许可证"
+                                     name="tenth">
+                            <div class="businessLicenses">
+                                <el-container>
+                                    <el-main>
+                                        <div class="title"
+                                             v-if="licenceUrl == ''">
+                                            未上传许可证
+                                        </div>
+                                        <img class="Licenses"
+                                             :src="licenceUrl"
+                                             alt=""
+                                             v-else />
+                                    </el-main>
+                                </el-container>
+                            </div>
+                        </el-tab-pane>
+                    </el-tabs>
+                </div>
+            </el-card>
+        </el-col>
+    </el-row>
+</template>
+
+<script>
+import {
+    manifestationList,
+    dispatchList,
+    honorchList,
+    trainList,
+    examinationList,
+    getInvestorList,
+    getManageList,
+} from "@/api/securityCompany/companyDetails";
+import equipment from "./computents/equipment.vue"; //装备管理
+import staff from "./computents/staff.vue"; //保安员信息
+import punish from "./computents/punish.vue"; //处罚信息
+import service from "./computents/service.vue"; //服务对象
+// import enclosure from "./computents/enclosure.vue"; //其他附件
+
+import { getList } from "@/api/securityCompany/security"; //保安公司
+
+export default {
+    components: {
+        equipment: equipment,
+        staff: staff,
+        punish: punish,
+        service: service,
+        // enclosure: enclosure,
+    },
+    data () {
+        var w = 160,
+            s = 12;
+        return {
+            businessLicenseUrl: "",
+            licenceUrl: "",
+
+            activeName: "first",
+            form: {},
+            manifestationData: [],
+            dispatchData: [],
+            honorchData: [],
+            trainData: [],
+            examinationData: [],
+
+            investorOption: {
+                // 操作栏多余按钮去除
+                delBtn: false,
+                editBtn: false,
+                addBtn: false,
+                menu: false,
+                selection: true,
+
+                align: "center",
+                height: "auto",
+                calcHeight: 270,
+                tip: false,
+                searchShow: false,
+                searchShowBtn: false,
+                searchMenuSpan: 4,
+                index: false,
+                viewBtn: true,
+                //dialogType: 'drawer',
+                dialogClickModal: false,
+                // 操作栏宽度
+                menuWidth: 156,
+                column: [
+                    {
+                        label: "id",
+                        prop: "id",
+                        hide: true,
+                        addDisplay: false,
+                        editDisplay: false,
+                    },
+                    {
+                        label: "股东",
+                        prop: "shareholder",
+                        searchLabelWidth: 55,
+                        search: true,
+                        labelWidth: w,
+                        span: s,
+                    },
+                    {
+                        label: "持股比例(%)",
+                        prop: "shareholdingratio",
+                        labelWidth: w,
+                        span: s,
+                    },
+                    //  {
+                    //     label: "最终受益股份",
+                    //     prop: "beneficial",
+                    // },
+                    {
+                        label: "出资金额(万元)",
+                        prop: "capital",
+                        labelWidth: w,
+                        span: s,
+                    },
+                    {
+                        label: "出资时间",
+                        prop: "capitaltime",
+                        type: "date",
+                        format: "yyyy-MM-dd hh:mm:ss",
+                        valueFormat: "timestamp",
+                        labelWidth: w,
+                        span: s,
+                    },
+                    {
+                        label: "身份证",
+                        prop: "cardid",
+                        labelWidth: w,
+                        // span: s,
+                        search: true,
+                    },
+                    {
+                        label: "联系电话",
+                        prop: "cell",
+                        labelWidth: w,
+                        span: s,
+                    },
+                    {
+                        label: "统一社会信用代码",
+                        prop: "creditcode",
+                        hide: true,
+                        addDisplay: false,
+                        editDisplay: false,
+                        labelWidth: w,
+                        span: s,
+                    },
+                ],
+            },
+            investorSearch: {},
+            investorLoading: true,
+            investorData: [],
+            investorPage: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0,
+            },
+            investorQuery: {},
+            investorSelectionList: [],
+
+            manageOption: {
+                // 操作栏多余按钮去除
+                delBtn: false,
+                editBtn: false,
+                addBtn: false,
+                selection: true,
+                searchShowBtn: false,
+                menu: false,
+
+                align: "center",
+                height: "auto",
+                calcHeight: 270,
+                tip: false,
+                searchShow: false,
+                searchMenuSpan: 4,
+                index: false,
+                viewBtn: true,
+                //dialogType: 'drawer',
+                dialogClickModal: false,
+                // 操作栏宽度
+                menuWidth: 156,
+                height: 600,
+                column: [
+                    {
+                        label: "管理人姓名",
+                        prop: "name",
+                        slot: true,
+                        display: false,
+                    },
+                    {
+                        label: "职务",
+                        prop: "post",
+                        slot: true,
+                        display: false,
+                    },
+                    {
+                        label: "身份证号",
+                        prop: "cardid",
+                        slot: true,
+                        display: false,
+                    },
+                    {
+                        label: "联系电话",
+                        prop: "cell",
+                        slot: true,
+                        display: false,
+                    },
+                ],
+            },
+            manageSearch: {},
+            manageLoading: true,
+            manageData: [],
+            managePage: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0,
+            },
+            manageQuery: {},
+            manageSelectionList: [],
+
+            forms: {}, //防串数据
+            jurisdictionSee: "", //中文辖区
+
+            seestaff: false,
+            seestaff2: false,
+            seestaff3: true,
+        };
+    },
+    created () {
+        var flag = false,
+            i = 0,
+            ind = null,
+            that = this;
+
+        this.$store.state.tags.tagList.forEach((item, index) => {
+            if (
+                item.label == "保安公司详细资料" ||
+                item.label == "保安公司详细信息"
+            ) {
+                if (flag == false) {
+                    ind = index;
+                    flag = true;
+                }
+                i++;
+            }
+        });
+
+        if (i > 1) {
+            this.$store.state.tags.tagList.splice(ind, 1);
+        }
+
+        if (this.$route.query.fromSecunityGuardId) {
+            var page = {
+                currentPage: 1,
+                pageSize: 10,
+            },
+                params = { departmentid: this.$route.query.fromSecunityGuardId };
+            getList(page.currentPage, page.pageSize, params).then((res) => {
+                that.form = res.data.data.records[0];
+                this.jurisdictionSee = this.form.jurisdictionName;
+                that.forms = res.data.data.records[0];
+                that.seestaff = true;
+                that.businessLicenseUrl = res.data.data.records[0].businessLicense;
+                that.licenceUrl = res.data.data.records[0].licence;
+            });
+            // })
+        } else {
+            this.form = this.$route.query;
+            this.jurisdictionSee = this.form.$jurisdiction;
+            this.forms = this.$route.query;
+            this.seestaff = true;
+            this.getFromData({
+                currentPage: 1,
+                pageSize: 10,
+            });
+        }
+    },
+    methods: {
+        getFromData (page, params = {}) {
+            var that = this;
+            params["departmentid"] = this.forms.departmentid;
+            getList(page.currentPage, page.pageSize, params).then((res) => {
+                that.form = res.data.data.records[0];
+                this.businessLicenseUrl = res.data.data.records[0].businessLicense;
+                this.licenceUrl = res.data.data.records[0].licence;
+            });
+        },
+        // inspects(d, val) {
+        //   var a = "";
+        //   var doit = (d, val) => {
+        //     for (let k in d) {
+        //       if (d[k].key == val) {
+        //         a = d[k].title;
+        //         break;
+        //       } else {
+        //         if (d[k].hasChildren) {
+        //           doit(d[k].children, val);
+        //         } else {
+        //         }
+        //       }
+        //     }
+        //   };
+        //   doit(d, val);
+        //   // if (a == "") {
+        //   //   a = val;
+        //   // }
+        //   return a;
+        // },
+        handleClick (tab) {
+            if (tab.index == 2) {
+                this.investorSearchReset();
+            } else if (tab.index == 3) {
+                this.manageSearchReset();
+            } else if (tab.index == 5) {
+                this.seestaff2 = !this.seestaff2;
+            } else if (tab.index == 7) {
+                this.seestaff3 = !this.seestaff3;
+            } else {
+                this.getFromData({
+                    currentPage: 1,
+                    pageSize: 10,
+                });
+            }
+            //  else if (tab.index == 3) {
+            //   this.getHonorchData();
+            // } else if (tab.index == 4) {
+            //   this.getTrainData();
+            // } else if (tab.index == 5) {
+            //   this.getExaminationData();
+            // }
+            //
+        },
+        getManifestationData () {
+            manifestationList(this.forms.cardid).then((res) => {
+                this.manifestationData = res.data.data.records;
+                this.manifestationData.forEach((item) => {
+                    item.name = this.forms.realName;
+                    item.time = item.time.substring(0, 10);
+                });
+            });
+        },
+        getDispatchData () {
+            dispatchList(this.forms.cardid).then((res) => {
+                this.dispatchData = res.data.data.records;
+            });
+        },
+        getHonorchData () {
+            honorchList(this.forms.cardid).then((res) => {
+                this.honorchData = res.data.data.records;
+            });
+        },
+        getTrainData () {
+            trainList(this.forms.cardid).then((res) => {
+                this.trainData = res.data.data;
+
+                this.trainData.forEach((item) => {
+                    if (item.sex == 1) {
+                        item.sex = "男";
+                    } else {
+                        item.sex = "女";
+                    }
+                });
+            });
+        },
+        getExaminationData () {
+            examinationList(this.forms.cardid).then((res) => {
+                this.examinationData = res.data.data;
+
+                this.examinationData.forEach((item) => {
+                    if (item.stat == 1) {
+                        item.stat = "不通过";
+                    } else {
+                        item.stat = "通过";
+                    }
+                });
+            });
+        },
+        investorSizerefresh () {
+            this.investorOnLoad(this.investorPage, this.investorQuery);
+        },
+        investorOnLoad (page, params = {}) {
+            this.investorLoading = true;
+            params["deptId"] = this.form.departmentid;
+            getInvestorList(
+                page.currentPage,
+                page.pageSize,
+                Object.assign(params, this.investorQuery)
+            ).then((res) => {
+                const data = res.data.data;
+
+                this.investorPage.total = data.total;
+                this.investorData = data.records;
+                this.investorLoading = false;
+                this.$refs.investorCrud.refreshTable();
+                this.$refs.investorCrud.doLayout();
+                this.investorSelectionClear();
+            });
+        },
+        investorSelectionClear () {
+            this.investorSelectionList = [];
+            this.$refs.investorCrud.toggleSelection();
+        },
+        investorSelectionChange (list) {
+            this.investorSelectionList = list;
+        },
+        investorSearchChange (params, done) {
+            this.investorQuery = params;
+            this.investorPage.currentPage = 1;
+            this.investorOnLoad(this.investorPage, params);
+            done();
+        },
+        investorSearchReset () {
+            this.investorQuery = {};
+            this.investorOnLoad(this.investorPage);
+        },
+        investorCurrentChange (currentPage) {
+            this.investorPage.currentPage = currentPage;
+        },
+        investorSizeChange (pageSize) {
+            this.investorPage.pageSize = pageSize;
+        },
+        manageSizerefresh () {
+            this.manageOnLoad(this.managePage, this.manageQuery);
+        },
+        manageOnLoad (page, params = {}) {
+            this.manageLoading = true;
+            params["deptId"] = this.form.departmentid;
+            getManageList(
+                page.currentPage,
+                page.pageSize,
+                Object.assign(params, this.manageQuery)
+            ).then((res) => {
+                const data = res.data.data;
+
+                this.managePage.total = data.total;
+                this.manageData = data.records;
+                this.manageLoading = false;
+
+                this.$refs.manageCrud.refreshTable();
+                this.$refs.manageCrud.doLayout();
+
+                this.manageSelectionClear();
+            });
+        },
+        manageSelectionClear () {
+            this.manageSelectionList = [];
+            this.$refs.manageCrud.toggleSelection();
+        },
+        manageSelectionChange (list) {
+            this.manageSelectionList = list;
+        },
+        manageSearchChange (params, done) {
+            this.manageQuery = params;
+            this.managePage.currentPage = 1;
+            this.manageOnLoad(this.managePage, params);
+            done();
+        },
+        manageSearchReset () {
+            this.manageQuery = {};
+            this.manageOnLoad(this.managePage);
+        },
+        manageCurrentChange (currentPage) {
+            this.managePage.currentPage = currentPage;
+        },
+        manageSizeChange (pageSize) {
+            this.managePage.pageSize = pageSize;
+        },
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.businessLicenses {
+    padding-top: 15px;
+    background-color: transparent;
+}
+.el-main {
+    background-color: transparent;
+    color: #333;
+    text-align: center;
+    // position: relative;
+    // right: 5%;
+}
+.businessLicensess {
+    height: 680px;
+    width: 450px;
+}
+.Licenses {
+    height: 680px;
+    width: 1048px;
+}
+.title {
+    color: #fff;
+}
+</style>
diff --git a/src/views/securityCompany/companyDetails.vue b/src/views/securityCompany/companyDetails.vue
index f03895f..69c3390 100644
--- a/src/views/securityCompany/companyDetails.vue
+++ b/src/views/securityCompany/companyDetails.vue
@@ -6,100 +6,22 @@
  * menu-name 保安公司详细资料
  */
 <template>
-    <el-row class="morpheus-box">
-        <el-col :span="24">
-            <el-card>
-                <div class="card-body">
-                    <el-tabs v-model="activeName"
-                             @tab-click="handleClick">
-                        <el-tab-pane label="基本信息"
-                                     name="first">
-                            <el-form :model="form"
-                                     label-position="right"
-                                     size="mini"
-                                     label-width="100px">
-                                <el-row>
-                                    <el-col span="12">
-                                        <el-form-item label="公司名称">
-                                            <el-input disabled="true"
-                                                      v-model="form.enterprisename"
-                                                      autocomplete="off"></el-input>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col span="12">
-                                        <el-form-item label="法定代表人">
-                                            <el-input disabled="true"
-                                                      v-model="form.representative"
-                                                      autocomplete="off"></el-input>
-                                        </el-form-item>
-                                    </el-col>
-                                </el-row>
-                                <el-row>
-                                    <el-col span="24">
-                                        <el-form-item label="注册地址">
-                                            <el-input disabled="true"
-                                                      v-model="form.address"
-                                                      autocomplete="off"></el-input>
-                                        </el-form-item>
-                                    </el-col>
-                                </el-row>
-
-                                <el-row>
-                                    <el-col span="12">
-                                        <el-form-item label="所属辖区">
-                                            <el-input disabled="true"
-                                                      v-model="jurisdictionSee"
-                                                      autocomplete="off"></el-input>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col span="12">
-                                        <el-form-item label="所属行业">
-                                            <el-input disabled="true"
-                                                      v-model="form.industry"
-                                                      autocomplete="off"></el-input>
-                                        </el-form-item>
-                                    </el-col>
-                                </el-row>
-
-                                <el-row>
-                                    <el-col span="12">
-                                        <el-form-item label="登记机关">
-                                            <el-input disabled="true"
-                                                      v-model="form.registration"
-                                                      autocomplete="off"></el-input>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col span="12">
-                                        <el-form-item label="公司类型">
-                                            <el-input disabled="true"
-                                                      v-model="form.enterprises"
-                                                      autocomplete="off"></el-input>
-                                        </el-form-item>
-                                    </el-col>
-                                </el-row>
-
-                                <el-row>
-                                    <el-col span="24">
-                                        <el-form-item label="经营范围">
-                                            <el-input type="textarea"
-                                                      disabled="true"
-                                                      v-model="form.business"
-                                                      resize="none"
-                                                      autocomplete="off"></el-input>
-                                        </el-form-item>
-                                    </el-col>
-                                </el-row>
-                            </el-form>
-                        </el-tab-pane>
-                        <el-tab-pane label="工商信息"
-                                     name="second">
-                            <el-form :model="form"
-                                     label-position="right"
-                                     size="mini"
-                                     label-width="100px">
-                                <!-- <el-row>
+  <el-row class="morpheus-box">
+    <el-col :span="24">
+      <el-card>
+        <div class="card-body">
+          <el-tabs v-model="activeName" @tab-click="handleClick">
+            <!-- 基本信息 -->
+            <el-tab-pane :label="baseTitle" name="first">
+              <el-form
+                :model="form"
+                label-position="right"
+                size="mini"
+                label-width="100px"
+              >
+                <el-row>
                   <el-col span="12">
-                    <el-form-item label="公司名称">
+                    <el-form-item label="企业名称" label-width="100px">
                       <el-input
                         disabled="true"
                         v-model="form.enterprisename"
@@ -108,7 +30,21 @@
                     </el-form-item>
                   </el-col>
                   <el-col span="12">
-                    <el-form-item label="法定代表人">
+                    <el-form-item label="所属辖区" label-width="160px">
+                      <el-input
+                        disabled="true"
+                        v-model="form.jurisdictionName"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row v-if="representativeVisiable">
+                  <el-col span="12">
+                    <el-form-item
+                      :label="representativeLabel"
+                      label-width="100px"
+                    >
                       <el-input
                         disabled="true"
                         v-model="form.representative"
@@ -116,176 +52,482 @@
                       ></el-input>
                     </el-form-item>
                   </el-col>
-                </el-row> -->
-
-                                <el-row>
-                                    <el-col span="12">
-                                        <el-form-item label="组织机构代码">
-                                            <el-input disabled="true"
-                                                      v-model="form.organizationcode"
-                                                      autocomplete="off"></el-input>
-                                        </el-form-item>
-                                    </el-col>
-
-                                    <el-col span="12">
-                                        <el-form-item label="注册资金">
-                                            <el-input disabled="true"
-                                                      v-model="form.registeredcapital"
-                                                      autocomplete="off"></el-input>
-                                        </el-form-item>
-                                    </el-col>
-                                </el-row>
-
-                                <el-row>
-                                    <!-- <el-col span="12">
-                    <el-form-item label="实缴资金">
-                      <el-input
-                        disabled="true"
-                        v-model="form.capital"
-                        autocomplete="off"
-                      ></el-input>
-                    </el-form-item>
-                  </el-col> -->
-                                    <el-col span="12">
-                                        <el-form-item label="注册时间">
-                                            <el-input disabled="true"
-                                                      v-model="form.establishtime"
-                                                      autocomplete="off"></el-input>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col span="12">
-                                        <el-form-item label="工商注册号">
-                                            <el-input disabled="true"
-                                                      v-model="form.registrationnumber"
-                                                      autocomplete="off"></el-input>
-                                        </el-form-item>
-                                    </el-col>
-                                </el-row>
-
-                                <!-- <el-row>
                   <el-col span="12">
-                    <el-form-item label="工商注册号">
+                    <el-form-item
+                      :label="representativecellLabel"
+                      label-width="160px"
+                    >
                       <el-input
                         disabled="true"
-                        v-model="form.registrationnumber"
+                        v-model="form.representativecell"
                         autocomplete="off"
                       ></el-input>
                     </el-form-item>
                   </el-col>
-                </el-row> -->
-                            </el-form>
-                        </el-tab-pane>
-                        <el-tab-pane label="投资人信息"
-                                     name="third">
-                            <avue-crud class="company-box"
-                                       :option="investorOption"
-                                       :search.sync="investorSearch"
-                                       :table-loading="investorLoading"
-                                       :data="investorData"
-                                       ref="investorCrud"
-                                       :page.sync="investorPage"
-                                       @selection-change="investorSelectionChange"
-                                       @search-change="investorSearchChange"
-                                       @search-reset="investorSearchReset"
-                                       @current-change="investorCurrentChange"
-                                       @size-change="investorSizeChange"
-                                       @refresh-change="investorSizerefresh"
-                                       @on-load="investorOnLoad">
-                            </avue-crud>
-                        </el-tab-pane>
-                        <el-tab-pane label="管理人信息"
-                                     name="fourth">
-                            <avue-crud class="company-box"
-                                       :option="manageOption"
-                                       :search.sync="manageSearch"
-                                       :table-loading="manageLoading"
-                                       :data="manageData"
-                                       ref="manageCrud"
-                                       :page.sync="managePage"
-                                       @selection-change="manageSelectionChange"
-                                       @search-change="manageSearchChange"
-                                       @search-reset="manageSearchReset"
-                                       @current-change="manageCurrentChange"
-                                       @size-change="manageSizeChange"
-                                       @refresh-change="manageSizerefresh"
-                                       @on-load="manageOnLoad">
-                            </avue-crud>
-                        </el-tab-pane>
-                        <el-tab-pane label="装备信息"
-                                     name="fifth">
-                            <equipment :forms="forms"
-                                       v-if="seestaff"></equipment>
-                        </el-tab-pane>
-                        <el-tab-pane label="保安员信息"
-                                     name="sixth">
-                            <staff :forms="forms"
-                                   v-if="seestaff"
-                                   :doit="seestaff2"></staff>
-                        </el-tab-pane>
-                        <el-tab-pane label="处罚信息"
-                                     name="seventh">
-                            <punish :forms="forms"
-                                    v-if="seestaff"></punish>
-                        </el-tab-pane>
-                        <el-tab-pane label="服务对象"
-                                     name="eighth">
-                            <service :form="forms"
-                                     v-if="seestaff"
-                                     :refresh="seestaff3"></service>
-                        </el-tab-pane>
-                        <!-- <el-tab-pane label="其他附件" name="eighth">
+                </el-row>
+                <el-row>
+                  <el-col span="12">
+                    <el-form-item label="联系人" label-width="100px">
+                      <el-input
+                        disabled="true"
+                        v-model="form.contacts"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col span="12">
+                    <el-form-item label="联系电话" label-width="160px">
+                      <el-input
+                        disabled="true"
+                        v-model="form.contactscell"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col span="12">
+                    <el-form-item label="企业属性" label-width="100px">
+                      <el-input
+                        disabled="true"
+                        v-model="form.stats"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col span="12">
+                    <el-form-item label="注册地址" label-width="160px">
+                      <el-input
+                        disabled="true"
+                        v-model="form.address"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row v-if="fregionVisiable">
+                  <el-col span="12">
+                    <el-form-item label="服务区域" label-width="100px">
+                      <el-input
+                        disabled="true"
+                        v-model="form.fregion"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col span="12">
+                    <el-form-item label="服务时间" label-width="160px">
+                      <el-input
+                        disabled="true"
+                        v-model="form.ftime"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col span="12">
+                    <el-form-item label="登记机关" label-width="100px">
+                      <el-input
+                        disabled="true"
+                        v-model="form.registration"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col span="12">
+                    <el-form-item
+                      label="办公地址"
+                      label-width="160px"
+                      v-if="industryVisiable"
+                    >
+                      <el-input
+                        disabled="true"
+                        v-model="form.industry"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-form>
+            </el-tab-pane>
+            <!-- 工商信息 -->
+            <el-tab-pane label="工商信息" name="second">
+              <div v-if="secondVisiable">
+                <a style="color:#fff">总公司工商信息</a>
+                <el-divider></el-divider>
+              </div>
+              <el-form
+                :model="form"
+                v-if="secondVisiable"
+                label-position="right"
+                size="mini"
+                label-width="100px"
+              >
+                <el-row>
+                  <el-col span="12">
+                    <el-form-item label="统一社会信用代码" label-width="130px">
+                      <el-input
+                        disabled="true"
+                        v-model="businessObj.socialCreditCode"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col span="12">
+                    <el-form-item label="注册时间">
+                      <el-input
+                        disabled="true"
+                        v-model="businessObj.registerTime"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col span="12">
+                    <el-form-item label="注册资本" label-width="130px">
+                      <el-input
+                        disabled="true"
+                        v-model="businessObj.capital"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col span="12">
+                    <el-form-item label="经营范围">
+                      <el-input
+                        disabled="true"
+                        v-model="businessObj.businessScope"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col span="12">
+                    <el-form-item label="营业执照" label-width="130px">
+                      <el-upload
+                        disabled="true"
+                        class="avatar-uploader"
+                        :show-file-list="false"
+                      >
+                        <img v-if="businessObj.trading" :src="businessObj.trading" class="avatar" />
+                        <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                      </el-upload>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-form>
+              <div v-if="secondVisiable">
+                <a style="color:#fff">分公司工商信息</a>
+                <el-divider></el-divider>
+              </div>
+              <el-form
+                :model="form"
+                label-position="right"
+                size="mini"
+                label-width="100px"
+              >
+                <el-row>
+                  <el-col span="12">
+                    <el-form-item label="统一社会信用代码" label-width="130px">
+                      <el-input
+                        disabled="true"
+                        v-model="form.creditcode"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col span="12">
+                    <el-form-item label="注册时间">
+                      <el-input
+                        disabled="true"
+                        v-model="form.establishtime"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col span="12">
+                    <el-form-item label="注册资本" label-width="130px">
+                      <el-input
+                        disabled="true"
+                        v-model="form.registeredcapital"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col span="12">
+                    <el-form-item label="经营范围">
+                      <el-input
+                        disabled="true"
+                        v-model="form.business"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col span="12">
+                    <el-form-item label="营业执照" label-width="130px">
+                      <el-upload
+                        disabled="true"
+                        class="avatar-uploader"
+                        :show-file-list="false"
+                      >
+                        <img v-if="form.businessLicense" :src="form.businessLicense" class="avatar" />
+                        <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                      </el-upload>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-form>
+            </el-tab-pane>
+            <!-- 出资人信息 -->
+            <el-tab-pane
+              label="出资人信息"
+              name="third"
+              v-if="shareholderVisiable"
+            >
+              <avue-crud
+                class="company-box"
+                :option="investorOption"
+                :search.sync="investorSearch"
+                :table-loading="investorLoading"
+                :data="investorData"
+                ref="investorCrud"
+                :page.sync="investorPage"
+                @selection-change="investorSelectionChange"
+                @search-change="investorSearchChange"
+                @search-reset="investorSearchReset"
+                @current-change="investorCurrentChange"
+                @size-change="investorSizeChange"
+                @refresh-change="investorSizerefresh"
+                @on-load="investorOnLoad"
+              >
+              </avue-crud>
+            </el-tab-pane>
+            <!-- 主要管理人员信息 -->
+            <el-tab-pane :label="managerLabel" name="fourth">
+              <avue-crud
+                class="company-box"
+                :option="manageOption"
+                :search.sync="manageSearch"
+                :table-loading="manageLoading"
+                :data="manageData"
+                ref="manageCrud"
+                :page.sync="managePage"
+                @selection-change="manageSelectionChange"
+                @search-change="manageSearchChange"
+                @search-reset="manageSearchReset"
+                @current-change="manageCurrentChange"
+                @size-change="manageSizeChange"
+                @refresh-change="manageSizerefresh"
+                @on-load="manageOnLoad"
+              >
+              </avue-crud>
+            </el-tab-pane>
+            <!-- 装备信息 -->
+            <el-tab-pane label="装备信息" name="fifth" v-if="equipmentVisiable">
+              <equipment :forms="forms" v-if="seestaff"></equipment>
+            </el-tab-pane>
+            <!-- 保安员信息 -->
+            <el-tab-pane
+              label="保安员信息"
+              name="sixth"
+              v-if="securityVisiable"
+            >
+              <staff :forms="forms" v-if="seestaff" :doit="seestaff2"></staff>
+            </el-tab-pane>
+            <!-- 处罚信息 -->
+            <el-tab-pane label="处罚信息" name="seventh">
+              <punish :forms="forms" v-if="seestaff"></punish>
+            </el-tab-pane>
+            <!-- 服务对象信息 -->
+            <el-tab-pane
+              label="服务对象信息"
+              name="eighth"
+              v-if="dispatcherUnitVisiable"
+            >
+              <service
+                :form="forms"
+                v-if="seestaff"
+                :refresh="seestaff3"
+              ></service>
+            </el-tab-pane>
+            <!-- <el-tab-pane label="其他附件" name="eighth">
               <enclosure :form="form"></enclosure>
             </el-tab-pane> -->
-                        <el-tab-pane label="营业执照"
-                                     name="ninth">
-                            <div class="businessLicenses">
-                                <el-container>
-                                    <el-main>
-                                        <div class="title"
-                                             v-if="businessLicenseUrl == ''">
-                                            未上传营业执照
-                                        </div>
-                                        <img class="businessLicensess"
-                                             :src="businessLicenseUrl"
-                                             alt=""
-                                             v-else />
-                                    </el-main>
-                                </el-container>
-                            </div>
-                        </el-tab-pane>
-                        <el-tab-pane label="许可证"
-                                     name="tenth">
-                            <div class="businessLicenses">
-                                <el-container>
-                                    <el-main>
-                                        <div class="title"
-                                             v-if="licenceUrl == ''">
-                                            未上传许可证
-                                        </div>
-                                        <img class="Licenses"
-                                             :src="licenceUrl"
-                                             alt=""
-                                             v-else />
-                                    </el-main>
-                                </el-container>
-                            </div>
-                        </el-tab-pane>
-                    </el-tabs>
-                </div>
-            </el-card>
-        </el-col>
-    </el-row>
+            <!-- 营业执照 -->
+            <!-- <el-tab-pane label="营业执照" name="ninth">
+              <div class="businessLicenses">
+                <el-container>
+                  <el-main>
+                    <div class="title" v-if="businessLicenseUrl == ''">
+                      未上传营业执照
+                    </div>
+                    <img
+                      class="businessLicensess"
+                      :src="businessLicenseUrl"
+                      alt=""
+                      v-else
+                    />
+                  </el-main>
+                </el-container>
+              </div>
+            </el-tab-pane> -->
+            <!-- 许可证信息 -->
+            <el-tab-pane
+              :label="licenceLabel"
+              name="tenth"
+              v-if="licenceVisiable"
+            >
+              <el-form
+                :model="licenceForm"
+                label-position="right"
+                size="mini"
+                label-width="100px"
+              >
+                <el-row>
+                  <el-col span="12">
+                    <el-form-item label="名称">
+                      <el-input
+                        disabled="true"
+                        v-model="licenceForm.unitName"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col span="12">
+                    <el-form-item label="住所">
+                      <el-input
+                        disabled="true"
+                        v-model="licenceForm.address"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col span="12">
+                    <el-form-item label="法定代表人">
+                      <el-input
+                        disabled="true"
+                        v-model="licenceForm.legalPeople"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col span="12">
+                    <el-form-item label="批准文号">
+                      <el-input
+                        disabled="true"
+                        v-model="licenceForm.approvalNumber"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col span="12">
+                    <el-form-item label="发证机关">
+                      <el-input
+                        disabled="true"
+                        v-model="licenceForm.licenceIssuingUnit"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col span="12">
+                    <el-form-item label="发证时间">
+                      <el-input
+                        disabled="true"
+                        v-model="licenceForm.licenceIssuingTime"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col span="12">
+                    <el-form-item label="许可证编号">
+                      <el-input
+                        disabled="true"
+                        v-model="licenceForm.code"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col span="12" v-if="registerCapitalVisiable">
+                    <el-form-item label="注册资本">
+                      <el-input
+                        disabled="true"
+                        v-model="licenceForm.registerCapital"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col span="24">
+                    <el-form-item :label="contentLabel">
+                      <el-input
+                        type="textarea"
+                        disabled="true"
+                        v-model="licenceForm.content"
+                        autocomplete="off"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col span="12">
+                    <el-form-item label="许可证图片">
+                      <el-upload
+                        disabled="true"
+                        class="avatar-uploader"
+                        :show-file-list="false"
+                      >
+                        <img v-if="licenceForm.url" :src="licenceForm.url" class="avatar" />
+                        <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                      </el-upload>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-form>
+            </el-tab-pane>
+            <!-- 备案证  -->
+            <el-tab-pane
+              label="备案证"
+              name="tab12"
+              v-if="certificdinedVisiable"
+            >
+              <div class="businessLicenses">
+                <el-container>
+                  <el-main>
+                    <div class="title" v-if="licenceUrl == ''">
+                      未上传备案证
+                    </div>
+                    <img class="Licenses" :src="licenceUrl" alt="" v-else />
+                  </el-main>
+                </el-container>
+              </div>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+      </el-card>
+    </el-col>
+  </el-row>
 </template>
 
 <script>
 import {
-    manifestationList,
-    dispatchList,
-    honorchList,
-    trainList,
-    examinationList,
-    getInvestorList,
-    getManageList,
+  manifestationList,
+  dispatchList,
+  honorchList,
+  trainList,
+  examinationList,
+  getInvestorList,
+  getManageList,
+  getBusinessInfo,
+  getLicenceDetail,
 } from "@/api/securityCompany/companyDetails";
 import equipment from "./computents/equipment.vue"; //装备管理
 import staff from "./computents/staff.vue"; //保安员信息
@@ -296,458 +538,625 @@
 import { getList } from "@/api/securityCompany/security"; //保安公司
 
 export default {
-    components: {
-        equipment: equipment,
-        staff: staff,
-        punish: punish,
-        service: service,
-        // enclosure: enclosure,
+  components: {
+    equipment: equipment,
+    staff: staff,
+    punish: punish,
+    service: service,
+    // enclosure: enclosure,
+  },
+  data() {
+    var w = 160,
+      s = 12;
+    return {
+      businessObj:{},
+      licenceForm:{},
+      representativeVisiable: true,
+      registerCapitalVisiable: true,
+      fregionVisiable: false,
+      secondVisiable: false,
+      industryVisiable: true,
+      representativecellLabel: "法定代表人联系电话",
+      representativeLabel: "法定代表人",
+      contentLabel: "服务范围",
+      businessLicenseUrl: "",
+      licenceUrl: "",
+      deptId: "",
+      managerLabel: "主要管理人信息",
+      licenceLabel: "许可证信息",
+      baseTitle: "基本信息",
+      certificdinedVisiable: false,
+      dispatcherUnitVisiable: true,
+      securityVisiable: true,
+      businessVisiable: true,
+      licenceVisiable: true,
+      shareholderVisiable: true,
+      equipmentVisiable: true,
+      activeName: "first",
+      form: {},
+      manifestationData: [],
+      dispatchData: [],
+      honorchData: [],
+      trainData: [],
+      examinationData: [],
+      investorOption: {
+        // 操作栏多余按钮去除
+        delBtn: false,
+        editBtn: false,
+        addBtn: false,
+        menu: false,
+        selection: true,
+
+        align: "center",
+        height: "auto",
+        calcHeight: 270,
+        tip: false,
+        searchShow: false,
+        searchShowBtn: false,
+        searchMenuSpan: 4,
+        index: false,
+        viewBtn: true,
+        //dialogType: 'drawer',
+        dialogClickModal: false,
+        // 操作栏宽度
+        menuWidth: 156,
+        column: [
+          {
+            label: "id",
+            prop: "id",
+            hide: true,
+            addDisplay: false,
+            editDisplay: false,
+          },
+          {
+            label: "股东",
+            prop: "shareholder",
+            searchLabelWidth: 55,
+            search: true,
+            labelWidth: w,
+            span: s,
+          },
+          {
+            label: "持股比例(%)",
+            prop: "shareholdingratio",
+            labelWidth: w,
+            span: s,
+          },
+          {
+            label: "出资金额(万元)",
+            prop: "capital",
+            labelWidth: w,
+            span: s,
+          },
+          {
+            label: "出资时间",
+            prop: "capitaltime",
+            type: "date",
+            format: "yyyy-MM-dd hh:mm:ss",
+            valueFormat: "timestamp",
+            labelWidth: w,
+            span: s,
+          },
+          {
+            label: "身份证",
+            prop: "cardid",
+            labelWidth: w,
+            // span: s,
+            search: true,
+          },
+          {
+            label: "联系电话",
+            prop: "cell",
+            labelWidth: w,
+            span: s,
+          },
+          {
+            label: "统一社会信用代码",
+            prop: "creditcode",
+            hide: true,
+            addDisplay: false,
+            editDisplay: false,
+            labelWidth: w,
+            span: s,
+          },
+        ],
+      },
+      investorSearch: {},
+      investorLoading: true,
+      investorData: [],
+      investorPage: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      investorQuery: {},
+      investorSelectionList: [],
+
+      manageOption: {
+        // 操作栏多余按钮去除
+        delBtn: false,
+        editBtn: false,
+        addBtn: false,
+        selection: true,
+        searchShowBtn: false,
+        menu: false,
+
+        align: "center",
+        height: "auto",
+        calcHeight: 270,
+        tip: false,
+        searchShow: false,
+        searchMenuSpan: 4,
+        index: false,
+        viewBtn: true,
+        //dialogType: 'drawer',
+        dialogClickModal: false,
+        // 操作栏宽度
+        menuWidth: 156,
+        column: [
+          {
+            label: "姓名",
+            prop: "name",
+            slot: true,
+            display: false,
+          },
+          {
+            label: "职务",
+            prop: "post",
+            slot: true,
+            display: false,
+          },
+          {
+            label: "身份证号",
+            prop: "cardid",
+            slot: true,
+            display: false,
+          },
+          {
+            label: "联系电话",
+            prop: "cell",
+            slot: true,
+            display: false,
+          },
+          {
+            label: "学历",
+            prop: "education",
+            display:false,
+            row:true,
+            hide:true,
+            rules: [{
+                required: true,
+                message: "请选择学历",
+                trigger: "blur"
+            }],
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationTypes",
+            search: false,
+            searchSpan: 4,
+            type: "select",
+            props: {
+                label: "dictValue",
+                value: "dictKey"
+            },
+            dataType: "number",
+          },
+          {
+            label: "证书",
+            prop: "paper",
+            type: "upload",
+            dataType:"string",
+            listType: "picture-card",
+            span: 24,
+            propsHttp: {
+              res: "data",
+            },
+            tip: "只能上传jpg/png格式图片,且不超过2Mb",
+            action: "/api/blade-resource/oss/endpoint/put-files",
+            display:false,
+            hide:true,
+          },
+        ],
+      },
+      manageSearch: {},
+      manageLoading: true,
+      manageData: [],
+      managePage: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      manageQuery: {},
+      manageSelectionList: [],
+      forms: {}, //防串数据
+      jurisdictionSee: "", //中文辖区
+      seestaff: false,
+      seestaff2: false,
+      seestaff3: true,
+    };
+  },
+  created() {
+    //防tab  重复
+    this.tabClear();
+    //数据初始化
+    this.initData();
+  },
+  methods: {
+    //数据初始化
+    initData() {
+      var data = JSON.parse(this.$route.query.data);
+      this.form = data;
+      //单位列表进入
+      var stats = data.stats;
+      var deptId = data.departmentid;
+      //初始tab控制
+      this.initController(stats, deptId);
+      //初始数据获取
+      this.getdatas(data);
     },
-    data () {
-        var w = 160,
-            s = 12;
-        return {
-            businessLicenseUrl: "",
-            licenceUrl: "",
-
-            activeName: "first",
-            form: {},
-            manifestationData: [],
-            dispatchData: [],
-            honorchData: [],
-            trainData: [],
-            examinationData: [],
-
-            investorOption: {
-                // 操作栏多余按钮去除
-                delBtn: false,
-                editBtn: false,
-                addBtn: false,
-                menu: false,
-                selection: true,
-
-                align: "center",
-                height: "auto",
-                calcHeight: 270,
-                tip: false,
-                searchShow: false,
-                searchShowBtn: false,
-                searchMenuSpan: 4,
-                index: false,
-                viewBtn: true,
-                //dialogType: 'drawer',
-                dialogClickModal: false,
-                // 操作栏宽度
-                menuWidth: 156,
-                height: 600,
-                column: [
-                    {
-                        label: "id",
-                        prop: "id",
-                        hide: true,
-                        addDisplay: false,
-                        editDisplay: false,
-                    },
-                    {
-                        label: "股东",
-                        prop: "shareholder",
-                        searchLabelWidth: 55,
-                        search: true,
-                        labelWidth: w,
-                        span: s,
-                    },
-                    {
-                        label: "持股比例(%)",
-                        prop: "shareholdingratio",
-                        labelWidth: w,
-                        span: s,
-                    },
-                    //  {
-                    //     label: "最终受益股份",
-                    //     prop: "beneficial",
-                    // },
-                    {
-                        label: "出资金额(万元)",
-                        prop: "capital",
-                        labelWidth: w,
-                        span: s,
-                    },
-                    {
-                        label: "出资时间",
-                        prop: "capitaltime",
-                        type: "date",
-                        format: "yyyy-MM-dd hh:mm:ss",
-                        valueFormat: "timestamp",
-                        labelWidth: w,
-                        span: s,
-                    },
-                    {
-                        label: "身份证",
-                        prop: "cardid",
-                        labelWidth: w,
-                        // span: s,
-                        search: true,
-                    },
-                    {
-                        label: "联系电话",
-                        prop: "cell",
-                        labelWidth: w,
-                        span: s,
-                    },
-                    {
-                        label: "统一社会信用代码",
-                        prop: "creditcode",
-                        hide: true,
-                        addDisplay: false,
-                        editDisplay: false,
-                        labelWidth: w,
-                        span: s,
-                    },
-                ],
-            },
-            investorSearch: {},
-            investorLoading: true,
-            investorData: [],
-            investorPage: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0,
-            },
-            investorQuery: {},
-            investorSelectionList: [],
-
-            manageOption: {
-                // 操作栏多余按钮去除
-                delBtn: false,
-                editBtn: false,
-                addBtn: false,
-                selection: true,
-                searchShowBtn: false,
-                menu: false,
-
-                align: "center",
-                height: "auto",
-                calcHeight: 270,
-                tip: false,
-                searchShow: false,
-                searchMenuSpan: 4,
-                index: false,
-                viewBtn: true,
-                //dialogType: 'drawer',
-                dialogClickModal: false,
-                // 操作栏宽度
-                menuWidth: 156,
-                height: 600,
-                column: [
-                    {
-                        label: "管理人姓名",
-                        prop: "name",
-                        slot: true,
-                        display: false,
-                    },
-                    {
-                        label: "职务",
-                        prop: "post",
-                        slot: true,
-                        display: false,
-                    },
-                    {
-                        label: "身份证号",
-                        prop: "cardid",
-                        slot: true,
-                        display: false,
-                    },
-                    {
-                        label: "联系电话",
-                        prop: "cell",
-                        slot: true,
-                        display: false,
-                    },
-                ],
-            },
-            manageSearch: {},
-            manageLoading: true,
-            manageData: [],
-            managePage: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0,
-            },
-            manageQuery: {},
-            manageSelectionList: [],
-
-            forms: {}, //防串数据
-            jurisdictionSee: "", //中文辖区
-
-            seestaff: false,
-            seestaff2: false,
-            seestaff3: true,
-        };
-    },
-    created () {
-        var flag = false,
-            i = 0,
-            ind = null,
-            that = this;
-
-        this.$store.state.tags.tagList.forEach((item, index) => {
-            if (
-                item.label == "保安公司详细资料" ||
-                item.label == "保安公司详细信息"
-            ) {
-                if (flag == false) {
-                    ind = index;
-                    flag = true;
-                }
-                i++;
-            }
+    //tab 初始设置
+    initController(stats, deptId) {
+      this.stats = stats;
+      this.deptId = deptId;
+      var that = this;
+      // 判断按进入的公司类型
+      if (stats == "2") {
+        //本市保安公司
+        that.baseTitle = "保安单位基本信息";
+      }
+      if (stats == "0") {
+        //自招保安单位
+        that.baseTitle = "单位基本信息";
+        that.equipmentVisiable = false;
+        that.shareholderVisiable = false;
+        that.certificdinedVisiable = true;
+        that.licenceVisiable = false;
+      }
+      if (stats == "4") {
+        //分公司
+        that.baseTitle = "保安单位基本信息";
+        that.certificdinedVisiable = true;
+        that.secondVisiable = true;
+        that.businessVisiable = false;
+        that.licenceLabel = "总公司许可证信息";
+        //查询分公司(及总公司)工商信息
+        getBusinessInfo(deptId).then((res) => {
+          that.businessObj = res.data.data;
+          if (that.businessObj.id == -1) {
+            that.businessObj.id = null;
+          }
+          // console.log(that.businessObj,1234546);
         });
-
-        if (i > 1) {
-            this.$store.state.tags.tagList.splice(ind, 1);
-        }
-
-        if (this.$route.query.fromSecunityGuardId) {
-            var page = {
-                currentPage: 1,
-                pageSize: 10,
-            },
-                params = { departmentid: this.$route.query.fromSecunityGuardId };
-            getList(page.currentPage, page.pageSize, params).then((res) => {
-                that.form = res.data.data.records[0];
-                this.jurisdictionSee = this.form.jurisdictionName;
-                that.forms = res.data.data.records[0];
-                that.seestaff = true;
-                that.businessLicenseUrl = res.data.data.records[0].businessLicense;
-                that.licenceUrl = res.data.data.records[0].licence;
-            });
-            // })
-        } else {
-            this.form = this.$route.query;
-            this.jurisdictionSee = this.form.$jurisdiction;
-            this.forms = this.$route.query;
-            this.seestaff = true;
-            this.getFromData({
-                currentPage: 1,
-                pageSize: 10,
-            });
-        }
+      }
+      if (stats == "1") {
+        //培训学校
+        that.baseTitle = "学校基本信息";
+        that.managerLabel = "师资力量";
+        that.licenceLabel = "培训许可证信息";
+        that.shareholderVisiable = false;
+        that.dispatcherUnitVisiable = false;
+        that.securityVisiable = false;
+      }
     },
-    methods: {
-        getFromData (page, params = {}) {
-            var that = this;
-            params["departmentid"] = this.forms.departmentid;
-            getList(page.currentPage, page.pageSize, params).then((res) => {
-                that.form = res.data.data.records[0];
-                this.businessLicenseUrl = res.data.data.records[0].businessLicense;
-                this.licenceUrl = res.data.data.records[0].licence;
-            });
-        },
-        // inspects(d, val) {
-        //   var a = "";
-        //   var doit = (d, val) => {
-        //     for (let k in d) {
-        //       if (d[k].key == val) {
-        //         a = d[k].title;
-        //         break;
-        //       } else {
-        //         if (d[k].hasChildren) {
-        //           doit(d[k].children, val);
-        //         } else {
-        //         }
-        //       }
-        //     }
-        //   };
-        //   doit(d, val);
-        //   // if (a == "") {
-        //   //   a = val;
-        //   // }
-        //   return a;
-        // },
-        handleClick (tab) {
-            if (tab.index == 2) {
-                this.investorSearchReset();
-            } else if (tab.index == 3) {
-                this.manageSearchReset();
-            } else if (tab.index == 5) {
-                this.seestaff2 = !this.seestaff2;
-            } else if (tab.index == 7) {
-                this.seestaff3 = !this.seestaff3;
-            } else {
-                this.getFromData({
-                    currentPage: 1,
-                    pageSize: 10,
-                });
-            }
-            //  else if (tab.index == 3) {
-            //   this.getHonorchData();
-            // } else if (tab.index == 4) {
-            //   this.getTrainData();
-            // } else if (tab.index == 5) {
-            //   this.getExaminationData();
-            // }
-            //
-        },
-        getManifestationData () {
-            manifestationList(this.forms.cardid).then((res) => {
-                this.manifestationData = res.data.data.records;
-                this.manifestationData.forEach((item) => {
-                    item.name = this.forms.realName;
-                    item.time = item.time.substring(0, 10);
-                });
-            });
-        },
-        getDispatchData () {
-            dispatchList(this.forms.cardid).then((res) => {
-                this.dispatchData = res.data.data.records;
-            });
-        },
-        getHonorchData () {
-            honorchList(this.forms.cardid).then((res) => {
-                this.honorchData = res.data.data.records;
-            });
-        },
-        getTrainData () {
-            trainList(this.forms.cardid).then((res) => {
-                this.trainData = res.data.data;
+    //初始数据获取
+    getdatas(data) {
+      console.log(data, 123456);
+      var that = this;
+      if (data.departmentid) {
+        if (data.stats == "2") {
+          data.stats = "本市保安公司";
+        }
+        if (data.stats == "0") {
+          data.stats = "自招保安单位";
+          that.representativeVisiable = false;
+          that.industryVisiable = false;
+          that.fregionVisiable = true;
+        }
+        if (data.stats == "1") {
+          data.stats = "保安培训学校";
+          const educationcolumn = this.findObject(
+            this.manageOption.column,
+            "education"
+          );
+          const papercolumn = this.findObject(
+            this.manageOption.column,
+            "paper"
+          );
+          //学历证书
+          educationcolumn.display = true;
+          educationcolumn.hide = false;
+          educationcolumn.search = true;
+          papercolumn.display = true;
+          papercolumn.hide = false;
 
-                this.trainData.forEach((item) => {
-                    if (item.sex == 1) {
-                        item.sex = "男";
-                    } else {
-                        item.sex = "女";
-                    }
-                });
-            });
-        },
-        getExaminationData () {
-            examinationList(this.forms.cardid).then((res) => {
-                this.examinationData = res.data.data;
-
-                this.examinationData.forEach((item) => {
-                    if (item.stat == 1) {
-                        item.stat = "不通过";
-                    } else {
-                        item.stat = "通过";
-                    }
-                });
-            });
-        },
-        investorSizerefresh () {
-            this.investorOnLoad(this.investorPage, this.investorQuery);
-        },
-        investorOnLoad (page, params = {}) {
-            this.investorLoading = true;
-            params["deptId"] = this.form.departmentid;
-            getInvestorList(
-                page.currentPage,
-                page.pageSize,
-                Object.assign(params, this.investorQuery)
-            ).then((res) => {
-                const data = res.data.data;
-
-                this.investorPage.total = data.total;
-                this.investorData = data.records;
-                this.investorLoading = false;
-                this.$refs.investorCrud.refreshTable();
-                this.$refs.investorCrud.doLayout();
-                this.investorSelectionClear();
-            });
-        },
-        investorSelectionClear () {
-            this.investorSelectionList = [];
-            this.$refs.investorCrud.toggleSelection();
-        },
-        investorSelectionChange (list) {
-            this.investorSelectionList = list;
-        },
-        investorSearchChange (params, done) {
-            this.investorQuery = params;
-            this.investorPage.currentPage = 1;
-            this.investorOnLoad(this.investorPage, params);
-            done();
-        },
-        investorSearchReset () {
-            this.investorQuery = {};
-            this.investorOnLoad(this.investorPage);
-        },
-        investorCurrentChange (currentPage) {
-            this.investorPage.currentPage = currentPage;
-        },
-        investorSizeChange (pageSize) {
-            this.investorPage.pageSize = pageSize;
-        },
-        manageSizerefresh () {
-            this.manageOnLoad(this.managePage, this.manageQuery);
-        },
-        manageOnLoad (page, params = {}) {
-            this.manageLoading = true;
-            params["deptId"] = this.form.departmentid;
-            getManageList(
-                page.currentPage,
-                page.pageSize,
-                Object.assign(params, this.manageQuery)
-            ).then((res) => {
-                const data = res.data.data;
-
-                this.managePage.total = data.total;
-                this.manageData = data.records;
-                this.manageLoading = false;
-
-                this.$refs.manageCrud.refreshTable();
-                this.$refs.manageCrud.doLayout();
-
-                this.manageSelectionClear();
-            });
-        },
-        manageSelectionClear () {
-            this.manageSelectionList = [];
-            this.$refs.manageCrud.toggleSelection();
-        },
-        manageSelectionChange (list) {
-            this.manageSelectionList = list;
-        },
-        manageSearchChange (params, done) {
-            this.manageQuery = params;
-            this.managePage.currentPage = 1;
-            this.manageOnLoad(this.managePage, params);
-            done();
-        },
-        manageSearchReset () {
-            this.manageQuery = {};
-            this.manageOnLoad(this.managePage);
-        },
-        manageCurrentChange (currentPage) {
-            this.managePage.currentPage = currentPage;
-        },
-        manageSizeChange (pageSize) {
-            this.managePage.pageSize = pageSize;
-        },
+          //许可证字段修改
+          this.contentLabel = "培训内容";
+          this.registerCapitalVisiable = false;
+        }
+        if (data.stats == "4") {
+          data.stats = "分公司";
+          that.representativecellLabel = "分公司负责人电话";
+          that.representativeLabel = "分公司负责人";
+        }
+        that.form = data;
+        that.forms = data;
+        that.seestaff = true;
+        that.businessLicenseUrl = data.businessLicense;
+        that.licenceUrl = data.licence;
+      } else {
+        this.form = this.$route.query;
+        this.jurisdictionSee = this.form.$jurisdiction;
+        this.forms = this.$route.query;
+        this.seestaff = true;
+        this.getFromData({
+          currentPage: 1,
+          pageSize: 10,
+        });
+      }
     },
+    //防 tab 重复
+    tabClear() {
+      var flag = false,
+        i = 0,
+        ind = null;
+
+      this.$store.state.tags.tagList.forEach((item, index) => {
+        if (
+          item.label == "保安公司详细资料" ||
+          item.label == "保安公司详细信息"
+        ) {
+          if (flag == false) {
+            ind = index;
+            flag = true;
+          }
+          i++;
+        }
+      });
+
+      if (i > 1) {
+        this.$store.state.tags.tagList.splice(ind, 1);
+      }
+    },
+    getFromData(page, params = {}) {
+      var that = this;
+      params["departmentid"] = this.forms.departmentid;
+      getList(page.currentPage, page.pageSize, params).then((res) => {
+        that.form = res.data.data.records[0];
+        var data = res.data.data.records[0];
+        if (data.stats == "2") {
+          data.stats = "本市保安公司";
+        }
+        if (data.stats == "0") {
+          data.stats = "自招保安单位";
+          that.representativeVisiable = false;
+          that.industryVisiable = false;
+          that.fregionVisiable = true;
+        }
+        if (data.stats == "1") {
+          data.stats = "保安培训学校";
+        }
+        if (data.stats == "4") {
+          data.stats = "分公司";
+          that.representativecellLabel = "分公司负责人电话";
+          that.representativeLabel = "分公司负责人";
+        }
+        that.form = data;
+        that.forms = data;
+        this.businessLicenseUrl = res.data.data.records[0].businessLicense;
+        this.licenceUrl = res.data.data.records[0].licence;
+      });
+    },
+    handleClick(tab) {
+      if (tab.index == 2) {
+        this.investorSearchReset();
+      } else if (tab.index == 3) {
+        this.manageSearchReset();
+      } else if (tab.index == 5) {
+        this.seestaff2 = !this.seestaff2;
+      } else if (tab.index == 7) {
+        this.seestaff3 = !this.seestaff3;
+      } else {
+        this.getFromData({
+          currentPage: 1,
+          pageSize: 10,
+        });
+      }
+
+      if(tab.name =="tenth"){
+        //获取许可证信息
+        this.getLicenceInfo();
+      }
+    },
+    //获取许可证信息
+    getLicenceInfo() {
+      var that = this;
+      getLicenceDetail(this.deptId).then((res) => {
+        that.licenceForm = res.data.data;
+      });
+    },
+    getManifestationData() {
+      manifestationList(this.forms.cardid).then((res) => {
+        this.manifestationData = res.data.data.records;
+        this.manifestationData.forEach((item) => {
+          item.name = this.forms.realName;
+          item.time = item.time.substring(0, 10);
+        });
+      });
+    },
+    getDispatchData() {
+      dispatchList(this.forms.cardid).then((res) => {
+        this.dispatchData = res.data.data.records;
+      });
+    },
+    getHonorchData() {
+      honorchList(this.forms.cardid).then((res) => {
+        this.honorchData = res.data.data.records;
+      });
+    },
+    getTrainData() {
+      trainList(this.forms.cardid).then((res) => {
+        this.trainData = res.data.data;
+
+        this.trainData.forEach((item) => {
+          if (item.sex == 1) {
+            item.sex = "男";
+          } else {
+            item.sex = "女";
+          }
+        });
+      });
+    },
+    getExaminationData() {
+      examinationList(this.forms.cardid).then((res) => {
+        this.examinationData = res.data.data;
+
+        this.examinationData.forEach((item) => {
+          if (item.stat == 1) {
+            item.stat = "不通过";
+          } else {
+            item.stat = "通过";
+          }
+        });
+      });
+    },
+    investorSizerefresh() {
+      this.investorOnLoad(this.investorPage, this.investorQuery);
+    },
+    investorOnLoad(page, params = {}) {
+      this.investorLoading = true;
+      params["deptId"] = this.form.departmentid;
+      getInvestorList(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.investorQuery)
+      ).then((res) => {
+        const data = res.data.data;
+
+        this.investorPage.total = data.total;
+        this.investorData = data.records;
+        this.investorLoading = false;
+        this.$refs.investorCrud.refreshTable();
+        this.$refs.investorCrud.doLayout();
+        this.investorSelectionClear();
+      });
+    },
+    investorSelectionClear() {
+      this.investorSelectionList = [];
+      this.$refs.investorCrud.toggleSelection();
+    },
+    investorSelectionChange(list) {
+      this.investorSelectionList = list;
+    },
+    investorSearchChange(params, done) {
+      this.investorQuery = params;
+      this.investorPage.currentPage = 1;
+      this.investorOnLoad(this.investorPage, params);
+      done();
+    },
+    investorSearchReset() {
+      this.investorQuery = {};
+      this.investorOnLoad(this.investorPage);
+    },
+    investorCurrentChange(currentPage) {
+      this.investorPage.currentPage = currentPage;
+    },
+    investorSizeChange(pageSize) {
+      this.investorPage.pageSize = pageSize;
+    },
+    manageSizerefresh() {
+      this.manageOnLoad(this.managePage, this.manageQuery);
+    },
+    manageOnLoad(page, params = {}) {
+      this.manageLoading = true;
+      params["deptId"] = this.form.departmentid;
+      getManageList(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.manageQuery)
+      ).then((res) => {
+        const data = res.data.data;
+
+        this.managePage.total = data.total;
+        this.manageData = data.records;
+        this.manageLoading = false;
+
+        this.$refs.manageCrud.refreshTable();
+        this.$refs.manageCrud.doLayout();
+
+        this.manageSelectionClear();
+      });
+    },
+    manageSelectionClear() {
+      this.manageSelectionList = [];
+      this.$refs.manageCrud.toggleSelection();
+    },
+    manageSelectionChange(list) {
+      this.manageSelectionList = list;
+    },
+    manageSearchChange(params, done) {
+      this.manageQuery = params;
+      this.managePage.currentPage = 1;
+      this.manageOnLoad(this.managePage, params);
+      done();
+    },
+    manageSearchReset() {
+      this.manageQuery = {};
+      this.manageOnLoad(this.managePage);
+    },
+    manageCurrentChange(currentPage) {
+      this.managePage.currentPage = currentPage;
+    },
+    manageSizeChange(pageSize) {
+      this.managePage.pageSize = pageSize;
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
 .businessLicenses {
-    padding-top: 15px;
-    background-color: transparent;
+  padding-top: 15px;
+  background-color: transparent;
 }
 .el-main {
-    background-color: transparent;
-    color: #333;
-    text-align: center;
-    // position: relative;
-    // right: 5%;
+  background-color: transparent;
+  color: #333;
+  text-align: center;
+  // position: relative;
+  // right: 5%;
 }
 .businessLicensess {
-    height: 680px;
-    width: 450px;
+  height: 680px;
+  width: 450px;
 }
 .Licenses {
-    height: 680px;
-    width: 1048px;
+  height: 680px;
+  width: 1048px;
 }
 .title {
-    color: #fff;
+  color: #fff;
 }
+
+
+  .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
 </style>
diff --git a/src/views/securityCompany/confess.vue b/src/views/securityCompany/confess.vue
index 514934c..686e254 100644
--- a/src/views/securityCompany/confess.vue
+++ b/src/views/securityCompany/confess.vue
@@ -99,7 +99,7 @@
   savePunish,
 } from "@/api/securityCompany/security";
 import { mapGetters } from "vuex";
-import { companyColimn } from "./column";
+import { confessColumn } from "./column";
 
 export default {
   data() {
@@ -196,7 +196,7 @@
         viewBtn: true,
         dialogClickModal: false,
 
-        column: companyColimn,
+        column: confessColumn,
         group: [
           {
             label: "详细信息",
@@ -244,6 +244,42 @@
       });
       return ids.join(",");
     },
+  },
+  created() {
+    //列控制
+    const representativecolumn = this.findObject(
+      this.option.column,
+      "representative"
+    );
+    const representativecellcolumn = this.findObject(
+      this.option.column,
+      "representativecell"
+    );
+    //法人及电话,办公地址不可见
+    representativecolumn.hide = true;
+    representativecolumn.search = false;
+    representativecellcolumn.hide = true;
+
+    const contactscolumn = this.findObject(
+      this.option.column,
+      "contacts"
+    );
+    const contactscellcolumn = this.findObject(
+      this.option.column,
+      "contactscell"
+    );
+    const ftimecolumn = this.findObject(
+      this.option.column,
+      "ftime"
+    );
+    const fregioncolumn = this.findObject(
+      this.option.column,
+      "fregion"
+    );
+    ftimecolumn.hide = false;
+    fregioncolumn.hide = false;
+    contactscolumn.hide = false;
+    contactscellcolumn.hide = false;
   },
   methods: {
     rowClickSelf(val) {
@@ -412,10 +448,10 @@
       // delete (row["name"]);
       var obj = row;
       obj["name"] = "保安公司详细信息";
-      // console.log(obj, "obj");
+      var data = JSON.stringify(obj);
       this.$router.push({
         path: `/securityCompany/index`,
-        query: obj,
+        query: {data:data},
       });
     },
   },
diff --git a/src/views/securityCompany/security.vue b/src/views/securityCompany/security.vue
index ab6e273..abd80b2 100644
--- a/src/views/securityCompany/security.vue
+++ b/src/views/securityCompany/security.vue
@@ -416,13 +416,12 @@
 
     // 行单击
     handleRowClick(row) {
-      // delete (row["name"]);
       var obj = row;
       obj["name"] = "保安公司详细信息";
-      // console.log(obj, "obj");
+      var data = JSON.stringify(obj);
       this.$router.push({
         path: `/securityCompany/index`,
-        query: obj,
+        query: {data:data},
       });
     },
   },
diff --git a/src/views/securityCompany/securityCrossRegion.vue b/src/views/securityCompany/securityCrossRegion.vue
index 65f67bc..a3572e3 100644
--- a/src/views/securityCompany/securityCrossRegion.vue
+++ b/src/views/securityCompany/securityCrossRegion.vue
@@ -99,7 +99,7 @@
   savePunish,
 } from "@/api/securityCompany/security";
 import { mapGetters } from "vuex";
-import { companyColimn } from "./column";
+import { crossColumn } from "./column";
 
 export default {
   data() {
@@ -196,7 +196,7 @@
         viewBtn: true,
         dialogClickModal: false,
 
-        column: companyColimn,
+        column: crossColumn,
         group: [
           {
             label: "详细信息",
@@ -244,6 +244,20 @@
       });
       return ids.join(",");
     },
+  },
+  created() {
+    //列控制
+    const representativecolumn = this.findObject(
+      this.option.column,
+      "representative"
+    );
+    const representativecellcolumn = this.findObject(
+      this.option.column,
+      "representativecell"
+    );
+    //法人及电话,办公地址不可见
+    representativecolumn.label = "分公司负责人";
+    representativecellcolumn.label = "分公司负责人电话";
   },
   methods: {
     rowClickSelf(val) {
@@ -409,13 +423,12 @@
 
     // 行单击
     handleRowClick(row) {
-      // delete (row["name"]);
       var obj = row;
       obj["name"] = "保安公司详细信息";
-      // console.log(obj, "obj");
+      var data = JSON.stringify(obj);
       this.$router.push({
         path: `/securityCompany/index`,
-        query: obj,
+        query: {data:data},
       });
     },
   },
diff --git a/src/views/securityCompany/train.vue b/src/views/securityCompany/train.vue
index 1b27c76..94d10ec 100644
--- a/src/views/securityCompany/train.vue
+++ b/src/views/securityCompany/train.vue
@@ -409,13 +409,12 @@
 
     // 行单击
     handleRowClick(row) {
-      // delete (row["name"]);
       var obj = row;
       obj["name"] = "保安公司详细信息";
-      // console.log(obj, "obj");
+      var data = JSON.stringify(obj);
       this.$router.push({
         path: `/securityCompany/index`,
-        query: obj,
+        query: {data:data},
       });
     },
   },
diff --git a/src/views/securityGuardManagement/register.vue b/src/views/securityGuardManagement/register.vue
index ff7bd0b..fe7a4d7 100644
--- a/src/views/securityGuardManagement/register.vue
+++ b/src/views/securityGuardManagement/register.vue
@@ -69,12 +69,12 @@
                   : ""
               }}
             </template>
-            <template slot-scope="{ row }" slot="deptId">
+            <template slot-scope="{ row }" slot="deptName">
               <el-tag
                 class="rowClickSelf"
                 title="点击查看所属公司情况"
                 @click="rowClickSelf(row.deptId)"
-                >{{ row.$deptId }}</el-tag
+                >{{ row.deptName }}</el-tag
               >
             </template>
             <template slot-scope="{ type, size, row }" slot="menu">
@@ -230,6 +230,7 @@
 import { getToken } from "@/util/auth";
 import { addhonor, getER } from "@/api/register/honor";
 import baoanz from "./baoanz.vue";
+import { getInformationDetails } from "@/api/securityCompany/security"; 
 export default {
   components: {
     baoanz,
@@ -411,7 +412,7 @@
             display: false,
           },
           {
-            label: "所属保安公司",
+            label: "企业名称",
             searchLabelWidth: "110",
             // prop: "deptName",
             prop: "deptId",
@@ -423,10 +424,18 @@
               value: "id",
             },
             slot: true,
+            hide:true,
             searchSpan: 5,
             display: false,
             overHidden: true,
             search: true,
+          },
+          {
+            label: "企业名称",
+            prop: "deptName",
+            slot: true,
+            display: false,
+            overHidden: true,
             width: 198,
           },
           {
@@ -753,12 +762,20 @@
     }
   },
   methods: {
-    rowClickSelf(row) {
-      // console.log(row, "baoan");
-      this.$router.push({
-        path: "/securityCompany/index",
-        query: { fromSecunityGuardId: row },
-      });
+    rowClickSelf(deptId) {
+      var data = {
+        departmentid:deptId
+      }
+      getInformationDetails(data).then((res) => {
+        var obj = res.data.data;
+        obj["name"] = "保安公司详细信息";
+        var data = JSON.stringify(obj);
+        this.$router.push({
+          path: "/securityCompany/index",
+          query: { data: data },
+        });
+      })
+      
     },
     Print() {
       this.$Print(this.$refs.baoanzheng);
@@ -794,7 +811,7 @@
     },
     errorf(err) {
       this.$message.success("请查看控制台");
-      console.log(err);
+      // console.log(err);
     },
     handleClose(done) {
       this.objf = {};
@@ -814,8 +831,6 @@
       this.dialogVisible = true;
     },
     nodeClick(data) {
-      //   this.treeDeptId = data.id;
-      // console.log(data, 55555);
       if (data.title != "南昌市公安局") {
         this.jurisdiction = data.id;
       } else {
@@ -930,8 +945,8 @@
     },
     onLoad(page, params = {}) {
       this.loading = true;
+      // console.log(this.jurisdiction,33333);
       params["jurisdiction"] = this.jurisdiction;
-      // console.log(params, 1, this.query, 2);
       getListSecurity(
         page.currentPage,
         page.pageSize,
@@ -1027,7 +1042,7 @@
         })
           .then(() => {
             updateHold(3, row.cardid).then((res) => {
-              console.log(res);
+              // console.log(res);
               this.$message({
                 type: "success",
                 message: "吊销成功!",

--
Gitblit v1.9.3