修改提交

src/components/approval.vue

@@ -60,7 +60,12 @@
         </template>
         <template v-if='form.capitalCode==="FENGSHENGBUSINESS"'>
           <el-form-item prop='riskResult' label='风审查询结果'>
-            <el-tag v-if='riskResult'>结果</el-tag>
+            <template v-if='riskResult!==null'>
+              <el-tag v-if='riskResult.status==="CREDIT_ING"' type='warning'>{{ riskResult.statusDesc }}</el-tag>
+              <el-tag v-else-if='riskResult.status==="YES"' type='success'>{{ riskResult.statusDesc }}</el-tag>
+              <el-tag v-else type='danger'>{{ riskResult.statusDesc }}</el-tag>
+            </template>
+
             <el-tag v-else type='info' size='mini'>结果未出</el-tag>
           </el-form-item>
         </template>
@@ -81,8 +86,13 @@
 
     </div>
     <span slot='footer' class='dialog-footer'>
-    <el-button type='primary' @click='onSubmit("dForm")'>确 定</el-button>
-    <el-button @click='handleClose'>取 消</el-button>
+      <template v-if='form.capitalCode!=="FENGSHENGBUSINESS"'>
+        <el-button type='primary' @click='onSubmit("dForm")'>确 定</el-button>
+      </template>
+      <template v-else-if='riskResult.status==="YES"'>
+        <el-button type='primary' @click='onSubmit("dForm")'>确 定</el-button>
+      </template>
+      <el-button @click='handleClose'>取 消</el-button>
   </span>
   </el-dialog>
 </template>
@@ -156,9 +166,9 @@
           ]
         },
         hasRisk: false,
-        riskResult: '',
+        riskResult: null,
         form: {
-          creditAmount:'',
+          creditAmount: '',
           applyAmount: '',
           approveStatus: '',
           capitalCode: '',
@@ -176,7 +186,7 @@
     async mounted() {
       console.log(this.item, 'nash ')
       if (this.item !== null) {
-        const { applyAmount,creditAmount, creditNo } = this.item
+        const { applyAmount, creditAmount, creditNo } = this.item
         this.form.applyAmount = this.money(applyAmount)
         this.form.creditAmount = this.money(creditAmount)
         this.form.creditNo = creditNo

src/components/loan-audit.vue

@@ -5,7 +5,7 @@
     :before-close='handleClose'
     :destroy-on-close='true'
     width='38%'
-    title='申述'>
+    title='稽核审批'>
     <div class='page'>
       <!--搜索-->
       <el-form ref='dForm' label-suffix=':' label-width='90px' :rules='rules' :model='form' class='form-inline'>

src/components/user-base-info.vue

@@ -11,7 +11,7 @@
       <el-descriptions-item label-class-name='labelCls' label='身份证号'>{{baseInfo.idCard}}</el-descriptions-item>
 
 
-      <el-descriptions-item label-class-name='labelCls' label='学历'>{{baseInfo.workIndustryStr}}</el-descriptions-item>
+      <el-descriptions-item label-class-name='labelCls' label='学历'>{{baseInfo.educationCodeStr}}</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='婚姻状况'>{{baseInfo.marriageStr}}</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='年龄(周岁)'>{{baseInfo.applyDate}}</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='工作行业'>{{baseInfo.workIndustryStr}}</el-descriptions-item>

src/views/approval/list.vue

@@ -86,9 +86,6 @@
           <span v-else-if='item.label==="授信状态"'>
             <el-tag v-if='row.creditStatus==="CREATED"' size='mini'>{{ row.creditStatusStr }}</el-tag>
             <el-tag v-if='row.creditStatus==="CREDIT_ING"' type='warning' size='mini'>{{ row.creditStatusStr }}</el-tag>
-            <el-tag v-if='row.creditStatus==="MANUAL_CREDIT_ING"' type='warning' size='mini'>{{ row.creditStatusStr
-              }}</el-tag>
-            <el-tag v-if='row.creditStatus==="MANUAL_BACK"' type='danger' size='mini'>{{ row.creditStatusStr }}</el-tag>
             <el-tag v-if='row.creditStatus==="FINISHED"' type='success' size='mini'>{{ row.creditStatusStr }}</el-tag>
           </span>
           <span v-else>{{ row[item.prop] }}</span>
@@ -306,7 +303,7 @@
         }
 
       },
-      //   申述
+      //   审批
       handleApproval(row) {
         this.ApprovalItem = row
         this.ApprovalVisible = true

src/views/credit/pre.vue

@@ -64,9 +64,11 @@
       >
         <template #default='{ row }'>
           <div v-if="item.prop==='preStatusStr'">
-            <el-tag v-if='row[item.prop]==="授信中"' type='warning'>{{ row[item.prop] }}</el-tag>
-            <el-tag v-else-if='row[item.prop]==="授信通过"' type='success'>{{ row[item.prop] }}</el-tag>
-            <el-tag v-else-if='row[item.prop]==="授信拒绝"' type='danger'>{{ row[item.prop] }}</el-tag>
+            <el-tag v-if='row[item.prop]==="审核中"' type='warning'>{{ row[item.prop] }}</el-tag>
+            <el-tag v-else-if='row[item.prop]==="审核通过"' type='success'>{{ row[item.prop] }}</el-tag>
+            <el-tag v-else-if='row[item.prop]==="审核拒绝"' type='danger'>{{ row[item.prop] }}</el-tag>
+            <el-tag v-else size='mini'>{{ row[item.prop] }}</el-tag>
+
           </div>
           <span v-else>{{ row[item.prop] }}</span>
         </template>
@@ -155,8 +157,7 @@
           {
             order: 7,
             label: '申请时间',
-            prop: 'applyDate',
-            width: 110
+            prop: 'applyDate'
           },
           {
             order: 8,

src/views/loan/audit.vue

@@ -81,10 +81,11 @@
         fixed='right'
         align='center'
         label='操作'
+        width='200'
       >
         <template #default='{ row }'>
           <template v-if='row.loanStatus==="SUBMITED" && row.stepsNo==="002"'>
-            <el-button size='mini' type='primary' @click='handleAudit(row)'>稽核</el-button>
+            <el-button size='mini' type='primary' @click='handleAudit(row)'>稽核审批</el-button>
           </template>
           <el-button size='mini' type='default' @click='handleDetail(row)'>详情</el-button>
         </template>

src/views/loan/list.vue

@@ -116,27 +116,33 @@
 
 
     <!--放款确认，放款取消-->
-    <el-dialog
-      :title='DialogTitle'
-      :visible.sync='DialogVisible'
-      width='30%'
-      center>
-      <el-form ref='dialogForm' :model='dialogForm' label-suffix=':'>
-        <el-form-item label='客户名称'>
-          <div>{{ dialogForm.clientName }}</div>
-        </el-form-item>
-        <el-form-item label='借款金额'>
-          <div>{{ dialogForm.loanAmount }}</div>
-        </el-form-item>
-        <el-form-item label='确认备注'>
-          <el-input type='textarea' :rows='2' v-model='dialogForm.memo' placeholder='请输入' />
-        </el-form-item>
-      </el-form>
-      <div slot='footer' class='dialog-footer'>
-        <el-button type='primary' @click='DialogVisible = false'>确 定</el-button>
-        <el-button @click='DialogVisible = false'>取 消</el-button>
-      </div>
-    </el-dialog>
+    <template v-if='DialogVisible'>
+      <el-dialog
+        :title='DialogTitle'
+        :visible.sync='DialogVisible'
+        :destroy-on-close='true'
+        width='30%'>
+        <div class='page'>
+          <el-form ref='dialogForm' :model='dialogForm' :rules='rules' label-width='100px' class='form-inline'
+                   label-suffix=':'>
+            <el-form-item label='客户名称'>
+              <span>{{ dialogForm.clientName }}</span>
+            </el-form-item>
+            <el-form-item label='借款金额'>
+              <span>{{ dialogForm.loanAmount }}</span>
+            </el-form-item>
+            <el-form-item prop='memo' label='确认备注'>
+              <el-input v-model='dialogForm.memo' type='textarea' clearable placeholder='请输入' />
+            </el-form-item>
+          </el-form>
+        </div>
+        <div slot='footer' class='dialog-footer'>
+          <el-button type='primary' @click='handleLoan("dialogForm")'>确 定</el-button>
+          <el-button @click='DialogVisible = false'>取 消</el-button>
+        </div>
+      </el-dialog>
+    </template>
+
 
   </div>
 </template>
@@ -156,7 +162,7 @@
           loanAmount: '',
           clientName: '',
           currentAction: '',
-          loanNo: '',
+          orderNo: '',
           memo: '',
           stepsNo: '',
           userId: ''
@@ -221,6 +227,15 @@
         listLoading: true,
         pickerConfig: this.datePickerOptions,
         total: 1,
+        rules: {
+          memo: [
+            {
+              required: true,
+              trigger: 'blur',
+              message: '请输入备注'
+            }
+          ]
+        },
         queryForm: {
           current: 1,
           size: 10,
@@ -267,10 +282,17 @@
         }
         this.fetchData()
       },
-      handleDialog(row) {
-        const { realName, loanAmount } = row
+      handleDialog(row, type) {
+        const { realName, loanAmount, currentAction, orderNo, stepsNo } = row
         console.log(row, '当前行信息')
         this.DialogVisible = true
+        this.DialogTitle = type === 'confirm' ? '确认放款' : '取消放款'
+        this.type = type
+        this.dialogForm.clientName = realName
+        this.dialogForm.loanAmount = loanAmount
+        this.dialogForm.currentAction = currentAction
+        this.dialogForm.orderNo = orderNo
+        this.dialogForm.stepsNo = stepsNo
 
       },
       handleCurrentChange(val) {
@@ -287,6 +309,34 @@
         this.list = records
         this.total = total
         this.listLoading = false
+      },
+      handleLoan(formName) {
+        this.$refs[formName].validate(async (valid) => {
+          if (valid) {
+            const form = this.dialogForm
+            form.userId = this.user.userId
+            console.log(form, '表单书')
+            let result
+            if (this.type === 'confirm') {
+              result = await API.loanConfirm({
+                ...form
+              })
+            } else {
+              result = await API.loanCancel({
+                ...form
+              })
+            }
+
+            if (result.success) {
+              this.$message({
+                type: 'success',
+                message: '操作成功!'
+              })
+            }
+
+
+          }
+        })
       }
     }
   }