From b29694352d7433e5666124cc99aa77384d929a26 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 11 Apr 2022 11:28:20 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apps/financing/AppGrabLog/needsStatistics.vue     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/project/xiushan/apps/financing/AppGrabLog/needsStatistics.vue b/project/xiushan/apps/financing/AppGrabLog/needsStatistics.vue
index 32bcdf9e..ac95ce1a 100644
--- a/project/xiushan/apps/financing/AppGrabLog/needsStatistics.vue
+++ b/project/xiushan/apps/financing/AppGrabLog/needsStatistics.vue
@@ -335,14 +335,17 @@ export default {
   },
   created() {
     this.search.areaId = this.user.info.areaId
-    this.dict.load('financialOrganizationType', 'financialLoanApplyStatus', 'financingDemandStatus')
-  },
-  mounted() {
     if (this.user.financeUser && this.user.financeUser.id) {  //机构
       this.search.organizationId = this.user.financeUser.organizationId
       this.userOrgId = this.user.financeUser.organizationId
     }
-    this.getTableData()
+    this.dict.load('financialOrganizationType', 'financialLoanApplyStatus', 'financingDemandStatus').then(() => {
+      this.getTableData()
+    })
+  },
+  mounted() {
+    
+    
   }
 }
 </script>

From 4a7a8b204fa168534ec2b08e91f22847c33a9f06 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 11 Apr 2022 11:30:50 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9C=BA=E6=9E=84?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/xiushan/apps/financing/AppGrabLog/needsStatistics.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/xiushan/apps/financing/AppGrabLog/needsStatistics.vue b/project/xiushan/apps/financing/AppGrabLog/needsStatistics.vue
index ac95ce1a..c379afcd 100644
--- a/project/xiushan/apps/financing/AppGrabLog/needsStatistics.vue
+++ b/project/xiushan/apps/financing/AppGrabLog/needsStatistics.vue
@@ -5,7 +5,7 @@
         <ai-area-get :instance="instance" v-model="search.areaId" @change="page.current=1,getTableData()"
                      :root="user.info.areaId" :clearable="false"/>
         <ai-select v-model="search.organizationId" placeholder="金融机构" clearable :prop="{label:'organizationName'}"
-                   :action='"/appfinancialorganization/list?organizationId="+userOrgId'
+                   :action='"/appfinancialorganization/list?id="+userOrgId'
                    @change="page.current=1,getTableData()" :instance="instance"/>
       </template>
     </ai-search-bar>

From ae749f9b2578cd6e7c28a11f5437ec179c9e3dbd Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 11 Apr 2022 11:53:16 +0800
Subject: [PATCH 3/4] 29041

---
 project/xiushan/apps/financing/AppGrabLog/needsStatistics.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/xiushan/apps/financing/AppGrabLog/needsStatistics.vue b/project/xiushan/apps/financing/AppGrabLog/needsStatistics.vue
index c379afcd..ee940b68 100644
--- a/project/xiushan/apps/financing/AppGrabLog/needsStatistics.vue
+++ b/project/xiushan/apps/financing/AppGrabLog/needsStatistics.vue
@@ -79,7 +79,7 @@
                 @getList="getList" :col-configs="colConfigs" :dict="dict" style="padding:0 20px 20px 20px;">
         <el-table-column slot="options" label="状态" fixed="right" width="100" align="center">
           <template slot-scope="{row}">
-            <span :class="`status${row.status}`">{{ $dict.getLabel('financialLoanApplyStatus', row.status) }}</span>
+            <span :class="`status${row.status}`">{{ $dict.getLabel('financingDemandStatus', row.status) }}</span>
           </template>
         </el-table-column>
       </ai-table>

From def72781e7413330e2c23d1aee2bf716edb4f746 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 11 Apr 2022 13:38:35 +0800
Subject: [PATCH 4/4] 29042

---
 project/xiushan/apps/AppLandTransfer/components/Add.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/xiushan/apps/AppLandTransfer/components/Add.vue b/project/xiushan/apps/AppLandTransfer/components/Add.vue
index 7a99dc3d..1d96daad 100644
--- a/project/xiushan/apps/AppLandTransfer/components/Add.vue
+++ b/project/xiushan/apps/AppLandTransfer/components/Add.vue
@@ -251,8 +251,8 @@ export default {
     background: #FFF !important;
   }
 
-  ::v-deep .ai-info-item label {
-    width: 130px;
-  }
+  // ::v-deep .ai-info-item label {
+  //   width: 130px;
+  // }
 }
 </style>
\ No newline at end of file