From c01c66c8ca70047f28a87be10e7016e375bca8c4 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 10:03:49 +0800
Subject: [PATCH 1/9] BUG 27819

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

diff --git a/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue b/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue
index fc279c2b..c3757082 100644
--- a/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue
+++ b/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue
@@ -214,7 +214,7 @@ export default {
         if (v) {
           if (this.lock) return this.$message.error("请勿多次提交!")
           this.lock = true
-          this.instance.post("/app/wxcp/wxuser/empower", this.dialogForm).then(res => {
+          this.instance.post("/user/edit", this.dialogForm).then(res => {
             this.lock = false
             if (res?.code == 0) {
               this.dialog = false;

From 04b2f02a13dca7ab9e423551569e62a7712fb248 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 10:15:44 +0800
Subject: [PATCH 2/9] BUG 27747

---
 .../xiushan/apps/finance/AppFinanceProduct/productDetail.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue b/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue
index 5c124a73..6086dbd1 100644
--- a/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue
+++ b/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue
@@ -3,7 +3,7 @@
     <ai-detail>
       <ai-title slot="title" title="金融产品详情" isShowBottomBorder isShowBack @onBackClick="$router.push({query:{}})">
         <template #rightBtn>
-          <el-button v-if="isAdmin" type="primary" @click="dialog=true">审核</el-button>
+          <el-button v-if="isAdmin&&detail.status==0" type="primary" @click="dialog=true">审核</el-button>
         </template>
       </ai-title>
       <template #content>

From c0a7716606fac0bd3d38354e50b2322bd634c3ef Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 10:24:16 +0800
Subject: [PATCH 3/9] BUG 27748

---
 .../apps/AppPortalUserManager/pumDetail.vue        | 14 +++++++++++---
 .../apps/finance/AppFinanceProduct/productList.vue |  6 +++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/project/xiushan/apps/AppPortalUserManager/pumDetail.vue b/project/xiushan/apps/AppPortalUserManager/pumDetail.vue
index 48339990..0b4f0e7c 100644
--- a/project/xiushan/apps/AppPortalUserManager/pumDetail.vue
+++ b/project/xiushan/apps/AppPortalUserManager/pumDetail.vue
@@ -18,7 +18,8 @@
               <el-form-item label="经营范围">{{ detail.businessScope }}</el-form-item>
               <el-form-item label="营业期限">{{ detail.operationPeriod }}</el-form-item>
               <el-form-item label="营业执照">
-                <el-image :src="detail.businessLicense"/>
+                <el-image class="thumbImage" :src="detail.businessLicense"
+                          :preview-src-list="[detail.businessLicense]"/>
               </el-form-item>
             </template>
           </ai-card>
@@ -29,8 +30,10 @@
               <el-form-item label="联系方式">{{ detail.phone }}</el-form-item>
               <el-form-item label="身份证照片">
                 <el-row type="flex" align="middle">
-                  <el-image :src="detail.idNumberTopside" :preview-src-list="[detail.idNumberTopside]"/>
-                  <el-image :src="detail.idNumberBackside" :preview-src-list="[detail.idNumberBackside]"/>
+                  <el-image class="thumbImage" :src="detail.idNumberTopside"
+                            :preview-src-list="[detail.idNumberTopside]"/>
+                  <el-image class="thumbImage" :src="detail.idNumberBackside"
+                            :preview-src-list="[detail.idNumberBackside]"/>
                 </el-row>
               </el-form-item>
             </template>
@@ -119,5 +122,10 @@ export default {
 <style lang="scss" scoped>
 .pumDetail {
   height: 100%;
+
+  .thumbImage {
+    width: 120px;
+    height: 120px;
+  }
 }
 </style>
diff --git a/project/xiushan/apps/finance/AppFinanceProduct/productList.vue b/project/xiushan/apps/finance/AppFinanceProduct/productList.vue
index a90ea999..7de37d89 100644
--- a/project/xiushan/apps/finance/AppFinanceProduct/productList.vue
+++ b/project/xiushan/apps/finance/AppFinanceProduct/productList.vue
@@ -31,7 +31,7 @@
           </el-table-column>
           <el-table-column slot="interestRateMin" label="参考利率" align="center">
             <template slot-scope="{row}">
-              {{row.interestRateMin}}%~{{row.interestRateMax}}%
+              {{ row.interestRateMin }}%~{{ row.interestRateMax }}%
             </template>
           </el-table-column>
           <el-table-column slot="options" label="操作" fixed="right" align="center" width="200px">
@@ -120,13 +120,12 @@ export default {
           this.$message.success("修改成功!")
           this.getTableData()
         } else {
-          
+
         }
       })
     }
   },
   created() {
-    this.dict.load("enterpriseName")
     this.getTableData()
   }
 }
@@ -134,5 +133,6 @@ export default {
 
 <style lang="scss" scoped>
 .productList {
+  height: 100%;
 }
 </style>

From 3c7983bf65b4b477b574221789b8cf2faa604120 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 10:27:50 +0800
Subject: [PATCH 4/9] BUG 27776

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

diff --git a/project/xiushan/apps/financing/AppGrabLog/grabList.vue b/project/xiushan/apps/financing/AppGrabLog/grabList.vue
index e4afaa90..561425f8 100644
--- a/project/xiushan/apps/financing/AppGrabLog/grabList.vue
+++ b/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"},

From f01a37a883a2ac3cf2e7b25d9b5222d50bc9e6c4 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 10:28:54 +0800
Subject: [PATCH 5/9] BUG 27778

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

diff --git a/project/xiushan/apps/financing/AppGrabLog/grabDetail.vue b/project/xiushan/apps/financing/AppGrabLog/grabDetail.vue
index 972b1752..67dc36ae 100644
--- a/project/xiushan/apps/financing/AppGrabLog/grabDetail.vue
+++ b/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>

From adac56a1c1bb0b93ebde49746a271fc48f5108ea Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 10:30:01 +0800
Subject: [PATCH 6/9] BUG 27779

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

diff --git a/project/xiushan/apps/financing/AppGrabLog/grabDetail.vue b/project/xiushan/apps/financing/AppGrabLog/grabDetail.vue
index 67dc36ae..d0ab7162 100644
--- a/project/xiushan/apps/financing/AppGrabLog/grabDetail.vue
+++ b/project/xiushan/apps/financing/AppGrabLog/grabDetail.vue
@@ -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>

From d6ca31c7b1c5ebf6c24a41aab34e1fd1131dd59f Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 10:31:18 +0800
Subject: [PATCH 7/9] BUG 27783

---
 project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue b/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
index c45a4985..682f6e0d 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
@@ -42,7 +42,7 @@
               </el-row>
               <el-row>
                 <el-form-item label="备注">{{ detail.remark }}</el-form-item>
-              </el-row> 
+              </el-row>
             </template>
           </ai-card>
           <ai-card title="办理结果" v-if="!isAuthing">
@@ -58,11 +58,11 @@
                   <el-form-item label="实际使用期限">{{ dict.getLabel('productRepaymentTimeline', detail.auditLifespan) }}
                   </el-form-item>
                 </template>
-                <el-form-item label="操作时间">{{ detail.auditTime }}</el-form-item>      
+                <el-form-item label="操作时间">{{ detail.auditTime }}</el-form-item>
               </el-row>
               <el-row>
                 <el-form-item v-if="detail.status==2" label="备注">{{ detail.auditDescription }}</el-form-item>
-              </el-row> 
+              </el-row>
             </template>
           </ai-card>
         </el-form>
@@ -82,7 +82,7 @@
                        :selectList="dict.getDict('productRepaymentTimeline')"/>
           </el-form-item>
           <el-form-item label="放款日期" prop="loanDate">
-            <el-date-picker v-model="form.loanDate" placeholder="请选择" clearable/>
+            <el-date-picker v-model="form.loanDate" placeholder="请选择" clearable value-format="yyyy-MM-dd"/>
           </el-form-item>
         </template>
         <el-form-item v-else-if="form.auditStatus==0" label="审批意见" prop="remark">

From f20a2d8146de1d2d288810e9dbae7424c8273ee4 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 10:34:44 +0800
Subject: [PATCH 8/9] BUG 27793

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

diff --git a/project/xiushan/apps/financing/AppGrabLog/grabDetail.vue b/project/xiushan/apps/financing/AppGrabLog/grabDetail.vue
index d0ab7162..4256c363 100644
--- a/project/xiushan/apps/financing/AppGrabLog/grabDetail.vue
+++ b/project/xiushan/apps/financing/AppGrabLog/grabDetail.vue
@@ -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>

From f32f10909517cd67d5a7e23ee823be36cc385682 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 10:36:47 +0800
Subject: [PATCH 9/9] BUG 27811

---
 project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue b/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
index 682f6e0d..8db0b399 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
@@ -85,7 +85,7 @@
             <el-date-picker v-model="form.loanDate" placeholder="请选择" clearable value-format="yyyy-MM-dd"/>
           </el-form-item>
         </template>
-        <el-form-item v-else-if="form.auditStatus==0" label="审批意见" prop="remark">
+        <el-form-item v-else-if="form.auditStatus==2" label="审批意见" prop="remark">
           <el-input type="textarea" v-model="form.auditDescription" placeholder="请输入"/>
         </el-form-item>
       </el-form>