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

src/api/system/followupsee.js

@@ -1,14 +1,22 @@
 import request from '@/utils/request'
 export function selectFollowPatientInfo(id) {
     return request({
-        url: '/manage/signroute/selectFollowPatientInfo/'+id,
+        url: '/manage/signroute/selectFollowPatientInfo/' + id,
         method: 'get',
     })
 }
+export function selectPhonePush(manageRouteNodeId) {
+    return request({
+        url: `/manage/signroute/selectPhonePush?manageRouteNodeId=${manageRouteNodeId}`,
+        method: 'get',
+    })
+}
+
+
 // 问卷量表
 export function question(id) {
     return request({
-        url: '/system/question/'+id,
+        url: '/system/question/' + id,
         method: 'get',
     })
 }

src/views/system/components/script.vue

@@ -1,28 +1,53 @@
 <template>
   <div class="app-container">
-        <el-button size="small" @click="classificationOpen = true" style="width: 200px;font-size:14px;text-align:left;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;"
+    <el-button
-            :style="handleselectName ? 'color:black' : 'color:#C0C4CC'">{{ handleselectName ? handleselectName :
+      size="small"
-                '请选择'
+      @click="classificationOpen = true"
-            }}</el-button>
+      style="
-        <el-dialog title="话书库模板选择" :visible.sync="classificationOpen" width="70%"
+        width: 200px;
-            :before-close="classificationOpenfalse">
+        font-size: 14px;
+        text-align: left;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      "
+      :style="handleselectName ? 'color:black' : 'color:#C0C4CC'"
+      >{{ handleselectName ? handleselectName : "请选择" }}</el-button
+    >
+    <el-dialog
+      title="话书库模板选择"
+      :visible.sync="classificationOpen"
+      width="70%"
+      :before-close="classificationOpenfalse"
+    >
       <el-row :gutter="20">
         <!--部门数据-->
         <el-col :span="6" :xs="24">
           <div class="leftscript" ref="box">
             <div class="name">科室名称</div>
             <div>
-                            <el-input v-model="name" placeholder="请输入科室名称" clearable
+              <el-input
-                                @keyup.enter.native="handleQuery" />
+                v-model="name"
+                placeholder="请输入科室名称"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
             </div>
             <div class="listitem">
-                            <div :class="itemname == null ? 'allactive' : 'all'" @click="itemdata()">
+              <div
+                :class="itemname == null ? 'allactive' : 'all'"
+                @click="itemdata()"
+              >
                 全部
               </div>
               <span class="count">{{ count }}</span>
             </div>
-                        <div class="listitem" v-for="(item, index) in DepartmentoList" :key="index"
+            <div
-                            @click="itemdata(item)">
+              class="listitem"
+              v-for="(item, index) in DepartmentoList"
+              :key="index"
+              @click="itemdata(item)"
+            >
               <div :class="itemname == item.id ? 'allactive' : 'all'">
                 {{ item.departmentName }}
               </div>
@@ -32,52 +57,136 @@
         </el-col>
         <!--用户数据-->
         <el-col :span="18" :xs="24">
-                    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+          <el-form
-                        label-width="100px">
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="100px"
+          >
             <el-form-item label="通用话术名称" prop="commonScriptName">
-                            <el-input v-model="queryParams.commonScriptName" placeholder="请输入通用话术名称" clearable
+              <el-input
-                                @keyup.enter.native="handleQuery" />
+                v-model="queryParams.commonScriptName"
+                placeholder="请输入通用话术名称"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
             </el-form-item>
             <el-form-item label="话术名称" prop="scriptName">
-                            <el-input v-model="queryParams.scriptName" placeholder="请输入话术名称" clearable
+              <el-input
-                                @keyup.enter.native="handleQuery" />
+                v-model="queryParams.scriptName"
+                placeholder="请输入话术名称"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
             </el-form-item>
             <el-form-item label="话术ID" prop="scriptId">
-                            <el-input v-model="queryParams.scriptId" placeholder="请输入话术ID" clearable
+              <el-input
-                                @keyup.enter.native="handleQuery" />
+                v-model="queryParams.scriptId"
+                placeholder="请输入话术ID"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
             </el-form-item>
             <el-form-item label="平台ID" prop="platformId">
-                            <el-input v-model="queryParams.platformId" placeholder="请输入平台ID" clearable
+              <el-input
-                                @keyup.enter.native="handleQuery" />
+                v-model="queryParams.platformId"
+                placeholder="请输入平台ID"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
             </el-form-item>
             <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" size="mini"
+              <el-button
-                                @click="handleQuery">搜索</el-button>
+                type="primary"
-                            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                icon="el-icon-search"
+                size="mini"
+                @click="handleQuery"
+                >搜索</el-button
+              >
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+                >重置</el-button
+              >
             </el-form-item>
           </el-form>
-                    <el-table v-loading="loading" :data="scriptList" @row-dblclick="handleselect">
+          <el-table
-                        <el-table-column label="序号" align="center" prop="sort" type="index" />
+            v-loading="loading"
-                        <el-table-column label="通用话术名称" align="center" prop="commonScriptName"
+            :data="scriptList"
-                            :show-overflow-tooltip="true" />
+            @row-dblclick="handleselect"
-                        <el-table-column label="话术名称" align="center" prop="scriptName" :show-overflow-tooltip="true" />
+          >
-                        <el-table-column label="话术ID" align="center" prop="scriptId" :show-overflow-tooltip="true" />
+            <el-table-column
-                        <el-table-column label="平台ID" align="center" prop="platformId" :show-overflow-tooltip="true" />
+              label="序号"
-                        <el-table-column label="话术简介" align="center" prop="scriptIntroduction"
+              align="center"
-                            :show-overflow-tooltip="true" />
+              prop="sort"
-                        <el-table-column label="病种名称" align="center" prop="diseaseTypeName"
+              type="index"
-                            :show-overflow-tooltip="true" />
+            />
-                        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <el-table-column
+              label="通用话术名称"
+              align="center"
+              prop="commonScriptName"
+              :show-overflow-tooltip="true"
+            />
+            <el-table-column
+              label="话术名称"
+              align="center"
+              prop="scriptName"
+              :show-overflow-tooltip="true"
+            />
+            <el-table-column
+              label="话术ID"
+              align="center"
+              prop="scriptId"
+              :show-overflow-tooltip="true"
+            />
+            <el-table-column
+              label="平台ID"
+              align="center"
+              prop="platformId"
+              :show-overflow-tooltip="true"
+            />
+            <el-table-column
+              label="话术简介"
+              align="center"
+              prop="scriptIntroduction"
+              :show-overflow-tooltip="true"
+            />
+            <el-table-column
+              label="病种名称"
+              align="center"
+              prop="diseaseTypeName"
+              :show-overflow-tooltip="true"
+            />
+            <el-table-column
+              label="操作"
+              align="center"
+              class-name="small-padding fixed-width"
+            >
               <template slot-scope="scope">
-                                <el-button size="mini" type="text" @click="handleselect(scope.row)"
+                <el-button
-                                    v-if="handleselectId != scope.row.textMessageId">选择</el-button>
+                  size="mini"
-                                <el-button size="mini" type="text" @click="nohandleselect(scope.row)"
+                  type="text"
-                                    v-if="handleselectId == scope.row.textMessageId">取消选择</el-button>
+                  @click="handleselect(scope.row)"
+                  v-if="handleselectId != scope.row.textMessageId"
+                  >选择</el-button
+                >
+                <el-button
+                  size="mini"
+                  type="text"
+                  @click="nohandleselect(scope.row)"
+                  v-if="handleselectId == scope.row.textMessageId"
+                  >取消选择</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
-                    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+          <pagination
-                        :limit.sync="queryParams.pageSize" @pagination="getList" />
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
         </el-col>
       </el-row>
     </el-dialog>
@@ -85,22 +194,33 @@
 </template>
 
 <script>
-import { listScript, getScript, delScript, addScript, updateScript, departmentDisease, department, listDisease, listScriptNum } from "@/api/manage/script";
+import {
+  listScript,
+  getScript,
+  delScript,
+  addScript,
+  updateScript,
+  departmentDisease,
+  department,
+  listDisease,
+  listScriptNum,
+} from "@/api/manage/script";
 import stationAcatar from "../../system/stationAvatar/index.vue";
 export default {
+  props: ["templateId", "templateName"],
   components: { stationAcatar },
   name: "Script",
   data() {
     return {
-            handleselectName: '',
+      handleselectName: "",
-            handleselectId: '',
+      handleselectId: "",
       classificationOpen: false,
       itemname: null,
       departmentName: null,
       diseaseTypeName: null,
-            name: '',
+      name: "",
       departmentId: null,
-            count: '',//全部
+      count: "", //全部
       // 遮罩层
       loading: true,
       // 选中数组
@@ -149,32 +269,57 @@ export default {
     this.getList();
     this.Departmentlist();
   },
+  mounted() {
+    this.handleselectId = this.templateId;
+    this.handleselectName = this.templateName;
+  },
   watch: {
     name(val) {
-            this.querydepartmen.departmentName = val
+      this.querydepartmen.departmentName = val;
       this.Departmentlist();
-        }
+    },
+    templateName(newValue, oldValue) {
+      console.log(newValue, "newValuenewValue");
+      this.handleselectName = newValue;
+    },
+    templateId(newValue, oldValue) {
+      console.log(
+        newValue,
+        "newValuenewValuenewValuenewValuenewValuenewValuenewValuenewValue"
+      );
+
+      this.handleselectId = newValue;
+    },
   },
   methods: {
     nohandleselect() {
-            this.handleselectId = ''
+      this.handleselectId = "";
-            this.handleselectName = ''
+      this.handleselectName = "";
-            this.$emit("on-template", { templateId: '', templateName: '', templateContent: "" });
+      this.$emit("on-template", {
+        templateId: "",
+        templateName: "",
+        templateContent: "",
+      });
     },
     handleselect(item) {
-            this.handleselectId = item.id
+      this.handleselectId = item.id;
-            this.handleselectName = item.commonScriptName
+      this.handleselectName = item.commonScriptName;
-            this.$emit("on-template", { templateId: item.id, templateName: item.commonScriptName, templateContent: item.scriptIntroduction });
+      console.log(this.handleselectName, "this.handleselectName");
-            this.classificationOpen = false
+      this.$emit("on-template", {
+        templateId: item.id,
+        templateName: item.commonScriptName,
+        templateContent: item.scriptIntroduction,
+      });
+      this.classificationOpen = false;
     },
     classificationOpenfalse() {
-            this.classificationOpen = false
+      this.classificationOpen = false;
     },
     // 左侧科室
     Departmentlist() {
       this.loading = true;
-            this.querydepartmen.scriptStatus = "NORMAL"
+      this.querydepartmen.scriptStatus = "NORMAL";
-            listScriptNum(this.querydepartmen).then(response => {
+      listScriptNum(this.querydepartmen).then((response) => {
         this.DepartmentoList = response.data;
         //定义
         let sum = 0;
@@ -190,22 +335,22 @@ export default {
     // 左侧科室
     itemdata(item) {
       if (item) {
-                this.itemname = item.id
+        this.itemname = item.id;
-                this.departmentName = item.departmentName
+        this.departmentName = item.departmentName;
         this.loading = true;
-                this.queryParams.departmentId = item.id
+        this.queryParams.departmentId = item.id;
-                this.getList()
+        this.getList();
       } else {
-                this.queryParams.departmentId = ''
+        this.queryParams.departmentId = "";
-                this.itemname = null
+        this.itemname = null;
-                this.getList()
+        this.getList();
       }
     },
     /** 查询话术信息列表 */
     getList() {
       this.loading = true;
-            this.queryParams.scriptStatus = "NORMAL"
+      this.queryParams.scriptStatus = "NORMAL";
-            listScript(this.queryParams).then(response => {
+      listScript(this.queryParams).then((response) => {
         this.scriptList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -231,15 +376,15 @@ export default {
         scriptName: null,
         scriptId: null,
         platformId: null,
-                scriptStatus: 'NORMAL',
+        scriptStatus: "NORMAL",
         scriptIntroduction: null,
         scriptSort: null,
         scriptRemark: null,
-            }
+      };
       this.resetForm("queryForm");
       this.getList();
     },
-    }
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/system/followupsee/index.vue

@@ -244,20 +244,24 @@
               :inline="true"
               :rules="rulesphone"
             >
-              <el-form-item label="话术名称" prop="scriptName">
+              <!-- <el-form-item label="话术名称" prop="scriptName">
-                <el-radio v-model="radio" label="1">备选项</el-radio>
-                <el-radio v-model="radio" label="2">备选项</el-radio>
-              </el-form-item>
-              <br />
-              <el-form-item label="通用话术名称" prop="commonScriptName">
                 <el-input
                   disabled
-                  v-model="formlist.commonScriptName"
+                  v-model="formlist.scriptName"
+                  placeholder="请输入话术名称"
+                />
+
+              </el-form-item> -->
+              <!-- <br /> -->
+              <el-form-item label="通用话术名称" prop="phoneTemplateName">
+                <el-input
+                  disabled
+                  v-model="formlist.phoneTemplateName"
                   placeholder="请输入通用话术名称"
                 />
               </el-form-item>
-              <br />
+              <!-- <br /> -->
-              <el-form-item label="话术简介" prop="scriptIntroduction">
+              <!-- <el-form-item label="话术简介" prop="scriptIntroduction">
                 <el-input
                   disabled
                   type="textarea"
@@ -265,7 +269,6 @@
                   placeholder="请输入话术简介"
                 />
               </el-form-item>
-              <br />
 
               <el-form-item label="任务处理信息" prop="routeHandleRemark">
                 <el-input
@@ -273,7 +276,85 @@
                   v-model="formlist.routeHandleRemark"
                   placeholder="请输入任务处理信息"
                 />
+              </el-form-item> -->
+              <!-- <br /> -->
+              <el-form-item label="电话外呼" prop="phonePushSign">
+                <!-- <el-input
+
+                  type="textarea"
+                  v-model="formlist.routeHandleRemark"
+                  placeholder="请输入任务处理信息"
+                /> -->
+                <el-switch
+                  v-model="formlist.phonePushSign"
+                  active-color="#13ce66"
+                  active-value="1"
+                  inactive-value="0"
+                >
+                </el-switch>
               </el-form-item>
+              <!-- <br /> -->
+
+              <el-form-item label="电话" prop="patientPhone">
+                <el-input
+                  disabled
+                  v-model="formlist.patientPhone"
+                  placeholder="请输入电话"
+                />
+              </el-form-item>
+              <!-- <br /> -->
+              <!-- <div style="background:red;width:200px;height:1600px"> -->
+              <el-form-item label="重复次数" prop="phoneRedialTimes">
+                <el-select
+                  v-model="formlist.phoneRedialTimes"
+                  style="width: 200px"
+                >
+                  <el-option
+                    v-for="item in optionslistS"
+                    :key="item.dictValue"
+                    :label="item.dictLabel"
+                    :value="item.dictValue"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <!-- <br /> -->
+              <el-form-item label="发送短信" prop="phone">
+                <el-input
+                  style="width: 200px"
+                  v-model="formlist.phone"
+                  placeholder="请输入电话"
+                />
+              </el-form-item>
+              <!-- <br /> -->
+
+              <el-form-item label="是否接通" prop="phone">
+                <el-radio v-model="radio" label="1">备选项</el-radio>
+                <el-radio v-model="radio" label="2">备选项</el-radio>
+              </el-form-item>
+              <!-- <br /> -->
+              <el-form-item label="是否发送短信" prop="phone">
+                <el-radio v-model="radio" label="1">备选项</el-radio>
+                <el-radio v-model="radio" label="2">备选项</el-radio>
+              </el-form-item>
+              <el-form-item label="话术图" prop="phone">
+                <img src="@/assets/images/dark.svg" style="width:250px;height:200px" alt="dark" />
+              </el-form-item>
+              <span class="pushMethod">
+                短信模板：
+                <message
+                  style="width: 200px"
+                  @on-template="messageontemplateMESSAGE"
+                  :templateId="formlist.phoneMessageTemplateId"
+                  :templateName="formlist.phoneMessageTemplateName"
+                ></message>
+              </span>
+
+              <!-- <br/> -->
+
+              <!-- <br /> -->
+
+              <!-- </div> -->
             </el-form>
           </div>
         </div>
@@ -283,15 +364,24 @@
 </template>
 
     <script>
+import message from "../components/message.vue";
+
 import {
   selectFollowPatientInfo,
   question,
   addPatientQuestionResult,
+  selectPhonePush
 } from "@/api/system/followupsee";
 import { getScript } from "@/api/manage/script";
 import Cookies from "js-cookie";
+import { getAgencytype } from "@/api/system/agency";
+
 export default {
+  components: {
+    message,
+  },
   name: "patientdetails",
+
   data() {
     return {
       obj: {},
@@ -299,6 +389,7 @@ export default {
       checkList: [],
       checked: false,
       formlist: {},
+      optionslistS: [],
       form: {
         taskType: this.$route.query.taskType,
         routeHandleId: Cookies.get("userId"),
@@ -338,15 +429,17 @@ export default {
     };
   },
   created() {
+    // this.infolist()
     this.id = this.$route.query.manageRouteId;
     this.info();
+    this.infolistMESSAGE();
     if (
       this.$route.query.taskType == "QUESTIONNAIRE_SCALE" ||
       this.$route.query.taskType == "ARTIFICIAL_FOLLOW_UP"
     ) {
       this.questioninfo();
     } else {
-      getScript(this.$route.query.templateId).then((response) => {
+      selectPhonePush(this.$route.query.manageRouteNodeId).then((response) => {
         if (response.data) {
           this.formlist = response.data;
         }
@@ -354,6 +447,25 @@ export default {
     }
   },
   methods: {
+    // infolist(){
+    //   console.log(this.form.manageRouteNodeId,'manageRouteNodeId')
+    //   selectPhonePush(this.form.manageRouteNodeId).then(res=>{
+    //     console.log(res,'red')
+    //   })
+    // },
+    // 短信
+    messageontemplateMESSAGE(item) {
+      console.log(item, "2222222");
+      this.formlist.phoneMessageTemplateId = item.templateId;
+      this.formlist.phoneMessageTemplateName = item.templateName;
+      // this.form.messagePreview = item.templateContent;
+    },
+    infolistMESSAGE() {
+      var dictType = "redial_times";
+      getAgencytype(dictType).then((res) => {
+        this.optionslistS = res.data;
+      });
+    },
     // 日期填空题
     timepicker(e, index) {
       this.questiondata.questionSubjectList[index].fillBlanksAnswer = e;
@@ -665,8 +777,9 @@ export default {
   }
 
   .bottomheader {
-    overflow: auto;
+    overflow: scroll;
     width: 99%;
+    height: 100vh;
     background-color: #fff;
     margin: 10px auto;
     padding: 10px 20px;

src/views/system/specialDiseaseNode/index.vue

@@ -370,7 +370,7 @@
             <div class="flex">
               <div class="pushMethod">
                 推送方式：
-                <span> AI电话 </span>
+                <span> 人工电话 </span>
               </div>
               <div class="pushMethod">
                 模板：
@@ -431,7 +431,6 @@
                 <el-select
                   v-model="form.phoneMessageRemind"
                   style="width: 150px"
-                  @change="changelist"
                 >
                   <el-option
                     v-for="item in optionslist"
@@ -449,7 +448,6 @@
                   v-if="form.phoneMessageRemind == 'NOT_SEND_MESSAGE'"
                 >
                   <message
-                  ref="refname"
                     style="width: 200px"
                     @on-template="messageontemplateMESSAGE"
                     :templateId="form.phoneMessageTemplateId"
@@ -613,24 +611,32 @@ export default {
     this.infolistMESSAGE();
   },
   beforeDestroy() {},
-  watch: {},
+  watch: {
-  mounted() {},
+    "form.phoneMessageRemind": {
-  methods: {
+      handler(newValue, oldValue) {
-    changelist(e) {
+        console.log(newValue, "2222221111122");
-      console.log(e, "e");
+        if (newValue == "NOT_SEND_MESSAGE") {
-      if (e == "NOT_SEND_MESSAGE ") {
-        console.log(this.form,'this.form')
-        this.$refs.refname.listDisease()
-        // this.form.phoneMessageTemplateId
-        // this.form.phoneMessageTemplateId = "";
-        // this.form.phoneMessageTemplateName = "";
-
-      }
-    },
-    listDisease(){
           this.form.phoneMessageTemplateId = "";
           this.form.phoneMessageTemplateName = "";
+        }
       },
+      deep: true,
+
+    },
+    "form.phoneTemplateId": {
+      handler(newValue, oldValue) {
+        console.log(newValue, "phoneTemplateId");
+        // if (newValue == "NOT_SEND_MESSAGE") {
+          this.form.phoneTemplateId = newValue;
+          // this.form.phoneMessageTemplateName = "";
+        // }
+      },
+      deep: true,
+      // phoneTemplateId
+    },
+  },
+  mounted() {},
+  methods: {
     infolistword() {
       var dictType = "text_message_remind";
       getAgencytype(dictType).then((res) => {
@@ -685,9 +691,11 @@ export default {
           this.agreeNumber = res.data.agreeNumber;
           this.totalNumber = res.data.totalNumber;
           res.data.specialDiseaseNodeList.forEach((e) => {
+            console.log(e, "eeeeeeeeeeeeeeeee");
             e.messagePushSign = "" + e.messagePushSign;
             e.officialPushSign = "" + e.officialPushSign;
             e.appletPushSign = "" + e.appletPushSign;
+            e.phonePushSign = "" + e.phonePushSign;
           });
           this.lists = this.handleData(
             res.data.specialDiseaseNodeList,
@@ -713,15 +721,6 @@ export default {
               taskSubdivision: "",
               taskSubdivisionName: "",
               taskStatus: "",
-              phoneAgencyName: null,
-              phoneRedialTimes: null,
-              phoneTimeInterval: null,
-              phoneMessageRemind: null,
-              phoneMessageTemplateId: null,
-              phoneMessageTemplateName: null,
-              phonePushSign: "0",
-              phoneTemplateId: "",
-              phoneTemplateName: "",
               secondClassifyDescribe: "",
               executionTime: "",
               appletPushSign: "0",
@@ -806,7 +805,7 @@ export default {
     messageontemplateword(item) {
       this.form.phoneTemplateId = item.templateId;
       this.form.phoneTemplateName = item.templateName;
-      this.form.messagePreview = item.templateContent;
+      // this.form.messagePreview = item.templateContent;
     },
     //公众号传值
     officialAccountontemplate(item) {
@@ -903,11 +902,6 @@ export default {
         this.info();
       });
     },
-    // 短信提醒
-    changephoneMessageRemind(e) {
-      console.log(e, "e");
-      // if
-    },
     //任务类型
     changeTaskType(code, taskSubdivision) {
       let id = this.selectTaskTypeList?.find((e) => e.taskTypeCode == code)?.id;