一步一走

src/components/approval.vue

@@ -210,6 +210,7 @@
 
 
       },
+
       // 风审查询结果
       async initRiskResult() {
         const { creditNo } = this.item
@@ -221,6 +222,7 @@
           this.hasRisk = !!result.result
         }
       },
+
       onSubmit(formName) {
         console.log(this.item, this.form, '数据呢')
         this.$refs[formName].validate(async (valid) => {

src/components/plead.vue

 <!-- 预授信申述 -->
 <template>
-  <div>
-    <!--图钉-->
-    <el-button class='btn-fixed'>审核</el-button>
-
-    <!--搜索-->
-    <block-header title='申述' />
-    <el-row>
-      <el-col :span='8'>
-        <el-form ref='form' :model='form' :rules='rules' label-suffix=':' label-width='120px'>
-
-          <el-form-item prop='quota' label='人审额度'>
-            <el-input v-model='form.quota' clearable placeholder='请输入额度' />
-          </el-form-item>
-
-          <el-form-item prop='fund' label='资金方选择'>
-            <!--<el-select v-model='form.fund' placeholder='请选择资金方'>-->
-            <!--  <el-option label='自己' value='1'></el-option>-->
-            <!--  <el-option label='其它人' value='2'></el-option>-->
-            <!--</el-select>-->
-
-            <el-select v-model="form.fund" style='width: 100%;' placeholder="请选择活动区域">
-              <el-option label="区域一" value="shanghai"></el-option>
-              <el-option label="区域二" value="beijing"></el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item prop='remarks' label='申述备注'>
-            <el-input v-model='form.remarks' clearable placeholder='请输入申述备注' />
-          </el-form-item>
-          <el-form-item prop='idea' label='审批意见'>
-            <el-radio-group v-model='form.idea'>
-              <el-radio :label='3'>备选项</el-radio>
-              <el-radio :label='6'>备选项</el-radio>
-              <el-radio :label='9'>备选项</el-radio>
+  <el-dialog
+    :visible.sync='dialogVisible'
+    :before-close='handleClose'
+    :destroy-on-close='true'
+    width='38%'
+    title='申述'>
+    <div class='page'>
+      <!--搜索-->
+      <el-form ref='dForm' label-suffix=':' label-width='90px' :rules='rules' :model='form' class='form-inline'>
+        <el-form-item prop='appealMemo' label='申述原因'>
+          <el-input v-model='form.appealMemo' type='textarea' clearable placeholder='请输入申述备注' />
+        </el-form-item>
+        <el-form-item prop='approveOpinion' label='审批意见'>
+          <template v-if='searchData!==null'>
+            <el-radio-group v-model='form.approveOpinion'>
+              <el-radio v-for='(item,index) in searchData.allotOpinionEnumResponseList'
+                        :key='index'
+                        :label='item.code'>{{ item.desc }}
+              </el-radio>
             </el-radio-group>
-          </el-form-item>
-
-
-          <el-form-item>
-            <el-button type='primary' @click='onSubmit'>提 交</el-button>
-          </el-form-item>
-        </el-form>
-      </el-col>
-    </el-row>
+          </template>
+        </el-form-item>
+      </el-form>
 
-  </div>
+    </div>
+    <span slot='footer' class='dialog-footer'>
+    <el-button type='primary' @click='onSubmit("dForm")'>确 定</el-button>
+    <el-button @click='handleClose'>取 消</el-button>
+  </span>
+  </el-dialog>
 </template>
 
 <script>
   import API from '@/server/api'
+  import _ from 'lodash'
+  import { mapGetters } from 'vuex'
 
   export default {
     name: 'PrePlead',
+    props: {
+      dialogVisible: {
+        type: Boolean,
+        require: true
+      },
+      //eslint-disable-next-line vue/require-default-prop
+      item: {
+        type: Object,
+        require: true
+      }
+    },
     data() {
       return {
         rules: {
-          quota: [
+          appealMemo: [
             {
               required: true,
-              message: '请输入额度',
-              trigger: 'blur'
+              trigger: 'blur',
+              message: '请输入申述原因'
             }
           ],
-          fund: [
+          approveOpinion: [
             {
               required: true,
-              message: '请选择资金方',
-              trigger: 'blur'
+              trigger: 'blur',
+              message: '请选择审批意见'
             }
           ]
         },
         form: {
-          quota: '',
-          fund: '',
-          remarks: '',
-          idea: ''
+          appealMemo: '',
+          approveOpinion: '',
+          creditNo: '',
+          operationId: ''
         }
       }
     },
+    computed: {
+      ...mapGetters(['searchData', 'user'])
+    },
+    created() {
+      console.log(this.item,'nash ')
+      if (this.item !== null) {
+        this.form.creditNo = this.item.creditNo
+      }
+    },
     methods: {
-      onSubmit() {
+      onSubmit(formName) {
+        console.log(this.item,this.form,'数据呢');
+        this.$refs[formName].validate(async (valid) => {
+          if (valid) {
+            this.$confirm('是否确认提交?', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(async (res) => {
+
+              console.log(res, '是啥')
+              const form = this.form;
+              form.operationId = this.user.userId;
+              console.log(form, '表单数据')
+              const result = await API.creditPlead({
+                ...form
+              })
+              if (result.success) {
+                this.$message({
+                  type: 'success',
+                  message: '申述成功!'
+                })
+
+                this.$emit('handleClose')
+                this.$emit('callback')
+              }
+            }).catch((e) => {
+              console.log(e, '取消申述了')
+            })
+          }
+        })
+      },
+      handleClose() {
+        this.$emit('handleClose')
       }
     }
   }

src/components/pre-operation-log.vue

@@ -36,7 +36,7 @@
   export default {
     name: 'PreOperationLog',
     props:{
-      logData:{
+      log:{
         type:Array,
         require:true
       }
@@ -87,9 +87,10 @@
       }
     },
     created() {
-      if(this.logData){
-        this.list = this.logData;
+      if(this.log){
+        this.list = this.log;
       }
     }
   }
 </script>
+

src/components/pre-plead.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/pre-report.vue

+
+<!-- 操作日志 -->
+<template>
+  <div>
+    <block-header title='预审报告' />
+    <!--表格-->
+    <el-table
+      ref="tableSort"
+      border
+      :data="list"
+      style="width: 100%; margin-bottom: 20px"
+    >
+      <el-table-column
+        v-for="(item, index) in finallyColumns"
+        :key="index"
+        align="center"
+        :label="item.label"
+        :sortable="item.sortable"
+        :width="item.width"
+        :fixed="!!item.fixed"
+        :show-overflow-tooltip="!!item.overflow"
+      >
+        <template #default="{ row }">
+          <span >{{ row[item.prop] }}</span>
+        </template>
+      </el-table-column>
+
+    </el-table>
+
+  </div>
+</template>
+
+<script>
+  import _ from 'lodash'
+  import API from '@/server/api'
+
+  export default {
+    name: 'PreOperationLog',
+    props:{
+      report:{
+        type:Array,
+        require:true
+      }
+    },
+    data() {
+      return {
+        checkList: ["规则名", "规则名称", "审批建议"],
+        columns: [
+          {
+            order: 1,
+            label: "规则名",
+            prop: "ruleCode"
+          },
+          {
+            order: 2,
+            label: "规则名称",
+            prop: "ruleName"
+          },
+          {
+            order: 3,
+            label: "审批建议",
+            prop: "ruleResultStr"
+          }
+        ],
+        list: []
+      }
+    },
+    computed: {
+      finallyColumns() {
+        let finallyArray = [];
+        this.checkList.forEach((checkItem) => {
+          finallyArray.push(
+            this.columns.filter((item) => item.label === checkItem)[0]
+          );
+        });
+        return _.sortBy(finallyArray, (item) => item.order);
+      }
+    },
+    created() {
+      if(this.report){
+        this.list = this.report;
+      }
+    }
+  }
+</script>

src/components/user-project-info.vue

@@ -8,9 +8,9 @@
       <el-descriptions-item label-class-name='labelCls' label='申请金额'>{{loanIntentionAmount}}元</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='借款期限'>{{projectInfo.loanIntentionNum}}月</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='申请项目'>{{projectInfo.projectName}}</el-descriptions-item>
-      <el-descriptions-item label-class-name='labelCls' label='商家等级'>{{projectInfo.applyDate}}</el-descriptions-item>
-      <el-descriptions-item label-class-name='labelCls' label='商户GPS'>{{projectInfo.projectId}}</el-descriptions-item>
-      <el-descriptions-item label-class-name='labelCls' label='资质类型'>{{projectInfo.loanApplyDate}}</el-descriptions-item>
+      <el-descriptions-item label-class-name='labelCls' label='商家等级'>{{projectInfo.partnerGrade}}</el-descriptions-item>
+      <el-descriptions-item label-class-name='labelCls' label='商户GPS'>{{projectInfo.lngAndLat}}</el-descriptions-item>
+      <el-descriptions-item label-class-name='labelCls' label='资质类型'>{{projectInfo.qualificationTypeStr}}</el-descriptions-item>
     </el-descriptions>
   </div>
 </template>

src/minix/index.js

 import BlockHeader from '@/components/blockHeader'
 import OperationLog from '@/components/pre-operation-log'
+import PreReport from '@/components/pre-report'
 import PrePlead from '@/components/pre-plead'
 import Plead from '@/components/plead'
 import Approval from '@/components/approval'
@@ -15,6 +16,7 @@ export default {
   components: {
     BlockHeader,
     OperationLog,
+    PreReport,
     PrePlead,
     Plead,
     UserOtherInfo,

src/views/credit/approval.vue

@@ -92,8 +92,8 @@
           <span v-if='item.label==="申请金额(元)" || item.label==="审核结果(元)"'>
             {{ money(row.availableAmount) }}
           </span>
-          <span v-if='item.label==="客户信息"'>
-            {{ row.realName }}({{ row.mobile }})
+          <span v-else-if='item.label==="客户信息"'>
+            {{ row.realName }} <br /> {{ row.mobile }}
           </span>
           <span v-else-if='item.label==="审批状态"'>
             <el-tag v-if='row.creditStatus==="CREATED"' size='mini'>{{ row.creditStatusStr }}</el-tag>
@@ -125,7 +125,7 @@
         <template #default='{ row }'>
           <el-button type='text' @click='handleDetail(row)'>详情</el-button>
           <template v-if='row.creditResult==="MANUAL_REJECT" || row.creditResult==="REJECT"'>
-            <el-button type='text' @click='handleDetail(row)'>申述</el-button>
+            <el-button type='text' @click='handlePlead(row)'>申述</el-button>
           </template>
         </template>
       </el-table-column>
@@ -139,6 +139,16 @@
       background
       @current-change='handleCurrentChange'
     />
+
+    <!--申述-->
+    <template v-if='visible'>
+      <plead
+        :dialog-visible='visible'
+        :item='item'
+        @handleClose='visible = false'
+        @callback='fetchData'
+      />
+    </template>
   </div>
 </template>
 
@@ -151,6 +161,11 @@
     name: 'CreditList',
     data() {
       return {
+        // 申述
+        visible: false,
+        item: null,
+
+
         checkList: ['授信编号', '授信类型', '客户信息', '对应BD', '商户区域', '申请金额(元)', '审核结果(元)', '审批状态', '审批结果', '创建时间'],
         columns: [
           {
@@ -166,6 +181,7 @@
           },
           {
             order: 3,
+            width: 115,
             label: '客户信息',
             prop: 'realName'
           },
@@ -294,9 +310,10 @@
 
 
       },
-      //   授信申述
-      handlePlead() {
-
+      // 授信申述
+      handlePlead(row) {
+        this.visible = true
+        this.item = row
       }
     }
   }

src/views/credit/list.vue

@@ -97,6 +97,7 @@
             <el-tag v-if='row.creditResult==="MANUAL_REJECT"' type='danger' size='mini'>{{ row.creditResultStr
               }}</el-tag>
             <el-tag v-if='row.creditResult==="RETRIAL"' type='warning' size='mini'>{{ row.creditResultStr }}</el-tag>
+            <el-tag v-if='!row.creditResult' type='info' size='mini'>未出结果</el-tag>
           </span>
           <span v-else>{{ row[item.prop] }}</span>
         </template>

src/views/credit/pre-detail.vue

@@ -19,19 +19,19 @@
       <el-descriptions-item label-class-name='labelCls' label='授信状态'>
 
 
-        <el-tag v-if='detail.preBasisInfoResponse.preStateStr==="授信中"' type='warning'>
+        <el-tag v-if='detail.preBasisInfoResponse.preStateStr==="授信中"' size='medium' type='warning'>
           {{ detail.preBasisInfoResponse.preStateStr }}
         </el-tag>
-        <el-tag v-else-if='detail.preBasisInfoResponse.preStateStr==="授信通过"' type='success'>
+        <el-tag v-else-if='detail.preBasisInfoResponse.preStateStr==="授信通过"' size='medium'  type='success'>
           {{ detail.preBasisInfoResponse.preStateStr }}
         </el-tag>
-        <el-tag v-else-if='detail.preBasisInfoResponse.preStateStr==="授信拒绝"' type='danger'>
+        <el-tag v-else-if='detail.preBasisInfoResponse.preStateStr==="授信拒绝"' size='medium'  type='danger'>
           {{ detail.preBasisInfoResponse.preStateStr }}
         </el-tag>
 
 
         <template v-if='detail.preBasisInfoResponse.preState === "PRE_CREDIT_REFUSE"'>
-          <el-button @click='handlePlead' size='mini' type='primary'>申述</el-button>
+          <el-button @click='handlePlead' size='mini' style='margin-left: 10px' type='primary'>申述</el-button>
         </template>
       </el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='商户区域'>{{ detail.preBasisInfoResponse.regionName }}
@@ -41,18 +41,13 @@
     </el-descriptions>
 
 
-    <div v-if='detail.reportResponse!==null'>
-      <block-header title='预审报告' />
-      <el-descriptions style='margin-bottom: 20px;' border size='small' :column='3'>
-        <el-descriptions-item label-class-name='labelCls' label='规则名称'>1</el-descriptions-item>
-        <el-descriptions-item label-class-name='labelCls' label='规则名称'>1</el-descriptions-item>
-        <el-descriptions-item label-class-name='labelCls' label='审批建议'>1</el-descriptions-item>
-      </el-descriptions>
+    <div v-if='reportResponse!==null && reportResponse.length'>
+      <pre-report :report='reportResponse' />
     </div>
 
     <!--操作日志-->
-    <div v-if='detail.operationLogResponse && detail.operationLogResponse.length'>
-      <operation-log :logData='detail.operationLogResponse' />
+    <div v-if='operationLogResponse && operationLogResponse.length'>
+      <operation-log :log='operationLogResponse' />
     </div>
 
     <!--申述弹框-->
@@ -69,16 +64,20 @@
 
 <script>
   import API from '@/server/api'
+  import PreOperationLog from '@/components/pre-operation-log'
 
   export default {
     name: 'PreDetail',
+    components: { PreOperationLog },
     data() {
       return {
         visible: false,
         item: null,
 
         preCreditNo: '',
-        detail: null
+        detail: null,
+        reportResponse:[],
+        operationLogResponse:[]
       }
     },
     async created() {
@@ -94,7 +93,16 @@
         const result = await API.preCreditDetail({
           preCreditNo
         })
-        this.detail = result.result
+        const data = result.result
+        const {reportResponse,operationLogResponse} = data;
+
+        console.log(data,'返回数据')
+
+        this.reportResponse = reportResponse;
+        this.operationLogResponse = operationLogResponse;
+        this.detail = data;
+
+
       },
       // 申述
       handlePlead() {