From 5ff593ee0a4dd9941b4d0160ead9bde8cd33603e Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 2 Mar 2022 10:27:37 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue b/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue
index 27d86a83..f71c7b8c 100644
--- a/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue
+++ b/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue
@@ -7,8 +7,7 @@
         </template>
       </ai-title>
       <template #content>
-        <el-alert show-icon v-if="!detail.id" type="error" title="该产品已下架" center/>
-        <el-form v-else size="small" label-width="120px">
+        <el-form v-if="detail.id" size="small" label-width="120px">
           <ai-card title="基本信息">
             <template #content>
               <el-row type="flex" class="flexWrap">

From ff72b0f1049f76211b8377e797eba9a79b966420 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 2 Mar 2022 10:47:22 +0800
Subject: [PATCH 2/6] BUG 27907

---
 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 53112f78..ce6e2ebf 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&&detail.status==0" #rightBtn>
+        <template v-if="isFinanceUser&&detail.status==1" #rightBtn>
           <el-button type="danger" @click="handleCancel">回退订单</el-button>
           <el-button type="primary" @click="dialog=true">放款</el-button>
         </template>

From 9d3378bc932f908ff7b52c1a732de2565b79226e Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 2 Mar 2022 10:48:22 +0800
Subject: [PATCH 3/6] BUG 27951

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

diff --git a/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue b/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
index 81df6c45..38648b41 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
@@ -125,6 +125,7 @@ export default {
         ],
         auditLifespan: [{required: true, message: "请选择 使用期限"}],
         loanDate: [{required: true, message: "请选择 放款日期"}],
+        remark: [{required: true, message: "请输入 审批意见"}],
       }
     }
   },

From 66fd58a69d6238fac33ab338a8f270fad7c5a7b6 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 2 Mar 2022 10:48:46 +0800
Subject: [PATCH 4/6] BUG 27951

---
 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 38648b41..504569fe 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
@@ -86,7 +86,7 @@
           </el-form-item>
         </template>
         <el-form-item v-else-if="form.auditStatus==2" label="审批意见" prop="remark">
-          <el-input type="textarea" v-model="form.auditDescription" placeholder="请输入"/>
+          <el-input type="textarea" v-model="form.auditDescription" placeholder="请输入" maxlength="200" show-word-limit/>
         </el-form-item>
       </el-form>
     </ai-dialog>

From ac0ca2966af7a7451922f9716975052d780ce54c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E4=BB=95=E4=BC=9F?= <499672082@qq.com>
Date: Wed, 2 Mar 2022 10:52:28 +0800
Subject: [PATCH 5/6] 27881

---
 project/xiushan/apps/financing/AppGrabLog/grabList.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/xiushan/apps/financing/AppGrabLog/grabList.vue b/project/xiushan/apps/financing/AppGrabLog/grabList.vue
index 004bbded..b0c93487 100644
--- a/project/xiushan/apps/financing/AppGrabLog/grabList.vue
+++ b/project/xiushan/apps/financing/AppGrabLog/grabList.vue
@@ -80,8 +80,8 @@ export default {
     },
     handleFilterApplyTime() {
       this.page.current = 1
-      this.search.createTimeStart = this.search.applyTime?.[0]
-      this.search.createTimeEnd = this.search.applyTime?.[1]
+      this.search.createTimeStart = this.search.applyTime?.[0].substring(0,10)
+      this.search.createTimeEnd = this.search.applyTime?.[1].substring(0,10)
       this.getTableData()
     }
   },

From dd4e0e126040e8006c894970c6b8cdd3ae6f0a19 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 2 Mar 2022 11:00:55 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 504569fe..85e00eee 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
@@ -106,7 +106,7 @@ export default {
   computed: {
     ...mapState(['user']),
     isFinanceAdmin() {
-      return this.user.financeUser?.userRole == 1
+      return !!this.user.financeUser?.id
     },
     isAuthing() {
       return this.detail.status == "0"