Merge remote-tracking branch 'origin/mc' into mc

src/components/byh/ByhServiceDetail.vue

@@ -6,11 +6,11 @@
     <div class="box">
       <el-tabs v-model="activeComponents" type="card" @tab-click="handleTabClick">
         <el-tab-pane name="BaseInfo" label="基本信息"></el-tab-pane>
+        <el-tab-pane name="RiskInfo" label="风险等级"></el-tab-pane>
         <el-tab-pane name="LoanInfo" label="借款信息"></el-tab-pane>
         <el-tab-pane name="FeedList" label="反馈记录"></el-tab-pane>
         <el-tab-pane name="UrgeList" label="催收记录"></el-tab-pane>
         <el-tab-pane name="OperateLog" label="操作日志"></el-tab-pane>
-        <el-tab-pane name="RiskInfo" label="风险等级"></el-tab-pane>
       </el-tabs>
       <div class="box-right">
         <el-button size="mini" v-if="activeComponents==='FeedList'" @click="handleTabClick({name:'addQuestion',label:'意见反馈'})" type="primary">新增反馈记录</el-button>

src/components/byh/RiskLevelList.vue

@@ -15,10 +15,11 @@
           </el-select>
         </el-form-item>
         <el-form-item label="选择时间">
+          <!-- 'datetimerange' -->
           <el-date-picker
               clearable
               v-model="form.time"
-              type="datetimerange"
+              type="daterange"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               value-format="yyyy-MM-dd HH:mm:ss"
@@ -145,8 +146,9 @@ export default {
     onSubmit() {
       const {time} = this.form;
       if (time) {
-        this.form.startDate = time[0];
-        this.form.endDate = time[1];
+        
+        this.form.startDate = new Date(time[0]);
+        this.form.endDate = new Date(time[1]);
       } else {
         this.form.startDate = '';
         this.form.endDate = '';

src/components/byh/componments/ApplyInfo.vue

@@ -8,7 +8,8 @@
         <td>放款日期:</td>
         <td>{{ loanModel.raiseDate | dateFilter }}</td>
         <td>项目名称:</td>
-        <td>{{ loanModel.bizTypeStr }}</td>
+        <td>{{ loanModel.productName }}</td>
+        <!-- <el-table-column align="center" prop="productName" label="产品名称" :formatter="productNameFormat"></el-table-column> -->
       </tr>
       <tr>
         <td>总应还金额:</td>
@@ -76,12 +77,21 @@ export default {
       console.log(this.params,'哈哈');
       const {applyVo} = this.params;
       this.loanModel = applyVo
+      this.productNameFormat(this.loanModel.productName)
     }
   },
+ 
   methods: {
     headerStyle() {
       return "tableHeaderStyle";
+    },
+     //产品名称
+   productNameFormat: function (row) {
+     if(this.loanModel!=null){
+       this.loanModel.productName=this.$enumUtils.toMsg('BusinessType', row)
      }
+      
+    },
   }
 }
 </script>

src/components/byh/componments/LoanInfo.vue

@@ -72,8 +72,9 @@ export default {
     }
   },
   async created() {
-    const {clientNo} = this.params;
-    const res = await this.$$post('/loan/getLoanListByClientNo/' + clientNo);
+    console.log(this.params,999);
+    const {clientNo,clientProductName} = this.params;
+    const res = await this.$$post('/loan/getLoanListByClientNo/',{productName:clientProductName,clientNo:clientNo});
     const {success, result} = res.data;
     if (success && result !== null) {
       this.data = result;

src/components/byh/componments/RePayList.vue

@@ -72,6 +72,7 @@ export default {
         total: 1,
         current: 1,
         size: 10,
+        // result:''
       },
       updateQueDialog: {
         visible: false,
@@ -83,7 +84,8 @@ export default {
         creater: '',
         finishContent: '',
       },
-      data: []
+      data: [],
+      backValue:null
     }
   },
   async created() {
@@ -100,7 +102,14 @@ export default {
       return "tableHeaderStyle";
     },
     async init() {
-      const res = await this.$$post('/back/detailPageList', this.form);
+      const parB={
+        bizNo: this.form.bizNo,
+        current: this.form.current,
+        size: this.form.size,
+        total: this.form.total,
+        result:this.backValue
+      }
+      const res = await this.$$post('/back/detailPageList', parB );
       const {success, result} = res.data;
       if (success && result !== null) {
         const {data, total} = result
@@ -165,8 +174,8 @@ export default {
       else {
         this.backValue = filters.status[0]
       }
-
-      this.loanBackedData(this.loanNos)
+      this.init();
+      // this.loanBackedData(this.loanNos)
 
     },
   }

src/utils/enumOpt.js

@@ -323,6 +323,8 @@ const enumUtils = {
                         {code: 'AWJ', message: '安稳借'},
                         {code: 'XYF_DAI', message: '信用飞'}
                       
+                                       
+
                     ]
                 };
 
@@ -679,6 +681,9 @@ const enumUtils = {
                         {value: 'YPD_DAI', label: '一品贷'},
                         {value: 'AYSC_DAI', label: '爱用商城-风尚贷'},
                         {value: 'HFD_DAI', label: '会分期'},
+                        {value: 'YYD_DAI', label: '有余贷'},
+                        {value: 'XXH_DAI', label: '心想花'},
+                        {value: 'JINSI_DAI', label: '金丝贷'},
                     ]
                 };