Merge branch 'main' into 'stg'

Main

See merge request cloud-mediate/mediate-manage-web!16

src/assets/style/common.scss

@@ -752,10 +752,12 @@ html{
 }
 
 //=================== start::提示框置顶 ===============================
+.el-message.el-message--warning{z-index: 3000 !important;}
 .el-message.el-message--error.is-closable{z-index: 3000 !important;}
 .el-message.el-message--warning.is-closable{z-index: 3000 !important;}
 .el-message.el-message--success.is-closable{z-index: 3000 !important;}
 .el-loading-mask.is-fullscreen{z-index: 9999 !important;}
+.el-loading-mask{z-index: 3000 !important;}
 //=================== end::提示框置顶 ===============================
 
 //=================== start::解决Elementui输入框(text)与文本域(textarea)字体不一样问题 ===============================

src/pages/case-management/detail/index.vue

@@ -223,7 +223,12 @@
                     class="f16">总计待还金额：{{ ProofStatistics.total || 0 }}元，总计已还金额：{{ ProofStatistics.payback || 0 }}元</span>
                 <el-table :data="ProofList" :height="300">
                   <el-table-column type="index" label="序号" width="55"></el-table-column>
-                  <el-table-column prop="paybackTime" label="凭证时间" show-overflow-tooltip></el-table-column>
+                  <el-table-column label="凭证时间" show-overflow-tooltip>
+                    <template slot-scope="scope">
+                      {{ scope.row.paybackTime | formaDate('yyyy-MM-dd')}}
+                    </template>
+                  </el-table-column>
+
                   <el-table-column prop="amount" label="凭证金额" show-overflow-tooltip></el-table-column>
                   <el-table-column prop="uploaderName" label="上传者" show-overflow-tooltip></el-table-column>
                   <el-table-column prop="createAt" label="上传时间" show-overflow-tooltip></el-table-column>
@@ -396,6 +401,7 @@
 import api from "@/services/caseManagement";
 import contactPerson from "@/services/contactPerson";
 import cmapi from "@/services/caseMaterial";
+import { forEach } from "lodash";
 
 // import {stubString} from "lodash";
 // import {subtract} from "lodash";
@@ -619,14 +625,17 @@ export default {
     },
     // 还款凭证
     getProofList() {
+      this.ProofList = []
       api.gettraceProof_list({caseId: this.caseId}).then(res => {
         if (!res.code) {
-          this.ProofList = res
+          res.forEach(item =>{
+            if(item.status.code == 2){ this.ProofList.push(item)}
+          })
         }
       })
       api.gettraceProof_statistics({caseId: this.caseId}).then(res => {
         if (!res.code) {
-          console.log(res, '---ProofStatistics')
+          // console.log(res, '---ProofStatistics')
           this.ProofStatistics = res
         }
       })

src/pages/mediation-page/components/LayoutContentNew.vue

@@ -10,31 +10,31 @@
         </span>
         <span class="separation"></span>
 
-        <span class="left-img-info flex-column" :class="leftActive == 1 ?'active':''" @mouseenter="leftActive = 1">
+        <span class="left-img-info flex-column" :class="leftActive == 1 ?'active':''" @mouseenter="handlerMouseenter(1)">
             <img src="../../../assets/image/mediate/m-info1.png"/>
             <a>基本信息</a>
         </span>
-        <span class="left-img-info flex-column" v-if="baseInfo.jointDebt == 1" :class="leftActive == 8 ?'active':''" @mouseenter="leftActive = 8">
+        <span class="left-img-info flex-column" v-if="baseInfo.jointDebt == 1" :class="leftActive == 8 ?'active':''" @mouseenter="handlerMouseenter(8)">
             <img src="../../../assets/image/mediate/m-info8.png"/>
             <a>共债</a>
         </span>
-        <span class="left-img-info flex-column" :class="leftActive == 2 ?'active':''" @mouseenter="leftActive = 2">
+        <span class="left-img-info flex-column" :class="leftActive == 2 ?'active':''" @mouseenter="handlerMouseenter(2)">
             <img src="../../../assets/image/mediate/m-info2.png"/>
             <a>联系人</a>
         </span>
-        <span class="left-img-info flex-column" :class="leftActive == 3 ?'active':''" @mouseenter="leftActive = 3">
+        <span class="left-img-info flex-column" :class="leftActive == 3 ?'active':''" @mouseenter="handlerMouseenter(3)">
             <img src="../../../assets/image/mediate/m-info3.png"/>
             <a>案件材料</a>
         </span>
-        <span class="left-img-info flex-column" :class="leftActive == 4 ?'active':''" @mouseenter="leftActive = 4">
+        <span class="left-img-info flex-column" :class="leftActive == 4 ?'active':''" @mouseenter="handlerMouseenter(4)">
             <img src="../../../assets/image/mediate/m-info4.png"/>
             <a>案件文书</a>
         </span>
-        <span class="left-img-info flex-column" :class="leftActive == 5 ?'active':''" @mouseenter="leftActive = 5">
+        <span class="left-img-info flex-column" :class="leftActive == 5 ?'active':''" @mouseenter="handlerMouseenter(5)">
             <img src="../../../assets/image/mediate/m-info5.png"/>
             <a>还款计划</a>
         </span>
-        <span class="left-img-info flex-column" :class="leftActive == 6 ?'active':''" @mouseenter="leftActive = 6">
+        <span class="left-img-info flex-column" :class="leftActive == 6 ?'active':''" @mouseenter="handlerMouseenter(6)">
             <img src="../../../assets/image/mediate/m-info6.png"/>
             <a>还款凭证</a>
         </span>
@@ -441,11 +441,17 @@ export default {
     this.getmediate_record()
   },
   beforeDestroy() {
+    console.log('销毁')
+    this.singlesmsvisible = false
     // if(this.timer) { //如果定时器还在运行 或者直接关闭，不用判断
     //     clearInterval(this.timer); //关闭
     // }
   },
   methods: {
+    handlerMouseenter(val) {
+      this.leftActive = val
+      if (val !== 1) this.singlesmsvisible = false
+    },
     // 代理人列表数据
     getAgentList() {
       let dataJson = {

src/pages/mediation-page/components/MediationRecordDialog.vue

@@ -136,8 +136,8 @@ export default {
   },
   data() {
     return {
-      CommunicationOptions:[{ label: '继续沟通', value: '4' },{ label: '一次性全部回款', value: '1' },{ label: '全部分期', value: '2' },
+      CommunicationOptions:[{ label: '继续沟通', value: 4 },{ label: '一次性全部回款', value: 1 },{ label: '全部分期', value: 2 },
-      { label: '部分还款', value: '3' },{ label: '拒绝沟通', value: '5' }],
+      { label: '部分还款', value: 3 },{ label: '拒绝沟通', value: 5 }],
       materialTypeOptions: this.$util.getMediationprogress(),
       mrObj: {
         id:'',
@@ -147,7 +147,7 @@ export default {
         linkedType:2,//联系类型：1：线上 2：线下	
         linkedPerson:[],//联系人	
         linkedSituation:0,//联系情况
-        communicationSituation:'4',//沟通情况
+        communicationSituation:4,//沟通情况
         communicationRemarks:'',//沟通备注	
         mediateStatus:'',//调解状态
         linkedTime:'',//联系时间	
@@ -171,7 +171,7 @@ export default {
       this.mrObj.linkedSituation = this.visiblemediatRecordObj.linkedSituation
       if(this.visiblemediatRecordObj.communicationSituation!=null)
       {
-        this.mrObj.communicationSituation = this.visiblemediatRecordObj.communicationSituation.toString()
+        this.mrObj.communicationSituation = this.visiblemediatRecordObj.communicationSituation
       }
       this.mrObj.communicationRemarks = this.visiblemediatRecordObj.communicationRemarks
       this.mrObj.mediateStatus = this.visiblemediatRecordObj.mediateStatus
@@ -182,7 +182,7 @@ export default {
       this.mrObj.callEndTime = this.visiblemediatRecordObj.callEndTime
       this.mrObj.nextFollowDate = this.visiblemediatRecordObj.nextFollowDate
       this.mrObj.linkedPerson = this.visiblemediatRecordObj.linkedPerson
-      console.log(this.visiblemediatRecordObj,'this.visiblemediatRecordObj')
+      // console.log(this.visiblemediatRecordObj,'this.visiblemediatRecordObj')
       this.visiblemediatRecordObj.files.forEach(item =>{  
         this.fileList.push({
           url: item,

src/pages/mediation-page/components/portraitPerson.vue

@@ -6,7 +6,7 @@
           <el-tooltip
               popper-class="custom-tooltip"
               effect="dark"
-              content="XXX"
+              :content="portraitInfo.name+'的人物画像'"
               placement="right">
             <div class="left-tab-icon flex-row justify-content-center align-items-center" @click="rightActive = 1" :class="rightActive == 1 ?'active':''">
               <svg-icon :icon-class="rightActive == 1 ? `hx-1-active` : 'hx-1'" className="tabs-svg" />
@@ -87,7 +87,7 @@
           <div class="hx-1-content" v-if="rightActive == 1">
             <div class="f12 pl-16 pt-16 pb-6">人物画像</div>
             <el-scrollbar :style="'height:'+`${CommunicationcontentHeight}`+'px'">
-              <div class="p-16 personghximg">
+              <div class="p-16" :class="portraitInfo.gender == 'Male' ? 'personghximg':'personghximgw'">
                 <!-- 基本信息  -->
                 <div class="position_info character-info theme-blue">
                   <div class="character-info-title">基本信息</div>
@@ -105,7 +105,7 @@
                   </div>
                   <div class="character-info-details flex-row">
                     <div class="character-info-details-label">居住地</div>
-                    <div class="character-info-details-text">{{ getAddress(portraitInfo.residencePlace) }}  {{portraitInfo.residenceAddress}} </div>
+                    <div class="character-info-details-text">{{ getAddress(portraitInfo.domicilePlace) }}  {{portraitInfo.domicileAddress}} </div>
                   </div>
                   <div class="character-info-details flex-row">
                     <div class="character-info-details-label">经济状况</div>
@@ -248,7 +248,7 @@
                     </span>
                   </div>
                   <div ref="targetRevenue" class="f18 mt-16">经济状况</div>
-                  <div class="f16 mt-16"><a class="dot"></a>经济收入</div>
+                  <div class="f16 mt-16"><a class="dot"></a>经济状况</div>
                   <div class="box-list" >
                     <span v-for="(item,index) in debtorProlabels.filter(item => item.labelGroup == 'REVENUE')" :key="index" @click="portraitObj.economicStatus = item.labelName " :class="portraitObj.economicStatus == item.labelName ? 'active':''">{{item.labelName}}</span>
                   </div>
@@ -480,7 +480,7 @@ export default {
     getAddress(residencePlace){
       if(residencePlace == undefined || residencePlace == null || residencePlace == '')
       {
-        return ''
+        return '请选择省市区(县)'
       }
       let residencePlaceNew = null
       if(!this.isJsonString(residencePlace)){
@@ -651,6 +651,13 @@ export default {
               background-size: 80% auto;
               background-position: top;
             }
+            .personghximgw{
+              background: url('~@/assets/image/VectorWoman.png') no-repeat;
+              height: 100%;
+              display: block;
+              background-size: 67% auto;
+              background-position: top;
+            }
             .character-info{
               width: calc(50% - 5px);
               // border: 1px solid;

src/utils/util.js

@@ -209,7 +209,8 @@ const util = {
                 return require('../assets/image/util/word_img.jpg');
             case 'xls':
             case 'xlsx':
-                return require('../assets/image/util/excel_img.jpg');    
+                return require('../assets/image/util/excel_img.jpg');   
+            case 'mp3': 
             case 'm3u8':
             case 'mp4':
                 return require('../assets/image/util/video_img.jpg');