From 0e9ef44843d0fca6a5104f968efbfe2dd0df39d0 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 23 Feb 2022 18:48:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E8=90=A5=E4=B8=BB=E4=BD=93=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppFinanceProduct/AppFinanceProduct.vue   |  3 +
 .../finance/AppFinanceProduct/productAdd.vue  | 92 +++++++++++--------
 .../AppFinanceProduct/productDetail.vue       | 58 +++++++-----
 .../finance/AppFinanceProduct/productList.vue | 56 +++++++----
 4 files changed, 132 insertions(+), 77 deletions(-)

diff --git a/project/xiushan/apps/finance/AppFinanceProduct/AppFinanceProduct.vue b/project/xiushan/apps/finance/AppFinanceProduct/AppFinanceProduct.vue
index cf1e2bea..3f65de24 100644
--- a/project/xiushan/apps/finance/AppFinanceProduct/AppFinanceProduct.vue
+++ b/project/xiushan/apps/finance/AppFinanceProduct/AppFinanceProduct.vue
@@ -24,6 +24,9 @@ export default {
       return this.$route.hash == "#add" ? ProductAdd :
           !!this.$route.query.id ? ProductDetail : ProductList
     }
+  },
+  created() {
+    this.dict.load( "productGuaranteeMode", "productRepaymentMethod", "productRepaymentTimeline", "productStatus", "productFaceUser","enterpriseAuditStatus")
   }
 }
 </script>
diff --git a/project/xiushan/apps/finance/AppFinanceProduct/productAdd.vue b/project/xiushan/apps/finance/AppFinanceProduct/productAdd.vue
index 134bfc5a..9e545639 100644
--- a/project/xiushan/apps/finance/AppFinanceProduct/productAdd.vue
+++ b/project/xiushan/apps/finance/AppFinanceProduct/productAdd.vue
@@ -6,32 +6,35 @@
         <el-form size="small" label-width="120px" :model="form" ref="ProductForm" :rules="rules">
           <ai-card title="基本信息">
             <template #content>
-              <el-form-item label="产品名称" prop="name">
-                <el-input v-model="form.name" placeholder="请输入" clearable show-word-limit maxlength="30"/>
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model="form.productName" placeholder="请输入" clearable show-word-limit maxlength="30"/>
               </el-form-item>
               <el-row type="flex" class="flexWrap">
-                <el-form-item label="贷款额度(万)">
-                  <el-input v-model="form.name" placeholder="最低额度" clearable/>
+                <el-form-item label="贷款额度(万)" prop="loanMax">
+                  <el-input v-model="form.loanMin" placeholder="最低额度" clearable/>
                 </el-form-item>
-                <el-form-item label="">
-                  <el-input v-model="form.name" placeholder="最高额度" clearable/>
+                <el-form-item label="" prop="loanMax">
+                  <el-input v-model="form.loanMax" placeholder="最高额度" clearable/>
                 </el-form-item>
-                <el-form-item label="参考利率(%)">
-                  <el-input v-model="form.name" placeholder="最低利率" clearable/>
+                <el-form-item label="参考利率(%)" prop="interestRateMin">
+                  <el-input v-model="form.interestRateMin" placeholder="最低利率" clearable/>
                 </el-form-item>
-                <el-form-item label="">
-                  <el-input v-model="form.name" placeholder="最高利率" clearable/>
+                <el-form-item label="" prop="interestRateMax">
+                  <el-input v-model="form.interestRateMax" placeholder="最高利率" clearable/>
                 </el-form-item>
-                <el-form-item class="half" label="还款期限(月)">
-                  <ai-select v-model="form.name" placeholder="请选择" :selectList="dict.getDict('')"/>
+                <el-form-item class="half" label="还款期限" prop="repaymentTimeline">
+                  <ai-select v-model="form.repaymentTimeline" placeholder="请选择"
+                             :selectList="dict.getDict('productRepaymentTimeline')"/>
                 </el-form-item>
-                <el-form-item class="half" label="还款方式">
-                  <ai-select v-model="form.name" placeholder="请选择" :selectList="dict.getDict('')"/>
+                <el-form-item class="half" label="还款方式" prop="repaymentMethod">
+                  <ai-select v-model="form.repaymentMethod" placeholder="请选择"
+                             :selectList="dict.getDict('productRepaymentMethod')"/>
                 </el-form-item>
               </el-row>
-              <el-form-item label="担保方式">
-                <el-checkbox-group v-model="form.way">
-                  <el-checkbox v-for="op in dict.getDict('yesOrNo')" :key="op.dictValue" :label="op.dictValue">
+              <el-form-item label="担保方式" prop="guaranteeMode">
+                <el-checkbox-group v-model="form.guaranteeMode">
+                  <el-checkbox v-for="op in dict.getDict('productGuaranteeMode')" :key="op.dictValue"
+                               :label="op.dictValue">
                     {{ op.dictName }}
                   </el-checkbox>
                 </el-checkbox-group>
@@ -40,12 +43,12 @@
           </ai-card>
           <ai-card title="适用范围">
             <template #content>
-              <el-form-item label="适用范围">
+              <el-form-item label="适用范围" prop="areaId">
                 <ai-area-get :instance="instance" v-model="form.areaId"/>
               </el-form-item>
-              <el-form-item label="面向对象">
-                <el-checkbox-group v-model="form.way">
-                  <el-checkbox v-for="op in dict.getDict('yesOrNo')" :key="op.dictValue" :label="op.dictValue">
+              <el-form-item label="面向对象" prop="faceUser">
+                <el-checkbox-group v-model="form.faceUser">
+                  <el-checkbox v-for="op in dict.getDict('productFaceUser')" :key="op.dictValue" :label="op.dictValue">
                     {{ op.dictName }}
                   </el-checkbox>
                 </el-checkbox-group>
@@ -54,16 +57,19 @@
           </ai-card>
           <ai-card title="产品信息">
             <template #content>
-              <el-form-item label="申请条件">
-                <el-input type="textarea" rows="5" v-model="form.name" placeholder="请输入" clearable maxlength="500"
+              <el-form-item label="申请条件" prop="applyCondition">
+                <el-input type="textarea" rows="5" v-model="form.applyCondition" placeholder="请输入" clearable
+                          maxlength="500"
                           show-word-limit/>
               </el-form-item>
-              <el-form-item label="所需材料">
-                <el-input type="textarea" rows="5" v-model="form.name" placeholder="请输入" clearable maxlength="500"
+              <el-form-item label="所需材料" prop="needMaterial">
+                <el-input type="textarea" rows="5" v-model="form.needMaterial" placeholder="请输入" clearable
+                          maxlength="500"
                           show-word-limit/>
               </el-form-item>
-              <el-form-item label="产品特色">
-                <el-input type="textarea" rows="5" v-model="form.name" placeholder="请输入" clearable maxlength="500"
+              <el-form-item label="产品特色" prop="productFeatures">
+                <el-input type="textarea" rows="5" v-model="form.productFeatures" placeholder="请输入" clearable
+                          maxlength="500"
                           show-word-limit/>
               </el-form-item>
             </template>
@@ -94,34 +100,47 @@ export default {
   data() {
     return {
       dialog: false,
-      form: {way: []},
+      form: {guaranteeMode: [], faceUser: []},
       rules: {
-        auditStatus: [{required: true, message: "请选择审批结果"}]
+        productName: [{required: true, message: "请输入 产品名称"}],
+        loanMin: [{required: true, message: "请输入 最低贷款额度"}],
+        loanMax: [{required: true, message: "请输入 最高贷款额度"}],
+        interestRateMin: [{required: true, message: "请输入 最低参考利率"}],
+        interestRateMax: [{required: true, message: "请输入 最高参考利率"}],
+        repaymentTimeline: [{required: true, message: "请选择 还款期限"}],
+        repaymentMethod: [{required: true, message: "请选择 还款方式"}],
+        guaranteeMode: [{required: true, message: "请选择 担保方式"}],
+        areaId: [{required: true, message: "请选择 适用范围"}],
+        faceUser: [{required: true, message: "请选择 面向对象"}],
+        applyCondition: [{required: true, message: "请输入 申请条件"}],
+        needMaterial: [{required: true, message: "请输入 所需材料"}],
+        productFeatures: [{required: true, message: "请输入 产品特色"}],
       }
     }
   },
   methods: {
     getDetail() {
       let {id} = this.$route.query
-      id && this.instance.post("/appportaluserenterprise/queryDetailById", null, {
+      id && this.instance.post("/appfinancialproduct/queryDetailById", null, {
         params: {id}
       }).then(res => {
         if (res?.data) {
           this.form = res.data
+          this.form.faceUser = res.data.faceUser?.split(",")
+          this.form.guaranteeMode = res.data.guaranteeMode?.split(",")
         }
       })
     },
     submit() {
       this.$refs.ProductForm.validate(v => {
         if (v) {
-          let {id} = this.form
-          this.instance.post("/appportaluserenterprise/addOrUpdate", null, {
-            params: {id, ...this.form}
-          }).then(res => {
+          let {form} = this
+          form.faceUser = form.faceUser?.toString()
+          form.guaranteeMode = form.guaranteeMode?.toString()
+          this.instance.post("/appfinancialproduct/addOrUpdate", form).then(res => {
             if (res?.code == 0) {
-              this.dialog = false
               this.$message.success("提交成功!")
-              this.getDetail()
+              this.back()
             }
           })
         }
@@ -132,7 +151,6 @@ export default {
     }
   },
   created() {
-    this.dict.load("auditStatus", "yesOrNo")
     this.getDetail()
   }
 }
diff --git a/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue b/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue
index f600da87..9a0cafd9 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="isAuthing" type="primary" @click="dialog=true">审核</el-button>
+          <el-button v-if="isAdmin" type="primary" @click="dialog=true">审核</el-button>
         </template>
       </ai-title>
       <template #content>
@@ -11,29 +11,36 @@
           <ai-card title="基本信息">
             <template #content>
               <el-row type="flex" class="flexWrap">
-                <el-form-item class="half" label="产品名称">{{ detail.enterpriseName }}</el-form-item>
-                <el-form-item class="half" label="状态">{{ detail.status }}</el-form-item>
-                <el-form-item class="half" label="贷款额度(万)">
-                  {{ dict.getLabel('enterpriseType', detail.enterpriseType) }}
+                <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>
+                <el-form-item class="half" label="参考利率(%)">
+                  {{ [detail.interestRateMin, detail.interestRateMax].join(" ~ ") }}
+                </el-form-item>
+                <el-form-item class="half" label="还款期限">
+                  {{ dict.getLabel('productRepaymentTimeline', detail.repaymentTimeline) }}
+                </el-form-item>
+                <el-form-item class="half" label="还款方式">
+                  {{ dict.getLabel('productRepaymentMethod', detail.repaymentMethod) }}
                 </el-form-item>
-                <el-form-item class="half" label="参考利率(%)">{{ detail.areaName }}</el-form-item>
-                <el-form-item class="half" label="还款期限(月)">{{ detail.address }}</el-form-item>
-                <el-form-item class="half" label="还款方式">{{ detail.businessScope }}</el-form-item>
               </el-row>
-              <el-form-item label="担保方式">{{ detail.operationPeriod }}</el-form-item>
+              <el-form-item label="担保方式">{{ detail.guaranteeModeLabel }}</el-form-item>
             </template>
           </ai-card>
           <ai-card title="适用范围">
             <template #content>
-              <el-form-item label="适用范围">{{ detail.legalPersonName }}</el-form-item>
-              <el-form-item label="面向对象">{{ detail.idNumber }}</el-form-item>
+              <el-form-item label="适用范围">{{ detail.areaName }}</el-form-item>
+              <el-form-item label="面向对象">{{ detail.faceUserLabel }}</el-form-item>
             </template>
           </ai-card>
           <ai-card title="产品信息">
             <template #content>
-              <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>
+              <el-form-item label="申请条件">{{ detail.applyCondition }}</el-form-item>
+              <el-form-item label="所需材料">{{ detail.needMaterial }}</el-form-item>
+              <el-form-item label="产品特色">{{ detail.productFeatures }}</el-form-item>
             </template>
           </ai-card>
           <ai-card title="审核结果" v-if="!isAuthing">
@@ -50,11 +57,11 @@
     </ai-detail>
     <ai-dialog :visible.sync="dialog" title="审批" @closed="form={}" @onConfirm="submitAudit" width="560px">
       <el-form :model="form" :rules="rules" ref="AuditForm" size="small" label-width="120px">
-        <el-form-item label="审批结果" prop="auditStatus">
-          <ai-select v-model="form.auditStatus" :selectList="dict.getDict('auditStatus')"/>
+        <el-form-item label="审批结果" prop="status">
+          <ai-select v-model="form.status" :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="remark">
+          <el-input type="textarea" v-model="form.remark" placeholder="请输入"/>
         </el-form-item>
       </el-form>
     </ai-dialog>
@@ -62,6 +69,8 @@
 </template>
 
 <script>
+import {mapState} from "vuex";
+
 export default {
   name: "productDetail",
   props: {
@@ -70,8 +79,12 @@ export default {
     permissions: Function
   },
   computed: {
+    ...mapState(['user']),
     isAuthing() {
       return this.detail.status == "0"
+    },
+    isAdmin() {
+      return this.user.financeUser.type == 1
     }
   },
   data() {
@@ -80,18 +93,20 @@ export default {
       detail: {},
       form: {},
       rules: {
-        auditStatus: [{required: true, message: "请选择审批结果"}]
+        status: [{required: true, message: "请选择审批结果"}]
       }
     }
   },
   methods: {
     getDetail() {
       let {id} = this.$route.query
-      this.instance.post("/appportaluserenterprise/queryDetailById", null, {
+      this.instance.post("/appfinancialproduct/queryDetailById", null, {
         params: {id}
       }).then(res => {
         if (res?.data) {
           this.detail = res.data
+          this.detail.guaranteeModeLabel = res.data.guaranteeMode?.split(",").map(g => this.dict.getLabel("productGuaranteeMode", g))?.toString()
+          this.detail.faceUserLabel = res.data.faceUser?.split(",").map(g => this.dict.getLabel("productFaceUser", g))?.toString()
         }
       })
     },
@@ -99,7 +114,7 @@ export default {
       this.$refs.AuditForm.validate(v => {
         if (v) {
           let {id} = this.detail
-          this.instance.post("/appportaluserenterprise/auditEnterprise", null, {
+          this.instance.post("/appfinancialproduct/auditProduct", null, {
             params: {id, ...this.form}
           }).then(res => {
             if (res?.code == 0) {
@@ -113,7 +128,6 @@ export default {
     }
   },
   created() {
-    this.dict.load("auditStatus")
     this.getDetail()
   }
 }
diff --git a/project/xiushan/apps/finance/AppFinanceProduct/productList.vue b/project/xiushan/apps/finance/AppFinanceProduct/productList.vue
index 41b1a8b3..410a9052 100644
--- a/project/xiushan/apps/finance/AppFinanceProduct/productList.vue
+++ b/project/xiushan/apps/finance/AppFinanceProduct/productList.vue
@@ -5,11 +5,11 @@
       <template #content>
         <ai-search-bar>
           <template #left>
-            <ai-select v-model="search.status" :selectList="dict.getDict('status')" placeholder="还款期限"
+            <ai-select v-model="search.repaymentTimeline" :selectList="dict.getDict('productRepaymentTimeline')"
+                       placeholder="还款期限"
                        @change="page.current=1,getTableData()"/>
-            <ai-select v-model="search.status" :selectList="dict.getDict('status')" placeholder="担保方式"
-                       @change="page.current=1,getTableData()"/>
-            <ai-select v-model="search.status" :selectList="dict.getDict('status')" placeholder="贷款额度"
+            <ai-select v-model="search.guaranteeMode" :selectList="dict.getDict('productGuaranteeMode')"
+                       placeholder="担保方式"
                        @change="page.current=1,getTableData()"/>
           </template>
           <template #right>
@@ -24,11 +24,16 @@
         </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">
-          <el-table-column slot="options" label="操作" fixed="right" align="center">
+          <el-table-column slot="hot" label="热门推荐" align="center">
+            <template slot-scope="{row}">
+              <el-switch v-model="row.isHot" active-value="1" inactive-value="0" @change="handleIsHot(row)"/>
+            </template>
+          </el-table-column>
+          <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>
+              <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
             </template>
           </el-table-column>
         </ai-table>
@@ -56,26 +61,29 @@ export default {
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       colConfigs: [
-        {label: "产品名称", prop: "enterpriseName"},
-        {label: "贷款额度(万)", prop: "enterpriseType"},
-        {label: "参考利率", prop: "areaName"},
-        {label: "还款期限(月)", prop: "legalPersonName"},
-        {label: "担保方式", prop: "phone"},
-        {label: "还款方式", prop: "createTime"},
-        {label: "操作人", prop: "loginAccount"},
-        {label: "联系方式", prop: "loginAccount"},
-        {label: "状态", prop: "loginAccount"},
+        {label: "产品名称", prop: "productName", width: "160px"},
+        {label: "贷款额度(万)", prop: "loanMax", align: "center", width: 120},
+        {label: "参考利率(%)", prop: "interestRateMin", align: "center", width: 120},
+        {label: "还款期限", prop: "repaymentTimeline", dict: "productRepaymentTimeline", align: "center"},
+        {label: "担保方式", prop: "guaranteeModeLabel", width: 200},
+        {label: "还款方式", prop: "repaymentMethod", dict: "productRepaymentMethod"},
+        {label: "操作人", prop: "createUserName", align: "center"},
+        {label: "状态", prop: "status", dict: "productStatus", align: "center"},
+        {label: "热门推荐", slot: "hot"},
         {slot: "options"}
       ]
     }
   },
   methods: {
     getTableData() {
-      this.instance.post("/appportaluserenterprise/list", null, {
+      this.instance.post("/appfinancialproduct/list", null, {
         params: {...this.page, ...this.search}
       }).then(res => {
         if (res?.data) {
-          this.tableData = res.data?.records
+          this.tableData = res.data?.records.map(e => {
+            let guaranteeModeLabel = e.guaranteeMode.split(",").map(g => this.dict.getLabel("productGuaranteeMode", g))?.toString()
+            return {...e, guaranteeModeLabel}
+          })
           this.page.total = res.data.total
         }
       })
@@ -88,7 +96,7 @@ export default {
     },
     handleDelete(ids) {
       this.$confirm("是否要删除该产品?").then(() => {
-        this.instance.post("/appportaluserenterprise/delete", null, {
+        this.instance.post("/appfinancialproduct/delete", null, {
           params: {ids}
         }).then(res => {
           if (res?.code == 0) {
@@ -97,6 +105,18 @@ export default {
           }
         })
       }).catch(() => 0)
+    },
+    handleIsHot(row) {
+      let {id, isHot} = row
+      this.instance.post("appfinancialproduct/setIsHot", null, {
+        params: {id, isHot}
+      }).then(res => {
+        if (res?.code == 0) {
+          this.$message.success("修改成功!")
+        } else {
+          row.isHot = (++isHot % 2).toString()
+        }
+      })
     }
   },
   created() {