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

src/views/manage/propaganda/index.vue

@@ -438,6 +438,7 @@
         </el-form-item>
         <el-form-item label="添加封面" prop="propagandaCoverPath">
           <stationAcatar
+          v-if="open"
             @imgUrl="imgUrl"
             :img="form.propagandaCoverPath"
             :type="'propagandaCoverUrl'"

src/views/system/followup/index.vue

@@ -333,7 +333,7 @@
             size="mini"
             type="text"
             icon="el-icon-notebook-2"
-            @click="handledatail(scope.row)"
+            @click="handleUpdate(scope.row)"
             >详情</el-button
           >
         </template>
@@ -771,6 +771,7 @@ export default {
           age: row.birthDate ? getAge(row.birthDate) : "",
           manageRouteId: row.manageRouteId,
           manageRouteNodeId: row.manageRouteNodeId,
+          visitRecordId:row.visitRecordId,
 
           departmentId: row.departmentId,
           departmentName: row.departmentName,

src/views/system/followupsee/index.vue

@@ -340,7 +340,7 @@ export default {
       this.questiondata.questionSubjectList[index].optionAnswer = e
 
     },
-    // 时间填空题 
+    // 时间填空题
     timepickerselect(e, index) {
       this.questiondata.questionSubjectList[index].optionAnswer = e
     },
@@ -388,6 +388,7 @@ export default {
         this.questiondata.manageRouteName = this.$route.query.manageRouteName
         this.questiondata.manageRouteNodeName = this.$route.query.manageRouteNodeName
         this.questiondata.taskType = this.$route.query.taskType
+        this.questiondata.visitRecordId=this.$route.query.visitRecordId
         this.questiondata.totalScore = 0
         this.questiondata.questionSubjectList.forEach(e => {
           if (e.questionType == 'MULTIPLE_CHOICE' || e.questionType == 'MULTIPLE_CHOICE_QUESTIONS' || e.questionType == 'SCORING_QUESTIONS' || e.questionType == 'COMBINATION_RADIO_SUBJECT' || e.questionType == 'COMBINATION_MULTIPLE_SUBJECT' || e.questionType == 'COMBINATION_SCORING_SUBJECT') {