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

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

@@ -2,7 +2,7 @@
   <section class="grabDetail">
     <ai-detail>
       <ai-title slot="title" title="融资详情" isShowBottomBorder isShowBack @onBackClick="back">
-        <template v-if="isFinanceUser" #rightBtn>
+        <template v-if="isFinanceUser&&detail.status==0" #rightBtn>
           <el-button type="danger" @click="handleCancel">回退订单</el-button>
           <el-button type="primary" @click="dialog=true">放款</el-button>
         </template>
@@ -35,7 +35,7 @@
                 <el-form-item label="融资进度">{{ dict.getLabel('financingDemandStatus', detail.status) }}</el-form-item>
                 <el-form-item label="贷款银行">{{ detail.organizationName }}</el-form-item>
                 <el-form-item label="贷款经理">{{ detail.auditUserName }}</el-form-item>
-                <el-form-item label="联系方式">{{ detail.phone }}</el-form-item>
+                <el-form-item label="联系方式">{{ detail.auditPhone }}</el-form-item>
                 <template v-if="detail.status==2">
                   <el-form-item label="放款金额">{{ detail.auditAmount }}</el-form-item>
                   <el-form-item label="放款日期">{{ detail.loanDate }}</el-form-item>
@@ -58,7 +58,7 @@
           <ai-select v-model="form.auditLifespan" :selectList="dict.getDict('productRepaymentTimeline')"/>
         </el-form-item>
         <el-form-item label="放款日期" prop="loanDate">
-          <el-date-picker v-model="form.loanDate" placeholder="请选择"/>
+          <el-date-picker v-model="form.loanDate" placeholder="请选择" value-format="yyyy-MM-dd"/>
         </el-form-item>
       </el-form>
     </ai-dialog>

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

@@ -53,7 +53,7 @@ export default {
         {label: "申请时间", prop: "createTime"},
         {label: "联系人", prop: "name"},
         {label: "联系方式", prop: "phone"},
-        {label: "客户经理", prop: "auditUserName"},
+        {label: "贷款经理", prop: "auditUserName"},
         {label: "贷款银行", prop: "organizationName"},
         {label: "放款金额", prop: "auditAmount"},
         {label: "状态", prop: "status", dict: "financingDemandStatus"},