diff --git a/src/views/system/ManuallyCreatingTasks/index.vue b/src/views/system/ManuallyCreatingTasks/index.vue
index 675152d..f5fc7bb 100644
--- a/src/views/system/ManuallyCreatingTasks/index.vue
+++ b/src/views/system/ManuallyCreatingTasks/index.vue
@@ -5,25 +5,43 @@
         <el-button type="primary" @click="upload">保存</el-button>
       </div>
       <el-descriptions title="手动创建任务"> </el-descriptions>
-      <el-form :inline="true" :model="updata" class="demo-form-inline" ref="updata">
+      <el-form
+        :inline="true"
+        :model="updata"
+        class="demo-form-inline"
+        ref="updata"
+      >
         <el-form-item label="任务名称">
           <el-input v-model="updata.routeName"></el-input>
         </el-form-item>
         <el-form-item label="适用范围">
           <el-select v-model="updata.suitRange" @change="changeoptions">
-            <el-option v-for="item in options" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
+            <el-option
+              v-for="item in options"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+            >
             </el-option>
           </el-select>
         </el-form-item>
       </el-form>
       <div class="chufatitle">
         <span>触发条件</span>
-        <el-button type="primary" plain size="mini" @click="addtriggerCondition">添加触发条件</el-button>
+        <el-button type="primary" plain size="mini" @click="addtriggerCondition"
+          >添加触发条件</el-button
+        >
       </div>
       <el-form ref="updata" :model="updata" label-width="80px">
-        <div class="node" v-for="(item, index) in updata.triggerConditionList" :key="index"
-          :style="updata.triggerConditionList.length > 1 ? '' : 'margin:0'">
-          <div style="display: inline-block; margin-right: 20px; font-size: 14px">
+        <div
+          class="node"
+          v-for="(item, index) in updata.triggerConditionList"
+          :key="index"
+          :style="updata.triggerConditionList.length > 1 ? '' : 'margin:0'"
+        >
+          <div
+            style="display: inline-block; margin-right: 20px; font-size: 14px"
+          >
             触发条件{{ index + 1 }}
           </div>
           <el-select v-model="item.triggerConditionName" style="width: 120px">
@@ -33,14 +51,24 @@
             <el-option label="手术名称" value="SURGICAL_NAME" />
             <el-option label="药品名称" value="DRUG_NAME" />
           </el-select>
-          <el-select v-model="item.triggerConditionOperator" style="width: 100px">
+          <el-select
+            v-model="item.triggerConditionOperator"
+            style="width: 100px"
+          >
             <el-option label="包含" value="CONTAIN" />
             <el-option label="不包含" value="NOT_CONTAIN" />
             <el-option label="等于" value="EQUAL_TO" />
             <el-option label="不等于" value="NOT_EQUAL_TO" />
           </el-select>
-          <el-input v-model="item.triggerConditionValue" style="width: 300px" placeholder="请输入触发条件"></el-input>
-          <i class="el-icon-delete" @click="delitem(item, index, updata.triggerConditionList)"></i>
+          <el-input
+            v-model="item.triggerConditionValue"
+            style="width: 300px"
+            placeholder="请输入触发条件"
+          ></el-input>
+          <i
+            class="el-icon-delete"
+            @click="delitem(item, index, updata.triggerConditionList)"
+          ></i>
         </div>
       </el-form>
     </div>
@@ -51,20 +79,35 @@
           <i class="el-icon-circle-plus-outline" @click="additem"></i>
         </div>
         <el-timeline>
-          <el-timeline-item v-for="(item, index) in list" :key="index" :color="listindex == index ? '#409EFF' : ''"
-            @click.native="clicktimelineitem(item, index)">
+          <el-timeline-item
+            v-for="(item, index) in list"
+            :key="index"
+            :color="listindex == index ? '#409EFF' : ''"
+            @click.native="clicktimelineitem(item, index)"
+          >
             <div class="top">
               <div class="toptop">
                 <el-select style="width: 100px" v-model="item.routeNodeName">
-                  <el-option v-for="item in parentDictCodelist" :key="item.dictValue" :label="item.dictLabel"
-                    :value="item.dictValue">
+                  <el-option
+                    v-for="item in parentDictCodelist"
+                    :key="item.dictValue"
+                    :label="item.dictLabel"
+                    :value="item.dictValue"
+                  >
                   </el-option>
                 </el-select>
-                <el-input style="width: 90px" v-model="item.routeNodeDay" type="number"></el-input>
+                <el-input
+                  style="width: 90px"
+                  v-model="item.routeNodeDay"
+                  type="number"
+                ></el-input>
                 <span>天</span>
               </div>
               <div>
-                <i class="el-icon-delete" @click="delitem(item, index, list)"></i>
+                <i
+                  class="el-icon-delete"
+                  @click="delitem(item, index, list)"
+                ></i>
               </div>
             </div>
             <el-card :class="listindex == index ? 'cards' : ''">
@@ -80,8 +123,10 @@
         </el-timeline>
       </div>
       <div class="nodetexts">
-        <div style="background-color: #fff; border-radius: 10px; padding: 20px"
-          :style="formInline.taskType == 'TEXT_REMIND' ? '' : 'height:160px'">
+        <div
+          style="background-color: #fff; border-radius: 10px; padding: 20px"
+          :style="formInline.taskType == 'TEXT_REMIND' ? '' : 'height:160px'"
+        >
           <el-form :model="formInline" class="demo-form-inline">
             <el-form-item label="任务内容">
               <el-radio-group v-model="formInline.taskType">
@@ -92,57 +137,192 @@
                 <el-radio label="ARTIFICIAL_FOLLOW_UP">人工随访</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="电话模板" v-if="formInline.taskType == 'PHONE_OUTBOUND'">
+            <!-- <el-form-item
+              label="电话模板"
+              v-if="formInline.taskType == 'PHONE_OUTBOUND'"
+            >
               <scriptphone @on-template="scriptphoneontemplate"></scriptphone>
-            </el-form-item>
-            <el-form-item label="宣教模板" v-if="formInline.taskType == 'PROPAGANDA_ARTICLE'">
+            </el-form-item> -->
+            <el-form-item
+              label="宣教模板"
+              v-if="formInline.taskType == 'PROPAGANDA_ARTICLE'"
+            >
               <propaganda @on-template="propagandaontemplate"></propaganda>
             </el-form-item>
-            <el-form-item label="提醒内容" v-if="formInline.taskType == 'TEXT_REMIND'">
-              <el-input type="textarea" v-model="formInline.textRemindContent" :rows="6" placeholder="请输入内容" />
+            <el-form-item
+              label="提醒内容"
+              v-if="formInline.taskType == 'TEXT_REMIND'"
+            >
+              <el-input
+                type="textarea"
+                v-model="formInline.textRemindContent"
+                :rows="6"
+                placeholder="请输入内容"
+              />
             </el-form-item>
-            <el-form-item label="人工随访模板" v-if="formInline.taskType == 'ARTIFICIAL_FOLLOW_UP'">
+            <el-form-item
+              label="人工随访模板"
+              v-if="formInline.taskType == 'ARTIFICIAL_FOLLOW_UP'"
+            >
               <question @on-template="questionontemplate"></question>
             </el-form-item>
           </el-form>
-          <el-form :model="formInline" class="demo-form-inline" :inline="true"
-            v-if="formInline.taskType == 'QUESTIONNAIRE_SCALE'">
+          <el-form
+            :model="formInline"
+            class="demo-form-inline"
+            :inline="true"
+            v-if="formInline.taskType == 'QUESTIONNAIRE_SCALE'"
+          >
             <el-form-item label="问卷模板">
               <question @on-template="questionontemplate"></question>
             </el-form-item>
             <el-form-item label="问卷有效期">
-              <el-input-number v-model="formInline.questionExpirationDate" :min="1" :max="99"
-                label="描述文字"></el-input-number>
+              <el-input-number
+                v-model="formInline.questionExpirationDate"
+                :min="1"
+                :max="99"
+                label="描述文字"
+              ></el-input-number>
               天
             </el-form-item>
           </el-form>
         </div>
-        <div v-if="formInline.taskType == 'TEXT_REMIND' ||
-          formInline.taskType == 'PROPAGANDA_ARTICLE' ||
-          formInline.taskType == 'QUESTIONNAIRE_SCALE'
-          ">
+        <div
+          v-if="
+            formInline.taskType == 'TEXT_REMIND' ||
+            formInline.taskType == 'PROPAGANDA_ARTICLE' ||
+            formInline.taskType == 'QUESTIONNAIRE_SCALE'
+          "
+        >
           <div class="PushMethod">
             <span>推送方式：短信</span>
-            <el-switch v-model="formInline.messagePushSign" active-color="#13ce66" active-value="1" inactive-value="0">
+            <el-switch
+              v-model="formInline.messagePushSign"
+              active-color="#13ce66"
+              active-value="1"
+              inactive-value="0"
+            >
             </el-switch>
           </div>
           <div class="PushMethod">
             <span>推送方式：公众号</span>
-            <el-switch v-model="formInline.officialPushSign" active-color="#13ce66" active-value="1" inactive-value="0">
+            <el-switch
+              v-model="formInline.officialPushSign"
+              active-color="#13ce66"
+              active-value="1"
+              inactive-value="0"
+            >
             </el-switch>
           </div>
           <div class="PushMethod">
             <span>推送方式：小程序</span>
-            <el-switch v-model="formInline.appletPushSign" active-color="#13ce66" active-value="1" inactive-value="0">
+            <el-switch
+              v-model="formInline.appletPushSign"
+              active-color="#13ce66"
+              active-value="1"
+              inactive-value="0"
+            >
             </el-switch>
           </div>
         </div>
-        <div class="PushMethod" v-if="formInline.taskType == 'PHONE_OUTBOUND'">
-          <span>推送方式：人工电话</span>
-          <el-switch v-model="formInline.phonePushSign" active-color="#13ce66" active-value="1" inactive-value="0">
-          </el-switch>
+        <div
+          class="PushMethodrg"
+          v-if="formInline.taskType == 'PHONE_OUTBOUND'"
+        >
+          <div class="flex">
+            <div class="itemlist">
+              推送方式：
+              <span> 人工电话 </span>
+            </div>
+            <div class="itemlist">
+              模板：
+              <scripts
+                @on-template="messageontemplateword"
+                :templateId="formInline.phoneTemplateId"
+                :templateName="formInline.phoneTemplateName"
+              ></scripts>
+            </div>
+            <div class="itemlist">
+              <el-switch
+                v-model="formInline.phonePushSign"
+                active-color="#13ce66"
+                active-value="1"
+                inactive-value="0"
+              >
+              </el-switch>
+            </div>
+          </div>
+          <div class="flex">
+            <div class="itemlist">
+              重播次数：
+              <span>
+                <el-select
+                  v-model="formInline.phoneRedialTimes"
+                  style="width: 100px"
+                >
+                  <el-option
+                    v-for="item in optionslistS"
+                    :key="item.dictValue"
+                    :label="item.dictLabel"
+                    :value="item.dictValue"
+                  >
+                  </el-option>
+                </el-select>
+              </span>
+            </div>
+            <div class="itemlist">
+              时间间隔:
+              <span>
+                <el-input
+                  v-model.number="formInline.phoneTimeInterval"
+                  oninput="value=value.replace(/[^\d]/g,'')"
+                  style="width: 100px"
+                >
+                </el-input>
+              </span>
+            </div>
+            <div class="itemlist">
+              短信提醒：
+              <el-select
+                v-model="formInline.phoneMessageRemind"
+                style="width: 150px"
+              >
+                <el-option
+                  v-for="item in optionslist"
+                  :key="item.dictValue"
+                  :label="item.dictLabel"
+                  :value="item.dictValue"
+                >
+                </el-option>
+              </el-select>
+            </div>
+            <div class="itemlist">
+              短信模板：
+              <span
+                class="spanname"
+                v-if="formInline.phoneMessageRemind == 'NOT_SEND_MESSAGE'"
+              >
+                <message
+                  style="width: 200px"
+                  @on-template="messageontemplateMESSAGE"
+                  :templateId="formInline.phoneMessageTemplateId"
+                  :templateName="formInline.phoneMessageTemplateName"
+                ></message>
+              </span>
+              <span v-else>
+                <message
+                  style="width: 200px"
+                  @on-template="messageontemplateMESSAGE"
+                  :templateId="formInline.phoneMessageTemplateId"
+                  :templateName="formInline.phoneMessageTemplateName"
+                ></message>
+              </span>
+            </div>
+          </div>
         </div>
+
       </div>
+
     </div>
   </div>
 </template>
@@ -150,17 +330,21 @@
 <script>
 import propaganda from "../components/propaganda.vue";
 import scriptphone from "../components/script.vue";
+import scripts from '../components/script.vue'
+import message from '../components/message.vue'
 import question from "../components/question.vue";
 import { signrouteadd } from "@/api/system/ManuallyCreatingTasks";
 import { getAgencytype } from "@/api/system/agency";
 import { list } from "@/api/system/specialDiseaseNode";
 
 export default {
-  components: { scriptphone, question, propaganda },
+  components: { scriptphone, question, propaganda, scripts, message },
   name: "ManuallyCreatingTasks",
   data() {
     return {
       options: [],
+      optionslist: [],
+      optionslistS: [],
       parentDictCodelist: [],
       updata: {
         signPatientRecordId: "",
@@ -222,6 +406,8 @@ export default {
   },
   created() {
     this.infolist();
+    this.infolistword();
+    this.infolistMESSAGE();
     this.formInline = this.list[0];
     this.updata.signPatientRecordId = this.$route.query.signPatientRecordId;
     this.updata.patientId = this.$route.query.patientId;
@@ -236,6 +422,20 @@ export default {
         this.options = res.data;
       });
     },
+    infolistword() {
+      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.optionslistS = res.data;
+        // this.taskinfo();
+      });
+    },
     changeoptions(e) {
       this.parentDictCode = this.options.find((el) => el.dictValue == e).dictCode;
       this.changelisy();
@@ -274,6 +474,18 @@ export default {
       this.formInline.phoneId = item.templateId;
       this.formInline.phoneTemplateName = item.templateName;
     },
+    // 短信
+    messageontemplateMESSAGE(item) {
+      this.formInline.phoneMessageTemplateId = item.templateId;
+      this.formInline.phoneMessageTemplateName = item.templateName;
+      this.formInline.messagePreview = item.templateContent;
+    },
+    // 话术
+    messageontemplateword(item) {
+      this.formInline.phoneTemplateId = item.templateId;
+      this.formInline.phoneTemplateName = item.templateName;
+      // this.form.messagePreview = item.templateContent;
+    },
     clicktimelineitem(item, index) {
       this.formInline = item;
       this.listindex = index;
@@ -342,6 +554,43 @@ export default {
     font-weight: bold;
   }
 }
+.PushMethodrg {
+  background-color: #fff;
+  width: 100%;
+  height: 200px;
+  margin: 20px 0 0;
+  padding: 20px 50px 0px 20px;
+
+
+
+  .flex {
+    display: flex;
+    width: 100%;
+    align-items: center;
+    // background: red;
+    justify-content: space-between;
+
+    .itemlist {
+      height: 30px;
+      margin-top: 30px;
+      line-height: 30px;
+      font-size: 13px;
+      color: #64666a;
+      .spanname {
+        pointer-events: none;
+      }
+      ::v-deep .el-input__inner {
+        color: black;
+        font-size: 13px;
+      }
+
+      span {
+        color: black;
+        font-size: 13px;
+      }
+    }
+  }
+}
 
 .node {
   margin-bottom: 10px;
@@ -455,4 +704,7 @@ export default {
   display: inline-block;
   float: right;
 }
-</style>
\ No newline at end of file
+::v-deep .el-form-item__content{
+  display: inline-block !important;
+}
+</style>