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

src/views/system/followup/index.vue

@@ -793,7 +793,7 @@ export default {
 
           visitRecordId:row.visitRecordId,
           taskExecuteRecordId:row.taskExecuteRecordId,
-          routeHandleRemark:row.routeHandleRemark,
+          routeHandleRemark:row.routeHandleRemark?row.routeHandleRemark:null,
         },
       });
       console.log(row)

src/views/system/followupdetails/index.vue

@@ -70,6 +70,7 @@
               >
                 <el-form-item label="任务处理信息" prop="routeHandleRemark">
                   <el-input
+                  disabled
                     type="textarea"
                     placeholder="请输入任务处理信息"
                     v-model="questiondata.routeHandleRemark"
@@ -156,6 +157,7 @@
                 class="custom-radio-group"
               >
                 <el-radio
+                disabled
                   class="custom"
                   v-for="(aitem, aindex) in item.optionResults"
                   :key="aindex"
@@ -173,6 +175,7 @@
                 "
               >
                 <el-checkbox
+                disabled
                   v-for="(aitem, aindex) in item.optionResults"
                   :key="aindex"
                   :label="aitem.id"
@@ -189,6 +192,8 @@
                 class="tk"
               >
                 <el-input
+                disabled
+
                   v-model="item.fillBlanksAnswer"
                   placeholder="请输入答案"
                   type="textarea"
@@ -201,6 +206,8 @@
                 style="margin: 20px 0 10px 30px"
               >
                 <el-date-picker
+                disabled
+
                   @change="timepicker($event, index)"
                   clearable
                   v-model="item.fillBlanksAnswer"
@@ -216,6 +223,7 @@
                 v-if="item.questionType == 'TIME_BLANKS_SUBJECT'"
               >
                 <el-time-select
+                disabled
                   @change="timepickerselect($event, index)"
                   clearable
                   v-model="item.fillBlanksAnswer"
@@ -300,6 +308,7 @@
         type: '',
         checkeddata: [],
         questiondata: {
+            // routeHandleRemark:null,
           totalScore: 0,  //总分
           routeHandlePerson: null,
           routeHandleId: null,
@@ -312,6 +321,9 @@
       this.info();
       if (this.$route.query.taskType == 'QUESTIONNAIRE_SCALE' || this.$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP') {
         this.selectlist();
+
+        console.log(this.$route.query.routeHandleRemark, "res");
+
       } else {
         getScript(this.$route.query.templateId).then(response => {
           if (response.data) {
@@ -322,18 +334,15 @@
     },
     methods: {
             // 问卷和随访
-    selectlist() {
+            selectlist() {
       selectPatientQuestionSubmit(this.$route.query.taskExecuteRecordId).then((res) => {
-        console.log(res, "res");
         this.questiondata = res.data;
         if (this.$route.query.routeHandleRemark) {
           this.questiondata.routeHandleRemark =
             this.$route.query.routeHandleRemark;
         }
-
         this.questiondata.subjectResultList.forEach((e) => {
           e.optionResults.forEach((el) => {
-            // console.log(el, "el");
             if (
               (el.optionChooseSign == "0" &&
                 e.questionType == "MULTIPLE_CHOICE") ||
@@ -341,9 +350,8 @@
             ) {
               e.checked = el.id;
             } else if (
-              (el.optionChooseSign == "0" &&
-                e.questionType == "MULTIPLE_CHOICE_QUESTIONS") ||
-              e.questionType == "COMBINATION_MULTIPLE_SUBJECT"
+              el.optionChooseSign == "0" &&
+              e.questionType == "MULTIPLE_CHOICE_QUESTIONS"
             ) {
               this.checkeddata.push(el.id);
             } else if (
@@ -351,6 +359,11 @@
               e.questionType == "SCORING_QUESTIONS"
             ) {
               e.checked = el.id;
+            } else if (
+              e.questionType == "COMBINATION_MULTIPLE_SUBJECT" &&
+              el.optionChooseSign == "0"
+            ) {
+              this.checkeddata.push(el.id);
             }
           });
         });
@@ -364,7 +377,6 @@
       timepickerselect(e, index) {
         this.questiondata.subjectResultList[index].fillBlanksAnswer = e
       },
-
       // 选中某个单选框时，由radio时触发
       radioChange(e, item, index) {
         console.log(e, item, index, '选中某个单选框时')