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

src/views/manage/components/PathReview.vue

@@ -172,8 +172,7 @@
                             <div v-for="item in informationlist.childRouteList" :key="item.id">
                                 <div class="zljtitle">
                                     {{ item.routeName }}
-                                    <span v-if="!item.conditionSatisfyStatus"
+                                    <span v-if="!item.conditionSatisfyStatus" style="color: red">(不符合条件)</span>
-                                        style="color: red">(不符合条件)</span>
                                 </div>
                                 <el-table :data="item.nodeList" style="width: 100%">
                                     <el-table-column prop="" label="" width="160">
@@ -443,6 +442,8 @@ export default {
         }
 
         .righttextarea {
+            word-break: break-all;
+            word-wrap: break-word;
             min-height: 80px;
             padding: 10px;
             width: 90%;

src/views/system/ManuallyCreatingTasks/index.vue

@@ -400,11 +400,6 @@ export default {
         phonePushSign: "1",
         phoneDialMethod: "",
       },
-      // updata: {
-      //   suitRange: "",
-      //   routeId: "",
-      //   triggerConditionList: [],
-      // },
       list: [
         {
           routeNodeDay: "",
@@ -427,7 +422,7 @@ export default {
       ],
       listindex: 0,
       // optionstriggerConditionOperator: [], // 将这部分选项的
-      dictDataType: "",
+      // dictDataType: "",
     };
   },
   created() {
@@ -437,12 +432,12 @@ export default {
     this.infolistoptionslistS();
     this.optiononditionOperators();
     this.optiononditionOperator();
-    this.formInline = this.list[0];
     this.updata.signPatientRecordId = this.$route.query.signPatientRecordId;
     this.updata.patientId = this.$route.query.patientId;
     this.updata.patientName = this.$route.query.patientName;
     this.updata.departmentId = this.$route.query.departmentId;
     this.updata.departmentName = this.$route.query.departmentName;
+    this.formInline = this.list[0];
   },
   mounted() {
     this.getMaxTableHeight()
@@ -562,24 +557,17 @@ export default {
       var dictType = "text_message_remind";
       getAgencytype(dictType).then((res) => {
         this.optionslist = res.data;
-        // this.taskinfo();
       });
     },
     infolistMESSAGE() {
       var dictType = "redial_times";
       getAgencytype(dictType).then((res) => {
         this.optionslisttime = res.data;
-        // this.taskinfo();
       });
     },
     changeoptions(e) {
-      this.parentDictCode = this.options.find(
+      let parentDictCode = this.options.find((el) => el.dictValue == e).dictCode;
-        (el) => el.dictValue == e
+      list(parentDictCode).then((res) => {
-      ).dictCode;
-      this.changelisy();
-    },
-    changelisy() {
-      list(this.parentDictCode).then((res) => {
         this.parentDictCodelist = res.rows;
       });
     },
@@ -661,20 +649,12 @@ export default {
       this.formInline = item;
       this.listindex = index;
     },
-    additem(item) {
+    additem() {
-      if (this.parentDictCode) {
+      let routeNodeName = this.parentDictCodelist.length > 0 ? this.parentDictCodelist[0].dictValue : ""
-        list(this.parentDictCode).then((res) => {
-          res.rows.forEach((e) => {
-            this.list.forEach((el) => {
-              el.routeNodeName = e.dictValue;
-            });
-          });
-        });
-      }
       this.list.push({
         routeNodeDay: "",
         taskNodeType: "",
-        routeNodeName: "",
+        routeNodeName: routeNodeName,
         // questionExpirationDate: 7,
         questionInfoId: "",
         questionnaireName: "",
@@ -695,7 +675,6 @@ export default {
     },
     changephoneDialMethod(e) {
       if (e == 'AI') {
-        // this.form.templateId=''
         this.formInline.phoneId = ''
         this.formInline.phoneTemplateName = ''
       } else if (e == 'COMMON') {