Merge branch 'main' into 'stg'

Main

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

src/filters/index.js

@@ -139,7 +139,7 @@ let formaDate = (value, fmt)  => {
 
 let secondsToMinutes = (value)  => {
 
-    if(value == 0 || value == ''|| value == null){return ''}
+    if(value == 0 || value == ''|| value == null){return '0秒'}
     const minutes = Math.floor(value / 60);
     const seconds = value % 60;
     if(minutes > 0)

src/pages/case-management/components/CalllogDialog.vue

@@ -33,7 +33,7 @@
                     </el-table-column>
                     <el-table-column label="沟通时长" show-overflow-tooltip >
                         <template slot-scope="scope">
-                            <span v-if="scope.linkedType == 1">通话{{scope.linkedDuration}}秒</span>
+                            <span v-if="scope.row.linkedType == 1">通话{{itemrecord.linkedDuration | secondsToMinutes}}</span>
                         </template>
                     </el-table-column>
                     <el-table-column prop="mediator" label="操作人" show-overflow-tooltip ></el-table-column>

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

@@ -335,7 +335,7 @@
             <el-table :data="fileList" :height="300">
               <el-table-column type="index" label="序号" width="55"></el-table-column>
               <el-table-column prop="materialType" label="材料类型" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="name" label="文件名称" show-overflow-tooltip></el-table-column>
+              <!-- <el-table-column prop="name" label="文件名称" show-overflow-tooltip></el-table-column> -->
               <el-table-column prop="createBy" label="上传人" show-overflow-tooltip></el-table-column>
               <el-table-column label="上传时间" show-overflow-tooltip>
                 <template slot-scope="scope">
@@ -381,9 +381,9 @@
                 </template>
               </el-table-column>
               <el-table-column prop="handleBy" label="操作人" show-overflow-tooltip></el-table-column>
-              <el-table-column label="操作时间" show-overflow-tooltip >
+              <el-table-column label="操作时间" width="230" >
                   <template slot-scope="scope">
-                      <span >{{ scope.row.handleTime | formaDate("yyyy-MM-dd hh:mm:ss") }}</span>
+                      <span style="width: 100%;display: block;">{{ scope.row.handleTime | formaDate("yyyy-MM-dd hh:mm:ss") }}</span>
                   </template>
               </el-table-column>
               
@@ -466,7 +466,7 @@ export default {
         H: ''
       }],
       caseId: '',
-      baseInfo: {},
+      baseInfo: {debtorEntityList:[],casePkg:{}},
       fileList: [],
       fileType: [{label: '身份证件', value: 1}, {label: '金融许可证', value: 2}, {
         label: '营业执照',
@@ -510,8 +510,7 @@ export default {
     if (this.$route.query.caseId != undefined) {
       this.caseId = this.$route.query.caseId;
       this.getCaseInfoById();//获取详情
-      this.getmediate_record()
-      this.getCaseLogsList()
+      
     }
   },
   methods: {
@@ -588,16 +587,18 @@ export default {
           } else {
             this.caseId = res.id.toString()
           }
+
+          this.getmediate_record()
+          this.getCaseLogsList()
+
+          this.getCoobligation()
+          this.getFileCaseList()
+          this.getLitigantByCaseId()
+          this.getplanlist()
+          this.getProofList()
+          this.getWritCaseList()
         }
-
       })
-      this.getCoobligation()
-      this.getFileCaseList()
-      this.getLitigantByCaseId()
-      this.getplanlist()
-      this.getProofList()
-      this.getWritCaseList()
-      
     },
 
     // 共债数据
@@ -667,7 +668,12 @@ export default {
     // 还款凭证
     getProofList() {
       this.ProofList = []
-      api.gettraceProof_list({caseId: this.caseId}).then(res => {
+      let data_json = {caseId: this.caseId} 
+      if(this.baseInfo.jointDebt == 1){
+        data_json ={mainCaseId: this.baseInfo.mainCaseId} 
+      }
+
+      api.gettraceProof_list(data_json).then(res => {
         if (!res.code) {
           res.forEach(item =>{
             if(item.status.code == 2){ this.ProofList.push(item)}

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

@@ -457,6 +457,8 @@ export default {
 
     this.mediaterecordpm.caseId = this.caseId
     this.eventDialog.caseId = this.caseId
+    this.eventDialog.jointDebt = this.thisCaseInfo.jointDebt
+    this.eventDialog.mainCaseId = this.thisCaseInfo.mainCaseId
     
     this.getCaseInfoById();//获取详情
     this.getAgentList()

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

@@ -632,7 +632,7 @@ export default {
       }
 
       let resultmsg = '成功'
-      if(resultStatus == 4){resultmsg = '失败'}
+      if(resultStatus == 6){resultmsg = '失败'}
       this.$confirm("请确定是否将案件标记为"+resultmsg+"?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",

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

@@ -235,7 +235,12 @@ import api from "@/services/caseManagement";
                 })
             },
             getProofList(){
-                api.gettraceProof_list({caseId:this.eventDialog.caseId}).then(async res => {
+                let data_json = {caseId: this.eventDialog.caseId} 
+                if(this.eventDialog.jointDebt == 1){
+                    data_json ={mainCaseId: this.eventDialog.mainCaseId} 
+                }
+
+                api.gettraceProof_list(data_json).then(async res => {
                      if(!res.code){
                         await this.getpreviewfull(res)
                      }