Merge remote-tracking branch 'origin/dev' into dev

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>

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>
@@ -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>
@@ -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.dict.load('financialOrganizationType', 'financialLoanApplyStatus', 'financingDemandStatus').then(() => {
       this.getTableData()
+    })
+  },
+  mounted() {
+    
+    
   }
 }
 </script>