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

src/views/system/record/record.vue

@@ -404,7 +404,7 @@ export default {
   data() {
     return {
       checkeddata: [],
-      formlists: [],
+      formlists: {},
       baseUrl: process.env.VUE_APP_BASE_API,
       radio: "1",
       activeName: "first",
@@ -430,6 +430,9 @@ export default {
   created() {
     console.log(this.$route.query);
     this.info();
+    if (this.$route.query.textRemindContent) {
+      this.formlists.textRemindContent = this.$route.query.textRemindContent;
+    }
     // 文章末班
     if (this.$route.query.taskType == "PROPAGANDA_ARTICLE") {
       this.getPropagandaLIST();
@@ -468,10 +471,6 @@ export default {
           this.questiondata.routeHandleRemark =
             this.$route.query.routeHandleRemark;
         }
-        if (this.$route.query.textRemindContent) {
-          this.formlists.textRemindContent =
-            this.$route.query.textRemindContent;
-        }
 
         this.questiondata.subjectResultList.forEach((e) => {
           e.optionResults.forEach((el) => {

src/views/system/taskExecuteRecord/index.vue

@@ -167,36 +167,36 @@
       <el-table-column label="手术名称" align="center" prop="patientName" /> -->
       <el-table-column label="执行人姓名" align="center" prop="executePerson" />
       <el-table-column
-        label="签约患者管理路径节点名称"
+        label="管理路径节点名称"
         align="center"
         prop="manageRouteNodeName"
-      />
-      <el-table-column
-        label="签约患者管理任务名称"
-        align="center"
-        prop="manageRouteName"
       >
-      <template slot-scope="scope">
+        <template slot-scope="scope">
           <span
-            >{{ scope.row.manageRouteName == "AFTER_DISCHARGE" ? "出院后" : "" }}
-            {{
-              scope.row.manageRouteName == "AFTER_ADMISSION" ? "入院后" : ""
+            >{{
+              scope.row.manageRouteName == "AFTER_DISCHARGE" ? "出院后" : ""
             }}
+            {{ scope.row.manageRouteName == "AFTER_ADMISSION" ? "入院后" : "" }}
             {{
               scope.row.manageRouteName == "AFTER_CONSULTATION" ? "就诊后" : ""
             }}
 
-            {{ scope.row.manageRouteName == "AFTER_VISIT_DISCHARGE" ? "就诊/出院后" : "" }}
             {{
-              scope.row.manageRouteName == "PREOPERATIVE" ? "术前" : ""
-            }}
-               {{
-              scope.row.manageRouteName == "POSTOPERATIVE" ? "术后" : ""
+              scope.row.manageRouteName == "AFTER_VISIT_DISCHARGE"
+                ? "就诊/出院后"
+                : ""
             }}
+            {{ scope.row.manageRouteName == "PREOPERATIVE" ? "术前" : "" }}
+            {{ scope.row.manageRouteName == "POSTOPERATIVE" ? "术后" : "" }}
           </span>
         </template>
-        </el-table-column
+      </el-table-column>
+      <el-table-column
+        label="管理任务名称"
+        align="center"
+        prop="manageRouteName"
       >
+      </el-table-column>
       <el-table-column
         label="入院时间"
         align="center"
@@ -236,7 +236,6 @@
           <span>{{ parseTime(scope.row.executeTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
- 
 
       <el-table-column label="任务内容" align="center" prop="taskContent">
         <template slot-scope="scope">
@@ -256,7 +255,7 @@
           </span>
         </template></el-table-column
       >
-    
+
       <!-- <el-table-column label="执行人姓名，手动执行时记录" align="center" prop="executePerson" /> -->
       <!-- <el-table-column label="任务执行方式，人工执行：MANUAL_EXECUTE，系统自动执行：SYSTEM_AUTOMATIC_EXECUTE" align="center" prop="executeType" /> -->
       <!-- <el-table-column
@@ -442,7 +441,7 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
-        this.getList();
+      this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
@@ -472,14 +471,14 @@ export default {
         query: {
           patientId: row.id,
           taskContent: row.taskContent,
-          taskType:row.taskType,
-          templateId:row.templateId,
+          taskType: row.taskType,
+          templateId: row.templateId,
           cardNo: row.cardNo,
           patientName: row.patientName,
           patientPhone: row.patientPhone,
           sex: row.sex,
-          routeHandleRemark:row.routeHandleRemark,
-          textRemindContent:row.textRemindContent,
+          routeHandleRemark: row.routeHandleRemark,
+          textRemindContent: row.textRemindContent,
           birthDate: row.birthDate,
           familyMemberPhone: row.familyMemberPhone,
           address: row.address,