Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue

@@ -12,7 +12,7 @@
           <ai-card title="融资需求">
             <template #content>
               <el-row type="flex" class="flexWrap">
-                <el-form-item label="意向金额">{{ detail.loanAmount }}</el-form-item>
+                <el-form-item label="意向金额(万)">{{ detail.loanAmount }}</el-form-item>
                 <el-form-item label="期望使用期限">{{
                     dict.getLabel('productRepaymentTimeline', detail.hopeLifespan)
                   }}
@@ -22,7 +22,7 @@
                   }}
                 </el-form-item>
                 <el-form-item label="企业主体">{{ detail.enterpriseName }}</el-form-item>
-                <el-form-item label="联系人">{{ detail.createUserName }}</el-form-item>
+                <el-form-item label="联系人">{{ detail.name }}</el-form-item>
                 <el-form-item label="所在地区">{{ detail.areaName }}</el-form-item>
                 <el-form-item label="联系方式">{{ detail.phone }}</el-form-item>
                 <el-form-item label="身份证号">{{ detail.idNumber }}</el-form-item>

project/xiushan/apps/financing/AppFinancingNeeds/needsList.vue

@@ -37,7 +37,7 @@ export default {
   },
   data() {
     return {
-      search: {name: ""},
+      search: {enterpriseName: ""},
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       colConfigs: [
@@ -45,7 +45,7 @@ export default {
         {label: "所在地区", prop: "areaName"},
         {label: "意向金额(万)", prop: "loanAmount"},
         {label: "申请时间", prop: "createTime"},
-        {label: "联系人", prop: "createUserName"},
+        {label: "联系人", prop: "name"},
         {label: "联系方式", prop: "phone"},
         {label: "备注", prop: "remark"},
         {slot: "options"}
@@ -55,7 +55,7 @@ export default {
   methods: {
     getTableData() {
       this.instance.post("/appfinancingdemand/list", null, {
-        params: {...this.page, ...this.search}
+        params: {...this.page, ...this.search, status: 0}
       }).then(res => {
         if (res?.data) {
           this.tableData = res.data?.records

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

@@ -8,7 +8,8 @@
             <ai-select placeholder="订单状态" v-model="search.status" @change="page.current=1,getTableData()"
                        :selectList="dict.getDict('financingDemandStatus')"/>
             <ai-search label="申请时间">
-              <el-date-picker size="small" v-model="search.applyTime" type="daterange" @change="handleFilterApplyTime"/>
+              <el-date-picker size="small" v-model="search.applyTime" type="daterange" @change="handleFilterApplyTime"
+                              :default-time="['00:00:00','23:59:59']" value-format="yyyy-MM-dd HH:mm:ss"/>
             </ai-search>
           </template>
           <template #right>