Merge branch 'main' into 'stg'

修改bug

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

src/assets/style/common.scss

@@ -759,9 +759,9 @@ html{
 
 //=================== start::提示框置顶 ===============================
 .el-message.el-message--warning{z-index: 9999 !important;}
-.el-message.el-message--error.is-closable{z-index: 9999 !important;}
+.el-message.el-message--error,.el-message.el-message--error.is-closable{z-index: 9999 !important;}
-.el-message.el-message--warning.is-closable{z-index: 9999 !important;}
+.el-message.el-message--warning,.is-closable{z-index: 9999 !important;}
-.el-message.el-message--success.is-closable{z-index: 9999 !important;}
+.el-message.el-message--success,.el-message.el-message--success.is-closable{z-index: 9999 !important;}
 .el-loading-mask.is-fullscreen{z-index: 9999 !important;}
 .el-loading-mask{z-index: 3000 !important;}
 //=================== end::提示框置顶 ===============================

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

@@ -104,6 +104,7 @@ import api from "@/services/caseManagement";
                         this.Effectobj.proofUrl =undefined
                         api.gettraceProof_valid(this.Effectobj).then(res => {
                             if(!res.code){
+                                this.handleClose()
                                 this.$parent.getProofList(1)
                             }
                         })

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

@@ -57,6 +57,33 @@
               <span><a>联系人手机：</a><a>{{item.phone}}</a></span>
             </div>
           </div>
+
+          <div v-if="baseInfo.jointDebt == 1" class="case-detail-label f-weight500 f16">
+            共债信息
+            <span style="font-weight:400;font-size: 14px;">
+              (当前债务人名下共有{{coobligationInfo.caseNum}}笔债务，
+              逾期总金额：<a class="color-F53F3F" style="margin-left: 0px;">{{coobligationInfo.totalAmount}}</a>元，
+              最低还款总金额：<a class="color-F53F3F" style="margin-left: 0px;">{{coobligationInfo.minTotalAmount}}</a>元)
+            </span>
+          </div>
+          
+          <div>
+            <div class="case-detail-des flex-column" v-for="(item,index) in coobligationInfo.caseList" :key="index">
+                <span><a>案件包名称：</a><a>{{item.casePkg}}</a></span>
+                <span><a>金融产品名称：</a><a>{{item.productTypeId}}</a></span>
+                <span><a>金融机构名称：</a><a>{{item.financialOrgName}}</a></span>
+                <span><a>案件编号：</a><a>{{item.caseNo}}</a></span>
+                <span><a>合同名称：</a><a>{{item.fields.find(item => item.fieldKey == 'contactName').fieldValue}}</a></span>
+                <span><a>当前逾期金额：</a><a>{{item.fields.find(item => item.fieldKey == 'moneyAmount').fieldValue}}</a></span>
+                <span><a>最低还款金额：</a><a>{{item.fields.find(item => item.fieldKey == 'limitLine').fieldValue}}</a></span>
+            </div>
+            <!-- <div class="case-detail-des flex-column">
+                <span><a>姓名：</a><a></a></span>
+                <span><a>与债务人关系：</a><a></a></span>
+                <span><a>联系人手机：</a><a></a></span>
+            </div> -->
+          </div>
+
           <div class="case-detail-label f-weight500 f16">案件办理信息</div>
           <div>
             <el-tabs type="border-card">
@@ -220,7 +247,7 @@
               <el-tab-pane>
                 <span slot="label"><i v-if="ProofList.length > 0" class="el-icon-s-flag"></i> 回款凭证</span>
                 <span
-                    class="f16">总计待还金额：{{ ProofStatistics.total || 0 }}元，总计已还金额：{{ ProofStatistics.payback || 0 }}元</span>
+                    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 label="凭证时间" show-overflow-tooltip>
@@ -471,7 +498,8 @@ export default {
       // 文书列表
       OfficeList:[],
       communicationRecord: [],
-      communicationLogRecord:[]
+      communicationLogRecord:[],
+      coobligationInfo:{},
     }
   },
   computed: {
@@ -556,18 +584,36 @@ export default {
     // 获取详情
     getCaseInfoById() {
       api.getCaseInfoById(this.caseId).then(res => {
-        console.log(res, 'res')
         if (!res.code) {
           this.baseInfo = res
+
+          if(res.jointDebt == 1){
+            // 有共债 mainCaseId
+            this.caseId = res.mainCaseId.toString()
+          } else {
+            this.caseId = res.id.toString()
+          }
         }
 
       })
+      this.getCoobligation()
       this.getFileCaseList()
       this.getLitigantByCaseId()
       this.getplanlist()
       this.getProofList()
       this.getWritCaseList()
+      
     },
+
+    // 共债数据
+    getCoobligation() {
+      api.mediate_coobligation_list({id:this.caseId}).then(res => {
+        if (!res.code) {
+          this.coobligationInfo = res
+        }
+      })
+    },
+
     // 获取证据材料
     getFileCaseList() {
       cmapi.getCaseFileList({caseId:this.caseId}).then(res => {

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

@@ -32,6 +32,7 @@
 </template>
 <script>
 import api from "@/services/caseManagement";
+import smapi from "@/services/systemManage";
     export default {
         components: {
         },
@@ -67,9 +68,14 @@ import api from "@/services/caseManagement";
         methods: {
             // 列表数据
             getuserList() {
-                api.getCurrGroupUserList().then(res => {
+                // api.getCurrGroupUserList().then(res => {
+                //     if (!res.code) {
+                //         this.operateMethodOptions = res
+                //     }
+                // })
+                smapi.getUserList({current:1,size:500,type:2}).then(res => {
                     if (!res.code) {
-                        this.operateMethodOptions = res
+                        this.operateMethodOptions = res.records
                     }
                 })
             },

src/pages/workbench/index.vue

@@ -761,7 +761,8 @@
     }
    
     .item-trace{
-        padding: 18px;
+        padding: 14px 18px;
+        height:575px ;
         background-color: #fff;
         border-radius: 8px;
         .case-pk-title{