From 858049d38e942d06dcd2495f0747e17549e6c83b Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Tue, 4 Aug 2020 16:08:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/api/enterprise.js                  |   1 +
 client/src/views/ability/abilityform.vue      |  12 +-
 client/src/views/enterprise/addresstype.vue   |   8 +-
 client/src/views/enterprise/enterprise.vue    |  14 +-
 .../src/views/enterprise/enterprisecreate.vue | 655 +++++++++---------
 .../src/views/enterprise/enterpriseupdate.vue | 653 ++++++++---------
 .../migrations/0011_auto_20200803_0939.py     |  35 +
 .../migrations/0012_auto_20200804_0931.py     |  33 +
 .../0013_remove_evaluationitem_pv_class.py    |  17 +
 .../migrations/0014_auto_20200804_1558.py     |  37 +
 server/apps/certset/models.py                 |  11 +-
 .../crm/migrations/0010_auto_20200803_0939.py |  18 +
 .../crm/migrations/0011_enterprise_parent.py  |  19 +
 server/apps/crm/models.py                     |   2 +
 server/apps/crm/serializers.py                |   2 +-
 15 files changed, 869 insertions(+), 648 deletions(-)
 create mode 100644 server/apps/certset/migrations/0011_auto_20200803_0939.py
 create mode 100644 server/apps/certset/migrations/0012_auto_20200804_0931.py
 create mode 100644 server/apps/certset/migrations/0013_remove_evaluationitem_pv_class.py
 create mode 100644 server/apps/certset/migrations/0014_auto_20200804_1558.py
 create mode 100644 server/apps/crm/migrations/0010_auto_20200803_0939.py
 create mode 100644 server/apps/crm/migrations/0011_enterprise_parent.py

diff --git a/client/src/api/enterprise.js b/client/src/api/enterprise.js
index 4ad2656..a675069 100644
--- a/client/src/api/enterprise.js
+++ b/client/src/api/enterprise.js
@@ -1,5 +1,6 @@
 import request from '@/utils/request'
 
+
 export function getEnterpriseList(query) {
   return request({
     url: '/crm/enterprise/',
diff --git a/client/src/views/ability/abilityform.vue b/client/src/views/ability/abilityform.vue
index 6ff03ed..cd1bac8 100644
--- a/client/src/views/ability/abilityform.vue
+++ b/client/src/views/ability/abilityform.vue
@@ -212,11 +212,11 @@ export default {
         this.afromOptions = genTree(res.data);
       });
     },
-    getauditor_abilitysOptions() {
-      getDictList({ type__code: "auditor_ability" }).then(res => {
-        this.auditor_abilitysOptions = genTree(res.data);
-      });
-    },
+    //getauditor_abilitysOptions() {
+    //  getDictList({ type__code: "auditor_ability" }).then(res => {
+    //    this.auditor_abilitysOptions = genTree(res.data);
+    //  });
+    //},
     getmajorOptions1() {
       getDictList({ type__code: "cnas_scope" }).then(res => {
         this.majorOptions1 = genTree(res.data);
@@ -266,4 +266,4 @@ getImplementRuleList({cert_field__code:'CCC'}).then(res=>{
     }
   }
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/client/src/views/enterprise/addresstype.vue b/client/src/views/enterprise/addresstype.vue
index 58ffa9d..31ffbd7 100644
--- a/client/src/views/enterprise/addresstype.vue
+++ b/client/src/views/enterprise/addresstype.vue
@@ -79,15 +79,15 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-                  <el-form-item label="地域选择" prop="county_code">
-                    <el-cascader v-model="addressData.county_code" :options="countyOptions" :props="county_prosecode"
+                  <el-form-item label="地域选择" prop="countyarry">
+                    <el-cascader v-model="addressData.countyarry" :options="countyOptions" :props="county_prosecode"
                                  :style="{width: '60%'}" clearable placeholder="请选择地区"></el-cascader>
                   </el-form-item>
 
 </el-form>
       <div style="text-align:right;">
         <el-button type="danger" @click="dialogVisible=false">取消</el-button>
-        <el-button type="primary" @click="confirm('Form')">确认</el-button>
+        <el-button type="primary" @click="confirms('Form')">确认</el-button>
       </div>
     </el-dialog>
    
@@ -248,7 +248,7 @@ handleDelete(scope){
     
 },
    
-   async confirm(form) {
+   async confirms(form) {
       this.$refs[form].validate(valid => {
         if (valid) {
           const isEdit = this.dialogType === 'update'
diff --git a/client/src/views/enterprise/enterprise.vue b/client/src/views/enterprise/enterprise.vue
index 5b21f52..7d2895e 100644
--- a/client/src/views/enterprise/enterprise.vue
+++ b/client/src/views/enterprise/enterprise.vue
@@ -24,12 +24,11 @@
 
     <el-table v-loading="listLoading"
               :data="enterpriseList.results"
-              style="width: 100%;margin-top:10px;"
-              border
-              fit
-              stripe
-              highlight-current-row
-              max-height="1000">
+             style="width: 100%;margin-bottom: 20px;"
+             row-key="id"
+             border
+             default-expand-all
+             :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
       <el-table-column fixed="left" type="index" width="50" />
       <el-table-column fixed="left" width="150" label="组织查询码">
         <template slot-scope="scope">
@@ -145,7 +144,8 @@
 <script>
 import { getEnterpriseList,deleteEnterprise } from "@/api/enterprise"
 import Pagination from "@/components/Pagination"
-import checkPermission from '@/utils/permission'
+  import checkPermission from '@/utils/permission'
+    import { genTree } from "@/utils";
 export default {
   components: { Pagination },
   data() {
diff --git a/client/src/views/enterprise/enterprisecreate.vue b/client/src/views/enterprise/enterprisecreate.vue
index f8e73eb..4880999 100644
--- a/client/src/views/enterprise/enterprisecreate.vue
+++ b/client/src/views/enterprise/enterprisecreate.vue
@@ -2,336 +2,348 @@
   <div class="app-container">
     <el-tabs type="border-card" v-model="activeName"  >
       <el-tab-pane  label="组织基本信息" name="enterprisexx">
-        <el-form ref="elForm" :model="formData" :rules="rule1"  size="medium" label-width="100px">
-         
-            <el-col :span="8" font="left">
-              <el-form-item label="组织查询码" prop="query_code">
-                <el-input v-model="formData.query_code"
-                          placeholder="请输入组织查询码"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="right">
-              <el-form-item label="组织名称" prop="name">
-                <el-input v-model="formData.name"
-                          placeholder="请输入组织名称"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="组织名称" prop="ename">
-                <el-input v-model="formData.ename"
-                          placeholder="请输入组织名称（英文）"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="right">
-              <el-form-item label="信用代码" prop="credit_code">
-                <el-input v-model="formData.credit_code"
-                          placeholder="请输入统一社会信用代码"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="组织法人" prop="legal">
-                <el-input v-model="formData.legal"
-                          placeholder="请输入组织法人"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="注册资金" prop="gassets">
-                <el-input v-model="formData.gassets"
-                          placeholder="请输入注册资金(万元)"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
+        <el-form ref="elForm" :model="formData" :rules="rule1" size="medium" label-width="100px">
+
+          <el-col :span="8" font="left">
+            <el-form-item label="组织查询码" prop="query_code">
+              <el-input v-model="formData.query_code"
+                        placeholder="请输入组织查询码"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+
+          </el-col>
+          <el-col :span="8" font="right">
+            <el-form-item label="组织名称" prop="name">
+              <el-input v-model="formData.name"
+                        placeholder="请输入组织名称"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="组织名称" prop="ename">
+              <el-input v-model="formData.ename"
+                        placeholder="请输入组织名称（英文）"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="right">
+            <el-form-item label="信用代码" prop="credit_code">
+              <el-input v-model="formData.credit_code"
+                        placeholder="请输入统一社会信用代码"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="组织法人" prop="legal">
+              <el-input v-model="formData.legal"
+                        placeholder="请输入组织法人"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="注册资金" prop="gassets">
+              <el-input v-model="formData.gassets"
+                        placeholder="请输入注册资金(万元)"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
 
 
-            <el-col :span="8" font="right">
-              <el-form-item label="组织员工数" prop="person_count">
-                <el-input v-model="formData.person_count"
-                          placeholder="请输入组织员工数"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="所属专业" prop="professional">
-                <el-select v-model="formData.professional"
-                           placeholder="请选择所属专业"
-                           clearable
-                           :style="{width: '100%'}">
-                  <el-option v-for="(item, index) in professional_classOptions"
-                             :key="index"
-                             :label="item.name"
-                             :value="item.value"
-                             :disabled="item.disabled">
+          <el-col :span="8" font="right">
+            <el-form-item label="组织员工数" prop="person_count">
+              <el-input v-model="formData.person_count"
+                        placeholder="请输入组织员工数"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="所属专业" prop="professional">
+              <el-select v-model="formData.professional"
+                         placeholder="请选择所属专业"
+                         clearable
+                         :style="{width: '100%'}">
+                <el-option v-for="(item, index) in professional_classOptions"
+                           :key="index"
+                           :label="item.name"
+                           :value="item.value"
+                           :disabled="item.disabled">
 
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="right">
-              <el-form-item label="陶瓷年产量" prop="ceramics_output">
-                <el-input v-model="formData.ceramics_output"
-                          placeholder="请输入陶瓷年产量（万平方米）"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="经济行业" prop="economy_class">
-                <el-select v-model="formData.economy_class"
-                           placeholder="请选择经济行业"
-                           clearable
-                           :style="{width: '100%'}">
-                  <el-option v-for="(item, index) in economy_classOptions"
-                             :key="index"
-                             :label="item.name"
-                             :value="item.value"
-                             :disabled="item.disabled"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="right">
+            <el-form-item label="陶瓷年产量" prop="ceramics_output">
+              <el-input v-model="formData.ceramics_output"
+                        placeholder="请输入陶瓷年产量（万平方米）"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="经济行业" prop="economy_class">
+              <el-select v-model="formData.economy_class"
+                         placeholder="请选择经济行业"
+                         clearable
+                         :style="{width: '100%'}">
+                <el-option v-for="(item, index) in economy_classOptions"
+                           :key="index"
+                           :label="item.name"
+                           :value="item.value"
+                           :disabled="item.disabled"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
 
-            <el-col :span="8" font="left">
-              <el-form-item label="机构类型" prop="type">
-                <el-select v-model="formData.type"
-                           placeholder="请选择机构类型"
-                           clearable
-                           :style="{width: '100%'}">
-                  <el-option v-for="(item, index) in type_Options"
-                             :key="index"
-                             :label="item.name"
-                             :value="item.value"
-                             :disabled="item.disabled">
+          <el-col :span="8" font="left">
+            <el-form-item label="机构类型" prop="type">
+              <el-select v-model="formData.type"
+                         placeholder="请选择机构类型"
+                         clearable
+                         :style="{width: '100%'}">
+                <el-option v-for="(item, index) in type_Options"
+                           :key="index"
+                           :label="item.name"
+                           :value="item.value"
+                           :disabled="item.disabled">
 
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
 
 
 
 
-            <el-col :span="8" font="left">
-              <el-form-item label="经济类型" prop="economy_type">
-                <el-select filterable v-model="formData.economy_type"
-                           placeholder="请选择经济类型"
-                           clearable
-                           :style="{width: '100%'}">
-                  <el-option v-for="(item, index) in economy_typeOptions"
-                             :key="index"
-                             :label="item.name"
-                             :value="item.value"
-                             :disabled="item.disabled">
+          <el-col :span="8" font="left">
+            <el-form-item label="经济类型" prop="economy_type">
+              <el-select filterable v-model="formData.economy_type"
+                         placeholder="请选择经济类型"
+                         clearable
+                         :style="{width: '100%'}">
+                <el-option v-for="(item, index) in economy_typeOptions"
+                           :key="index"
+                           :label="item.name"
+                           :value="item.value"
+                           :disabled="item.disabled">
 
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="5" font="right">
-              <el-form-item label="建厂时间" prop="build_time">
-                <el-date-picker v-model="formData.build_time"
-                                type="date"
-                                placeholder="选择日期"
-                                format="yyyy 年 MM 月 dd 日"
-                                value-format="yyyy-MM-dd">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="5" font="left">
-              <el-form-item label="工厂编号" prop="code">
-                <el-input v-model="formData.code"
-                          placeholder="请输入工厂编号"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
-            <el-col :span="24">
-              <el-form-item label="经营范围" prop="business_type">
-                <el-input type="textarea" :rows="2" v-model="formData.business_type"
-                          placeholder="请输入经营范围"
+          <el-col :span="8" font="left">
+            <el-form-item label="工厂编号" prop="code">
+              <el-input v-model="formData.code"
+                        placeholder="请输入工厂编号"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="上级公司" prop="parent">
+
+              <treeselect v-model="formData.parent"
+                          :multiple="false"
+                          placeholder="请选择上级"
                           clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
+                          :style="{width: '100%'}"
+                          :options="tableData"></treeselect>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="right">
+            <el-form-item label="建厂时间" prop="build_time">
+              <el-date-picker v-model="formData.build_time"
+                              type="date"
+                              placeholder="选择日期"
+                              format="yyyy 年 MM 月 dd 日"
+                              value-format="yyyy-MM-dd":style="{width: '100%'}">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="经营范围" prop="business_type">
+              <el-input type="textarea" :rows="2" v-model="formData.business_type"
+                        placeholder="请输入经营范围"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
 
 
 
-            <div slot="header" class="clearfix">
-              <span>组织联系人信息</span>
+          <div slot="header" class="clearfix">
+            <span>组织联系人信息</span>
 
-            </div>
-            <el-col :span="8" font="left">
-              <el-form-item label="常用联系人" prop="linkman1_name">
-                <el-input v-model="formData.linkman1_name"
-                          placeholder="请输入常用联系人"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="职务" prop="linkman1_duty">
-                <el-input v-model="formData.linkman1_duty"
-                          placeholder="职务"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="right">
-              <el-form-item label="手机" prop="linkman1_mobile">
-                <el-input v-model="formData.linkman1_mobile"
-                          placeholder="手机"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="联系电话" prop="linkman1_tel" >
-                <el-input v-model="formData.linkman1_tel"
-                          placeholder="联系电话"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="传真" prop="linkman1_fax">
-                <el-input v-model="formData.linkman1_fax"
-                          placeholder="传真"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="right">
-              <el-form-item label="Email" prop="linkman1_email" >
-                <el-input v-model="formData.linkman1_email"
-                          placeholder="Email"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="备用联系人" prop="linkman2_name">
-                <el-input v-model="formData.linkman2_name"
-                          placeholder="请输入常用联系人"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="职务" prop="linkman2_duty">
-                <el-input v-model="formData.linkman2_duty"
-                          placeholder="职务"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="right">
-              <el-form-item label="手机" prop="linkman2_mobile">
-                <el-input v-model="formData.linkman2_mobile"
-                          placeholder="手机"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="联系电话" prop="linkman2_tel">
-                <el-input v-model="formData.linkman2_tel"
-                          placeholder="联系电话"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="传真" prop="linkman2_fax">
-                <el-input v-model="formData.linkman2_fax"
-                          placeholder="传真"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="right">
-              <el-form-item label="Email" prop="linkman2_email">
-                <el-input v-model="formData.linkman2_email"
-                          placeholder="Email"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="ES联系人" prop="linkman3_name">
-                <el-input v-model="formData.linkman3_name"
-                          placeholder="请输入常用联系人"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="职务" prop="linkman3_duty">
-                <el-input v-model="formData.linkman3_duty"
-                          placeholder="职务"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="right">
-              <el-form-item label="手机" prop="linkman3_mobile">
-                <el-input v-model="formData.linkman3_mobile"
-                          placeholder="手机"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="联系电话" prop="linkman3_tel">
-                <el-input v-model="formData.linkman3_tel"
-                          placeholder="联系电话"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="传真" prop="linkman3_fax">
-                <el-input v-model="formData.linkman3_fax"
-                          placeholder="传真"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="right">
-              <el-form-item label="Email" prop="linkman3_email">
-                <el-input v-model="formData.linkman3_email"
-                          placeholder="Email"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="备注" prop="remarks">
-                <el-input type="textarea" :rows="2" v-model="formData.remarks"
-                          placeholder="请输入备注"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" style="margin-top:4px">
-              <el-form-item size="large">
-                <el-button type="primary" @click="submitForm">保存</el-button>
-                <el-button @click="resetForm">重置</el-button>
-              </el-form-item>
-            </el-col>
-         </el-form>
+          </div>
+          <el-col :span="8" font="left">
+            <el-form-item label="常用联系人" prop="linkman1_name">
+              <el-input v-model="formData.linkman1_name"
+                        placeholder="请输入常用联系人"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="职务" prop="linkman1_duty">
+              <el-input v-model="formData.linkman1_duty"
+                        placeholder="职务"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="right">
+            <el-form-item label="手机" prop="linkman1_mobile">
+              <el-input v-model="formData.linkman1_mobile"
+                        placeholder="手机"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="联系电话" prop="linkman1_tel">
+              <el-input v-model="formData.linkman1_tel"
+                        placeholder="联系电话"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="传真" prop="linkman1_fax">
+              <el-input v-model="formData.linkman1_fax"
+                        placeholder="传真"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="right">
+            <el-form-item label="Email" prop="linkman1_email">
+              <el-input v-model="formData.linkman1_email"
+                        placeholder="Email"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="备用联系人" prop="linkman2_name">
+              <el-input v-model="formData.linkman2_name"
+                        placeholder="请输入常用联系人"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="职务" prop="linkman2_duty">
+              <el-input v-model="formData.linkman2_duty"
+                        placeholder="职务"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="right">
+            <el-form-item label="手机" prop="linkman2_mobile">
+              <el-input v-model="formData.linkman2_mobile"
+                        placeholder="手机"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="联系电话" prop="linkman2_tel">
+              <el-input v-model="formData.linkman2_tel"
+                        placeholder="联系电话"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="传真" prop="linkman2_fax">
+              <el-input v-model="formData.linkman2_fax"
+                        placeholder="传真"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="right">
+            <el-form-item label="Email" prop="linkman2_email">
+              <el-input v-model="formData.linkman2_email"
+                        placeholder="Email"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="ES联系人" prop="linkman3_name">
+              <el-input v-model="formData.linkman3_name"
+                        placeholder="请输入常用联系人"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="职务" prop="linkman3_duty">
+              <el-input v-model="formData.linkman3_duty"
+                        placeholder="职务"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="right">
+            <el-form-item label="手机" prop="linkman3_mobile">
+              <el-input v-model="formData.linkman3_mobile"
+                        placeholder="手机"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="联系电话" prop="linkman3_tel">
+              <el-input v-model="formData.linkman3_tel"
+                        placeholder="联系电话"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="传真" prop="linkman3_fax">
+              <el-input v-model="formData.linkman3_fax"
+                        placeholder="传真"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="right">
+            <el-form-item label="Email" prop="linkman3_email">
+              <el-input v-model="formData.linkman3_email"
+                        placeholder="Email"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remarks">
+              <el-input type="textarea" :rows="2" v-model="formData.remarks"
+                        placeholder="请输入备注"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" style="margin-top:4px">
+            <el-form-item size="large">
+              <el-button type="primary" @click="submitForm">保存</el-button>
+              <el-button @click="resetForm">重置</el-button>
+            </el-form-item>
+          </el-col>
+        </el-form>
       </el-tab-pane>
       <el-tab-pane  label="组织地址信息"  name="address" v-if="formData.id">
         <Addresstype :enterprise="formData.id"></Addresstype>
@@ -361,7 +373,7 @@
 </style>
 <script>
   import { getDictList } from "@/api/dict";
-  import { createEnterprise,getEnterprise } from "@/api/enterprise";
+  import { createEnterprise,getEnterprise,getEnterpriseList } from "@/api/enterprise";
   import { genTree } from "@/utils";
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -409,14 +421,17 @@
         linkman3_mobile: undefined,
         linkman3_tel: undefined,
         linkman3_fax: undefined,
-        linkman3_email: undefined
+        linkman3_email: undefined,
+        parent: undefined
         },
+        
         economy_classOptions: [
         ],
         economy_typeOptions:[],
         professional_classOptions: [
         ],
         type_Options: [],
+        tableData: [],
         rule1: {
         query_code: [{ required: true, message: '请输入组织查询码', trigger: 'blur' }],
           code: [{ required: true, message: '请输入工厂编号', trigger: 'blur' }],
@@ -435,6 +450,7 @@
     computed: {},
 
     created() {
+      this.getList(),
       this.getECclass(),
         this.getPfclass(),
         this.getTypeclass(),
@@ -443,6 +459,17 @@
     },
     mounted() { },
     methods: {
+
+      getList() {
+      this.listLoading = true
+      getEnterpriseList().then(response => {
+        this.tableData = genTree(response.data.results)
+        console.log(this.tableData)
+        
+      })
+        this.listLoading = false
+    },
+
       handlePreview(file) {
         if ("url" in file) {
           window.open(file.url);
diff --git a/client/src/views/enterprise/enterpriseupdate.vue b/client/src/views/enterprise/enterpriseupdate.vue
index 609cf66..fd131b6 100644
--- a/client/src/views/enterprise/enterpriseupdate.vue
+++ b/client/src/views/enterprise/enterpriseupdate.vue
@@ -2,336 +2,347 @@
   <div class="app-container">
     <el-tabs type="border-card"  >
       <el-tab-pane  label="组织基本信息" >
-        <el-form ref="elForm" :model="formData" :rules="rule1"  size="medium" label-width="100px">
-         
-            <el-col :span="8" font="left">
-              <el-form-item label="组织查询码" prop="query_code">
-                <el-input v-model="formData.query_code"
-                          placeholder="请输入组织查询码"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="right">
-              <el-form-item label="组织名称" prop="name">
-                <el-input v-model="formData.name"
-                          placeholder="请输入组织名称"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="组织名称" prop="ename">
-                <el-input v-model="formData.ename"
-                          placeholder="请输入组织名称（英文）"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="right">
-              <el-form-item label="信用代码" prop="credit_code">
-                <el-input v-model="formData.credit_code"
-                          placeholder="请输入统一社会信用代码"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="组织法人" prop="legal">
-                <el-input v-model="formData.legal"
-                          placeholder="请输入组织法人"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="注册资金" prop="gassets">
-                <el-input v-model="formData.gassets"
-                          placeholder="请输入注册资金(万元)"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
+        <el-form ref="elForm" :model="formData" :rules="rule1" size="medium" label-width="100px">
+        
+          <el-col :span="8" font="left">
+            <el-form-item label="组织查询码" prop="query_code">
+              <el-input v-model="formData.query_code"
+                        placeholder="请输入组织查询码"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="right">
+            <el-form-item label="组织名称" prop="name">
+              <el-input v-model="formData.name"
+                        placeholder="请输入组织名称"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="组织名称" prop="ename">
+              <el-input v-model="formData.ename"
+                        placeholder="请输入组织名称（英文）"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="right">
+            <el-form-item label="信用代码" prop="credit_code">
+              <el-input v-model="formData.credit_code"
+                        placeholder="请输入统一社会信用代码"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="组织法人" prop="legal">
+              <el-input v-model="formData.legal"
+                        placeholder="请输入组织法人"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="注册资金" prop="gassets">
+              <el-input v-model="formData.gassets"
+                        placeholder="请输入注册资金(万元)"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
 
 
-            <el-col :span="8" font="right">
-              <el-form-item label="组织员工数" prop="person_count">
-                <el-input v-model="formData.person_count"
-                          placeholder="请输入组织员工数"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="所属专业" prop="professional">
-                <el-select v-model="formData.professional"
-                           placeholder="请选择所属专业"
-                           clearable
-                           :style="{width: '100%'}">
-                  <el-option v-for="(item, index) in professional_classOptions"
-                             :key="index"
-                             :label="item.name"
-                             :value="item.value"
-                             :disabled="item.disabled">
+          <el-col :span="8" font="right">
+            <el-form-item label="组织员工数" prop="person_count">
+              <el-input v-model="formData.person_count"
+                        placeholder="请输入组织员工数"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="所属专业" prop="professional">
+              <el-select v-model="formData.professional"
+                         placeholder="请选择所属专业"
+                         clearable
+                         :style="{width: '100%'}">
+                <el-option v-for="(item, index) in professional_classOptions"
+                           :key="index"
+                           :label="item.name"
+                           :value="item.value"
+                           :disabled="item.disabled">
 
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="right">
-              <el-form-item label="陶瓷年产量" prop="ceramics_output">
-                <el-input v-model="formData.ceramics_output"
-                          placeholder="请输入陶瓷年产量（万平方米）"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="经济行业" prop="economy_class">
-                <el-select v-model="formData.economy_class"
-                           placeholder="请选择经济行业"
-                           clearable
-                           :style="{width: '100%'}">
-                  <el-option v-for="(item, index) in economy_classOptions"
-                             :key="index"
-                             :label="item.name"
-                             :value="item.value"
-                             :disabled="item.disabled"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="right">
+            <el-form-item label="陶瓷年产量" prop="ceramics_output">
+              <el-input v-model="formData.ceramics_output"
+                        placeholder="请输入陶瓷年产量（万平方米）"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="经济行业" prop="economy_class">
+              <el-select v-model="formData.economy_class"
+                         placeholder="请选择经济行业"
+                         clearable
+                         :style="{width: '100%'}">
+                <el-option v-for="(item, index) in economy_classOptions"
+                           :key="index"
+                           :label="item.name"
+                           :value="item.value"
+                           :disabled="item.disabled"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
 
-            <el-col :span="8" font="left">
-              <el-form-item label="机构类型" prop="type">
-                <el-select v-model="formData.type"
-                           placeholder="请选择机构类型"
-                           clearable
-                           :style="{width: '100%'}">
-                  <el-option v-for="(item, index) in type_Options"
-                             :key="index"
-                             :label="item.name"
-                             :value="item.value"
-                             :disabled="item.disabled">
+          <el-col :span="8" font="left">
+            <el-form-item label="机构类型" prop="type">
+              <el-select v-model="formData.type"
+                         placeholder="请选择机构类型"
+                         clearable
+                         :style="{width: '100%'}">
+                <el-option v-for="(item, index) in type_Options"
+                           :key="index"
+                           :label="item.name"
+                           :value="item.value"
+                           :disabled="item.disabled">
 
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
 
 
 
 
-            <el-col :span="8" font="left">
-              <el-form-item label="经济类型" prop="economy_type">
-                <el-select filterable v-model="formData.economy_type"
-                           placeholder="请选择经济类型"
-                           clearable
-                           :style="{width: '100%'}">
-                  <el-option v-for="(item, index) in economy_typeOptions"
-                             :key="index"
-                             :label="item.name"
-                             :value="item.value"
-                             :disabled="item.disabled">
+          <el-col :span="8" font="left">
+            <el-form-item label="经济类型" prop="economy_type">
+              <el-select filterable v-model="formData.economy_type"
+                         placeholder="请选择经济类型"
+                         clearable
+                         :style="{width: '100%'}">
+                <el-option v-for="(item, index) in economy_typeOptions"
+                           :key="index"
+                           :label="item.name"
+                           :value="item.value"
+                           :disabled="item.disabled">
 
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="5" font="right">
-              <el-form-item label="建厂时间" prop="build_time">
-                <el-date-picker v-model="formData.build_time"
-                                type="date"
-                                placeholder="选择日期"
-                                format="yyyy 年 MM 月 dd 日"
-                                value-format="yyyy-MM-dd">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="5" font="left">
-              <el-form-item label="工厂编号" prop="code">
-                <el-input v-model="formData.code"
-                          placeholder="请输入工厂编号"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
-            <el-col :span="24">
-              <el-form-item label="经营范围" prop="business_type">
-                <el-input type="textarea" :rows="2" v-model="formData.business_type"
-                          placeholder="请输入经营范围"
+          <el-col :span="8" font="left">
+            <el-form-item label="工厂编号" prop="code">
+              <el-input v-model="formData.code"
+                        placeholder="请输入工厂编号"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="上级公司" prop="parent">
+
+              <treeselect v-model="formData.parent"
+                          :multiple="false"
+                          placeholder="请选择上级"
                           clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
+                          :style="{width: '100%'}"
+                          :options="tableData"></treeselect>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="建厂时间" prop="build_time">
+              <el-date-picker v-model="formData.build_time"
+                              type="date"
+                              placeholder="选择日期"
+                              format="yyyy 年 MM 月 dd 日"
+                              value-format="yyyy-MM-dd" :style="{width: '100%'}">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="经营范围" prop="business_type">
+              <el-input type="textarea" :rows="2" v-model="formData.business_type"
+                        placeholder="请输入经营范围"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
 
 
 
-            <div slot="header" class="clearfix">
-              <span>组织联系人信息</span>
+          <div slot="header" class="clearfix">
+            <span>组织联系人信息</span>
 
-            </div>
-            <el-col :span="8" font="left">
-              <el-form-item label="常用联系人" prop="linkman1_name">
-                <el-input v-model="formData.linkman1_name"
-                          placeholder="请输入常用联系人"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="职务" prop="linkman1_duty">
-                <el-input v-model="formData.linkman1_duty"
-                          placeholder="职务"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="right">
-              <el-form-item label="手机" prop="linkman1_mobile">
-                <el-input v-model="formData.linkman1_mobile"
-                          placeholder="手机"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="联系电话" prop="linkman1_tel">
-                <el-input v-model="formData.linkman1_tel"
-                          placeholder="联系电话"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="传真" prop="linkman1_fax">
-                <el-input v-model="formData.linkman1_fax"
-                          placeholder="传真"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="right">
-              <el-form-item label="Email" prop="linkman1_email">
-                <el-input v-model="formData.linkman1_email"
-                          placeholder="Email"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="备用联系人" prop="linkman2_name">
-                <el-input v-model="formData.linkman2_name"
-                          placeholder="请输入常用联系人"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="职务" prop="linkman2_duty">
-                <el-input v-model="formData.linkman2_duty"
-                          placeholder="职务"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="right">
-              <el-form-item label="手机" prop="linkman2_mobile">
-                <el-input v-model="formData.linkman2_mobile"
-                          placeholder="手机"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="联系电话" prop="linkman2_tel">
-                <el-input v-model="formData.linkman2_tel"
-                          placeholder="联系电话"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="传真" prop="linkman2_fax">
-                <el-input v-model="formData.linkman2_fax"
-                          placeholder="传真"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="right">
-              <el-form-item label="Email" prop="linkman2_email">
-                <el-input v-model="formData.linkman2_email"
-                          placeholder="Email"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="ES联系人" prop="linkman3_name">
-                <el-input v-model="formData.linkman3_name"
-                          placeholder="请输入常用联系人"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="职务" prop="linkman3_duty">
-                <el-input v-model="formData.linkman3_duty"
-                          placeholder="职务"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="right">
-              <el-form-item label="手机" prop="linkman3_mobile">
-                <el-input v-model="formData.linkman3_mobile"
-                          placeholder="手机"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="联系电话" prop="linkman3_tel">
-                <el-input v-model="formData.linkman3_tel"
-                          placeholder="联系电话"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="left">
-              <el-form-item label="传真" prop="linkman3_fax">
-                <el-input v-model="formData.linkman3_fax"
-                          placeholder="传真"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" font="right">
-              <el-form-item label="Email" prop="linkman3_email">
-                <el-input v-model="formData.linkman3_email"
-                          placeholder="Email"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="备注" prop="remarks">
-                <el-input type="textarea" :rows="2" v-model="formData.remarks"
-                          placeholder="请输入备注"
-                          clearable
-                          :style="{width: '100%'}"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" style="margin-top:4px">
-              <el-form-item size="large">
-                <el-button type="primary" @click="submitForm">保存</el-button>
-                <el-button @click="resetForm">重置</el-button>
-              </el-form-item>
-            </el-col>
-         </el-form>
+          </div>
+          <el-col :span="8" font="left">
+            <el-form-item label="常用联系人" prop="linkman1_name">
+              <el-input v-model="formData.linkman1_name"
+                        placeholder="请输入常用联系人"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="职务" prop="linkman1_duty">
+              <el-input v-model="formData.linkman1_duty"
+                        placeholder="职务"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="right">
+            <el-form-item label="手机" prop="linkman1_mobile">
+              <el-input v-model="formData.linkman1_mobile"
+                        placeholder="手机"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="联系电话" prop="linkman1_tel">
+              <el-input v-model="formData.linkman1_tel"
+                        placeholder="联系电话"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="传真" prop="linkman1_fax">
+              <el-input v-model="formData.linkman1_fax"
+                        placeholder="传真"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="right">
+            <el-form-item label="Email" prop="linkman1_email">
+              <el-input v-model="formData.linkman1_email"
+                        placeholder="Email"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="备用联系人" prop="linkman2_name">
+              <el-input v-model="formData.linkman2_name"
+                        placeholder="请输入常用联系人"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="职务" prop="linkman2_duty">
+              <el-input v-model="formData.linkman2_duty"
+                        placeholder="职务"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="right">
+            <el-form-item label="手机" prop="linkman2_mobile">
+              <el-input v-model="formData.linkman2_mobile"
+                        placeholder="手机"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="联系电话" prop="linkman2_tel">
+              <el-input v-model="formData.linkman2_tel"
+                        placeholder="联系电话"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="传真" prop="linkman2_fax">
+              <el-input v-model="formData.linkman2_fax"
+                        placeholder="传真"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="right">
+            <el-form-item label="Email" prop="linkman2_email">
+              <el-input v-model="formData.linkman2_email"
+                        placeholder="Email"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="ES联系人" prop="linkman3_name">
+              <el-input v-model="formData.linkman3_name"
+                        placeholder="请输入常用联系人"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="职务" prop="linkman3_duty">
+              <el-input v-model="formData.linkman3_duty"
+                        placeholder="职务"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="right">
+            <el-form-item label="手机" prop="linkman3_mobile">
+              <el-input v-model="formData.linkman3_mobile"
+                        placeholder="手机"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="联系电话" prop="linkman3_tel">
+              <el-input v-model="formData.linkman3_tel"
+                        placeholder="联系电话"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="left">
+            <el-form-item label="传真" prop="linkman3_fax">
+              <el-input v-model="formData.linkman3_fax"
+                        placeholder="传真"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" font="right">
+            <el-form-item label="Email" prop="linkman3_email">
+              <el-input v-model="formData.linkman3_email"
+                        placeholder="Email"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remarks">
+              <el-input type="textarea" :rows="2" v-model="formData.remarks"
+                        placeholder="请输入备注"
+                        clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" style="margin-top:4px">
+            <el-form-item size="large">
+              <el-button type="primary" @click="submitForm">保存</el-button>
+              <el-button @click="resetForm">重置</el-button>
+            </el-form-item>
+          </el-col>
+        </el-form>
       </el-tab-pane>
       <el-tab-pane  label="组织地址信息"  >
         <Addresstype :enterprise="formData.id"></Addresstype>
@@ -361,7 +372,7 @@
 </style>
 <script>
   import { getDictList } from "@/api/dict";
-  import { updateEnterprise,getEnterprise } from "@/api/enterprise";
+  import { updateEnterprise,getEnterprise ,getEnterpriseList} from "@/api/enterprise";
   import { genTree } from "@/utils";
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -409,8 +420,10 @@
         linkman3_mobile: undefined,
         linkman3_tel: undefined,
         linkman3_fax: undefined,
-        linkman3_email: undefined
+          linkman3_email: undefined,
+        parent:undefined
         },
+        tableData:[],
         economy_classOptions: [
         ],
         economy_typeOptions:[],
@@ -439,7 +452,8 @@
     computed: {},
 
     created() {
-      this.formData.id = this.$route.query.id , //接收参数
+      this.formData.id = this.$route.query.id, //接收参数
+        this.getList(),
        this.getData(),
       this.getECclass(),
         this.getPfclass(),
@@ -449,6 +463,15 @@
     },
     mounted() { },
     methods: {
+       getList() {
+      this.listLoading = true
+      getEnterpriseList().then(response => {
+        this.tableData = genTree(response.data.results)
+        console.log(this.tableData)
+        
+      })
+        this.listLoading = false
+    },
       handlePreview(file) {
         if ("url" in file) {
           window.open(file.url);
diff --git a/server/apps/certset/migrations/0011_auto_20200803_0939.py b/server/apps/certset/migrations/0011_auto_20200803_0939.py
new file mode 100644
index 0000000..5612a22
--- /dev/null
+++ b/server/apps/certset/migrations/0011_auto_20200803_0939.py
@@ -0,0 +1,35 @@
+# Generated by Django 3.0.5 on 2020-08-03 01:39
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('system', '0024_auto_20200716_0927'),
+        ('certset', '0010_auto_20200731_1418'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='evaluationitem',
+            name='ccc_list',
+            field=models.ManyToManyField(blank=True, related_name='EvaluationItem_ccc_list', to='system.Dict', verbose_name='CCC产品分类'),
+        ),
+        migrations.AddField(
+            model_name='evaluationitem',
+            name='cert_field',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='EvaluationItem_cert_field', to='system.Dict', verbose_name='所属认证领域'),
+        ),
+        migrations.AddField(
+            model_name='evaluationitem',
+            name='cnas_scope',
+            field=models.ManyToManyField(blank=True, related_name='EvaluationItem_cnas_scope', to='system.Dict', verbose_name='CNAS业务范围'),
+        ),
+        migrations.AddField(
+            model_name='evaluationitem',
+            name='pv_class',
+            field=models.ManyToManyField(blank=True, null=True, related_name='EvaluationItem_pv_class', to='system.Dict', verbose_name='自愿性产品认证产品分类'),
+        ),
+    ]
diff --git a/server/apps/certset/migrations/0012_auto_20200804_0931.py b/server/apps/certset/migrations/0012_auto_20200804_0931.py
new file mode 100644
index 0000000..fb79a0e
--- /dev/null
+++ b/server/apps/certset/migrations/0012_auto_20200804_0931.py
@@ -0,0 +1,33 @@
+# Generated by Django 3.0.5 on 2020-08-04 01:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('system', '0024_auto_20200716_0927'),
+        ('certset', '0011_auto_20200803_0939'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='evaluationitem',
+            name='cnas_scope',
+        ),
+        migrations.AlterField(
+            model_name='evaluationitem',
+            name='ccc_list',
+            field=models.ManyToManyField(blank=True, related_name='EvaluationItem_ccc_list', to='system.Dict', verbose_name='CCC产品认证分类'),
+        ),
+        migrations.AlterField(
+            model_name='evaluationitem',
+            name='cert_field',
+            field=models.CharField(blank=True, max_length=1000, verbose_name='所属认证领域分类'),
+        ),
+        migrations.AlterField(
+            model_name='evaluationitem',
+            name='pv_class',
+            field=models.ManyToManyField(blank=True, null=True, related_name='EvaluationItem_pv_class', to='system.Dict', verbose_name='自愿产品认证分类'),
+        ),
+    ]
diff --git a/server/apps/certset/migrations/0013_remove_evaluationitem_pv_class.py b/server/apps/certset/migrations/0013_remove_evaluationitem_pv_class.py
new file mode 100644
index 0000000..95e69f6
--- /dev/null
+++ b/server/apps/certset/migrations/0013_remove_evaluationitem_pv_class.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.0.5 on 2020-08-04 01:32
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('certset', '0012_auto_20200804_0931'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='evaluationitem',
+            name='pv_class',
+        ),
+    ]
diff --git a/server/apps/certset/migrations/0014_auto_20200804_1558.py b/server/apps/certset/migrations/0014_auto_20200804_1558.py
new file mode 100644
index 0000000..771542a
--- /dev/null
+++ b/server/apps/certset/migrations/0014_auto_20200804_1558.py
@@ -0,0 +1,37 @@
+# Generated by Django 3.0.5 on 2020-08-04 07:58
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('certset', '0013_remove_evaluationitem_pv_class'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='evaluationitem',
+            name='content',
+        ),
+        migrations.CreateModel(
+            name='Evaluations',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')),
+                ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')),
+                ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')),
+                ('content', models.TextField(blank=True, verbose_name='内容')),
+                ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='evaluations_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')),
+                ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='evaluations_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')),
+            ],
+            options={
+                'verbose_name': '评审列',
+                'verbose_name_plural': '评审列',
+            },
+        ),
+    ]
diff --git a/server/apps/certset/models.py b/server/apps/certset/models.py
index 3645c69..6727f84 100644
--- a/server/apps/certset/models.py
+++ b/server/apps/certset/models.py
@@ -61,10 +61,19 @@ class UnitType(CommonAModel):
         return self.name
 
 class EvaluationItem(CommonAModel):
-    content = models.TextField('内容', blank=True)
+    cert_field = models.CharField('所属认证领域分类',max_length=1000,blank=True)
+    ccc_list = models.ManyToManyField(Dict,blank=True, verbose_name='CCC产品认证分类', related_name= 'EvaluationItem_ccc_list')
     class Meta:
         verbose_name = '评审表项目'
         verbose_name_plural = verbose_name
 
+    def __str__(self):
+        return self.cert_field
+class Evaluations(CommonAModel):
+    content = models.TextField('内容', blank=True)
+    class Meta:
+        verbose_name = '评审列'
+        verbose_name_plural = verbose_name
+
     def __str__(self):
         return self.content
\ No newline at end of file
diff --git a/server/apps/crm/migrations/0010_auto_20200803_0939.py b/server/apps/crm/migrations/0010_auto_20200803_0939.py
new file mode 100644
index 0000000..b17a2a6
--- /dev/null
+++ b/server/apps/crm/migrations/0010_auto_20200803_0939.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.5 on 2020-08-03 01:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('crm', '0009_remove_enterpriseaddress_provincecode'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='enterprise',
+            name='name',
+            field=models.CharField(blank=True, max_length=1000, null=True, unique=True, verbose_name='工厂名称'),
+        ),
+    ]
diff --git a/server/apps/crm/migrations/0011_enterprise_parent.py b/server/apps/crm/migrations/0011_enterprise_parent.py
new file mode 100644
index 0000000..059de70
--- /dev/null
+++ b/server/apps/crm/migrations/0011_enterprise_parent.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.0.5 on 2020-08-04 01:31
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('crm', '0010_auto_20200803_0939'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='enterprise',
+            name='parent',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='crm.Enterprise', verbose_name='父'),
+        ),
+    ]
diff --git a/server/apps/crm/models.py b/server/apps/crm/models.py
index 45acabe..a676b6b 100644
--- a/server/apps/crm/models.py
+++ b/server/apps/crm/models.py
@@ -5,6 +5,8 @@ from django.contrib.postgres.fields import ArrayField
 import uuid
 # Create your models here.
 class Enterprise(CommonBModel):
+    parent= models.ForeignKey('self', null=True, blank=True,
+                            on_delete=models.SET_NULL, verbose_name='父')
     code = models.CharField('工厂编号',unique=True, max_length=300)
     name = models.CharField('工厂名称',null=True,unique=True, blank=True,max_length=1000)
     ename =  models.CharField('工厂英文名称',null=True, blank=True,max_length=1000)
diff --git a/server/apps/crm/serializers.py b/server/apps/crm/serializers.py
index 019b4ec..e7623b1 100644
--- a/server/apps/crm/serializers.py
+++ b/server/apps/crm/serializers.py
@@ -13,7 +13,7 @@ class EnterpriseListSerializer(serializers.ModelSerializer):
     economy_class = DictSerializer()
     class Meta:
         model = Enterprise
-        fields = ['id','query_code', 'code', 'name','ename','type','legal','build_time','person_count','ceramics_output','gassets','linkman1_name','linkman1_tel','linkman1_mobile','country_code','credit_code','professional','all_person','economy_class','economy_type','linkman1_duty','business_type']
+        fields = ['id','query_code', 'code', 'name','ename','type','legal','build_time','person_count','ceramics_output','gassets','linkman1_name','linkman1_tel','linkman1_mobile','country_code','parent','credit_code','professional','all_person','economy_class','economy_type','linkman1_duty','business_type']
     @staticmethod
     def setup_eager_loading(queryset):
         """ Perform necessary eager loading of data. """