From 8ef98bfd45d97a4c7d494d5a4e51b573df8da268 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 10 Jul 2021 13:51:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

---
 src/views/securityUnitChild/data.js |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/views/securityUnitChild/data.js b/src/views/securityUnitChild/data.js
index 3b90fc1..e93de06 100644
--- a/src/views/securityUnitChild/data.js
+++ b/src/views/securityUnitChild/data.js
@@ -84,7 +84,13 @@
     },
     {
         label: "企业类型",
-        prop: "enterprises",
+        prop: "stats",
+        type: "tree",
+        dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
+        props: {
+            label: "dictValue",
+            value: "dictKey"
+        },
         span: 11,
         labelWidth: 130,
         disabled: true,
@@ -138,17 +144,19 @@
         prop: "id",
         hide: true,
         addDisplay: false,
-        editDisplay:false
+        editDisplay: false
     }, {
         label: "股东",
         prop: "shareholder",
     }, {
         label: "持股比例(%)",
         prop: "shareholdingratio",
-    }, {
-        label: "最终受益股份",
-        prop: "beneficial",
-    }, {
+    },
+    //  {
+    //     label: "最终受益股份",
+    //     prop: "beneficial",
+    // },
+    {
         label: "出资金额(万元)",
         prop: "capital",
     }, {
@@ -167,7 +175,7 @@
         label: "统一社会信用代码",
         prop: "creditcode",
         addDisplay: false,
-        editDisplay:false
+        editDisplay: false
     },
 ]
 
@@ -176,13 +184,13 @@
         label: "统一社会信用代码",
         prop: "creditcode",
         addDisplay: false,
-        editDisplay:false
+        editDisplay: false
     }, {
         label: "id",
         prop: "id",
         hide: true,
         addDisplay: false,
-        editDisplay:false
+        editDisplay: false
     }, {
         label: "姓名",
         prop: "name",

--
Gitblit v1.9.3