From 30965d9bdf9fb46307be45c2608cc1fa7e617e6c Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 12:10:26 +0800
Subject: [PATCH 01/22] BUG 27881

---
 project/xiushan/apps/finance/AppLoanAudit/loanList.vue | 3 ++-
 project/xiushan/apps/financing/AppGrabLog/grabList.vue | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/project/xiushan/apps/finance/AppLoanAudit/loanList.vue b/project/xiushan/apps/finance/AppLoanAudit/loanList.vue
index 2d14d47c..b81ea62a 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/loanList.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanList.vue
@@ -8,7 +8,8 @@
             <ai-select v-model="search.status" :selectList="dict.getDict('financialLoanApplyStatus')" placeholder="审批状态"
                        @change="page.current=1,getTableData()"/>
             <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>
diff --git a/project/xiushan/apps/financing/AppGrabLog/grabList.vue b/project/xiushan/apps/financing/AppGrabLog/grabList.vue
index 95e59377..569d349f 100644
--- a/project/xiushan/apps/financing/AppGrabLog/grabList.vue
+++ b/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>

From c6b293d4bdbd776ad55edb85e56722b073dbfaa0 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 12:13:59 +0800
Subject: [PATCH 02/22] BUG 27833

---
 .../apps/finance/AppFinanceProduct/productList.vue | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/project/xiushan/apps/finance/AppFinanceProduct/productList.vue b/project/xiushan/apps/finance/AppFinanceProduct/productList.vue
index 7de37d89..2256530e 100644
--- a/project/xiushan/apps/finance/AppFinanceProduct/productList.vue
+++ b/project/xiushan/apps/finance/AppFinanceProduct/productList.vue
@@ -19,7 +19,8 @@
         </ai-search-bar>
         <ai-search-bar>
           <template #left>
-            <el-button type="primary" icon="iconfont iconAdd" @click="handleEdit()">添加产品</el-button>
+            <el-button type="primary" icon="iconfont iconAdd" @click="handleEdit()" v-if="isFinanceUser">添加产品
+            </el-button>
           </template>
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
@@ -37,8 +38,10 @@
           <el-table-column slot="options" label="操作" fixed="right" align="center" width="200px">
             <template slot-scope="{row}">
               <el-button type="text" @click="showDetail(row.id)">详情</el-button>
-              <el-button type="text" @click="handleEdit(row.id)">编辑</el-button>
-              <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
+              <template v-if="isFinanceUser">
+                <el-button type="text" @click="handleEdit(row.id)">编辑</el-button>
+                <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
+              </template>
             </template>
           </el-table-column>
         </ai-table>
@@ -58,7 +61,10 @@ export default {
     permissions: Function
   },
   computed: {
-    ...mapState(['user'])
+    ...mapState(['user']),
+    isFinanceUser() {
+      return !!this.user.financeUser?.id
+    }
   },
   data() {
     return {

From 4ac2f5a1349babf2f2d98a767b59c1dd4a721382 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 12:17:18 +0800
Subject: [PATCH 03/22] BUG 27835

---
 .../xiushan/apps/finance/AppFinanceProduct/productList.vue    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/xiushan/apps/finance/AppFinanceProduct/productList.vue b/project/xiushan/apps/finance/AppFinanceProduct/productList.vue
index 2256530e..ffd03d26 100644
--- a/project/xiushan/apps/finance/AppFinanceProduct/productList.vue
+++ b/project/xiushan/apps/finance/AppFinanceProduct/productList.vue
@@ -39,8 +39,8 @@
             <template slot-scope="{row}">
               <el-button type="text" @click="showDetail(row.id)">详情</el-button>
               <template v-if="isFinanceUser">
-                <el-button type="text" @click="handleEdit(row.id)">编辑</el-button>
-                <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
+                <el-button type="text" @click="handleEdit(row.id)" v-if="row.status==2">编辑</el-button>
+                <el-button type="text" @click="handleDelete(row.id)" v-if="['2','1'].includes(row.status)">删除</el-button>
               </template>
             </template>
           </el-table-column>

From 9d1e81b4921acb3da80bcc64b6d936793c76fcfb Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 14:10:57 +0800
Subject: [PATCH 04/22] BUG 27840

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

diff --git a/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue b/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
index 9f1be73b..05a1fc56 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
@@ -3,7 +3,7 @@
     <ai-detail>
       <ai-title slot="title" title="贷款审核详情" isShowBottomBorder isShowBack @onBackClick="$router.push({query:{}})">
         <template #rightBtn>
-          <el-button v-if="isAuthing" type="primary" @click="dialog=true">审核</el-button>
+          <el-button v-if="isAuthing&&isFinanceUser" type="primary" @click="dialog=true">审核</el-button>
         </template>
       </ai-title>
       <template #content>
@@ -102,6 +102,9 @@ export default {
     permissions: Function
   },
   computed: {
+    isFinanceUser() {
+      return !!this.user.financeUser?.id
+    },
     isAuthing() {
       return this.detail.status == "0"
     }

From a25114945231cfc90d2cf93c0a939a1c0db66832 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 14:14:29 +0800
Subject: [PATCH 05/22] BUG 27803

---
 .../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 1b05ecd5..e2c94af7 100644
--- a/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue
+++ b/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue
@@ -60,7 +60,7 @@
         <el-form-item label="审批结果" prop="status">
           <ai-select v-model="form.status" :selectList="dict.getDict('enterpriseAuditStatus')"/>
         </el-form-item>
-        <el-form-item label="审批意见" prop="remark">
+        <el-form-item label="审批意见" :prop="form.status==2?'remark':''">
           <el-input type="textarea" v-model="form.remark" placeholder="请输入"/>
         </el-form-item>
       </el-form>

From 70aa2ef31e29954e4d9d389fffbb9edab1d682c6 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 14:18:45 +0800
Subject: [PATCH 06/22] BUG 27847

---
 .../apps/finance/AppFinanceOrgMember/AppFinanceOrgMember.vue     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/project/xiushan/apps/finance/AppFinanceOrgMember/AppFinanceOrgMember.vue b/project/xiushan/apps/finance/AppFinanceOrgMember/AppFinanceOrgMember.vue
index d2c791a9..e539becc 100644
--- a/project/xiushan/apps/finance/AppFinanceOrgMember/AppFinanceOrgMember.vue
+++ b/project/xiushan/apps/finance/AppFinanceOrgMember/AppFinanceOrgMember.vue
@@ -62,6 +62,7 @@ export default {
         organizationName: [{required: true, message: "请输入机构名称"}],
         userRole: [{required: true, message: "请选择成员角色"}],
         organizationId: [{required: true, message: "请选择所属金融机构"}],
+        userId: [{required: true, message: "请选择机构成员"}],
       }
     },
   },

From 1a7e06f48063b1df3dd3b051e8a927e5c9a64f6c Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 14:22:26 +0800
Subject: [PATCH 07/22] BUG 27844

---
 project/xiushan/apps/finance/AppFinanceOrg/AppFinanceOrg.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/xiushan/apps/finance/AppFinanceOrg/AppFinanceOrg.vue b/project/xiushan/apps/finance/AppFinanceOrg/AppFinanceOrg.vue
index ccb49d1a..18adf09e 100644
--- a/project/xiushan/apps/finance/AppFinanceOrg/AppFinanceOrg.vue
+++ b/project/xiushan/apps/finance/AppFinanceOrg/AppFinanceOrg.vue
@@ -28,14 +28,14 @@
       <el-form ref="addAccountForm" :model="form" :rules="rules" size="small"
                label-width="120px">
         <el-form-item required label="机构名称" prop="organizationName">
-          <el-input v-model.trim="form.organizationName" placeholder="请输入" clearable :maxLength="32" show-word-limit/>
+          <el-input v-model.trim="form.organizationName" placeholder="请输入" clearable maxlength="32" show-word-limit/>
         </el-form-item>
         <el-form-item required label="机构类型" prop="organizationType">
           <ai-select v-model="form.organizationType" :selectList="dict.getDict('financialOrganizationType')"
                      placeholder="请选择"/>
         </el-form-item>
         <el-form-item label="logo" prop="logoUrl">
-          <ai-uploader v-model="form.logoUrl" :instance="instance" :limit="1"/>
+          <ai-uploader v-model="form.logoUrl" :instance="instance" :limit="1" isShowTip/>
         </el-form-item>
       </el-form>
     </ai-dialog>

From 570c6cf82c7e756bac951a38dfc41b7dc1529131 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 14:37:00 +0800
Subject: [PATCH 08/22] BUG 27892

---
 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 c3757082..19b766b5 100644
--- a/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue
+++ b/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue
@@ -16,7 +16,7 @@
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
                   @getList="getTableData" :col-configs="colConfigs" :dict="dict"
-                  @selection-change="v=>ids=v.filter(e=>e.sysUserId).map(e=>e.sysUserId)">
+                  @selection-change="v=>ids=v.map(e=>e.id)">
           <el-table-column slot="name" label="姓名" width="180px">
             <el-row type="flex" align="middle" slot-scope="{row}">
               <el-image class="avatar" :src="row.avatar" :preview-src-list="[row.avatar]">

From 3880e8bc0feffc00b39ce0701c6f52c1aeb2f827 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 14:39:29 +0800
Subject: [PATCH 09/22] BUG 27895

---
 .../xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue b/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue
index c9f5cd03..5c20156a 100644
--- a/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue
+++ b/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue
@@ -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>

From 02d6343d8e95f97c4144619e5e88ab20a402eae0 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 14:40:00 +0800
Subject: [PATCH 10/22] BUG 27894

---
 .../xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue b/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue
index 5c20156a..909038a7 100644
--- a/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue
+++ b/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)
                   }}

From 349a8693117e94210dbda3a8bacd958e6c7d7e29 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 14:40:17 +0800
Subject: [PATCH 11/22] BUG 27894

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

diff --git a/project/xiushan/apps/financing/AppFinancingNeeds/needsList.vue b/project/xiushan/apps/financing/AppFinancingNeeds/needsList.vue
index d81540ed..0817db99 100644
--- a/project/xiushan/apps/financing/AppFinancingNeeds/needsList.vue
+++ b/project/xiushan/apps/financing/AppFinancingNeeds/needsList.vue
@@ -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"}

From 9c0019087b514d17eae34d170a57251c7b3f6005 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 14:41:49 +0800
Subject: [PATCH 12/22] BUG 27900

---
 .../xiushan/apps/financing/AppFinancingNeeds/needsList.vue    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/xiushan/apps/financing/AppFinancingNeeds/needsList.vue b/project/xiushan/apps/financing/AppFinancingNeeds/needsList.vue
index 0817db99..599f6f69 100644
--- a/project/xiushan/apps/financing/AppFinancingNeeds/needsList.vue
+++ b/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: [
@@ -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

From 08a7208cc4e45cfafffcec9acb8e0c7f9263b1d7 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 14:47:39 +0800
Subject: [PATCH 13/22] BUG 27873

---
 .../xiushan/apps/AppPortalUserManager/pumDetail.vue  | 12 +++++-------
 .../xiushan/apps/AppPortalUserManager/pumList.vue    |  1 +
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/project/xiushan/apps/AppPortalUserManager/pumDetail.vue b/project/xiushan/apps/AppPortalUserManager/pumDetail.vue
index 0b4f0e7c..e3de324c 100644
--- a/project/xiushan/apps/AppPortalUserManager/pumDetail.vue
+++ b/project/xiushan/apps/AppPortalUserManager/pumDetail.vue
@@ -18,8 +18,7 @@
               <el-form-item label="经营范围">{{ detail.businessScope }}</el-form-item>
               <el-form-item label="营业期限">{{ detail.operationPeriod }}</el-form-item>
               <el-form-item label="营业执照">
-                <el-image class="thumbImage" :src="detail.businessLicense"
-                          :preview-src-list="[detail.businessLicense]"/>
+                <el-image class="thumb" :src="detail.businessLicense" :preview-src-list="[detail.businessLicense]"/>
               </el-form-item>
             </template>
           </ai-card>
@@ -30,16 +29,15 @@
               <el-form-item label="联系方式">{{ detail.phone }}</el-form-item>
               <el-form-item label="身份证照片">
                 <el-row type="flex" align="middle">
-                  <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-image class="thumb" :src="detail.idNumberTopside" :preview-src-list="[detail.idNumberTopside]"/>
+                  <el-image class="thumb" :src="detail.idNumberBackside" :preview-src-list="[detail.idNumberBackside]"/>
                 </el-row>
               </el-form-item>
             </template>
           </ai-card>
           <ai-card title="审核结果" v-if="!isAuthing">
             <template #content>
+              <el-form-item label="审核结果">{{ dict.getLabel("enterpriseStatus", detail.status) }}</el-form-item>
               <el-form-item label="审核人">{{ detail.auditUserName }}</el-form-item>
               <el-form-item label="联系方式">{{ detail.auditPhone }}</el-form-item>
               <el-form-item label="备注说明">{{ detail.auditDescription }}</el-form-item>
@@ -123,7 +121,7 @@ export default {
 .pumDetail {
   height: 100%;
 
-  .thumbImage {
+  .thumb {
     width: 120px;
     height: 120px;
   }
diff --git a/project/xiushan/apps/AppPortalUserManager/pumList.vue b/project/xiushan/apps/AppPortalUserManager/pumList.vue
index 3490cd9d..e98a34a1 100644
--- a/project/xiushan/apps/AppPortalUserManager/pumList.vue
+++ b/project/xiushan/apps/AppPortalUserManager/pumList.vue
@@ -56,6 +56,7 @@ export default {
         {label: "联系方式", prop: "phone"},
         {label: "创建时间", prop: "createTime"},
         {label: "登录账号", prop: "loginAccount"},
+        {label: "审核状态", prop: "status", dict: "enterpriseStatus"},
         {slot: "options"}
       ]
     }

From b15eca92a42fc6f70a66fb370d58252062189262 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 14:52:06 +0800
Subject: [PATCH 14/22] BUG 27872

---
 project/xiushan/apps/AppPortalUserManager/pumDetail.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/project/xiushan/apps/AppPortalUserManager/pumDetail.vue b/project/xiushan/apps/AppPortalUserManager/pumDetail.vue
index e3de324c..400124e9 100644
--- a/project/xiushan/apps/AppPortalUserManager/pumDetail.vue
+++ b/project/xiushan/apps/AppPortalUserManager/pumDetail.vue
@@ -52,8 +52,8 @@
         <el-form-item label="审批结果" prop="auditStatus">
           <ai-select v-model="form.auditStatus" :selectList="dict.getDict('enterpriseAuditStatus')"/>
         </el-form-item>
-        <el-form-item label="审批意见" prop="auditDescription">
-          <el-input type="textarea" v-model="form.auditDescription" placeholder="请输入"/>
+        <el-form-item label="审批意见" :prop="form.auditStatus==2?'auditDescription':''">
+          <el-input type="textarea" rows="4" v-model="form.auditDescription" placeholder="请输入" maxlength="200" show-word-limit/>
         </el-form-item>
       </el-form>
     </ai-dialog>
@@ -79,7 +79,8 @@ export default {
       detail: {},
       form: {},
       rules: {
-        auditStatus: [{required: true, message: "请选择审批结果"}]
+        auditStatus: [{required: true, message: "请选择审批结果"}],
+        auditDescription: [{required: true, message: "请输入审批意见"}],
       }
     }
   },

From e1a89b5d783b7cc23cccb6ad19b5ebd4b3df1778 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 14:54:17 +0800
Subject: [PATCH 15/22] BUG 27853

---
 .../apps/finance/AppFinanceProduct/productDetail.vue      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue b/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue
index e2c94af7..c1da700c 100644
--- a/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue
+++ b/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue
@@ -13,9 +13,8 @@
               <el-row type="flex" class="flexWrap">
                 <el-form-item class="half" label="产品名称">{{ detail.productName }}</el-form-item>
                 <el-form-item class="half" label="状态">{{ dict.getLabel('productStatus', detail.status) }}</el-form-item>
-                <el-form-item class="half" label="贷款额度(万)">{{
-                    [detail.loanMin, detail.loanMax].join(" ~ ")
-                  }}
+                <el-form-item class="half" label="贷款额度(万)">
+                  {{ [detail.loanMin, detail.loanMax].join(" ~ ") }}
                 </el-form-item>
                 <el-form-item class="half" label="参考利率(%)">
                   {{ [detail.interestRateMin, detail.interestRateMax].join(" ~ ") }}
@@ -46,6 +45,9 @@
           <ai-card title="审核结果" v-if="!isAuthing">
             <template #content>
               <el-row type="flex" class="flexWrap">
+                <el-form-item class="half" label="审核结果">
+                  {{ dict.getLabel("productStatus", detail.status) }}
+                </el-form-item>
                 <el-form-item class="half" label="审核人">{{ detail.auditUserName }}</el-form-item>
                 <el-form-item class="half" label="审核时间">{{ detail.auditTime }}</el-form-item>
               </el-row>

From d6201819c12881e272af6bb8ccae865ff30673d2 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 14:58:14 +0800
Subject: [PATCH 16/22] BUG 27852

---
 .../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 c1da700c..e1edea37 100644
--- a/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue
+++ b/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue
@@ -63,7 +63,7 @@
           <ai-select v-model="form.status" :selectList="dict.getDict('enterpriseAuditStatus')"/>
         </el-form-item>
         <el-form-item label="审批意见" :prop="form.status==2?'remark':''">
-          <el-input type="textarea" v-model="form.remark" placeholder="请输入"/>
+          <el-input type="textarea" v-model="form.remark" placeholder="请输入" maxlength="200" rows="4" show-word-limit/>
         </el-form-item>
       </el-form>
     </ai-dialog>

From 727d05f861ac25f251f33d7fd4f5c1b92c174c41 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 15:19:25 +0800
Subject: [PATCH 17/22] BUG 27822

---
 project/xiushan/apps/AppXsBanner/AppXsBanner.vue | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/project/xiushan/apps/AppXsBanner/AppXsBanner.vue b/project/xiushan/apps/AppXsBanner/AppXsBanner.vue
index fc5c315e..9db36d05 100644
--- a/project/xiushan/apps/AppXsBanner/AppXsBanner.vue
+++ b/project/xiushan/apps/AppXsBanner/AppXsBanner.vue
@@ -215,18 +215,16 @@ export default {
     // 确定新增
     addConfirm() {
       // console.log('确定')
-      this.instance
-      .post(`/appbanner/addOrUpdate`, {
-        imgUrl: this.dialogInfo.imgUrl[0].url,
+      this.instance.post(`/appbanner/addOrUpdate`, {
+        imgUrl: this.dialogInfo.imgUrl?.[0]?.url,
         linkUrl: this.dialogInfo.linkUrl,
         status: this.status,
         title: this.dialogInfo.title,
         showIndex: this.dialogInfo.showIndex,
         id: this.dialogInfo.id,
-      })
-      .then(res => {
+      }).then(res => {
         if (res?.code == 0) {
-          this.$message.success('新增成功')
+          this.$message.success('提交成功')
           this.visible = false
           this.getList()
         }

From 8936a026df3607289b91c2d8f14901a93a5672fe Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 15:21:52 +0800
Subject: [PATCH 18/22] BUG 27822

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

diff --git a/project/xiushan/apps/AppXsBanner/AppXsBanner.vue b/project/xiushan/apps/AppXsBanner/AppXsBanner.vue
index 9db36d05..187a1386 100644
--- a/project/xiushan/apps/AppXsBanner/AppXsBanner.vue
+++ b/project/xiushan/apps/AppXsBanner/AppXsBanner.vue
@@ -74,7 +74,7 @@
             <span>{{ dialogInfo.linkUrl }}</span>
           </ai-info-item>
           <ai-info-item label="状态：">
-            <span>{{ dialogInfo.status }}</span>
+            <span>{{ dict.getLabel("bannerSstatus", dialogInfo.status) }}</span>
           </ai-info-item>
           <ai-info-item label="显示顺序：">
             <span>{{ dialogInfo.showIndex }}</span>

From 57a9d329bacf1596df90ee06b3671b764c297821 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 15:23:02 +0800
Subject: [PATCH 19/22] BUG 27825

---
 project/xiushan/apps/AppXsBanner/AppXsBanner.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/xiushan/apps/AppXsBanner/AppXsBanner.vue b/project/xiushan/apps/AppXsBanner/AppXsBanner.vue
index 187a1386..bbd68197 100644
--- a/project/xiushan/apps/AppXsBanner/AppXsBanner.vue
+++ b/project/xiushan/apps/AppXsBanner/AppXsBanner.vue
@@ -233,10 +233,10 @@ export default {
     // 发布/取消发布
     release(row) {
       this.$confirm('确定此操作？').then(() => {
-        var status = row.status == 1 ? '0' : '1'
-        this.instance.post(`/appbanner/setStatus?id=${row.id}&status=${status}`)
-        .then((res) => {
+        let status = row.status == 1 ? '0' : '1'
+        this.instance.post(`/appbanner/setStatus?id=${row.id}&status=${status}`).then((res) => {
           if (res?.code == 0) {
+            this.$message.success("操作成功!")
             this.getList()
           }
         })

From 7bcee2b1b6c994612a21106eea3393d9becd2640 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 15:26:06 +0800
Subject: [PATCH 20/22] BUG 27826

---
 .../xiushan/apps/AppXsBanner/AppXsBanner.vue  | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/project/xiushan/apps/AppXsBanner/AppXsBanner.vue b/project/xiushan/apps/AppXsBanner/AppXsBanner.vue
index bbd68197..b5fde196 100644
--- a/project/xiushan/apps/AppXsBanner/AppXsBanner.vue
+++ b/project/xiushan/apps/AppXsBanner/AppXsBanner.vue
@@ -39,7 +39,7 @@
     <!-- 添加的模态框 -->
     <ai-dialog :title="dialog.title" :visible.sync="visible" @onCancel="visible = false" @onConfirm="addConfirm"
                width="800px">
-      <el-form ref="ruleForm" :model="dialogInfo" :rules="formRules" size="small" label-width="100px">
+      <el-form ref="DialogForm" :model="dialogInfo" :rules="formRules" size="small" label-width="100px">
         <!-- 首页封面 -->
         <el-form-item label="首页封面" prop="imgUrl">
           <ai-uploader v-model="dialogInfo.imgUrl" @change="change" :instance="instance" :limit="1"></ai-uploader>
@@ -61,8 +61,6 @@
 
     <!-- 详情的模态框 -->
     <ai-dialog title="详情" :visible.sync="detailDialog" customFooter width="800px">
-      <!--  -->
-      <el-form ref="ruleForm" :model="dialogInfo" :rules="formRules" size="small" label-width="100px">
         <ai-wrapper label-width="80px" :columnsNumber="1">
           <ai-info-item label="首页封面">
             <span><img :src="dialogInfo.imgUrl" alt="" style="width:100px;height:100px;"/></span>
@@ -80,8 +78,6 @@
             <span>{{ dialogInfo.showIndex }}</span>
           </ai-info-item>
         </ai-wrapper>
-      </el-form>
-
       <div class="dialog-footer" slot="footer">
         <el-button @click="detailDialog=false">关闭</el-button>
       </div>
@@ -214,19 +210,22 @@ export default {
     },
     // 确定新增
     addConfirm() {
-      // console.log('确定')
-      this.instance.post(`/appbanner/addOrUpdate`, {
-        imgUrl: this.dialogInfo.imgUrl?.[0]?.url,
-        linkUrl: this.dialogInfo.linkUrl,
-        status: this.status,
-        title: this.dialogInfo.title,
-        showIndex: this.dialogInfo.showIndex,
-        id: this.dialogInfo.id,
-      }).then(res => {
-        if (res?.code == 0) {
-          this.$message.success('提交成功')
-          this.visible = false
-          this.getList()
+      this.$refs.DialogForm.validate(v => {
+        if (v) {
+          this.instance.post(`/appbanner/addOrUpdate`, {
+            imgUrl: this.dialogInfo.imgUrl?.[0]?.url,
+            linkUrl: this.dialogInfo.linkUrl,
+            status: this.status,
+            title: this.dialogInfo.title,
+            showIndex: this.dialogInfo.showIndex,
+            id: this.dialogInfo.id,
+          }).then(res => {
+            if (res?.code == 0) {
+              this.$message.success('提交成功')
+              this.visible = false
+              this.getList()
+            }
+          })
         }
       })
     },

From 7a87dd25d2c2e72f6d9755aa65aa084aecf5a736 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 15:27:33 +0800
Subject: [PATCH 21/22] BUG 27827

---
 project/xiushan/apps/AppNewsCenter/components/addArticle.vue | 2 +-
 project/xiushan/apps/AppNewsCenter/components/addVideo.vue   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/xiushan/apps/AppNewsCenter/components/addArticle.vue b/project/xiushan/apps/AppNewsCenter/components/addArticle.vue
index 7ff8a7f9..f1635b2f 100644
--- a/project/xiushan/apps/AppNewsCenter/components/addArticle.vue
+++ b/project/xiushan/apps/AppNewsCenter/components/addArticle.vue
@@ -38,7 +38,7 @@
     </template>
     <template slot="footer">
       <el-button class="footer_btn" @click="$emit('goBack')">取消</el-button>
-      <el-button class="footer_btn" @click="handleSubmit('0')">保存</el-button>
+      <el-button type="primary" class="footer_btn" @click="handleSubmit('0')">保存</el-button>
     </template>
   </ai-detail>
 </template>
diff --git a/project/xiushan/apps/AppNewsCenter/components/addVideo.vue b/project/xiushan/apps/AppNewsCenter/components/addVideo.vue
index 9f98c20c..14feaa1f 100644
--- a/project/xiushan/apps/AppNewsCenter/components/addVideo.vue
+++ b/project/xiushan/apps/AppNewsCenter/components/addVideo.vue
@@ -53,7 +53,7 @@
     </template>
     <template slot="footer">
       <el-button class="footer_btn" @click="$emit('goBack')">取消</el-button>
-      <el-button class="footer_btn" @click="handleSubmit('0')">保存</el-button>
+      <el-button type="primary" class="footer_btn" @click="handleSubmit('0')">保存</el-button>
     </template>
   </ai-detail>
 </template>
@@ -116,7 +116,7 @@ export default {
       this.$refs['ruleForm']?.clearValidate('videoUrl');
       const fileType = file.file.name.split(".")[1];
       const size = file.file.size / 1024 / 1024 > 100;
-      
+
       if (size) {
         return this.$message.error("视频大小不能超过100M");
       }

From e98d1babd252ed065d5f9fdbbc92a4e1b59f1e19 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 1 Mar 2022 15:28:42 +0800
Subject: [PATCH 22/22] BUG 27830

---
 .../xiushan/apps/AppNewsCenter/components/addArticle.vue  | 8 ++++----
 .../xiushan/apps/AppNewsCenter/components/addVideo.vue    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/project/xiushan/apps/AppNewsCenter/components/addArticle.vue b/project/xiushan/apps/AppNewsCenter/components/addArticle.vue
index f1635b2f..789f338d 100644
--- a/project/xiushan/apps/AppNewsCenter/components/addArticle.vue
+++ b/project/xiushan/apps/AppNewsCenter/components/addArticle.vue
@@ -12,10 +12,10 @@
               <el-input v-model="articInfo.title" size="small" placeholder="请输入…" maxlength="30"
                         show-word-limit></el-input>
             </el-form-item>
-            <el-form-item prop="description" label="摘要：">
-              <el-input type="textarea" v-model="articInfo.description" size="small" placeholder="请输入…" maxlength="255"
-                        show-word-limit></el-input>
-            </el-form-item>
+<!--            <el-form-item prop="description" label="摘要：">-->
+<!--              <el-input type="textarea" v-model="articInfo.description" size="small" placeholder="请输入…" maxlength="255"-->
+<!--                        show-word-limit></el-input>-->
+<!--            </el-form-item>-->
             <el-form-item prop="category" label="分类：">
               <ai-select
                   v-model="articInfo.category"
diff --git a/project/xiushan/apps/AppNewsCenter/components/addVideo.vue b/project/xiushan/apps/AppNewsCenter/components/addVideo.vue
index 14feaa1f..fdf3c890 100644
--- a/project/xiushan/apps/AppNewsCenter/components/addVideo.vue
+++ b/project/xiushan/apps/AppNewsCenter/components/addVideo.vue
@@ -12,10 +12,10 @@
               <el-input v-model="newsInfo.title" size="small" placeholder="请输入…" maxlength="30"
                         show-word-limit></el-input>
             </el-form-item>
-            <el-form-item prop="description" label="摘要：">
-              <el-input type="textarea" v-model="newsInfo.description" size="small" placeholder="请输入…" maxlength="255"
-                        show-word-limit></el-input>
-            </el-form-item>
+<!--            <el-form-item prop="description" label="摘要：">-->
+<!--              <el-input type="textarea" v-model="newsInfo.description" size="small" placeholder="请输入…" maxlength="255"-->
+<!--                        show-word-limit/>-->
+<!--            </el-form-item>-->
             <el-form-item prop="category" label="分类：">
               <ai-select
                   v-model="newsInfo.category"