Merge branch 'main' into 'stg'

修改bug

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

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

@@ -96,7 +96,7 @@
                   v-model="singlesmsvisible"
                   title="发送短信"
                   trigger="click">
-                  <singlesmsPopover :caseId="caseId" :sendPhone="(baseInfo.debtorEntityList.find(item => item.role == 'DEBTOR')).phone" :singlesmsvisible.sync="singlesmsvisible"/>
+                  <singlesmsPopover :caseId="caseId" :sendPhone="[(baseInfo.debtorEntityList.find(item => item.role == 'DEBTOR')).phone]" :singlesmsvisible.sync="singlesmsvisible"/>
                   <span slot="reference" class="flex-row align-items-center cursor-pointer">
                     <div class="f32 color-FF7D00 mr-8"><i class="el-icon-message"></i></div>
                         <div>发送短信</div>
@@ -398,7 +398,7 @@ export default {
       AgentData:[],
       fileList: [],
       mediationRecord: [],//调解记录
-      baseInfo: {},//基本信息
+      baseInfo: {casePkg:{}},//基本信息
       obligorInfo: [],//债务人信息
       communicationRecord: [],
 

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

@@ -25,7 +25,7 @@
               v-model="singlesmsvisible"
               title="发送短信"
               trigger="click">
-              <singlesmsPopover :caseId="caseId" :sendPhone="(baseInfo.debtorEntityList.find(item => item.role == 'DEBTOR')).phone" :singlesmsvisible.sync="singlesmsvisible"/>
+              <singlesmsPopover :caseId="caseId" :sendPhone="sendPhones" :singlesmsvisible.sync="singlesmsvisible"/>
               <el-button slot="reference" type="warning" icon="el-icon-message" circle></el-button>
           </el-popover>
           
@@ -274,6 +274,7 @@ export default {
       eventDialog: {caseId: ''},
       leftActive: 1,
       rightActive: 1,
+      sendPhones:[],
       mediationRecord: [],//调解记录
       baseInfo: {},//基本信息
       obligorInfo: [],//债务人信息
@@ -491,6 +492,16 @@ export default {
           this.baseInfo = res
           this.phoneNumber = res.debtorEntityList.find(item => item.role == 'DEBTOR').phone
           this.contactId = res.debtorEntityList.find(item => item.role == 'DEBTOR').id
+
+          if(this.baseInfo.debtorEntityList !=undefined)
+          {
+            this.baseInfo.debtorEntityList.forEach(item =>{
+              if(item.role == 'DEBTOR'){
+                this.sendPhones.push(item.phone)
+              }
+            })
+          }
+
           if(res.jointDebt == 1){
             // 有共债 mainCaseId
             this.caseId = res.mainCaseId.toString()

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

@@ -37,16 +37,15 @@
           <el-popover v-if="item.role == 'DEBTOR' &&  item.type =='本人'"
               placement="top"
               width="500"
-              v-model="singlesmsvisible"
+              v-model="item.singlesmsvisible"
               title="发送短信"
               trigger="click">
-              <singlesmsPopover :caseId="caseId" :sendPhone="item.phone" :singlesmsvisible.sync="singlesmsvisible"/>
+              <singlesmsPopover :caseId="caseId" :sendPhone="[item.phone]" :singlesmsvisible.sync="item.singlesmsvisible"/>
               <span slot="reference" class="ml-8 cursor-pointer">
                 <i class="el-icon-message"></i> 短信
               </span>
           </el-popover>
-
+          
-          <!-- <a class="ml-8 cursor-pointer" v-if="item.role == 'DEBTOR' &&  item.type =='本人'"><i class="el-icon-message"></i> 短信</a> -->
         </div>
       </div>
     </el-card>
@@ -72,7 +71,6 @@ export default {
   },
   data() {
     return {
-      singlesmsvisible:false,
       personnelType: ['被申请人', '申请人', '申请人代理人'],
       personnelTypeActive: '被申请人',
       // 联系人
@@ -110,7 +108,8 @@ export default {
             let surname = item.name.split('')[0];
             return {
               ...item,
-              surname: surname
+              surname: surname,
+              singlesmsvisible:false
             }
           });
           this.total = res.total;

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

@@ -156,7 +156,7 @@ import api from "@/services/caseManagement";
   .officelist {
     background-color: rgba(236, 238, 241, 0.8196078431);
     padding: 20px 20px;
-
+    height: 220px;
     .el-checkbox {
       width: 180px;
       margin: 10px;

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

@@ -46,8 +46,8 @@ import caseManagement from "@/services/caseManagement";
                 default: () => {},
             },
             sendPhone: {
-                type: String,
+                type: Array,
-                default: () => {},
+                default: () => {return []},
             },
         },
         data() {
@@ -88,7 +88,7 @@ import caseManagement from "@/services/caseManagement";
                 }
                 if(!this.$clickThrottle()) { return }//防止重复点击
                 let caseIdList = [this.caseId];
-                caseManagement.smsBatchSend({...this.ObjectInfo, caseIdList: caseIdList,phones:[this.sendPhone]}).then(res => {
+                caseManagement.smsBatchSend({...this.ObjectInfo, caseIdList: caseIdList,phones:this.sendPhone}).then(res => {
                     this.$message.success("发起短信成功");
                     this.handleClose()
                     this.$parent.getWritCaseList()