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

# Conflicts:
#	project/xiushan/apps/financing/AppFinancingNeeds/AppFinancingNeeds.vue

project/xiushan/apps/financing/AppGrabLog/needsStatistics.vue

@@ -3,7 +3,7 @@
     <ai-search-bar>
       <template #left>   
         <ai-select v-model="search.organizationId" placeholder="金融机构" clearable :prop="{label:'organizationName'}"
-          :action='"/appfinancialorganization/list?organizationId="+user.financeUser.organizationId' @change="page.current=1,getTableData()" :instance="instance"/>    
+          :action='"/appfinancialorganization/list?organizationId="+userOrgId' @change="page.current=1,getTableData()" :instance="instance"/>    
       </template>
     </ai-search-bar>
     <div class="col-row">
@@ -48,7 +48,7 @@
       <div class="title">交易记录</div>
       <ai-search-bar style="padding:20px 20px 0 20px;">
         <template #left>
-          <ai-select v-model="search.organizationType" placeholder="机构类型" clearable :selectList="$dict.getDict('financialOrganizationType')" @change="getList()"></ai-select>   
+          <ai-select v-model="search.status" placeholder="状态" clearable :selectList="$dict.getDict('financingDemandStatus')" @change="getList()"></ai-select>   
          <ai-search label="申请时间">
             <el-date-picker size="small" placeholder="请选择" type="daterange"
               start-placeholder="开始日期"
@@ -96,7 +96,7 @@ export default {
   },
   data() {
     return {
-      search: {organizationId: '', name: '', createTimeStart: '', createTimeEnd: '', organizationType: ''},
+      search: {organizationId: '', name: '', createTimeStart: '', createTimeEnd: '', status: ''},
       page: {current: 1, total: 10},
       circleChart: null,
       lineChart: null,
@@ -106,19 +106,22 @@ export default {
         // {label: "产品名称", width: '200', prop: "enterpriseName"},
         {label: "联系人", width: '150', prop: "name"},
         {label: "联系方式", width: '150', prop: "phone"},
-        {label: "身份证号", width: '180', prop: "idNumber"},
+        // {label: "身份证号", width: '180', prop: "idNumber"},
         {label: "企业主体", width: '200', prop: "enterpriseName"},
-        {label: "贷款金额(万)", width: '150', prop: "loanAmount"},
+        {label: "意向金额(万)", width: '150', prop: "loanAmount"},
         {label: "申请时间", width: '180', prop: "createTime"},
-        {label: "贷款机构", width: '200', prop: "organizationName"},
-        {label: "机构类型", width: '200', prop: "organizationType", dict:'financialOrganizationType'},
+        {label: "客户经理", width: '200', prop: "auditUserName"},
+        {label: "贷款银行", width: '200', prop: "organizationName"},
+        {label: "放款金额(万)", width: '200', prop: "auditAmount"},
+        // {label: "机构类型", width: '200', prop: "organizationType", dict:'financialOrganizationType'},
         {slot: "options"}
       ],
       cloList: [],
       applyInfo: {},
       demandInfo: {},
       staticInfo: {},
-      stuTime: []
+      stuTime: [],
+      userOrgId: ''
     }
   },
   methods: {
@@ -324,11 +327,12 @@ export default {
     }
   },
   created() {
-    this.dict.load('financialOrganizationType', 'financialLoanApplyStatus')
+    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()
   }