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

src/views/system/followupdetails/index.vue

@@ -273,6 +273,15 @@
                     placeholder="请输入话术简介"
                   />
                 </el-form-item>
+                <br />
+                <el-form-item label="任务处理信息" prop="routeHandleRemark">
+                <el-input
+                  disabled
+                  type="textarea"
+                  v-model="questiondata.routeHandleRemark"
+                  placeholder="请输入任务处理信息"
+                />
+              </el-form-item>
               </el-form>
             </div>
           </div>

src/views/system/record/record.vue

@@ -362,6 +362,14 @@
                   placeholder="请输入话术简介"
                 />
               </el-form-item>
+              <el-form-item label="任务处理信息" prop="routeHandleRemark">
+                <el-input
+                  type="textarea"
+                  disabled
+                  placeholder="请输入任务处理信息"
+                  v-model="formlist.routeHandleRemark"
+                />
+              </el-form-item>
             </el-form>
           </div>
         </div>
@@ -435,6 +443,10 @@ export default {
     if (this.$route.query.textRemindContent) {
       this.formlists.textRemindContent = this.$route.query.textRemindContent;
     }
+    if(  this.$route.query.routeHandleRemark){
+      this.formlist.routeHandleRemark =
+            this.$route.query.routeHandleRemark;
+    }
     // 文章末班
     if (this.$route.query.taskType == "PROPAGANDA_ARTICLE") {
       this.getPropagandaLIST();
@@ -472,6 +484,8 @@ export default {
         if (this.$route.query.routeHandleRemark) {
           this.questiondata.routeHandleRemark =
             this.$route.query.routeHandleRemark;
+          
+            
         }
 
         this.questiondata.subjectResultList.forEach((e) => {