From a0d348748cb224f2e01b23ebf2c9faf53df930c5 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 23 Aug 2022 10:41:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=9E=84=E5=BB=BA=E4=B8=80?=
 =?UTF-8?q?=E9=81=8Dokr-tree?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/dvui/{ => components}/AiOkrTree/AiOkrTree.vue           | 2 +-
 project/dvui/{ => components}/AiOkrTree/OkrTreeNode.vue         | 0
 project/dvui/{ => components}/AiOkrTree/model/merge.js          | 0
 project/dvui/{ => components}/AiOkrTree/model/node.js           | 0
 project/dvui/{ => components}/AiOkrTree/model/transition.css    | 0
 project/dvui/{ => components}/AiOkrTree/model/tree-store.js     | 0
 project/dvui/{ => components}/AiOkrTree/model/util.js           | 0
 .../xiushan/apps/finance/AppGuaranteeProduct/productList.vue    | 2 +-
 8 files changed, 2 insertions(+), 2 deletions(-)
 rename project/dvui/{ => components}/AiOkrTree/AiOkrTree.vue (99%)
 rename project/dvui/{ => components}/AiOkrTree/OkrTreeNode.vue (100%)
 rename project/dvui/{ => components}/AiOkrTree/model/merge.js (100%)
 rename project/dvui/{ => components}/AiOkrTree/model/node.js (100%)
 rename project/dvui/{ => components}/AiOkrTree/model/transition.css (100%)
 rename project/dvui/{ => components}/AiOkrTree/model/tree-store.js (100%)
 rename project/dvui/{ => components}/AiOkrTree/model/util.js (100%)

diff --git a/project/dvui/AiOkrTree/AiOkrTree.vue b/project/dvui/components/AiOkrTree/AiOkrTree.vue
similarity index 99%
rename from project/dvui/AiOkrTree/AiOkrTree.vue
rename to project/dvui/components/AiOkrTree/AiOkrTree.vue
index 8bb46f08..df330118 100644
--- a/project/dvui/AiOkrTree/AiOkrTree.vue
+++ b/project/dvui/components/AiOkrTree/AiOkrTree.vue
@@ -231,7 +231,7 @@ export default {
 </script>
 
 <style>
-@import "./model/transition.css";
+@import "model/transition.css";
 
 * {
   margin: 0;
diff --git a/project/dvui/AiOkrTree/OkrTreeNode.vue b/project/dvui/components/AiOkrTree/OkrTreeNode.vue
similarity index 100%
rename from project/dvui/AiOkrTree/OkrTreeNode.vue
rename to project/dvui/components/AiOkrTree/OkrTreeNode.vue
diff --git a/project/dvui/AiOkrTree/model/merge.js b/project/dvui/components/AiOkrTree/model/merge.js
similarity index 100%
rename from project/dvui/AiOkrTree/model/merge.js
rename to project/dvui/components/AiOkrTree/model/merge.js
diff --git a/project/dvui/AiOkrTree/model/node.js b/project/dvui/components/AiOkrTree/model/node.js
similarity index 100%
rename from project/dvui/AiOkrTree/model/node.js
rename to project/dvui/components/AiOkrTree/model/node.js
diff --git a/project/dvui/AiOkrTree/model/transition.css b/project/dvui/components/AiOkrTree/model/transition.css
similarity index 100%
rename from project/dvui/AiOkrTree/model/transition.css
rename to project/dvui/components/AiOkrTree/model/transition.css
diff --git a/project/dvui/AiOkrTree/model/tree-store.js b/project/dvui/components/AiOkrTree/model/tree-store.js
similarity index 100%
rename from project/dvui/AiOkrTree/model/tree-store.js
rename to project/dvui/components/AiOkrTree/model/tree-store.js
diff --git a/project/dvui/AiOkrTree/model/util.js b/project/dvui/components/AiOkrTree/model/util.js
similarity index 100%
rename from project/dvui/AiOkrTree/model/util.js
rename to project/dvui/components/AiOkrTree/model/util.js
diff --git a/project/xiushan/apps/finance/AppGuaranteeProduct/productList.vue b/project/xiushan/apps/finance/AppGuaranteeProduct/productList.vue
index 533f6611..b6045cd2 100644
--- a/project/xiushan/apps/finance/AppGuaranteeProduct/productList.vue
+++ b/project/xiushan/apps/finance/AppGuaranteeProduct/productList.vue
@@ -85,7 +85,7 @@ export default {
       }).then(res => {
         if (res?.data) {
           this.tableData = res.data?.records.map(e => {
-            let guaranteeModeLabel = e.guaranteeMode.split(",").map(g => this.dict.getLabel("productGuaranteeMode", g))?.toString()
+            let guaranteeModeLabel = e.guaranteeMode?.split(",").map(g => this.dict.getLabel("productGuaranteeMode", g))?.toString()
             return {...e, guaranteeModeLabel}
           })
           this.page.total = res.data.total