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

src/HDrpManagement/projectChange/modules/modules/stageTask/modules/edit.vue

@@ -58,7 +58,7 @@
               <span>{{item.enterprisename}}</span>
               <div style="width: 100%">
 <!--                <el-radio v-model="item.partiestype" :label=item.optionname>{{item.optionname + item.remarks}}</el-radio>-->
-                <el-radio-group v-model="item.checkedscore" v-for="(radio,index) in item.option" :key="index" @change="radioChange">
+                <el-radio-group v-model="item.checkedscore" v-for="(radio,index) in item.option" :key="index" @change="radioChange(item,radio)">
                   <el-radio :label="radio">{{radio.optionname + radio.remarks}}</el-radio>
                 </el-radio-group>
               </div>
@@ -171,11 +171,15 @@ export default {
         this.selectData[index] = item.sa_project_partiesid
       })
     },
-    radioChange(val){
+    radioChange(item,radio){
+      this.radioSelect = this.radioSelect.filter(e=>{
+        return e.sa_project_partiesid !== item.sa_project_partiesid
+      })
+
       this.radioSelect.push({
-        "sa_projtaskmag_optionsid": val.sa_projtaskmag_optionsid,
-        "sa_project_partiesid": 0,
-        "score":val.score
+        "sa_projtaskmag_optionsid": radio.sa_projtaskmag_optionsid,
+        "sa_project_partiesid": item.sa_project_partiesid,
+        "score":radio.score
       })
       console.log(this.radioSelect,"获取单选结果1")
     },

src/components/normal-basic-layout/details/index.vue

@@ -36,8 +36,12 @@
           <slot name="custom"></slot>
         </el-col>
         <el-col style="width:400px;" :span="6">
-          <group v-if="activeApp.isdatateam" ref="group" style="margin-bottom:10px" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess"></group>
-          <follow-up v-if="activeApp.isdatafollowup" ref="follow" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)"></follow-up>
+          <group v-if="activeApp.isdatateam" ref="group" style="margin-bottom:10px" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess">
+            <el-button slot="collapse" type="text" icon="el-icon-s-unfold" class="inline-16"></el-button>
+          </group>
+          <follow-up v-if="activeApp.isdatafollowup" ref="follow" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)">
+            <el-button slot="collapse" type="text" icon="el-icon-s-unfold" class="inline-16"></el-button>
+          </follow-up>
         </el-col>
         
       </el-row>

src/components/normal-basic-layout/details/modules/followUp/followUp.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="normal-panel follow__panel">
     <div class="container flex-align-center flex-between">
-      <p>跟进动态</p>
+      <div>
+        <slot name="collapse"></slot>
+        <p class="inline-16">跟进动态</p>
+      </div>
       <addLog :ownertable="ownertable" @onSuccess="queryLogs"></addLog>
     </div>
     <div  class="container">

src/components/normal-basic-layout/details/modules/group/group.vue

@@ -1,8 +1,11 @@
 <template>
 <div class="normal-panel">
   <div  v-for="item in list" :key="item.index" class="normal-panel">
-    <div class="flex-align-center" style="border-bottom:1px solid #f1f2f3;padding:0 10px">
-      <p style="flex:1;padding:10px 0;color:#999">负责人</p>
+    <div class="flex-align-center flex-between" style="border-bottom:1px solid #f1f2f3;padding:0 10px">
+      <div>
+        <slot name="collapse"></slot>
+        <p style="display:inline;flex:1;padding:10px 0;color:#999">负责人</p>
+      </div>
       <el-popover
         placement="right"
         trigger="manual"