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

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">

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>
@@ -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"
@@ -125,6 +125,7 @@ export default {
         ],
         auditLifespan: [{required: true, message: "请选择 使用期限"}],
         loanDate: [{required: true, message: "请选择 放款日期"}],
+        remark: [{required: true, message: "请输入 审批意见"}],
       }
     }
   },

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>

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()
     }
   },