电话拨打记录页面调整，部分分页问题修复

# Conflicts:
#	.env.development
#	.env.production
#	.env.staging

.env.development

@@ -5,11 +5,7 @@ VUE_APP_TITLE = 新医路院后患者管理平台
 ENV = 'development'
 
 # 新医路院后患者管理平台/开发环境
-# VUE_APP_BASE_API = 'http://192.168.20.37:19090'
 VUE_APP_BASE_API = 'http://8.131.93.145:54098'
-# VUE_APP_BASE_API = 'http://192.168.0.95:9090'
-# VUE_APP_BASE_API = 'https://1608.xinelu.cn'
-# VUE_APP_BASE_API = 'http://192.168.124.10:19090'
 
 
 # 路由懒加载

.env.production

@@ -5,9 +5,5 @@ VUE_APP_TITLE = 新医路院后患者管理平台
 ENV = 'production'
 
 # 新医路院后患者管理平台/生产环境
-# VUE_APP_BASE_API = 'http://192.168.20.37:19090'
 VUE_APP_BASE_API = 'http://8.131.93.145:54098'
-# VUE_APP_BASE_API = 'http://192.168.0.95:9090'
-# VUE_APP_BASE_API = 'https://1608.xinelu.cn'
-# VUE_APP_BASE_API = 'http://192.168.124.10:19090'
 

.env.staging

@@ -7,8 +7,4 @@ NODE_ENV = production
 ENV = 'staging'
 
 # 新医路院后患者管理平台/测试环境
-# VUE_APP_BASE_API = 'http://192.168.20.37:19090'
 VUE_APP_BASE_API = 'http://8.131.93.145:54098'
-# VUE_APP_BASE_API = 'http://192.168.0.95:9090'
-# VUE_APP_BASE_API = 'https://1608.xinelu.cn'
-# VUE_APP_BASE_API = 'http://192.168.124.10:19090'

package.json

@@ -74,7 +74,6 @@
     "vuex": "3.6.0"
   },
   "devDependencies": {
-    "@types/js-cookie": "^3.0.6",
     "@vue/cli-plugin-babel": "4.4.6",
     "@vue/cli-plugin-eslint": "4.4.6",
     "@vue/cli-service": "4.4.6",

src/api/manage/message.js

@@ -50,3 +50,10 @@ export function listMessageNum(query) {
         params: query
     })
 }
+// 查询字典信息（当前页面）
+export function type(dictValue) {
+    return request({
+        url: '/system/dict/data/type/' + dictValue,
+        method: 'get'
+    })
+}

src/api/manage/patientInfoImport.js

@@ -34,7 +34,7 @@ export function outboundConfirmation() {
     })
 }
 
-// 确认按钮
+// 确认按钮  
 export function directOutbound(data) {
     return request({
         url: `/manage/signroute/directOutbound`,
@@ -58,30 +58,4 @@ export function addDialTime(data) {
         method: 'post',
         data
     })
-}
+}
-
-// 手动导入请求列表
-export function patientInfoImportList(data) {
-    return request({
-        url: '/system/externalImport/externalImports',
-        method: 'post',
-        data
-    })
-}
-
-// 科室筛选框集合
-export function deptSelectList() {
-    return request({
-        url: '/system/department/getDepartmentList',
-        method: 'get',
-    })
-}
-
-// 生成导入信息
-export function CreategenerateImport(data) {
-    return request({
-        url: '/manage/patientInfoimportmain/manuallyCreate',
-        method: 'post',
-        data
-    })
-}

src/api/system/batchSendTaskInfo.js

@@ -0,0 +1,70 @@
+import request from '@/utils/request'
+
+// 查询批量推送任务信息列表
+export function listBatchSendTaskInfo(query) {
+    return request({
+        url: '/system/batchSendTaskInfo/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询批量推送任务信息详细
+export function getBatchSendTaskInfo(id) {
+    return request({
+        url: '/system/batchSendTaskInfo/' + id,
+        method: 'get'
+    })
+}
+
+// 新增批量推送任务信息
+export function addBatchSendTaskInfo(data) {
+    return request({
+        url: '/system/batchSendTaskInfo',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改批量推送任务信息
+export function updateBatchSendTaskInfo(data) {
+    return request({
+        url: '/system/batchSendTaskInfo',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除批量推送任务信息
+export function delBatchSendTaskInfo(id) {
+    return request({
+        url: '/system/batchSendTaskInfo/' + id,
+        method: 'delete'
+    })
+}
+
+// 获取总结标签数据
+export function getPhysicalExaminationLabel() {
+  return request({
+      url: '/system/batchSendTaskInfo/getPhysicalExaminationLabel',
+      method: 'get',
+  })
+}
+
+// 查询不分页数据
+export function AllBatchSendTaskInfo(query) {
+    return request({
+        url: '/system/batchSendTaskInfo/batchSendTaskList',
+        method: 'get',
+        params: query
+    })
+}
+
+// 生成推送任务
+export function generatePushTask(data) {
+  return request({
+      url: '/system/batchSendTaskInfo/batchSend',
+      method: 'post',
+      data: data
+  })
+}

src/api/system/batchSendTaskRecordInfo.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询批量推送任务记录列表
+export function listBatchSendTaskRecordInfo(query) {
+    return request({
+        url: '/system/batchSendTaskRecordInfo/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询批量推送任务记录详细
+export function getBatchSendTaskRecordInfo(id) {
+    return request({
+        url: '/system/batchSendTaskRecordInfo/' + id,
+        method: 'get'
+    })
+}
+
+// 新增批量推送任务记录
+export function addBatchSendTaskRecordInfo(data) {
+    return request({
+        url: '/system/batchSendTaskRecordInfo',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改批量推送任务记录
+export function updateBatchSendTaskRecordInfo(data) {
+    return request({
+        url: '/system/batchSendTaskRecordInfo',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除批量推送任务记录
+export function delBatchSendTaskRecordInfo(id) {
+    return request({
+        url: '/system/batchSendTaskRecordInfo/' + id,
+        method: 'delete'
+    })
+}
+
+// 选择推送类型查询模板
+export function selectTemplateByType(query) {
+    return request({
+        url: '/system/batchSendTaskRecordInfo/getTemplate',
+        method: 'get',
+        params: query
+    })
+}

src/api/system/externalImport.js

@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询外部数据导入列表
-export function listExternalImport(query) {
-    return request({
-        url: '/system/externalImport/list',
-        method: 'get',
-        params: query
-    })
-}
-
-// 查询外部数据导入详细
-export function getExternalImport(id) {
-    return request({
-        url: '/system/externalImport/' + id,
-        method: 'get'
-    })
-}
-
-// 新增外部数据导入
-export function addExternalImport(data) {
-    return request({
-        url: '/system/externalImport',
-        method: 'post',
-        data: data
-    })
-}
-
-// 修改外部数据导入
-export function updateExternalImport(data) {
-    return request({
-        url: '/system/externalImport',
-        method: 'put',
-        data: data
-    })
-}
-
-// 删除外部数据导入
-export function delExternalImport(id) {
-    return request({
-        url: '/system/externalImport/' + id,
-        method: 'delete'
-    })
-}

src/views/manage/Satisfactionsurvey/index.vue

@@ -257,6 +257,9 @@
             <span style="color: #f56c6c">
               {{ scope.row.nodeExecuteStatus == "UNEXECUTED" ? "未执行" : "" }}
             </span>
+            <span style="color: #409eff">
+              {{ scope.row.nodeExecuteStatus == "EXECUTING" ? "执行中" : "" }}
+            </span>
           </template>
         </el-table-column>
         <el-table-column
@@ -395,10 +398,7 @@
                 :label="aitem.id"
                 @change="radioChange($event, aitem, index)"
               >
-                {{ aitem.optionName
+                {{ aitem.optionName }}
-                }}<span v-if="aitem.contentedFlag == 'DISCONTENTED'"
-                  >（原因：{{ aitem.optionSubmitAnswer }}）</span
-                >
               </el-radio>
             </el-radio-group>
             <el-checkbox-group

src/views/manage/dataImport/index.vue

@@ -1,554 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="100px"
-    >
-      <el-form-item label="患者姓名" prop="patientName">
-        <el-input
-          v-model="queryParams.patientName"
-          placeholder="请输入患者姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="患者电话" prop="phone">
-        <el-input
-          v-model="queryParams.phone"
-          placeholder="请输入患者电话"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="年龄" prop="age">
-        <el-input
-          v-model="queryParams.age"
-          placeholder="请输入年龄"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="身份证号" prop="cardNo">
-        <el-input
-          v-model="queryParams.cardNo"
-          placeholder="请输入身份证号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属科室名称" prop="departmentName">
-        <el-input
-          v-model="queryParams.departmentName"
-          placeholder="请输入所属科室名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="就诊编号" prop="visitCode">
-        <el-input
-          v-model="queryParams.visitCode"
-          placeholder="请输入就诊编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="就诊方式" prop="visitMethod">
-        <el-select
-          v-model="queryParams.visitMethod"
-          placeholder="请选择就诊方式"
-        >
-          <el-option label="门诊" value="1"> </el-option>
-          <el-option label="住院" value="2"> </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="就诊时间" prop="visitDate">
-        <el-date-picker
-          clearable
-          v-model="queryParams.visitDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择就诊时间"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="入院时间" prop="admissionTime">
-        <el-date-picker
-          clearable
-          v-model="queryParams.admissionTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择入院时间"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="出院时间" prop="dischargeTime">
-        <el-date-picker
-          clearable
-          v-model="queryParams.dischargeTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择出院时间"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="数据获取时间" prop="dataGetTime">
-        <el-date-picker
-          clearable
-          v-model="queryParams.dataGetTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择数据获取时间"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button
-          type="primary"
-          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-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:externalImport:export']"
-          >导出</el-button
-        >
-      </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
-    </el-row>
-    <el-table
-      :height="tableHeight"
-      v-loading="loading"
-      :data="externalImportList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="导入编号" align="center" prop="sn" />
-      <el-table-column label="患者姓名" align="center" prop="patientName" />
-      <el-table-column label="患者电话" align="center" prop="phone" />
-      <el-table-column label="年龄" align="center" prop="age" width="50" />
-      <el-table-column label="身份证号" align="center" prop="cardNo" />
-      <el-table-column label="性别" align="center" prop="sex" width="50" />
-      <el-table-column
-        label="所属科室名称"
-        align="center"
-        prop="departmentName"
-      />
-      <el-table-column label="就诊编号" align="center" prop="visitCode" />
-      <el-table-column label="就诊方式" align="center" prop="visitMethod">
-        <template slot-scope="scope">
-          <span>{{ scope.row.visitMethod === "1" ? "门诊" : "住院" }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="就诊时间" align="center" prop="visitDate">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.visitDate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="入院时间" align="center" prop="admissionTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.admissionTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="出院时间" align="center" prop="dischargeTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.dischargeTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="主要诊断" align="center" prop="mainDiagnosis" />
-      <el-table-column label="出院方式" align="center" prop="dischargeMethod" />
-      <el-table-column label="患者健康状况" align="center" prop="healthState" />
-      <el-table-column label="数据获取时间" align="center" prop="dataGetTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.dataGetTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改外部数据导入对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="患者姓名" prop="patientName">
-          <el-input v-model="form.patientName" placeholder="请输入患者姓名" />
-        </el-form-item>
-        <el-form-item label="患者电话" prop="phone">
-          <el-input v-model="form.phone" placeholder="请输入患者电话" />
-        </el-form-item>
-        <el-form-item label="年龄" prop="age">
-          <el-input v-model="form.age" placeholder="请输入年龄" />
-        </el-form-item>
-        <el-form-item label="身份证号" prop="cardNo">
-          <el-input v-model="form.cardNo" placeholder="请输入身份证号" />
-        </el-form-item>
-        <el-form-item label="所属科室名称" prop="departmentName">
-          <el-input
-            v-model="form.departmentName"
-            placeholder="请输入所属科室名称"
-          />
-        </el-form-item>
-        <el-form-item label="就诊编号" prop="visitCode">
-          <el-input v-model="form.visitCode" placeholder="请输入就诊编号" />
-        </el-form-item>
-        <el-form-item
-          label="就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL"
-          prop="visitMethod"
-        >
-          <el-input
-            v-model="form.visitMethod"
-            placeholder="请输入就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL"
-          />
-        </el-form-item>
-        <el-form-item label="就诊时间" prop="visitDate">
-          <el-date-picker
-            clearable
-            v-model="form.visitDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择就诊时间"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item
-          label="入院时间，时间格式：yyyy-MM-dd"
-          prop="admissionTime"
-        >
-          <el-date-picker
-            clearable
-            v-model="form.admissionTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择入院时间，时间格式：yyyy-MM-dd"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="出院时间" prop="dischargeTime">
-          <el-date-picker
-            clearable
-            v-model="form.dischargeTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择出院时间"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="推送时间，时间格式：yyyy-MM-dd" prop="pushTime">
-          <el-date-picker
-            clearable
-            v-model="form.pushTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择推送时间，时间格式：yyyy-MM-dd"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item
-          label="计划随访时间，时间格式：yyyy-MM-dd"
-          prop="planFollowUp"
-        >
-          <el-date-picker
-            clearable
-            v-model="form.planFollowUp"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择计划随访时间，时间格式：yyyy-MM-dd"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="随访模板编号" prop="followUpTemplate">
-          <el-input
-            v-model="form.followUpTemplate"
-            placeholder="请输入随访模板编号"
-          />
-        </el-form-item>
-        <el-form-item label="主要诊断" prop="mainDiagnosis">
-          <el-input v-model="form.mainDiagnosis" placeholder="请输入主要诊断" />
-        </el-form-item>
-        <el-form-item label="数据来源，医共体平台" prop="dataSource">
-          <el-input
-            v-model="form.dataSource"
-            placeholder="请输入数据来源，医共体平台"
-          />
-        </el-form-item>
-        <el-form-item label="出院方式" prop="dischargeMethod">
-          <el-input
-            v-model="form.dischargeMethod"
-            placeholder="请输入出院方式"
-          />
-        </el-form-item>
-        <el-form-item label="患者健康状况" prop="healthState">
-          <el-input
-            v-model="form.healthState"
-            placeholder="请输入患者健康状况"
-          />
-        </el-form-item>
-        <el-form-item label="数据获取时间" prop="dataGetTime">
-          <el-date-picker
-            clearable
-            v-model="form.dataGetTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择数据获取时间"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="批次编号" prop="sn">
-          <el-input v-model="form.sn" placeholder="请输入批次编号" />
-        </el-form-item>
-        <el-form-item label="加入批次时间" prop="snTime">
-          <el-date-picker
-            clearable
-            v-model="form.snTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择加入批次时间"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="导入批次名称" prop="importName">
-          <el-input
-            v-model="form.importName"
-            placeholder="请输入导入批次名称"
-          />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import {
-  listExternalImport,
-  getExternalImport,
-  delExternalImport,
-  addExternalImport,
-  updateExternalImport,
-} from "@/api/system/externalImport";
-
-export default {
-  name: "ExternalImport",
-  data() {
-    return {
-      tableHeight: 480,
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 外部数据导入表格数据
-      externalImportList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        patientName: null,
-        phone: null,
-        age: null,
-        cardNo: null,
-        sex: null,
-        departmentName: null,
-        visitCode: null,
-        visitMethod: null,
-        visitDate: null,
-        admissionTime: null,
-        dischargeTime: null,
-        pushTime: null,
-        planFollowUp: null,
-        followUpTemplate: null,
-        mainDiagnosis: null,
-        dataSource: null,
-        dischargeMethod: null,
-        healthState: null,
-        dataGetTime: null,
-        sn: null,
-        snTime: null,
-        importName: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        patientName: [
-          { required: true, message: "患者姓名不能为空", trigger: "blur" },
-        ],
-        phone: [
-          { required: true, message: "患者电话不能为空", trigger: "blur" },
-        ],
-        cardNo: [
-          { required: true, message: "身份证号不能为空", trigger: "blur" },
-        ],
-      },
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询外部数据导入列表 */
-    getList() {
-      this.loading = true;
-      listExternalImport(this.queryParams).then((response) => {
-        this.externalImportList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        patientName: null,
-        phone: null,
-        age: null,
-        cardNo: null,
-        sex: null,
-        departmentName: null,
-        visitCode: null,
-        visitMethod: null,
-        visitDate: null,
-        admissionTime: null,
-        dischargeTime: null,
-        pushTime: null,
-        planFollowUp: null,
-        followUpTemplate: null,
-        mainDiagnosis: null,
-        dataSource: null,
-        dischargeMethod: null,
-        healthState: null,
-        dataGetTime: null,
-        sn: null,
-        snTime: null,
-        importName: null,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
-      this.single = selection.length !== 1;
-      this.multiple = !selection.length;
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids;
-      getExternalImport(id).then((response) => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改外部数据导入";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateExternalImport(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addExternalImport(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal
-        .confirm('是否确认删除外部数据导入编号为"' + ids + '"的数据项？')
-        .then(function () {
-          return delExternalImport(ids);
-        })
-        .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        })
-        .catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download(
-        "system/externalImport/export",
-        {
-          ...this.queryParams,
-        },
-        `externalImport_${new Date().getTime()}.xlsx`
-      );
-    },
-  },
-  watch: {
-    showSearch(val) {
-      this.tableHeight = val ? 480 : 600;
-    },
-  },
-};
-</script>
-<style scoped lang="scss">
-.top-right-btn {
-  margin-right: 40px;
-}
-</style>

src/views/manage/patientInfoImport/index.vue

@@ -1,63 +1,25 @@
 <template>
   <div class="app-container" ref="layout">
     <div ref="topform" class="form">
-      <SearchFilter
+      <SearchFilter :labelWidths="310" :widths="70" size="small" @search="handleQuery" @handleRules="getList"
-        :labelWidths="310"
+        patientUploadButtonVisible="true" @reset="resetQuery" @minShowCtrol="getMaxTableHeight" v-show="showSearch">
-        :widths="70"
-        size="small"
-        @search="handleQuery"
-        @handleRules="getList"
-        patientUploadButtonVisible="true"
-        @reset="resetQuery"
-        @minShowCtrol="getMaxTableHeight"
-        v-show="showSearch"
-      >
         <el-form-item label="导入日期" prop="" label-width="90px">
-          <el-date-picker
+          <el-date-picker v-model="createTime" type="daterange" range-separator="至" start-placeholder="开始日期"
-            v-model="createTime"
+            style="width: 220px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            style="width: 220px"
-            value-format="yyyy-MM-dd"
-            end-placeholder="结束日期"
-          >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="流水号" prop="sn" label-width="90px">
-          <el-input
+          <el-input v-model="queryParams.sn" placeholder="请输入流水号" style="width: 220px" clearable>
-            v-model="queryParams.sn"
-            placeholder="请输入流水号"
-            style="width: 220px"
-            clearable
-          >
           </el-input>
         </el-form-item>
         <el-form-item label="批次名称" prop="importName" label-width="90px">
-          <el-input
+          <el-input v-model="queryParams.importName" placeholder="请输入批次名称" style="width: 220px" clearable>
-            v-model="queryParams.importName"
-            placeholder="请输入批次名称"
-            style="width: 220px"
-            clearable
-          >
           </el-input>
         </el-form-item>
         <el-form-item label="医院" prop="" label-width="90px">
-          <el-select
+          <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width: 220px"
-            v-model="queryParams.hospitalAgencyId"
+            clearable @clear="clearhospitalAgency" @change="changehospitalAgency">
-            filterable
+            <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
-            placeholder="请选择医院"
-            style="width: 220px"
-            clearable
-            @clear="clearhospitalAgency"
-            @change="changehospitalAgency"
-          >
-            <el-option
-              v-for="item in hospitalAgencylist"
-              :key="item.id"
-              :label="item.agencyName"
-              :value="item.id"
-            >
             </el-option>
           </el-select>
         </el-form-item>
@@ -70,17 +32,9 @@
         </el-form-item> -->
       </SearchFilter>
     </div>
-    <div ref="mb8" class="mb8" style="margin-left: 5px">
+    <!-- <div ref="mb8" class="mb8">
       <el-row :gutter="10" class="">
-        <el-button
+        <el-col :span="1.5">
-          type="primary"
-          plain
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleManualImport"
-          >手动导入</el-button
-        >
-        <!-- <el-col :span="1.5">
           <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
             v-hasPermi="['manage:blacklist:add']">新增</el-button>
         </el-col>
@@ -96,16 +50,12 @@
           <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
             v-hasPermi="['manage:blacklist:export']">导出</el-button>
         </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
-    </div>
+    </div> -->
     <div ref="table">
-      <el-table
+      <el-table :max-height="maxTableHeight" v-loading="loading" :data="PatientInfoImportBatchlist"
-        :max-height="maxTableHeight"
+        @selection-change="handleSelectionChange">
-        v-loading="loading"
-        :data="PatientInfoImportBatchlist"
-        @selection-change="handleSelectionChange"
-      >
         <el-table-column type="selection" width="55" />
         <el-table-column label="序号" type="index" width="50" align="center" />
         <el-table-column label="流水号" prop="sn" align="center">
@@ -123,56 +73,28 @@
             <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          label="操作"
-          align="center"
-          class-name="small-padding fixed-width"
-        >
           <template slot-scope="scope">
             <!-- <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
               v-hasPermi="['manage:blacklist:edit']">修改</el-button>
             <el-button size="mini" type="text" @click="handleDelete(scope.row)"
               v-hasPermi="['manage:blacklist:remove']">删除</el-button> -->
-            <el-button size="mini" type="text" @click="handOutbound(scope.row)"
+            <el-button size="mini" type="text" @click="handOutbound(scope.row)">外呼</el-button>
-              >外呼</el-button
+            <el-button size="mini" type="text" @click="ljhandOutbound(scope.row)">立即外呼</el-button>
-            >
+            <el-button size="mini" type="text" @click="handsn(scope.row)">明细</el-button>
-            <el-button
+            <el-button size="mini" type="text" @click="handleDelete(scope.row)">删除</el-button>
-              size="mini"
-              type="text"
-              @click="ljhandOutbound(scope.row)"
-              >立即外呼</el-button
-            >
-            <el-button size="mini" type="text" @click="handsn(scope.row)"
-              >明细</el-button
-            >
-            <el-button size="mini" type="text" @click="handleDelete(scope.row)"
-              >删除</el-button
-            >
           </template>
         </el-table-column>
       </el-table>
     </div>
     <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize" @pagination="getList" /> -->
-    <myPagination
+    <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
-      v-show="total > 0"
+      :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
-      :total="total"
+    <el-dialog title="立即外呼" :visible.sync="open" width="500px" append-to-body>
-      :pageSize="queryParams.pageSize"
-      :indexFromWrap="queryParams.pageNum"
-      @updateCPage="updateCPage"
-    ></myPagination>
-    <el-dialog
-      title="立即外呼"
-      :visible.sync="open"
-      width="500px"
-      append-to-body
-    >
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="任务名称" prop="manageRouteName">
-          <el-input
+          <el-input v-model="form.manageRouteName" placeholder="请输入任务名称" />
-            v-model="form.manageRouteName"
-            placeholder="请输入任务名称"
-          />
         </el-form-item>
         <el-descriptions title="上次外呼数据简介" />
         <el-form-item label="流水号" prop="sn">
@@ -182,10 +104,10 @@
         </el-form-item>
         <el-form-item label="任务节点类型" prop="taskNodeType">
           <div class="formdiv">
-            {{ form.taskNodeType == "PHONE_OUTBOUND" ? "电话外呼" : "" }}
+            {{ form.taskNodeType == 'PHONE_OUTBOUND' ? '电话外呼' : '' }}
-            {{ form.taskNodeType == "QUESTIONNAIRE_SCALE" ? "问卷量表" : "" }}
+            {{ form.taskNodeType == 'QUESTIONNAIRE_SCALE' ? '问卷量表' : '' }}
-            {{ form.taskNodeType == "PROPAGANDA_ARTICLE" ? "宣教文案" : "" }}
+            {{ form.taskNodeType == 'PROPAGANDA_ARTICLE' ? '宣教文案' : '' }}
-            {{ form.taskNodeType == "TEXT_REMIND" ? "文字提醒" : "" }}
+            {{ form.taskNodeType == 'TEXT_REMIND' ? '文字提醒' : '' }}
           </div>
         </el-form-item>
         <span v-if="form.taskNodeType == 'PHONE_OUTBOUND'">
@@ -196,8 +118,8 @@
           </el-form-item>
           <el-form-item label="推送方式" prop="phoneDialMethod">
             <div class="formdiv">
-              {{ form.phoneDialMethod == "COMMON" ? "人工电话" : "" }}
+              {{ form.phoneDialMethod == 'COMMON' ? '人工电话' : '' }}
-              {{ form.phoneDialMethod == "AI" ? "自动外呼" : "" }}
+              {{ form.phoneDialMethod == 'AI' ? '自动外呼' : '' }}
             </div>
           </el-form-item>
           <el-form-item label="重播次数" prop="phoneRedialTimes">
@@ -219,17 +141,13 @@
           </el-form-item>
           <el-form-item label="推送方式" prop="phoneDialMethod">
             <div class="formdiv">
-              {{ form.phoneDialMethod == "" ? "小程序问卷" : "" }}
+              {{ form.phoneDialMethod == '' ? '小程序问卷' : '' }}
-              {{ form.phoneDialMethod == "AI" ? "AI自动外呼" : "" }}
+              {{ form.phoneDialMethod == 'AI' ? 'AI自动外呼' : '' }}
-              {{ form.phoneDialMethod == "COMMON" ? "人工随访" : "" }}
+              {{ form.phoneDialMethod == 'COMMON' ? '人工随访' : '' }}
             </div>
           </el-form-item>
         </span>
-        <el-form-item
+        <el-form-item v-if="form.taskNodeType == 'PROPAGANDA_ARTICLE'" label="宣教模板" prop="taskNodeType">
-          v-if="form.taskNodeType == 'PROPAGANDA_ARTICLE'"
-          label="宣教模板"
-          prop="taskNodeType"
-        >
           <div class="formdiv">
             {{ form.propagandaTitle }}
           </div>
@@ -240,228 +158,19 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog
-      title="手动导入"
-      :visible.sync="manualImportDialog"
-      width="80%"
-      append-to-body
-    >
-      <div style="display: flex; flex-direction: column; height: 600px">
-        <div style="flex: 0 0 auto">
-          <el-form :inline="true" :model="manualImportQuery" size="small">
-            <el-form-item label="所属科室名称">
-              <el-select
-                v-model="manualImportQuery.departmentNameList"
-                multiple
-                filterable
-                clearable
-                placeholder="请选择科室名称"
-              >
-                <el-option
-                  v-for="(item, index) in deptSelectData"
-                  :key="index"
-                  :label="item.departmentName"
-                  :value="item.departmentName"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="就诊方式">
-              <el-select
-                v-model="manualImportQuery.visitMethod"
-                placeholder="请选择就诊方式"
-                style="width: 200px"
-                clearable
-                @change="handleVisitMethodChange"
-              >
-                <el-option label="门诊" value="1" />
-                <el-option label="住院" value="2" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="就诊时间">
-              <el-date-picker
-                v-model="visitTimeRange"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                value-format="yyyy-MM-dd"
-                style="width: 300px"
-                :disabled="manualImportQuery.visitMethod == '2'"
-              />
-            </el-form-item>
-            <el-form-item label="出院日期">
-              <el-date-picker
-                v-model="dischargeTimeRange"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                value-format="yyyy-MM-dd"
-                style="width: 300px"
-                :disabled="manualImportQuery.visitMethod == '1'"
-              />
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" @click="handleManualSearch"
-                >搜索</el-button
-              >
-              <el-button @click="handleManualReset">重置</el-button>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div style="flex: 1; overflow: auto">
-          <el-table
-            :data="manualImportList"
-            style="width: 100%"
-            height="100%"
-            v-loading="manualImportLoading"
-            @selection-change="DiahandleSelectionChange"
-          >
-            <el-table-column type="selection" width="50" align="center" />
-            <el-table-column
-              label="患者姓名"
-              align="center"
-              prop="patientName"
-            />
-            <el-table-column
-              label="患者电话"
-              align="center"
-              prop="phone"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              label="年龄"
-              align="center"
-              prop="age"
-              width="50"
-            />
-            <el-table-column
-              label="身份证号"
-              align="center"
-              prop="cardNo"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              label="性别"
-              align="center"
-              prop="sex"
-              width="50"
-            />
-            <el-table-column
-              label="所属科室名称"
-              align="center"
-              prop="departmentName"
-            />
-            <el-table-column
-              label="就诊编号"
-              align="center"
-              prop="visitCode"
-              show-overflow-tooltip
-            />
-            <el-table-column label="就诊方式" align="center" prop="visitMethod">
-              <template slot-scope="scope">
-                <span>{{
-                  scope.row.visitMethod === "1" ? "门诊" : "住院"
-                }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              label="就诊时间"
-              align="center"
-              prop="visitDate"
-              width="100"
-            >
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.visitDate, "{y}-{m}-{d}") }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              label="入院时间"
-              align="center"
-              prop="admissionTime"
-            >
-              <template slot-scope="scope">
-                <span>{{
-                  parseTime(scope.row.admissionTime, "{y}-{m}-{d}")
-                }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              label="出院时间"
-              align="center"
-              prop="dischargeTime"
-            >
-              <template slot-scope="scope">
-                <span>{{
-                  parseTime(scope.row.dischargeTime, "{y}-{m}-{d}")
-                }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              label="主要诊断"
-              align="center"
-              prop="mainDiagnosis"
-            />
-            <el-table-column
-              label="出院方式"
-              align="center"
-              prop="dischargeMethod"
-            />
-            <el-table-column
-              label="患者健康状况"
-              align="center"
-              prop="healthState"
-            />
-            <el-table-column
-              label="数据获取时间"
-              align="center"
-              prop="dataGetTime"
-              width="100"
-            >
-              <template slot-scope="scope">
-                <span>{{
-                  parseTime(scope.row.dataGetTime, "{y}-{m}-{d}")
-                }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="generateImportInfo()"
-          >生成导入信息</el-button
-        >
-        <el-button @click="manualImportDialog = false">关 闭</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import {
+import { patientInfoImportBatchlist, updateSn, outboundConfirmation, directOutbound } from "@/api/manage/patientInfoImport";
-  patientInfoImportBatchlist,
+import { selectAgencyList, getDepartmentList, getAgencyList } from "@/api/manage/selectAgencyList";
-  updateSn,
+import SearchFilter from '../../components/SearchForm.vue'
-  outboundConfirmation,
-  directOutbound,
-  patientInfoImportList,
-  deptSelectList,
-  CreategenerateImport,
-} from "@/api/manage/patientInfoImport";
-import {
-  selectAgencyList,
-  getDepartmentList,
-  getAgencyList,
-} from "@/api/manage/selectAgencyList";
-import SearchFilter from "../../components/SearchForm.vue";
 import { getAgencytype } from "@/api/system/agency";
 export default {
   name: "Importlist",
   components: { SearchFilter },
   data() {
     return {
-      deptSelectData: [],
-      manualImportLoading: false,
       maxTableHeight: undefined,
       //医院list
       hospitalAgencylist: [],
@@ -471,8 +180,6 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 选中数据列表
-      selectionList: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -487,8 +194,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      // 手动导入弹出层
-      manualImportDialog: false,
       createTime: "",
       // 查询参数
       queryParams: {
@@ -501,17 +206,6 @@ export default {
         sn: "",
         importName: "",
       },
-      // 手动导入查询参数
-      manualImportQuery: {
-        departmentNameList: [],
-        visitMethod: "1",
-        visitDateStart: "",
-        visitDateEnd: "",
-        dischargeDateStart: "",
-        dischargeDateEnd: "",
-      },
-      // 手动导入列表
-      manualImportList: [],
       // 表单参数
       form: {},
       //重播次数
@@ -519,9 +213,9 @@ export default {
       // 表单校验
       rules: {
         manageRouteName: [
-          { required: true, message: "请输入任务名称", trigger: "change" },
+          { required: true, message: '请输入任务名称', trigger: 'change' }
         ],
-      },
+      }
     };
   },
   created() {
@@ -529,37 +223,8 @@ export default {
     this.getList();
   },
   mounted() {
-    this.getMaxTableHeight();
+    this.getMaxTableHeight()
-    this.screenChange();
+    this.screenChange()
-  },
-  computed: {
-    visitTimeRange: {
-      get() {
-        const { visitDateStart, visitDateEnd } = this.manualImportQuery;
-        return visitDateStart || visitDateEnd
-          ? [visitDateStart, visitDateEnd]
-          : [];
-      },
-      set(value) {
-        this.manualImportQuery.visitDateStart =
-          value && value[0] ? value[0] : "";
-        this.manualImportQuery.visitDateEnd = value && value[1] ? value[1] : "";
-      },
-    },
-    dischargeTimeRange: {
-      get() {
-        const { dischargeDateStart, dischargeDateEnd } = this.manualImportQuery;
-        return dischargeDateStart || dischargeDateEnd
-          ? [dischargeDateStart, dischargeDateEnd]
-          : [];
-      },
-      set(value) {
-        this.manualImportQuery.dischargeDateStart =
-          value && value[0] ? value[0] : "";
-        this.manualImportQuery.dischargeDateEnd =
-          value && value[1] ? value[1] : "";
-      },
-    },
   },
   methods: {
     // 流水号/明细
@@ -573,49 +238,6 @@ export default {
         },
       });
     },
-    // 手动导入
-    handleManualImport() {
-      this.manualImportDialog = true;
-      this.handleManualSearch();
-      deptSelectList().then((res) => {
-        this.deptSelectData = res.data;
-      });
-    },
-    // 手动导入搜索
-    handleManualSearch() {
-      this.manualImportLoading = true;
-      patientInfoImportList(this.manualImportQuery).then((response) => {
-        this.manualImportLoading = false;
-        this.manualImportList = response;
-      });
-    },
-    // 手动导入重置
-    handleManualReset() {
-      this.manualImportQuery = {
-        departmentNameList: [],
-        visitMethod: "",
-        visitDateStart: "",
-        visitDateEnd: "",
-        dischargeDateStart: "",
-        dischargeDateEnd: "",
-      };
-      this.handleManualSearch();
-    },
-    // 就诊方式切换时清空对应日期范围
-    handleVisitMethodChange(value) {
-      if (value === "1") {
-        this.manualImportQuery.dischargeDateStart = "";
-        this.manualImportQuery.dischargeDateEnd = "";
-      } else if (value === "2") {
-        this.manualImportQuery.visitDateStart = "";
-        this.manualImportQuery.visitDateEnd = "";
-      } else {
-        this.manualImportQuery.visitDateStart = "";
-        this.manualImportQuery.visitDateEnd = "";
-        this.manualImportQuery.dischargeDateStart = "";
-        this.manualImportQuery.dischargeDateEnd = "";
-      }
-    },
     // 外呼
     handOutbound(row) {
       this.$router.push({
@@ -623,10 +245,10 @@ export default {
         query: {
           path: "/patient/patientinfoimport",
           // signPatientRecordId: row.id,
-          sn: row.sn ? row.sn : "",
+          sn: row.sn ? row.sn : '',
-          patientName: row.patientName ? row.patientName : "",
+          patientName: row.patientName ? row.patientName : '',
-          departmentId: row.departmentId ? row.departmentId : "",
+          departmentId: row.departmentId ? row.departmentId : '',
-          departmentName: row.departmentName ? row.departmentName : "",
+          departmentName: row.departmentName ? row.departmentName : '',
         },
       });
     },
@@ -643,51 +265,47 @@ export default {
       var dictType = "redial_times";
       getAgencytype(dictType).then((res) => {
         this.optionslisttime = res.data;
-        outboundConfirmation().then((res) => {
+        outboundConfirmation().then(res => {
           if (res.data) {
             this.form = res.data;
-            this.$set(this.form, "sn", row.sn + "");
+            this.$set(this.form, 'sn', row.sn + '')
             this.open = true;
           } else {
             this.$modal.msgError("暂无最新外呼数据,请先进行手动外呼");
           }
-        });
+        })
       });
     },
     Calloutimmediately() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
-          directOutbound(this.form).then((res) => {
+          directOutbound(this.form).then(res => {
             this.$modal.msgSuccess("操作成功");
             this.open = false;
             this.getList();
-          });
+          })
         }
-      });
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
       // const ids = row.id || this.ids;
-      this.$modal
+      this.$modal.confirm('是否确认删除？').then(() => {
-        .confirm("是否确认删除？")
+        return updateSn(row.sn);
-        .then(() => {
+      }).then(() => {
-          return updateSn(row.sn);
+        this.getList();
-        })
+        this.$modal.msgSuccess("删除成功");
-        .then(() => {
+      }).catch(() => { });
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        })
-        .catch(() => {});
     },
     updateCPage(index, size) {
-      this.queryParams.pageNum = index;
+      this.queryParams.pageNum = index
-      this.queryParams.pageSize = size;
+      this.queryParams.pageSize = size
       this.getList();
     },
     /** 查询 */
     getList() {
       this.loading = true;
-      patientInfoImportBatchlist(this.queryParams).then((response) => {
+      patientInfoImportBatchlist(this.queryParams).then(response => {
         this.PatientInfoImportBatchlist = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -726,61 +344,54 @@ export default {
         campusAgencyId: null,
         sn: "",
         importName: "",
-      };
+      }
-      this.createTime = "";
+      this.createTime = '';
       // this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1;
+      this.single = selection.length !== 1
-      this.multiple = !selection.length;
+      this.multiple = !selection.length
-    },
-    DiahandleSelectionChange(selection) {
-      this.selectionList = selection;
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download(
+      this.download('manage/blacklist/export', {
-        "manage/blacklist/export",
+        ...this.queryParams
-        {
+      }, `blacklist_${new Date().getTime()}.xlsx`)
-          ...this.queryParams,
-        },
-        `blacklist_${new Date().getTime()}.xlsx`
-      );
     },
     //获取医院list
     selectAgencyinfo() {
       let query = {
-        agencyStatus: "ON",
+        agencyStatus: 'ON',
-        nodeType: "HOSPITAL",
+        nodeType: 'HOSPITAL',
-      };
+      }
-      selectAgencyList(query).then((res) => {
+      selectAgencyList(query).then(res => {
-        this.hospitalAgencylist = res.data;
+        this.hospitalAgencylist = res.data
-      });
+      })
     },
     //获取下级单位
     getAgencyListinfo(nodeType, id, type) {
       let query = {
         nodeType: nodeType,
-      };
-      if (nodeType == "HOSPITAL") {
-        query.hospitalId = id;
-      } else if (nodeType == "CAMPUS") {
-        query.campusId = id;
       }
-      getAgencyList(query).then((res) => {
+      if (nodeType == 'HOSPITAL') {
+        query.hospitalId = id
+      } else if (nodeType == 'CAMPUS') {
+        query.campusId = id
+      }
+      getAgencyList(query).then(res => {
         // if (type) {
-        if (nodeType == "HOSPITAL") {
+        if (nodeType == 'HOSPITAL') {
           this.campusAgencylist = res.data.campusList;
         }
         // }
-      });
+      })
     },
     //选中医院获取院区
     changehospitalAgency(id, type, typetwo) {
-      this.getAgencyListinfo("HOSPITAL", id, type);
+      this.getAgencyListinfo('HOSPITAL', id, type)
       // let query = {
       //   agencyStatus: 'ON',
       //   nodeType: 'CAMPUS',
@@ -789,110 +400,75 @@ export default {
       // selectAgencyList(query).then(res => {
       if (type) {
         if (!typetwo) {
-          this.form.campusAgencyId = null;
+          this.form.campusAgencyId = null
         }
       } else {
-        this.queryParams.campusAgencyId = null;
+        this.queryParams.campusAgencyId = null
       }
       // })
     },
     //选中院区获取科室
     changecampusAgency(id, type, typetwo) {
-      this.getAgencyListinfo("CAMPUS", id, type);
+      this.getAgencyListinfo('CAMPUS', id, type)
     },
     //清空医院
     clearhospitalAgency(type) {
       if (type) {
-        this.form.campusAgencyId = null;
+        this.form.campusAgencyId = null
-        this.form.departmentId = null;
+        this.form.departmentId = null
-        this.form.wardId = null;
+        this.form.wardId = null
       } else {
-        this.queryParams.campusAgencyId = null;
+        this.queryParams.campusAgencyId = null
-        this.queryParams.departmentId = null;
+        this.queryParams.departmentId = null
-        this.queryParams.wardId = null;
+        this.queryParams.wardId = null
       }
     },
     //清空院区
     clearcampusAgency(type) {
       if (type) {
-        this.form.departmentId = null;
+        this.form.departmentId = null
-        this.form.wardId = null;
+        this.form.wardId = null
-        this.getAgencyListinfo("HOSPITAL", this.form.hospitalAgencyId, type);
+        this.getAgencyListinfo('HOSPITAL', this.form.hospitalAgencyId, type)
       } else {
-        this.queryParams.departmentId = null;
+        this.queryParams.departmentId = null
-        this.queryParams.wardId = null;
+        this.queryParams.wardId = null
-        this.getAgencyListinfo("HOSPITAL", this.queryParams.hospitalAgencyId);
+        this.getAgencyListinfo('HOSPITAL', this.queryParams.hospitalAgencyId)
       }
     },
     // 获取表格最高高度
     getMaxTableHeight() {
-      const windowInnerHeight = window.innerHeight; // 屏幕可视高度
+      const windowInnerHeight = window.innerHeight // 屏幕可视高度
-      const layoutDiv = this.$refs.layout;
+      const layoutDiv = this.$refs.layout
-      const formDiv = this.$refs.topform;
+      const formDiv = this.$refs.topform
-      const mb8Div = this.$refs.mb8;
+      const mb8Div = this.$refs.mb8
       this.maxTableHeight =
-        windowInnerHeight -
+        windowInnerHeight - 134 -
-        134 -
         this.getBoxPadding(layoutDiv) -
         this.getBoxHeight(mb8Div) -
-        this.getBoxHeight(formDiv);
+        this.getBoxHeight(formDiv)
     },
     // 屏幕resize监听
     screenChange() {
       // 屏幕resize监听事件：一旦屏幕宽高发生变化，就会执行resize
-      window.addEventListener("resize", this.getMaxTableHeight, true);
+      window.addEventListener('resize', this.getMaxTableHeight, true)
       // 将屏幕监听事件移除
       // 这步是必须的。离开页面时不移除，再返回，或者进入到别的有相同元素的页面会报错
       // 或者将这里的方法直接写在beforeDestroy函数中也可以
-      this.$once("hook:beforeDestroy", () => {
+      this.$once('hook:beforeDestroy', () => {
-        window.removeEventListener("resize", this.getMaxTableHeight, true);
+        window.removeEventListener('resize', this.getMaxTableHeight, true)
-      });
-    },
-    // 手动生成导入信息确认
-    generateImportInfo() {
-      if (this.selectionList.length === 0) {
-        this.$modal.msgWarning("请至少选择一条数据进行导入");
-        return;
-      }
-      this.$prompt("请输入导入批次名称", "提示", {
-        confirmButtonText: "确认导入",
-        cancelButtonText: "取消",
-        inputValidator: (value) => {
-          if (!value || value.trim() === "") {
-            return "导入批次名称不能为空";
-          }
-          return true;
-        },
       })
-        .then(({ value }) => {
-          CreategenerateImport({
-            externalImports: this.selectionList,
-            importName: value,
-          }).then((res) => {
-            console.log(res);
-            this.$modal.msgSuccess("导入成功");
-            this.manualImportDialog = false;
-            this.getList();
-          });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "输入取消",
-          });
-        });
     },
-  },
+  }
 };
 </script>
 <style>
 .formdiv {
   width: 340px;
-  border: 1px solid #dcdfe6;
+  border: 1px solid #DCDFE6;
   height: 36px;
   line-height: 36px;
   font-size: 14px;
   padding: 0 15px;
   border-radius: 4px;
 }
-</style>
+</style>

src/views/system/CreatePushTask/index.vue

@@ -0,0 +1,318 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <h2 style="margin-bottom: 20px">创建推送任务</h2>
+      <el-form :model="form" ref="form" label-width="120px" :rules="rules">
+        <el-form-item label="任务名称" prop="manageRouteName">
+          <el-input
+            v-model="form.manageRouteName"
+            placeholder="请输入任务名称"
+            style="width: 200px"
+          />
+        </el-form-item>
+        <!-- <el-form-item label="指定时间" prop="nodePlanTime">
+          <el-date-picker
+            v-model="form.nodePlanTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择指定时间"
+            :picker-options="pickerOptions"
+            style="width: 200px"
+          />
+        </el-form-item> -->
+        <el-form-item label="任务节点类型" prop="batchTaskSource">
+          <el-radio-group v-model="form.batchTaskSource">
+            <el-radio label="telephone">电话外呼</el-radio>
+            <el-radio label="message">短信推送</el-radio>
+          </el-radio-group>
+        </el-form-item>
+
+        <!-- 电话外呼部分 -->
+        <template v-if="form.batchTaskSource === 'telephone'">
+          <el-form-item label="话术模板" prop="phoneTemplate">
+            <scripts
+              @on-template="handlePhoneTemplateSelect"
+              :templateId="form.phoneTemplateId"
+              :node="form.phoneDialMethod"
+              :templateName="form.phoneTemplate"
+            ></scripts>
+          </el-form-item>
+          <el-form-item label="话术简介" prop="phoneDesc">
+            <el-input
+              v-model="form.phoneNodeContent"
+              type="textarea"
+              placeholder="话术简介"
+              autosize
+              disabled
+            />
+          </el-form-item>
+          <!-- <el-form-item label="话术变量" prop="phoneVars">
+            <el-input
+              v-model="form.phoneVars"
+              type="textarea"
+              placeholder="请输入话术变量（如有多个请用逗号分隔）"
+            />
+          </el-form-item> -->
+          <el-form-item label="重播次数" prop="phoneRedialTimes">
+            <el-select v-model="form.phoneRedialTimes" style="width: 200px">
+              <el-option
+                v-for="item in optionslisttime"
+                :key="item.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="时间间隔(分)" prop="phoneTimeInterval">
+            <el-input
+              v-model.number="form.phoneTimeInterval"
+              oninput="value=value.replace(/[^\d]/g,'')"
+              style="width: 200px"
+            />
+          </el-form-item>
+        </template>
+
+        <!-- 短信推送部分 -->
+        <template v-if="form.batchTaskSource === 'message'">
+          <el-form-item label="短信模板" prop="smsTemplate">
+            <message
+              @on-template="handleSmsTemplateSelect"
+              :templateId="form.smsTemplateId"
+              :templateName="form.smsTemplate"
+            ></message>
+          </el-form-item>
+          <el-form-item label="短信简介" prop="messageNodeContent">
+            <el-input
+              v-model="form.messageNodeContent"
+              type="textarea"
+              placeholder="短信简介"
+              autosize
+              disabled
+            />
+          </el-form-item>
+          <el-form-item label="短信变量" v-if="smsVarsVisible">
+            <div
+              style="
+                display: flex;
+                gap: 12px;
+                align-items: center;
+                flex-wrap: wrap;
+              "
+            >
+              <div
+                v-for="key in smsVarKeys"
+                :key="key"
+                style="display: flex; align-items: center; gap: 8px"
+              >
+                <el-form-item :label="key">
+                  <el-input
+                    v-model="form.vars[key]"
+                    :placeholder="'请输入' + key"
+                    style="width: 200px"
+                  />
+                </el-form-item>
+              </div>
+            </div>
+          </el-form-item>
+        </template>
+
+        <el-form-item>
+          <el-button type="primary" @click="handleSubmit">保存</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import scripts from "../components/script.vue";
+import message from "../components/message.vue";
+import { getAgencytype } from "@/api/system/agency";
+import {
+  AllBatchSendTaskInfo,
+  generatePushTask,
+} from "@/api/system/batchSendTaskInfo";
+
+export default {
+  name: "CreatePushTask",
+  components: { scripts, message },
+  data() {
+    return {
+      rules: {
+        manageRouteName: [
+          { required: true, message: "任务名称不能为空", trigger: "blur" },
+        ],
+        // nodePlanTime: [
+        //   { required: true, message: "指定时间不能为空", trigger: "change" },
+        // ],
+        batchTaskSource: [
+          {
+            required: true,
+            message: "任务节点类型不能为空",
+            trigger: "change",
+          },
+        ],
+      },
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7;
+        },
+      },
+      optionslisttime: [],
+      smsVarsVisible: false,
+      smsVarKeys: [],
+      form: {
+        manageRouteName: "",
+        nodePlanTime: "",
+        batchTaskSource: "",
+        phoneDialMethod: "AI",
+        phoneTemplateId: "",
+        phoneTemplate: "",
+        phoneNodeContent: "",
+        scriptInfoId: "",
+        robotPublishId: "",
+        phoneTemplateName: "",
+        phoneDesc: "",
+        phoneVars: "",
+        phoneRedialTimes: "",
+        phoneTimeInterval: "",
+        smsTemplateId: "",
+        smsTemplate: "",
+        messageTemplateId: "",
+        messageTemplateCode: "",
+        messageTemplateName: "",
+        messageNodeContent: "",
+        physicalExaminationLabel: "",
+        vars: {},
+        list: [],
+      },
+    };
+  },
+  created() {
+    this.infolistMESSAGE();
+    this.form.physicalExaminationLabel =
+      this.$route.query.physicalExaminationLabel || "";
+    AllBatchSendTaskInfo(this.$route.query).then((res) => {
+      this.form.list = res || [];
+    });
+  },
+  mounted() {},
+  methods: {
+    infolistMESSAGE() {
+      const dictType = "redial_times";
+      getAgencytype(dictType).then((res) => {
+        this.optionslisttime = res.data || [];
+      });
+    },
+    handlePhoneTemplateSelect(item) {
+      this.form.phoneTemplateId = item.phoneTemplateId || "";
+      this.form.phoneTemplate = item.templateName || "";
+      this.form.phoneNodeContent = item.templateContent || "";
+      this.form.robotPublishId = item.robotPublishId || "";
+      this.form.phoneTemplateName = item.templateName || "";
+      this.form.scriptInfoId = item.scriptInfoId || "";
+    },
+    handleSmsTemplateSelect(item) {
+      this.form.smsTemplateId = item.templateId || "";
+      this.form.smsTemplate = item.templateName || "";
+      this.form.messageTemplateId = item.templateId || "";
+      this.form.messageTemplateCode = item.messageTemplateCode || "";
+      this.form.messageTemplateName = item.templateName || "";
+      this.form.messageNodeContent = item.templateContent || "";
+      const variablesStr = item.variables;
+      if (variablesStr && String(variablesStr).trim() !== "") {
+        const keys = String(variablesStr)
+          .split("|")
+          .map((s) => s.trim())
+          .filter(Boolean);
+
+        this.smsVarsVisible = keys.length > 0;
+        this.smsVarKeys = keys;
+
+        const keySet = new Set(keys);
+
+        // 写入模板变量占位符（例如 month|day）
+        keys.forEach((key) => {
+          if (this.form.vars[key] === undefined)
+            this.$set(this.form.vars, key, "");
+        });
+
+        // 清理不在模板变量里的旧值，避免沿用旧模板变量
+        Object.keys(this.form.vars).forEach((existingKey) => {
+          if (!keySet.has(existingKey))
+            this.$delete(this.form.vars, existingKey);
+        });
+      } else {
+        this.smsVarsVisible = false;
+        this.smsVarKeys = [];
+        Object.keys(this.form.vars).forEach((existingKey) => {
+          this.$delete(this.form.vars, existingKey);
+        });
+      }
+    },
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (
+            this.form.batchTaskSource == "message" &&
+            !this.form.messageTemplateName
+          ) {
+            this.$message.error("请选择短信模板");
+            return;
+          }
+          if (
+            this.form.batchTaskSource == "telephone" &&
+            !this.form.phoneTemplateName
+          ) {
+            this.$message.error("请选择话术模板");
+            return;
+          }
+          const loading = this.$loading({
+            lock: true,
+            text: "加载中",
+            spinner: "el-icon-loading",
+            background: "rgba(0, 0, 0, 0.7)",
+          });
+          // 获取此时时间，并格式化为 yyyy-MM-dd HH:mm:ss
+          const now = new Date();
+          const pad = (value) => String(value).padStart(2, "0");
+          this.form.nodePlanTime = `${now.getFullYear()}-${pad(
+            now.getMonth() + 1
+          )}-${pad(now.getDate())} ${pad(now.getHours())}:${pad(
+            now.getMinutes()
+          )}:${pad(now.getSeconds())}`;
+
+          generatePushTask(this.form).then((res) => {
+            loading.close();
+            if (res.code == 200) {
+              this.$message.success(res.msg);
+              // 延迟2秒后关闭当前页面并刷新上一个页面的标签页
+              setTimeout(() => {
+                this.$store
+                  .dispatch("tagsView/delView", this.$route)
+                  .then(() => {
+                    this.$router.go(-1);
+                  });
+              }, 2000);
+            }
+          });
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style scoped>
+.app-container {
+  padding: 24px;
+}
+
+::v-deep .el-form-item__label {
+  font-size: 16px !important;
+}
+.el-textarea {
+  font-size: 16px;
+}
+</style>

src/views/system/batchSendTaskInfo/index.vue

@@ -0,0 +1,845 @@
+<template>
+  <div
+    class="app-container"
+    style="max-height: 100vh; overflow-y: auto; overflow-x: hidden"
+  >
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="流水号" prop="sn">
+        <el-input
+          v-model="queryParams.sn"
+          placeholder="请输入流水号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="导入批次" prop="importName">
+        <el-input
+          v-model="queryParams.importName"
+          placeholder="请输入导入批次名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="团体" prop="teamName">
+        <el-input
+          v-model="queryParams.teamName"
+          placeholder="请输入团体名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="科室名称" prop="departmentName">
+        <el-input
+          v-model="queryParams.departmentName"
+          placeholder="请输入科室名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="姓名" prop="patientName">
+        <el-input
+          v-model="queryParams.patientName"
+          placeholder="请输入姓名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="电话" prop="patientPhone">
+        <el-input
+          v-model="queryParams.patientPhone"
+          placeholder="请输入电话"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="年龄" prop="age">
+        <el-input
+          v-model="queryParams.age"
+          placeholder="请输入年龄"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="身份证号" prop="cardNo">
+        <el-input
+          v-model="queryParams.cardNo"
+          placeholder="请输入身份证号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="总结标签" prop="physicalExaminationLabel">
+        <el-select
+          v-model="queryParams.physicalExaminationLabel"
+          placeholder="请选择总结标签"
+          clearable
+        >
+          <el-option
+            v-for="item in ExaminationLabelList"
+            :key="item"
+            :label="item"
+            :value="item"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="就诊/出院/体检时间"
+        prop="visitDate"
+        label-width="135px"
+      >
+        <el-date-picker
+          clearable
+          v-model="visitDate"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          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-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-upload2"
+          size="mini"
+          @click="uploadOpen = true"
+          >导入</el-button
+        >
+      </el-col>
+      <!-- 导入弹窗 -->
+      <el-dialog
+        title="导入"
+        :visible.sync="uploadOpen"
+        width="400px"
+        append-to-body
+      >
+        <el-form
+          :model="uploadForm"
+          ref="uploadForm"
+          size="small"
+          :inline="true"
+          label-width="110px"
+        >
+          <el-form-item label="批次名称" prop="importName">
+            <el-input
+              v-model="uploadForm.importName"
+              placeholder="请输入批次名称"
+            />
+          </el-form-item>
+        </el-form>
+        <el-upload
+          drag
+          class="upload-demo"
+          ref="upload"
+          :action="uploadAction.url"
+          :headers="uploadAction.headers"
+          :on-preview="handlePreview"
+          :on-remove="handleRemove"
+          :file-list="fileList"
+          :auto-upload="false"
+          :on-success="handleUploadSuccess"
+          :data="uploadForm"
+          :on-exceed="handleExceed"
+          :limit="1"
+        >
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+          <div class="el-upload__tip" slot="tip" style="line-height: 25px">
+            <div>
+              1.<span
+                style="color: #1890ff; cursor: pointer"
+                @click="downloadTemplate"
+                >下载导入模板</span
+              >
+            </div>
+            <div>2.最大支持2MB的xls/xlsx文件</div>
+            <div>3.一次导入患者数量不能超过5000</div>
+          </div>
+        </el-upload>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitUpload">确 定</el-button>
+          <el-button @click="uploadCancel">取 消</el-button>
+        </div>
+      </el-dialog>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-edit-outline"
+          size="mini"
+          @click="handleCreatePushTask"
+          >创建推送任务</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:batchSendTaskInfo:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <right-toolbar
+        style="margin-right: 20px"
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="batchSendTaskInfoList"
+      @selection-change="handleSelectionChange"
+      style="margin-bottom: 40px"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="流水号"
+        align="center"
+        prop="sn"
+        show-overflow-tooltip
+      />
+      <el-table-column label="导入批次" align="center" prop="importName" />
+      <el-table-column label="姓名" align="center" prop="patientName" />
+      <el-table-column
+        label="电话"
+        align="center"
+        prop="patientPhone"
+        width="110"
+      />
+      <el-table-column label="年龄" align="center" prop="age" />
+      <el-table-column
+        label="身份证号"
+        align="center"
+        prop="cardNo"
+        show-overflow-tooltip
+      />
+      <el-table-column label="人员类型" align="center" prop="personnelType" />
+      <el-table-column label="团体" align="center" prop="teamName" />
+      <el-table-column label="科室名称" align="center" prop="departmentName" />
+      <el-table-column
+        label="就诊/出院/体检时间"
+        align="center"
+        prop="visitDate"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.visitDate, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="门诊/住院/体检号"
+        align="center"
+        prop="inHospitalNumber"
+        width="130"
+      />
+      <el-table-column label="人群" align="center" prop="crowdName" />
+      <el-table-column
+        label="总结标签"
+        align="center"
+        prop="physicalExaminationLabel"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="120"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:batchSendTaskInfo:edit']"
+            >查看</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:batchSendTaskInfo:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 创建推送任务弹窗 -->
+    <el-dialog
+      title="请确认创建推送任务的名单"
+      :visible.sync="createPushTaskOpen"
+      width="85%"
+      append-to-body
+    >
+      <el-table
+        v-loading="createPushTaskLoading"
+        :data="createPushTaskList"
+        border
+        style="width: 100%"
+      >
+        <el-table-column
+          label="流水号"
+          align="center"
+          prop="sn"
+          width="120"
+          show-overflow-tooltip
+        />
+        <el-table-column label="导入批次" align="center" prop="importName" />
+        <el-table-column label="姓名" align="center" prop="patientName" />
+        <el-table-column label="电话" align="center" prop="patientPhone" />
+        <el-table-column label="年龄" align="center" prop="age" />
+        <el-table-column
+          label="人员类型"
+          align="center"
+          prop="personnelType"
+          width="190"
+        />
+        <el-table-column label="团体" align="center" prop="teamName" />
+        <el-table-column
+          label="就诊/出院/体检时间"
+          align="center"
+          prop="visitDate"
+          width="180"
+        >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.visitDate, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="100">
+          <template slot-scope="scope">
+            <el-button size="mini" type="text" @click="removeRow(scope.$index)"
+              >移除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="createPushTaskTotal > 0"
+        :total="createPushTaskTotal"
+        :page.sync="createPushTaskQueryParams.pageNum"
+        :limit.sync="createPushTaskQueryParams.pageSize"
+        @pagination="getCreatePushTaskList"
+      />
+
+      <div slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button @click="createPushTaskOpen = false">关闭</el-button>
+        <el-button
+          type="primary"
+          v-show="createPushTaskList.length > 0"
+          @click="toNewPage"
+          >确认并创建推送任务</el-button
+        >
+      </div>
+    </el-dialog>
+
+    <!-- 添加或修改批量推送任务信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="135px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="流水号" prop="sn">
+              <el-input v-model="form.sn" placeholder="请输入流水号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="导入批次" prop="importName">
+              <el-input
+                v-model="form.importName"
+                placeholder="请输入导入批次"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="团体名称" prop="teamName">
+              <el-input v-model="form.teamName" placeholder="请输入团体名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所属医院" prop="hospitalAgencyName">
+              <el-input
+                v-model="form.hospitalAgencyName"
+                placeholder="请输入所属医院"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="科室名称" prop="departmentName">
+              <el-input
+                v-model="form.departmentName"
+                placeholder="请输入科室名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="患者姓名" prop="patientName">
+              <el-input
+                v-model="form.patientName"
+                placeholder="请输入患者姓名"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="门诊/住院/体检号" prop="inHospitalNumber">
+              <el-input
+                v-model="form.inHospitalNumber"
+                placeholder="请输入门诊/住院/体检号"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="就诊/出院/体检时间" prop="visitDate">
+              <el-date-picker
+                clearable
+                v-model="form.visitDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择就诊/出院/体检时间"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="患者电话" prop="patientPhone">
+              <el-input
+                v-model="form.patientPhone"
+                placeholder="请输入患者电话"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="年龄" prop="age">
+              <el-input v-model="form.age" placeholder="请输入年龄" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="身份证号" prop="cardNo">
+              <el-input v-model="form.cardNo" placeholder="请输入身份证号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="人群名称" prop="crowdName">
+              <el-input v-model="form.crowdName" placeholder="请输入人群名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item
+          label="体检总结/主要诊断"
+          prop="physicalExaminationSummary"
+        >
+          <el-input
+            v-model="form.physicalExaminationSummary"
+            placeholder="请输入体检总结/主要诊断"
+            type="textarea"
+            :autosize="{ minRows: 2, maxRows: 10 }"
+          />
+        </el-form-item>
+        <el-form-item label="总结标签" prop="physicalExaminationLabel">
+          <el-input
+            v-model="form.physicalExaminationLabel"
+            placeholder="请输入总结标签"
+            type="textarea"
+            autosize
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <!-- <el-button type="primary" @click="submitForm">确 定</el-button> -->
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listBatchSendTaskInfo,
+  getBatchSendTaskInfo,
+  delBatchSendTaskInfo,
+  addBatchSendTaskInfo,
+  updateBatchSendTaskInfo,
+  getPhysicalExaminationLabel,
+} from "@/api/system/batchSendTaskInfo";
+import { getToken } from "@/utils/auth";
+
+export default {
+  name: "BatchSendTaskInfo",
+  data() {
+    return {
+      ExaminationLabelList: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 创建推送任务弹窗
+      createPushTaskOpen: false,
+      createPushTaskLoading: false,
+      createPushTaskList: [],
+      createPushTaskTotal: 0,
+      createPushTaskQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      // 批量推送任务信息表格数据
+      batchSendTaskInfoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 导入弹窗
+      uploadOpen: false,
+      uploadForm: {
+        importName: "",
+      },
+      fileList: [],
+      uploadAction: {
+        url:
+          process.env.VUE_APP_BASE_API +
+          "/system/batchSendTaskInfo/batchSendTaskUpload",
+        headers: {
+          Authorization: "Bearer " + getToken(),
+        },
+      },
+      // 查询参数
+      queryParams: {
+        startDate: null,
+        endDate: null,
+        orderNum: null,
+        sn: null,
+        importName: null,
+        teamName: null,
+        hospitalAgencyId: null,
+        hospitalAgencyName: null,
+        departmentId: null,
+        departmentName: null,
+        visitDate: null,
+        inHospitalNumber: null,
+        patientName: null,
+        patientPhone: null,
+        age: null,
+        cardNo: null,
+        crowdId: null,
+        crowdName: null,
+        physicalExaminationSummary: null,
+        physicalExaminationLabel: null,
+        pageSize: 10,
+        pageNum: 1,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        sn: [
+          {
+            required: true,
+            message: "流水号/导入编号不能为空",
+            trigger: "blur",
+          },
+        ],
+        inHospitalNumber: [
+          {
+            required: true,
+            message: "门诊/住院/体检号不能为空",
+            trigger: "blur",
+          },
+        ],
+        patientName: [
+          { required: true, message: "患者姓名不能为空", trigger: "blur" },
+        ],
+        patientPhone: [
+          { required: true, message: "患者电话不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+    getPhysicalExaminationLabel().then((res) => {
+      this.ExaminationLabelList = res;
+    });
+  },
+  methods: {
+    /** 查询批量推送任务信息列表 */
+    getList() {
+      this.loading = true;
+      listBatchSendTaskInfo(this.queryParams).then((response) => {
+        this.batchSendTaskInfoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    // 导入相关方法
+    submitUpload() {
+      this.$refs.upload.submit();
+    },
+    handleUploadSuccess(response) {
+      if (response.code === 200) {
+        this.$modal.msgSuccess("导入成功");
+        this.uploadOpen = false;
+        this.getList();
+      } else {
+        this.$modal.msgError(response.msg || "导入失败");
+      }
+    },
+    handleRemove(file, fileList) {
+      this.fileList = fileList;
+    },
+    handlePreview(file) {},
+    handleExceed(files, fileList) {
+      this.$modal.msgError("只能上传一个文件");
+    },
+    uploadCancel() {
+      this.uploadOpen = false;
+      this.fileList = [];
+      this.uploadForm.importName = "";
+    },
+    downloadTemplate() {
+      this.download(
+        "/system/importDownload/downloadTemplate?fileType=batchSendTaskInfo",
+        {},
+        `batchSendTaskInfo.xlsx`
+      );
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        orderNum: null,
+        sn: null,
+        importName: null,
+        teamName: null,
+        hospitalAgencyId: null,
+        hospitalAgencyName: null,
+        departmentId: null,
+        departmentName: null,
+        visitDate: null,
+        inHospitalNumber: null,
+        patientName: null,
+        patientPhone: null,
+        age: null,
+        cardNo: null,
+        crowdId: null,
+        crowdName: null,
+        physicalExaminationSummary: null,
+        physicalExaminationLabel: null,
+        createBy: null,
+        createTime: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams.startDate = null;
+      this.queryParams.endDate = null;
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加批量推送任务信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getBatchSendTaskInfo(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "信息详情";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateBatchSendTaskInfo(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBatchSendTaskInfo(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除批量推送任务信息编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delBatchSendTaskInfo(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "system/batchSendTaskInfo/export",
+        {
+          ...this.queryParams,
+        },
+        `batchSendTaskInfo_${new Date().getTime()}.xlsx`
+      );
+    },
+
+    /** 创建推送任务按钮操作 */
+    handleCreatePushTask() {
+      // 判断所有查询条件都为空
+      const params = this.queryParams;
+      const hasQuery = Object.keys(params).some(
+        (key) =>
+          params[key] !== null &&
+          params[key] !== "" &&
+          key !== "pageNum" &&
+          key !== "pageSize"
+      );
+      if (!hasQuery) {
+        this.$modal.msgError("请选择查询条件");
+        return;
+      }
+      this.createPushTaskOpen = true;
+      this.createPushTaskQueryParams.pageNum = 1;
+      this.getCreatePushTaskList();
+    },
+
+    /** 创建推送任务弹窗列表（调用 listBatchSendTaskInfo） */
+    getCreatePushTaskList() {
+      this.createPushTaskLoading = true;
+      const params = {
+        ...this.queryParams,
+        pageNum: this.createPushTaskQueryParams.pageNum,
+        pageSize: this.createPushTaskQueryParams.pageSize,
+      };
+      listBatchSendTaskInfo(params)
+        .then((response) => {
+          this.createPushTaskList = response.rows || [];
+          this.createPushTaskTotal = response.total || 0;
+          this.createPushTaskLoading = false;
+        })
+        .catch(() => {
+          this.createPushTaskLoading = false;
+        });
+    },
+    toNewPage() {
+      this.createPushTaskOpen = false;
+      // 过滤掉分页参数
+      const query = {};
+      Object.keys(this.queryParams).forEach((key) => {
+        if (key !== "pageNum" && key !== "pageSize") {
+          query[key] = this.queryParams[key];
+        }
+      });
+      this.$router.push({
+        path: "/batchsendtask/CreatePushTask",
+        query,
+      });
+    },
+    removeRow(index) {
+      this.createPushTaskList.splice(index, 1);
+    },
+  },
+  computed: {
+    visitDate: {
+      get() {
+        const { startDate, endDate } = this.queryParams;
+        if (!startDate && !endDate) {
+          return null;
+        }
+        return [startDate, endDate];
+      },
+      set(val) {
+        this.queryParams.startDate = val && val.length ? val[0] : null;
+        this.queryParams.endDate = val && val.length ? val[1] : null;
+      },
+    },
+  },
+};
+</script>

src/views/system/batchSendTaskRecordInfo/index.vue

@@ -0,0 +1,484 @@
+<template>
+  <div class="app-container" style="max-height: 100vh; overflow-y: auto">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="任务编号" prop="batchTaskNumber">
+        <el-input
+          v-model="queryParams.batchTaskNumber"
+          placeholder="请输入任务编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="任务名称" prop="batchTaskName">
+        <el-input
+          v-model="queryParams.batchTaskName"
+          placeholder="请输入任务名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="执行时间" prop="nodePlanTime">
+        <el-date-picker
+          clearable
+          v-model="queryParams.nodePlanTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择执行时间"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="推送类型" prop="batchTaskSource">
+        <el-select
+          v-model="queryParams.batchTaskSource"
+          placeholder="请选择推送类型"
+          clearable
+          @change="ChangeBatchTaskSource"
+        >
+          <el-option label="短信" value="message"></el-option>
+          <el-option label="电话" value="telephone"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="模板" prop="robotPublishId">
+        <!-- queryParams.templateId -->
+        <el-select
+          v-model="queryParams.robotPublishId"
+          placeholder="请选择推送类型"
+          clearable
+        >
+          <el-option
+            v-for="item in templateList"
+            :key="item.robotPublishId"
+            :label="item.templateName"
+            :value="item.robotPublishId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="总结标签" prop="physicalExaminationLabel">
+        <el-input
+          v-model="queryParams.physicalExaminationLabel"
+          placeholder="请输入总结标签"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          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="batchSendTaskRecordInfoList"
+      @selection-change="handleSelectionChange"
+      style="margin-bottom: 40px"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="任务编号"
+        align="center"
+        prop="batchTaskNumber"
+        show-overflow-tooltip
+      />
+      <el-table-column label="任务名称" align="center" prop="batchTaskName" />
+      <el-table-column
+        label="执行时间"
+        align="center"
+        prop="nodePlanTime"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.nodePlanTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="推送类型" align="center" prop="batchTaskSource" />
+      <el-table-column label="模板" align="center" prop="templateName" />
+      <el-table-column label="内容" align="center" prop="nodeContent" />
+      <!-- ，已执行：EXECUTED，未执行：UNEXECUTED，执行中：EXECUTING -->
+      <el-table-column
+        label="节点任务执行状态"
+        align="center"
+        prop="nodeExecuteStatus"
+      />
+      <el-table-column
+        label="总结标签"
+        align="center"
+        prop="physicalExaminationLabel"
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:batchSendTaskRecordInfo:edit']"
+            >查看</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:batchSendTaskRecordInfo:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改批量推送任务记录对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1000px"
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="任务编号" prop="batchTaskNumber">
+              <el-input
+                v-model="form.batchTaskNumber"
+                placeholder="请输入任务编号"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="任务名称" prop="batchTaskName">
+              <el-input
+                v-model="form.batchTaskName"
+                placeholder="请输入任务名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="模板名称" prop="templateName">
+              <el-input
+                v-model="form.templateName"
+                placeholder="请输入模板名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="模版类型" prop="batchTaskSource">
+              <el-select
+                v-model="form.batchTaskSource"
+                placeholder="请选择推送类型"
+              >
+                <el-option label="短信" value="message"></el-option>
+                <el-option label="电话" value="telephone"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="执行时间" prop="nodePlanTime">
+              <el-date-picker
+                clearable
+                v-model="form.nodePlanTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择任务计划执行时间"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="内容">
+          <el-input
+            v-model="form.nodeContent"
+            type="textarea"
+            :autosize="{ minRows: 2, maxRows: 10 }"
+          />
+        </el-form-item>
+        <el-form-item label="总结标签" prop="physicalExaminationLabel">
+          <el-input
+            v-model="form.physicalExaminationLabel"
+            placeholder="请输入总结标签"
+          />
+        </el-form-item>
+      </el-form>
+      <strong>人员明细</strong>
+      <el-table :data="form.batchSendTaskInfos">
+        <el-table-column
+          label="流水号"
+          align="center"
+          prop="sn"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="导入批次"
+          align="center"
+          prop="importName"
+          show-overflow-tooltip
+        />
+        <el-table-column label="姓名" align="center" prop="patientName" />
+        <el-table-column
+          label="电话"
+          align="center"
+          prop="patientPhone"
+          width="110"
+        />
+        <el-table-column label="年龄" align="center" prop="age" />
+        <el-table-column
+          label="身份证号"
+          align="center"
+          prop="cardNo"
+          show-overflow-tooltip
+        />
+        <el-table-column label="人员类型" align="center" prop="personnelType">
+          <template slot-scope="scope">
+            <span v-if="scope.row.personnelType == 'IN_HOSPITAL'"> 在院 </span>
+            <span v-if="scope.row.personnelType == 'OUTPATIENT'"> 门诊 </span>
+            <span v-if="scope.row.personnelType == 'DISCHARGED'"> 出院 </span>
+            <span v-if="scope.row.personnelType == 'PHYSICAL_EXAMINATION'">
+              体检
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column label="团体" align="center" prop="teamName" />
+        <el-table-column
+          label="科室名称"
+          align="center"
+          prop="departmentName"
+        />
+        <el-table-column
+          label="就诊/出院/体检时间"
+          align="center"
+          prop="visitDate"
+          width="180"
+        >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.visitDate, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="门诊/住院/体检号"
+          align="center"
+          prop="inHospitalNumber"
+          width="130"
+        />
+        <el-table-column label="人群" align="center" prop="crowdName" />
+        <el-table-column
+          label="总结标签"
+          align="center"
+          prop="physicalExaminationLabel"
+          show-overflow-tooltip
+        />
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <!-- <el-button type="primary" @click="submitForm">确 定</el-button> -->
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listBatchSendTaskRecordInfo,
+  getBatchSendTaskRecordInfo,
+  delBatchSendTaskRecordInfo,
+  addBatchSendTaskRecordInfo,
+  updateBatchSendTaskRecordInfo,
+  selectTemplateByType,
+} from "@/api/system/batchSendTaskRecordInfo";
+
+export default {
+  name: "BatchSendTaskRecordInfo",
+  data() {
+    return {
+      templateList: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 批量推送任务记录表格数据
+      batchSendTaskRecordInfoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        batchTaskNumber: null,
+        batchTaskName: null,
+        taskExecuteType: null,
+        nodePlanTime: null,
+        batchTaskSource: null,
+        templateId: null,
+        templateName: null,
+        robotPublishId: null,
+        nodeContent: null,
+        nodeExecuteStatus: null,
+        physicalExaminationLabel: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询批量推送任务记录列表 */
+    getList() {
+      this.loading = true;
+      listBatchSendTaskRecordInfo(this.queryParams).then((response) => {
+        this.batchSendTaskRecordInfoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        batchTaskNumber: null,
+        batchTaskName: null,
+        taskExecuteType: null,
+        nodePlanTime: null,
+        batchTaskSource: null,
+        templateId: null,
+        templateName: null,
+        robotPublishId: null,
+        nodeContent: null,
+        nodeExecuteStatus: "0",
+        physicalExaminationLabel: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加批量推送任务记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getBatchSendTaskRecordInfo(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "任务记录详情";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateBatchSendTaskRecordInfo(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBatchSendTaskRecordInfo(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除批量推送任务记录编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delBatchSendTaskRecordInfo(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "system/batchSendTaskRecordInfo/export",
+        {
+          ...this.queryParams,
+        },
+        `batchSendTaskRecordInfo_${new Date().getTime()}.xlsx`
+      );
+    },
+    // 推送类型数据改变时，查询对应的模板数据
+    ChangeBatchTaskSource(e) {
+      this.queryParams.templateId = "";
+      let batchTaskSource = e;
+      selectTemplateByType({ batchTaskSource }).then((res) => {
+        this.templateList = res;
+      });
+    },
+  },
+};
+</script>

src/views/system/billInfo/index.vue

@@ -78,7 +78,9 @@
       <el-table-column label="缴费状态" align="center" prop="paymentStatus">
         <template slot-scope="scope">
           <span v-if="scope.row.paymentStatus === 'PAID'">已缴费</span>
-          <span v-else-if="scope.row.paymentStatus === 'UNPAID_FEES'">未缴费</span>
+          <span v-else-if="scope.row.paymentStatus === 'UNPAID_FEES'"
+            >未缴费</span
+          >
         </template>
       </el-table-column>
       <el-table-column label="账单来源" align="center" prop="billSource">

src/views/system/components/message.vue

@@ -1,68 +1,171 @@
 <template>
   <div class="app-container">
-    <el-button size="small" @click="classificationOpen = true" style="
+    <el-button
+      size="small"
+      @click="classificationOpen = true"
+      style="
         width: 200px;
         font-size: 14px;
         text-align: left;
         white-space: nowrap;
         text-overflow: ellipsis;
         overflow: hidden;
-      " :style="handleselectName ? 'color:black' : 'color:#C0C4CC'">{{ handleselectName ? handleselectName : "选择短信模板"
+      "
-      }}</el-button>
+      :style="handleselectName ? 'color:black' : 'color:#C0C4CC'"
-    <el-dialog title="短信库模板选择" :visible.sync="classificationOpen" width="70%" :before-close="classificationOpenfalse">
+      >{{ 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">
-          <DepartmentList ref="DepartmentList" :modal="false" @clickdepartment="clickdepartment"
+          <DepartmentList
-            :methods="'listMessageNumtwo'">
+            ref="DepartmentList"
+            :modal="false"
+            @clickdepartment="clickdepartment"
+            :methods="'listMessageNumtwo'"
+          >
           </DepartmentList>
         </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="68px">
+            :model="queryParams"
-            <el-form-item label="短信模板名称" prop="textMessageName" label-width="100px">
+            ref="queryForm"
-              <el-input v-model="queryParams.textMessageName" placeholder="请输入模版名称" clearable
+            size="small"
-                @keyup.enter.native="handleQuery" />
+            :inline="true"
+            v-show="showSearch"
+            label-width="68px"
+          >
+            <el-form-item
+              label="短信模板名称"
+              prop="textMessageName"
+              label-width="100px"
+            >
+              <el-input
+                v-model="queryParams.textMessageName"
+                placeholder="请输入模版名称"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
             </el-form-item>
             <el-form-item label="模板ID" prop="textMessageId">
-              <el-input v-model="queryParams.textMessageId" placeholder="请输入模板ID" clearable
+              <el-input
-                @keyup.enter.native="handleQuery" />
+                v-model="queryParams.textMessageId"
+                placeholder="请输入模板ID"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+              <el-button
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                type="primary"
+                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="templateList" @row-dblclick="handleselect">
+          <el-table
-            <el-table-column type="index" width="48" align="center" label="序号" />
+            v-loading="loading"
-            <el-table-column label="短信模板名称" align="center" prop="textMessageName" :show-overflow-tooltip="true" />
+            :data="templateList"
-            <el-table-column label="短信ID" align="center" prop="textMessageId" />
+            @row-dblclick="handleselect"
-            <el-table-column label="短信内容" align="center" prop="textMessageContent" :show-overflow-tooltip="true" />
+          >
-            <el-table-column :show-overflow-tooltip="true" label="适用任务类型" align="center" prop="suitTaskTypeName">
+            <el-table-column
+              type="index"
+              width="48"
+              align="center"
+              label="序号"
+            />
+            <el-table-column
+              label="短信模板名称"
+              align="center"
+              prop="textMessageName"
+              :show-overflow-tooltip="true"
+            />
+            <el-table-column
+              label="短信ID"
+              align="center"
+              prop="textMessageId"
+            />
+            <el-table-column
+              label="短信内容"
+              align="center"
+              prop="textMessageContent"
+              :show-overflow-tooltip="true"
+            />
+            <el-table-column
+              :show-overflow-tooltip="true"
+              label="适用任务类型"
+              align="center"
+              prop="suitTaskTypeName"
+            >
               <template slot-scope="scope">
-                {{ scope.row.suitTaskTypeName != "null" ? scope.row.suitTaskTypeName : "" }}
+                {{
+                  scope.row.suitTaskTypeName != "null"
+                    ? scope.row.suitTaskTypeName
+                    : ""
+                }}
               </template>
             </el-table-column>
-            <el-table-column label="短信通道" align="center" prop="textMessageChannel">
+            <el-table-column
+              label="短信通道"
+              align="center"
+              prop="textMessageChannel"
+            >
               <template slot-scope="scope">
-                {{ scope.row.textMessageChannel == "WATER_DROPLET_PLATFORM" ? "水滴平台" : "" }}
+                {{
+                  scope.row.textMessageChannel == "WATER_DROPLET_PLATFORM"
+                    ? "水滴平台"
+                    : ""
+                }}
               </template>
             </el-table-column>
-            <el-table-column label="病种名称" align="center" prop="diseaseTypeName" />
+            <el-table-column
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+              label="病种名称"
+              align="center"
+              prop="diseaseTypeName"
+            />
+            <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.id">选择</el-button>
+                  size="mini"
-                <el-button size="mini" type="text" @click="nohandleselect(scope.row)"
+                  type="text"
-                  v-if="handleselectId == scope.row.id">取消选择</el-button>
+                  @click="handleselect(scope.row)"
+                  v-if="handleselectId != scope.row.id"
+                  >选择</el-button
+                >
+                <el-button
+                  size="mini"
+                  type="text"
+                  @click="nohandleselect(scope.row)"
+                  v-if="handleselectId == scope.row.id"
+                  >取消选择</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
         </el-col>
       </el-row>
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      <pagination
-        @pagination="getList" />
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
     </el-dialog>
   </div>
 </template>
@@ -78,10 +181,10 @@ import {
 } from "@/api/manage/message";
 import { typelist } from "@/api/manage/template";
 import { department, listDisease } from "@/api/manage/script";
-import DepartmentList from '../../components/DepartmentList.vue'
+import DepartmentList from "../../components/DepartmentList.vue";
 export default {
   components: {
-    DepartmentList
+    DepartmentList,
   },
   props: ["templateId", "templateName"],
   name: "Template",
@@ -140,14 +243,14 @@ export default {
   methods: {
     //接收科室列表传值
     clickdepartment(item) {
-      this.queryParams.hospitalAgencyId = item.hospitalAgencyId
+      this.queryParams.hospitalAgencyId = item.hospitalAgencyId;
-      this.queryParams.hospitalAgencyName = item.hospitalAgencyName
+      this.queryParams.hospitalAgencyName = item.hospitalAgencyName;
-      this.queryParams.departmentId = item.itemid
+      this.queryParams.departmentId = item.itemid;
-      this.queryParams.departmentName = item.itemName
+      this.queryParams.departmentName = item.itemName;
       if (item.hospitalAgencyId) {
         this.handleQuery();
       }
-      this.$forceUpdate()
+      this.$forceUpdate();
     },
     nohandleselect() {
       this.handleselectId = "";
@@ -156,7 +259,7 @@ export default {
         templateId: "",
         templateName: "",
         templateContent: "",
-        messageTemplateCode:"",
+        messageTemplateCode: "",
       });
     },
     handleselect(item) {
@@ -165,8 +268,9 @@ export default {
       this.$emit("on-template", {
         templateId: item.id,
         templateName: item.textMessageName,
-        templateContent: item.templateContent,
+        templateContent: item.textMessageContent,
-        messageTemplateCode:item.messageTemplateCode
+        messageTemplateCode: item.messageTemplateCode,
+        variables: item.variables,
       });
       this.classificationOpen = false;
     },
@@ -193,7 +297,7 @@ export default {
       this.queryParams.departmentId = null;
       this.itemname = null;
       this.resetForm("queryForm");
-      this.$refs.DepartmentList.resetQuery()
+      this.$refs.DepartmentList.resetQuery();
       // this.handleQuery();
     },
   },

src/views/system/components/script.vue

@@ -1,72 +1,180 @@
 <template>
   <div class="app-containers">
-    <el-button size="small" @click="classificationOpen = true" style="
+    <el-button
+      size="small"
+      @click="classificationOpen = true"
+      style="
         width: 200px;
         font-size: 14px;
         text-align: left;
         white-space: nowrap;
         text-overflow: ellipsis;
         overflow: hidden;
-      " :style="handleselectName ? 'color:black' : 'color:#C0C4CC'">{{ handleselectName ? handleselectName : "请选择"
+      "
-      }}</el-button>
+      :style="handleselectName ? 'color:black' : 'color:#C0C4CC'"
-    <el-dialog title="话术库模板选择" :visible.sync="classificationOpen" width="70%" :before-close="classificationOpenfalse">
+      >{{ 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">
-          <DepartmentList ref="DepartmentList" :modal="false" @clickdepartment="clickdepartment"
+          <DepartmentList
-            :methods="'listScriptNumtwo'">
+            ref="DepartmentList"
+            :modal="false"
+            @clickdepartment="clickdepartment"
+            :methods="'listScriptNumtwo'"
+          >
           </DepartmentList>
         </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" @click="handleQuery">搜索</el-button>
+              <el-button
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                type="primary"
+                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" width="48" />
+            v-loading="loading"
-            <el-table-column label="通用话术名称" align="center" prop="commonScriptName" :show-overflow-tooltip="true" />
+            :data="scriptList"
-            <el-table-column label="话术名称" align="center" prop="scriptName" :show-overflow-tooltip="true" />
+            @row-dblclick="handleselect"
-            <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
-            <el-table-column label="话术简介" align="center" prop="scriptIntroduction" :show-overflow-tooltip="true" />
+              label="序号"
-            <el-table-column label="病种名称" align="center" prop="diseaseTypeName" :show-overflow-tooltip="true" />
+              align="center"
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+              prop="sort"
+              type="index"
+              width="48"
+            />
+            <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="handlesee(scope.row)">预览</el-button>
+                <el-button size="mini" type="text" @click="handlesee(scope.row)"
-                <el-button size="mini" type="text" @click="handleselect(scope.row)"
+                  >预览</el-button
-                  v-if="handleselectId != scope.row.id">选择</el-button>
+                >
-                <el-button size="mini" type="text" @click="nohandleselect(scope.row)"
+                <el-button
-                  v-if="handleselectId == scope.row.id">取消选择</el-button>
+                  size="mini"
+                  type="text"
+                  @click="handleselect(scope.row)"
+                  v-if="handleselectId != scope.row.id"
+                  >选择</el-button
+                >
+                <el-button
+                  size="mini"
+                  type="text"
+                  @click="nohandleselect(scope.row)"
+                  v-if="handleselectId == scope.row.id"
+                  >取消选择</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
         </el-col>
       </el-row>
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      <pagination
-        @pagination="getList" />
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
     </el-dialog>
     <el-dialog title="话术预览" :visible.sync="lookshow" width="90%">
-      <Scriptpreview :phoneNodeContent="phoneNodeContent" v-if="lookshow"></Scriptpreview>
+      <Scriptpreview
+        :phoneNodeContent="phoneNodeContent"
+        v-if="lookshow"
+      ></Scriptpreview>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="lookshow = false">确 定</el-button>
       </span>
@@ -88,9 +196,9 @@ import {
   listScriptNum,
 } from "@/api/manage/script";
 import stationAcatar from "../../system/stationAvatar/index.vue";
-import DepartmentList from '../../components/DepartmentList.vue'
+import DepartmentList from "../../components/DepartmentList.vue";
 export default {
-  props: ["templateId", "templateName", 'node'],
+  props: ["templateId", "templateName", "node"],
   components: { stationAcatar, Scriptpreview, DepartmentList },
   name: "Script",
   data() {
@@ -160,14 +268,14 @@ export default {
   methods: {
     //接收科室列表传值
     clickdepartment(item) {
-      this.queryParams.hospitalAgencyId = item.hospitalAgencyId
+      this.queryParams.hospitalAgencyId = item.hospitalAgencyId;
-      this.queryParams.hospitalAgencyName = item.hospitalAgencyName
+      this.queryParams.hospitalAgencyName = item.hospitalAgencyName;
-      this.queryParams.departmentId = item.itemid
+      this.queryParams.departmentId = item.itemid;
-      this.queryParams.departmentName = item.itemName
+      this.queryParams.departmentName = item.itemName;
       if (item.hospitalAgencyId) {
         this.handleQuery();
       }
-      this.$forceUpdate()
+      this.$forceUpdate();
     },
     handlesee(row) {
       if (row.flowScheme == null || row.flowScheme == "") {
@@ -181,18 +289,20 @@ export default {
       this.handleselectId = "";
       this.handleselectName = "";
       this.$emit("on-template", {
-        robotPublishId: '',
+        robotPublishId: "",
         templateId: "",
         templateName: "",
         templateContent: "",
-        scriptInfoId: '',
+        scriptInfoId: "",
-        phoneTemplateId: '',
+        phoneTemplateId: "",
       });
     },
     handleselect(item) {
-      if (this.node == 'AI') {
+      if (this.node == "AI") {
         if (!item.robotPublishId) {
-          return this.$message.error("机器人ID不存在，请维护机器人ID或重新选择模板");
+          return this.$message.error(
+            "机器人ID不存在，请维护机器人ID或重新选择模板"
+          );
         }
       }
       this.handleselectId = item.id;
@@ -204,7 +314,7 @@ export default {
         phoneNodeContent: item.flowScheme,
         scriptInfoId: item.id,
         phoneTemplateId: item.scriptId,
-        robotPublishId: item.robotPublishId
+        robotPublishId: item.robotPublishId,
       });
       this.classificationOpen = false;
     },
@@ -246,7 +356,7 @@ export default {
         scriptRemark: null,
       };
       this.resetForm("queryForm");
-      this.$refs.DepartmentList.resetQuery()
+      this.$refs.DepartmentList.resetQuery();
       // this.getList();
     },
   },

src/views/system/phoneDialRecord/index.vue

@@ -1,5 +1,8 @@
 <template>
-  <div class="app-container">
+  <div
+    class="app-container"
+    style="max-height: 100vh; overflow-y: auto; overflow-x: hidden"
+  >
     <el-form
       :model="queryParams"
       ref="queryForm"
@@ -8,26 +11,10 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="患者id" prop="patientId">
+      <el-form-item label="手机号" prop="patientPhone">
-        <el-input
-          v-model="queryParams.patientId"
-          placeholder="请输入患者id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="签约患者管理任务节点表id" prop="manageRouteNodeId">
-        <el-input
-          v-model="queryParams.manageRouteNodeId"
-          placeholder="请输入签约患者管理任务节点表id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="患者手机号" prop="patientPhone">
         <el-input
           v-model="queryParams.patientPhone"
-          placeholder="请输入患者手机号"
+          placeholder="请输入手机号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -42,15 +29,11 @@
         >
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="电话模板id" prop="phoneTemplateId">
+      <el-form-item
-        <el-input
+        label="电话模板名称"
-          v-model="queryParams.phoneTemplateId"
+        prop="phoneTemplateName"
-          placeholder="请输入电话模板id"
+        label-width="100px"
-          clearable
+      >
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="电话模板名称" prop="phoneTemplateName">
         <el-input
           v-model="queryParams.phoneTemplateName"
           placeholder="请输入电话模板名称"
@@ -58,67 +41,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item
+      <el-form-item label="外呼方式" prop="phoneDialMethod">
-        label="AI ：自动外呼 或  COMMON：人工随访电话，否则为空"
+        <el-select
-        prop="phoneDialMethod"
-      >
-        <el-input
           v-model="queryParams.phoneDialMethod"
-          placeholder="请输入AI ：自动外呼 或  COMMON：人工随访电话，否则为空"
           clearable
-          @keyup.enter.native="handleQuery"
+          placeholder="请选择外呼方式"
-        />
+        >
-      </el-form-item>
+          <el-option label="自动外呼" value="AI" />
-      <el-form-item label="推送结果状态码" prop="errorCode">
+          <el-option label="人工随访电话" value="COMMON" />
-        <el-input
+        </el-select>
-          v-model="queryParams.errorCode"
-          placeholder="请输入推送结果状态码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item
-        label="生成通话录音唯一标识,可通过该标识，获取录音"
-        prop="ctUuid"
-      >
-        <el-input
-          v-model="queryParams.ctUuid"
-          placeholder="请输入生成通话录音唯一标识,可通过该标识，获取录音"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="通话记录录音存储路径" prop="phoneDialRecordVideo">
-        <el-input
-          v-model="queryParams.phoneDialRecordVideo"
-          placeholder="请输入通话记录录音存储路径"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="通话时长" prop="phoneDuration">
-        <el-input
-          v-model="queryParams.phoneDuration"
-          placeholder="请输入通话时长"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="通话费用" prop="phoneCost">
-        <el-input
-          v-model="queryParams.phoneCost"
-          placeholder="请输入通话费用"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="关联账单id" prop="billId">
-        <el-input
-          v-model="queryParams.billId"
-          placeholder="请输入关联账单id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item>
         <el-button
@@ -157,61 +88,43 @@
       v-loading="loading"
       :data="phoneDialRecordList"
       @selection-change="handleSelectionChange"
+      style="margin-bottom: 40px"
     >
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="45 " align="center" />
-      <el-table-column label="主键id" align="center" prop="id" />
+      <el-table-column label="患者姓名" align="center" prop="patientName" />
-      <el-table-column label="患者id" align="center" prop="patientId" />
-      <el-table-column
-        label="签约患者管理任务节点表id"
-        align="center"
-        prop="manageRouteNodeId"
-      />
       <el-table-column label="患者手机号" align="center" prop="patientPhone" />
       <el-table-column
         label="呼叫时间"
         align="center"
         prop="dialTime"
-        width="180"
+        width="100"
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.dialTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="电话模板id"
-        align="center"
-        prop="phoneTemplateId"
-      />
       <el-table-column
         label="电话模板名称"
         align="center"
         prop="phoneTemplateName"
       />
       <el-table-column
-        label="替换标签之后的电话内容"
+        label="电话内容"
         align="center"
         prop="messageNodeContent"
       />
-      <el-table-column
+      <el-table-column label="外呼方式" align="center" prop="phoneDialMethod" />
-        label="AI ：自动外呼 或  COMMON：人工随访电话，否则为空"
+      <!-- <el-table-column label="推送结果状态码" align="center" prop="errorCode" /> -->
-        align="center"
+      <!-- <el-table-column
-        prop="phoneDialMethod"
-      />
-      <el-table-column label="推送结果状态码" align="center" prop="errorCode" />
-      <el-table-column
         label="推送结果状态码，success：成功，fail：失败"
         align="center"
         prop="errorStatus"
-      />
+      /> -->
       <el-table-column
-        label="生成通话录音唯一标识,可通过该标识，获取录音"
+        label="录音存储路径"
-        align="center"
-        prop="ctUuid"
-      />
-      <el-table-column
-        label="通话记录录音存储路径"
         align="center"
         prop="phoneDialRecordVideo"
+        show-overflow-tooltip
       />
       <el-table-column label="通话时长" align="center" prop="phoneDuration" />
       <el-table-column label="通话费用" align="center" prop="phoneCost" />
@@ -252,16 +165,10 @@
 
     <!-- 添加或修改电话拨打记录对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
         <el-form-item label="患者id" prop="patientId">
           <el-input v-model="form.patientId" placeholder="请输入患者id" />
         </el-form-item>
-        <el-form-item label="签约患者管理任务节点表id" prop="manageRouteNodeId">
-          <el-input
-            v-model="form.manageRouteNodeId"
-            placeholder="请输入签约患者管理任务节点表id"
-          />
-        </el-form-item>
         <el-form-item label="患者手机号" prop="patientPhone">
           <el-input
             v-model="form.patientPhone"
@@ -278,29 +185,24 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="电话模板id" prop="phoneTemplateId">
-          <el-input
-            v-model="form.phoneTemplateId"
-            placeholder="请输入电话模板id"
-          />
-        </el-form-item>
         <el-form-item label="电话模板名称" prop="phoneTemplateName">
           <el-input
             v-model="form.phoneTemplateName"
             placeholder="请输入电话模板名称"
           />
         </el-form-item>
-        <el-form-item label="替换标签之后的电话内容">
+        <el-form-item label="电话内容">
           <editor v-model="form.messageNodeContent" :min-height="192" />
         </el-form-item>
-        <el-form-item
+        <el-form-item label="外呼方式" prop="phoneDialMethod">
-          label="AI ：自动外呼 或  COMMON：人工随访电话，否则为空"
+          <el-select
-          prop="phoneDialMethod"
-        >
-          <el-input
             v-model="form.phoneDialMethod"
-            placeholder="请输入AI ：自动外呼 或  COMMON：人工随访电话，否则为空"
+            clearable
-          />
+            placeholder="请选择外呼方式"
+          >
+            <el-option label="自动外呼" value="AI" />
+            <el-option label="人工随访电话" value="COMMON" />
+          </el-select>
         </el-form-item>
         <el-form-item label="推送结果状态码" prop="errorCode">
           <el-input
@@ -308,19 +210,10 @@
             placeholder="请输入推送结果状态码"
           />
         </el-form-item>
-        <el-form-item
+        <el-form-item label="录音存储路径" prop="phoneDialRecordVideo">
-          label="生成通话录音唯一标识,可通过该标识，获取录音"
-          prop="ctUuid"
-        >
-          <el-input
-            v-model="form.ctUuid"
-            placeholder="请输入生成通话录音唯一标识,可通过该标识，获取录音"
-          />
-        </el-form-item>
-        <el-form-item label="通话记录录音存储路径" prop="phoneDialRecordVideo">
           <el-input
             v-model="form.phoneDialRecordVideo"
-            placeholder="请输入通话记录录音存储路径"
+            placeholder="请输入录音存储路径"
           />
         </el-form-item>
         <el-form-item label="通话时长" prop="phoneDuration">
@@ -329,9 +222,6 @@
         <el-form-item label="通话费用" prop="phoneCost">
           <el-input v-model="form.phoneCost" placeholder="请输入通话费用" />
         </el-form-item>
-        <el-form-item label="关联账单id" prop="billId">
-          <el-input v-model="form.billId" placeholder="请输入关联账单id" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

src/views/system/shortMessageSendRecord/index.vue

@@ -170,10 +170,10 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="消息模板id" prop="messageTemplateId">
+        <el-form-item label="模板名称" prop="messageTemplateId">
           <el-input
             v-model="form.messageTemplateId"
-            placeholder="请输入消息模板id"
+            placeholder="请输入模板名称"
           />
         </el-form-item>
         <el-form-item label="消息内容">

src/views/system/specialDiseaseRoute/index.vue

@@ -2,73 +2,37 @@
   <div class="app-container" ref="layout">
     <el-row :gutter="20">
       <el-col :span="5">
-        <DepartmentList
+        <DepartmentList ref="DepartmentList" @clickdepartment="clickdepartment" :methods="'selectDiseaseCount'">
-          ref="DepartmentList"
-          @clickdepartment="clickdepartment"
-          :methods="'selectDiseaseCount'"
-        >
         </DepartmentList>
       </el-col>
       <el-col :span="19">
         <div ref="topform" class="form">
-          <el-form
+          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-            :model="queryParams"
+            label-width="68px">
-            ref="queryForm"
-            size="small"
-            :inline="true"
-            v-show="showSearch"
-            label-width="68px"
-          >
             <el-form-item label="发布状态" prop="releaseStatus">
-              <el-select
+              <el-select v-model="queryParams.releaseStatus" placeholder="请选择">
-                v-model="queryParams.releaseStatus"
-                placeholder="请选择"
-              >
                 <el-option label="已发布" value="PUBLISHED" />
                 <el-option label="未发布" value="UNPUBLISHED" />
               </el-select>
             </el-form-item>
             <el-form-item label="路径分类" prop="routeClassify">
-              <el-select
+              <el-select v-model="queryParams.routeClassify" placeholder="请选择">
-                v-model="queryParams.routeClassify"
-                placeholder="请选择"
-              >
                 <el-option label="全部" value="ALL" />
-                <el-option
+                <el-option label="科室管理路径" value="DEPARTMENT_MANAGE_PATH" />
-                  label="科室管理路径"
+                <el-option label="专病管理路径" value="SPECIAL_DIEASE_MANAGE_PATH" />
-                  value="DEPARTMENT_MANAGE_PATH"
-                />
-                <el-option
-                  label="专病管理路径"
-                  value="SPECIAL_DIEASE_MANAGE_PATH"
-                />
               </el-select>
             </el-form-item>
             <el-form-item>
-              <el-button
+              <el-button type="primary" icon="el-icon-search" size="mini" @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>
         </div>
         <div ref="mb8" class="mb8">
           <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-              <el-button
+              <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增主路径</el-button>
-                type="primary"
+
-                plain
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd"
-                >新增主路径</el-button
-              >
             </el-col>
             <!-- <el-col :span="1.5">
             <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
@@ -82,201 +46,84 @@
             <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
               v-hasPermi="['system:specialDiseaseRoute:export']">导出</el-button>
           </el-col> -->
-            <right-toolbar
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-              :showSearch.sync="showSearch"
-              @queryTable="getList"
-            ></right-toolbar>
           </el-row>
         </div>
         <div ref="table">
-          <el-table
+          <el-table :max-height="maxTableHeight" v-loading="loading" :data="specialDiseaseRouteList"
-            :max-height="maxTableHeight"
+            @selection-change="handleSelectionChange">
-            v-loading="loading"
+            <el-table-column label="序号" type="index" width="55" align="center" />
-            :data="specialDiseaseRouteList"
-            @selection-change="handleSelectionChange"
-          >
-            <el-table-column
-              label="序号"
-              type="index"
-              width="55"
-              align="center"
-            />
             <el-table-column label="路径名称" align="center" prop="routeName" />
             <el-table-column label="版本号" align="center" prop="version" />
-            <el-table-column
+            <el-table-column label="路径分类" align="center" prop="routeClassify">
-              label="路径分类"
-              align="center"
-              prop="routeClassify"
-            >
               <template slot-scope="scope">
-                {{
+                {{ scope.row.routeClassify == 'DEPARTMENT_MANAGE_PATH' ? '科室管理路径' : '' }}
-                  scope.row.routeClassify == "DEPARTMENT_MANAGE_PATH"
+                {{ scope.row.routeClassify == 'SPECIAL_DIEASE_MANAGE_PATH' ? '专病管理路径' : '' }}
-                    ? "科室管理路径"
-                    : ""
-                }}
-                {{
-                  scope.row.routeClassify == "SPECIAL_DIEASE_MANAGE_PATH"
-                    ? "专病管理路径"
-                    : ""
-                }}
               </template>
             </el-table-column>
-            <el-table-column
+            <el-table-column label="发布状态" align="center" prop="releaseStatus">
-              label="发布状态"
-              align="center"
-              prop="releaseStatus"
-            >
               <template slot-scope="scope">
-                <el-tag
+                <el-tag type="success" v-if="scope.row.releaseStatus == 'PUBLISHED'">已发布</el-tag>
-                  type="success"
-                  v-if="scope.row.releaseStatus == 'PUBLISHED'"
-                  >已发布</el-tag
-                >
                 <el-tag type="warning" v-else>未发布</el-tag>
               </template>
             </el-table-column>
-            <el-table-column
+            <el-table-column label="病种名称" align="center" prop="diseaseTypeName" />
-              label="病种名称"
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-              align="center"
-              prop="diseaseTypeName"
-            />
-            <el-table-column
-              label="操作"
-              align="center"
-              class-name="small-padding fixed-width"
-            >
               <template slot-scope="scope">
-                <el-button
+                <el-button size="mini" type="text" v-if="scope.row.releaseStatus == 'PUBLISHED'"
-                  size="mini"
+                  @click="norelease(scope.row)">取消发布</el-button>
-                  type="text"
+                <el-button size="mini" type="text" v-else @click="release(scope.row)">发布</el-button>
-                  v-if="scope.row.releaseStatus == 'PUBLISHED'"
-                  @click="norelease(scope.row)"
-                  >取消发布</el-button
-                >
-                <el-button
-                  size="mini"
-                  type="text"
-                  v-else
-                  @click="release(scope.row)"
-                  >发布</el-button
-                >
                 <!-- <el-button size="mini" type="text">复制</el-button> -->
-                <el-button
+                <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
-                  size="mini"
+                  v-hasPermi="['system:specialDiseaseRoute:edit']">编辑</el-button>
-                  type="text"
+                  <el-button size="mini" type="text" @click="handlecopy(scope.row)"
-                  @click="handleUpdate(scope.row)"
+                  >克隆</el-button>
-                  v-hasPermi="['system:specialDiseaseRoute:edit']"
+                <el-button size="mini" type="text" @click="handleDelete(scope.row)"
-                  >编辑</el-button
+                  v-hasPermi="['system:specialDiseaseRoute:remove']">删除</el-button>
-                >
+        
-                <el-button
-                  size="mini"
-                  type="text"
-                  @click="handlecopy(scope.row)"
-                  >克隆</el-button
-                >
-                <el-button
-                  size="mini"
-                  type="text"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="['system:specialDiseaseRoute:remove']"
-                  >删除</el-button
-                >
               </template>
             </el-table-column>
           </el-table>
         </div>
         <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize" @pagination="getList" /> -->
-        <myPagination
+        <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
-          v-show="total > 0"
+          :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
-          :total="total"
-          :pageSize="queryParams.pageSize"
-          :indexFromWrap="queryParams.pageNum"
-          @updateCPage="updateCPage"
-        ></myPagination>
       </el-col>
     </el-row>
     <!-- 添加或修改专病路径信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="560px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="所属科室" prop="departmentId">
-          <el-select
+          <el-select v-model="form.departmentId" placeholder="请选择所属科室" style="width:380px" @change="changedepartment">
-            v-model="form.departmentId"
+            <el-option v-for="item in adddepartmentlist" :key="item.id" :label="item.departmentName" :value="item.id" />
-            placeholder="请选择所属科室"
-            style="width: 380px"
-            @change="changedepartment"
-          >
-            <el-option
-              v-for="item in adddepartmentlist"
-              :key="item.id"
-              :label="item.departmentName"
-              :value="item.id"
-            />
           </el-select>
         </el-form-item>
         <el-form-item label="所属病种" prop="diseaseTypeId">
-          <el-select
+          <el-select v-model="form.diseaseTypeId" placeholder="请选择所属病种" style="width:380px">
-            v-model="form.diseaseTypeId"
+            <el-option v-for="item in adddiseaselist" :key="item.id" :label="item.diseaseTypeName" :value="item.id" />
-            placeholder="请选择所属病种"
-            style="width: 380px"
-          >
-            <el-option
-              v-for="item in adddiseaselist"
-              :key="item.id"
-              :label="item.diseaseTypeName"
-              :value="item.id"
-            />
           </el-select>
         </el-form-item>
         <el-form-item label="所属服务包" prop="servicePackageId">
-          <el-select
+          <el-select v-model="form.servicePackageId" placeholder="请选择所属服务包" style="width:380px" multiple>
-            v-model="form.servicePackageId"
+            <el-option v-for="item in addpackagelist" :key="item.id" :label="item.packageName" :value="item.id" />
-            placeholder="请选择所属服务包"
-            style="width: 380px"
-            multiple
-          >
-            <el-option
-              v-for="item in addpackagelist"
-              :key="item.id"
-              :label="item.packageName"
-              :value="item.id"
-            />
           </el-select>
         </el-form-item>
         <el-form-item label="路径名称" prop="routeName">
-          <el-input
+          <el-input v-model="form.routeName" placeholder="请输入路径名称" style="width:380px" />
-            v-model="form.routeName"
-            placeholder="请输入路径名称"
-            style="width: 380px"
-          />
         </el-form-item>
         <el-form-item label="版本号" prop="version">
-          <el-input
+          <el-input v-model="form.version" placeholder="请输入版本号" style="width:380px" />
-            v-model="form.version"
-            placeholder="请输入版本号"
-            style="width: 380px"
-          />
         </el-form-item>
         <el-form-item label="路径分类" prop="routeClassify">
-          <el-select
+          <el-select v-model="form.routeClassify" placeholder="请选择路径分类" style="width:380px">
-            v-model="form.routeClassify"
-            placeholder="请选择路径分类"
-            style="width: 380px"
-          >
             <el-option label="全部" value="ALL" />
             <el-option label="科室管理路径" value="DEPARTMENT_MANAGE_PATH" />
-            <el-option
+            <el-option label="专病管理路径" value="SPECIAL_DIEASE_MANAGE_PATH" />
-              label="专病管理路径"
-              value="SPECIAL_DIEASE_MANAGE_PATH"
-            />
           </el-select>
         </el-form-item>
         <el-form-item label="适用范围" prop="suitRange">
-          <el-select
+          <el-select v-model="form.suitRange" placeholder="请选择适用范围" style="width:380px">
-            v-model="form.suitRange"
-            placeholder="请选择适用范围"
-            style="width: 380px"
-          >
             <el-option label="在院" value="IN_THE_HOSPITAL" />
             <el-option label="出院" value="DISCHARGE" />
             <el-option label="门诊" value="OUTPATIENT_SERVICE" />
@@ -284,19 +131,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="排序" prop="routeSort">
-          <el-input
+          <el-input v-model="form.routeSort" placeholder="请输入排序" style="width:380px" />
-            v-model="form.routeSort"
-            placeholder="请输入排序"
-            style="width: 380px"
-          />
         </el-form-item>
         <el-form-item label="备注信息" prop="routeRemark">
-          <el-input
+          <el-input type="textarea" v-model="form.routeRemark" placeholder="请输入备注信息" style="width:380px" />
-            type="textarea"
-            v-model="form.routeRemark"
-            placeholder="请输入备注信息"
-            style="width: 380px"
-          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -308,19 +146,13 @@
 </template>
 <script>
 import {
-  listSpecialDiseaseRoute,
+  listSpecialDiseaseRoute, getSpecialDiseaseRoute, addSpecialDiseaseRoute, updateSpecialDiseaseRoute,
-  getSpecialDiseaseRoute,
+  editReleaseStatus, selectDiseaseCount, getDepartmentList, getdiseaseList, specialDiseaseRoutedel,cloneRoute
-  addSpecialDiseaseRoute,
-  updateSpecialDiseaseRoute,
-  editReleaseStatus,
-  selectDiseaseCount,
-  getDepartmentList,
-  getdiseaseList,
-  specialDiseaseRoutedel,
-  cloneRoute,
 } from "@/api/system/specialDiseaseRoute";
-import { servicepackageinfo } from "@/api/manage/signRecord.js";
+import {
-import DepartmentList from "../../components/DepartmentList.vue";
+  servicepackageinfo
+} from '@/api/manage/signRecord.js'
+import DepartmentList from '../../components/DepartmentList.vue'
 
 export default {
   name: "SpecialDiseaseRoute",
@@ -329,7 +161,7 @@ export default {
     return {
       maxTableHeight: undefined,
       // 遮罩层
-      loading: false,
+      loading: true,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -372,28 +204,28 @@ export default {
       // 表单校验
       rules: {
         departmentId: [
-          { required: true, message: "所属科室不能为空", trigger: "blur" },
+          { required: true, message: "所属科室不能为空", trigger: "blur" }
         ],
         diseaseTypeId: [
-          { required: true, message: "所属病种不能为空", trigger: "blur" },
+          { required: true, message: "所属病种不能为空", trigger: "blur" }
         ],
         servicePackageId: [
-          { required: true, message: "所属服务包不能为空", trigger: "blur" },
+          { required: true, message: "所属服务包不能为空", trigger: "blur" }
         ],
         routeName: [
-          { required: true, message: "路径名称不能为空", trigger: "blur" },
+          { required: true, message: "路径名称不能为空", trigger: "blur" }
         ],
         version: [
-          { required: true, message: "版本号不能为空", trigger: "blur" },
+          { required: true, message: "版本号不能为空", trigger: "blur" }
         ],
         routeClassify: [
-          { required: true, message: "路径分类不能为空", trigger: "blur" },
+          { required: true, message: "路径分类不能为空", trigger: "blur" }
         ],
         suitRange: [
-          { required: true, message: "适用范围不能为空", trigger: "blur" },
+          { required: true, message: "适用范围不能为空", trigger: "blur" }
         ],
         routeSort: [
-          { required: true, message: "排序不能为空", trigger: "blur" },
+          { required: true, message: "排序不能为空", trigger: "blur" }
         ],
       },
       adddepartmentlist: [],
@@ -405,44 +237,45 @@ export default {
     // this.getList();
   },
   mounted() {
-    this.getMaxTableHeight();
+    this.getMaxTableHeight()
-    this.screenChange();
+    this.screenChange()
+  },
+  watch: {
   },
-  watch: {},
   methods: {
     //接收科室列表传值
     clickdepartment(item) {
-      this.queryParams.hospitalAgencyId = item.hospitalAgencyId;
+      this.queryParams.hospitalAgencyId = item.hospitalAgencyId
-      this.queryParams.hospitalAgencyName = item.hospitalAgencyName;
+      this.queryParams.hospitalAgencyName = item.hospitalAgencyName
-      this.queryParams.departmentId = item.itemid;
+      this.queryParams.departmentId = item.itemid
-      this.addDepartmentquery.hospitalAgencyId = item.hospitalAgencyId;
+      this.addDepartmentquery.hospitalAgencyId = item.hospitalAgencyId
       if (item.hospitalAgencyId) {
         this.handleQuery();
       }
-      this.$forceUpdate();
+      this.$forceUpdate()
     },
     updateCPage(index, size) {
-      this.queryParams.pageNum = index;
+      this.queryParams.pageNum = index
-      this.queryParams.pageSize = size;
+      this.queryParams.pageSize = size
       this.getList();
     },
     addinfo() {
-      getDepartmentList(this.addDepartmentquery).then((res) => {
+      getDepartmentList(this.addDepartmentquery).then(res => {
-        this.adddepartmentlist = res.data;
+        this.adddepartmentlist = res.data
         if (this.queryParams.departmentId) {
-          this.changedepartment(this.queryParams.departmentId);
+          this.changedepartment(this.queryParams.departmentId)
         }
-      });
+      })
     },
     //点击所属科室
     changedepartment(id) {
-      getdiseaseList({ departmentId: id }).then((res) => {
+      getdiseaseList({ departmentId: id }).then(res => {
-        this.adddiseaselist = res.data;
+        this.adddiseaselist = res.data
-      });
+      })
       //服务包
-      servicepackageinfo({ departmentId: id }).then((res) => {
+      servicepackageinfo({ departmentId: id }).then(res => {
-        this.addpackagelist = res.data;
+        this.addpackagelist = res.data
-      });
+      })
     },
     clickDepartmenitem(item) {
       this.loading = true;
@@ -452,7 +285,7 @@ export default {
     /** 查询专病路径信息列表 */
     getList() {
       this.loading = true;
-      listSpecialDiseaseRoute(this.queryParams).then((response) => {
+      listSpecialDiseaseRoute(this.queryParams).then(response => {
         this.specialDiseaseRouteList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -484,7 +317,7 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null,
+        updateTime: null
       };
       this.resetForm("form");
     },
@@ -495,28 +328,24 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.adddepartmentlist.hospitalAgencyId = JSON.parse(
+      this.adddepartmentlist.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
-        localStorage.getItem("user")
+      this.queryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
-      ).hospitalAgencyId;
+      this.$refs.DepartmentList.resetQuery()
-      this.queryParams.hospitalAgencyId = JSON.parse(
-        localStorage.getItem("user")
-      ).hospitalAgencyId;
-      this.$refs.DepartmentList.resetQuery();
       this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1;
+      this.single = selection.length !== 1
-      this.multiple = !selection.length;
+      this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.open = true;
       if (this.queryParams.departmentId) {
-        this.form.departmentId = this.queryParams.departmentId;
+        this.form.departmentId = this.queryParams.departmentId
       }
       this.title = "添加专病路径信息";
       this.addinfo();
@@ -539,57 +368,50 @@ export default {
           diseaseTypeName: row.diseaseTypeName,
           version: row.version,
           routeName: row.routeName,
-        },
+        }
       });
       // })
     },
     /** 提交按钮 */
     submitForm() {
       if (this.form.departmentId && this.adddepartmentlist?.length > 0) {
-        this.form.departmentName = this.adddepartmentlist.find(
+        this.form.departmentName = this.adddepartmentlist.find(e => e.id == this.form.departmentId)?.departmentName
-          (e) => e.id == this.form.departmentId
-        )?.departmentName;
       }
       if (this.form.diseaseTypeId && this.adddiseaselist?.length > 0) {
-        this.form.diseaseTypeName = this.adddiseaselist.find(
+        this.form.diseaseTypeName = this.adddiseaselist.find(e => e.id == this.form.diseaseTypeId)?.diseaseTypeName
-          (e) => e.id == this.form.diseaseTypeId
-        )?.diseaseTypeName;
       }
-      if (
+      if (this.form.servicePackageId?.length > 0 && this.addpackagelist?.length > 0) {
-        this.form.servicePackageId?.length > 0 &&
+        let routePackageList = []
-        this.addpackagelist?.length > 0
+        this.addpackagelist.forEach(e => {
-      ) {
+          this.form.servicePackageId.forEach(el => {
-        let routePackageList = [];
-        this.addpackagelist.forEach((e) => {
-          this.form.servicePackageId.forEach((el) => {
             if (e.id == el) {
               let item = {
                 servicePackageId: el,
-                packageName: e.packageName,
+                packageName: e.packageName
-              };
+              }
-              routePackageList.push(item);
+              routePackageList.push(item)
             }
-          });
+          })
-        });
+        })
-        this.form.routePackageList = routePackageList;
+        this.form.routePackageList = routePackageList
       }
-      this.form.hospitalAgencyId = this.queryParams.hospitalAgencyId;
+      this.form.hospitalAgencyId = this.queryParams.hospitalAgencyId
-      this.form.hospitalAgencyName = this.queryParams.hospitalAgencyName;
+      this.form.hospitalAgencyName = this.queryParams.hospitalAgencyName
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateSpecialDiseaseRoute(this.form).then((response) => {
+            updateSpecialDiseaseRoute(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
-              this.$refs.DepartmentList.Departmentlist();
+              this.$refs.DepartmentList.Departmentlist()
             });
           } else {
-            addSpecialDiseaseRoute(this.form).then((response) => {
+            addSpecialDiseaseRoute(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
-              this.$refs.DepartmentList.Departmentlist();
+              this.$refs.DepartmentList.Departmentlist()
             });
           }
         }
@@ -597,100 +419,96 @@ export default {
     },
     //发布
     release(item) {
-      this.$confirm("是否发布此路径?", "提示", {
+      this.$confirm('是否发布此路径?', '提示', {
-        confirmButtonText: "确定",
+        confirmButtonText: '确定',
-        cancelButtonText: "取消",
+        cancelButtonText: '取消',
       }).then(() => {
-        var obj = { ...item };
+        var obj = { ...item }
-        obj.releaseStatus = "PUBLISHED";
+        obj.releaseStatus = 'PUBLISHED'
-        editReleaseStatus(obj).then((response) => {
+        editReleaseStatus(obj).then(response => {
           this.$message({
-            type: "success",
+            type: 'success',
-            message: "发布成功!",
+            message: '发布成功!'
           });
           this.getList();
         });
-      });
+      })
     },
     //取消发布
     norelease(item) {
-      this.$confirm("是否取消发布此路径?", "提示", {
+      this.$confirm('是否取消发布此路径?', '提示', {
-        confirmButtonText: "确定",
+        confirmButtonText: '确定',
-        cancelButtonText: "取消",
+        cancelButtonText: '取消',
       }).then(() => {
-        var obj = { ...item };
+        var obj = { ...item }
-        obj.releaseStatus = "REVOKE";
+        obj.releaseStatus = 'REVOKE'
-        editReleaseStatus(obj).then((response) => {
+        editReleaseStatus(obj).then(response => {
           this.$message({
-            type: "success",
+            type: 'success',
-            message: "取消发布成功!",
+            message: '取消发布成功!'
           });
           this.getList();
         });
-      });
+      })
     },
     /** 克隆按钮操作 */
-    handlecopy(row) {
+    handlecopy(row){
-      this.$confirm("此操作会克隆主路径, 是否继续?", "提示", {
+      this.$confirm('此操作会克隆主路径, 是否继续?', '提示', {
-        confirmButtonText: "确定",
+        confirmButtonText: '确定',
-        cancelButtonText: "取消",
+        cancelButtonText: '取消',
       }).then(() => {
-        cloneRoute(row.id).then((res) => {
+        cloneRoute(row.id).then(res => {
           this.getList();
           this.$modal.msgSuccess("克隆成功");
-          this.$refs.DepartmentList.Departmentlist();
+          this.$refs.DepartmentList.Departmentlist()
-        });
+        })
-      });
+      })
+
     },
     /** 删除按钮操作 */
     handleDelete(row) {
       //删除主路径
-      this.$confirm("此操作会删除主路径, 是否继续?", "提示", {
+      this.$confirm('此操作会删除主路径, 是否继续?', '提示', {
-        confirmButtonText: "确定",
+        confirmButtonText: '确定',
-        cancelButtonText: "取消",
+        cancelButtonText: '取消',
       }).then(() => {
-        specialDiseaseRoutedel(row.id).then((res) => {
+        specialDiseaseRoutedel(row.id).then(res => {
           this.getList();
           this.$modal.msgSuccess("删除主路径成功");
-          this.$refs.DepartmentList.Departmentlist();
+          this.$refs.DepartmentList.Departmentlist()
-        });
+        })
-      });
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download(
+      this.download('system/specialDiseaseRoute/export', {
-        "system/specialDiseaseRoute/export",
+        ...this.queryParams
-        {
+      }, `specialDiseaseRoute_${new Date().getTime()}.xlsx`)
-          ...this.queryParams,
-        },
-        `specialDiseaseRoute_${new Date().getTime()}.xlsx`
-      );
     },
     // 获取表格最高高度
     getMaxTableHeight() {
-      const windowInnerHeight = window.innerHeight; // 屏幕可视高度
+      const windowInnerHeight = window.innerHeight // 屏幕可视高度
-      const layoutDiv = this.$refs.layout;
+      const layoutDiv = this.$refs.layout
-      const formDiv = this.$refs.topform;
+      const formDiv = this.$refs.topform
-      const mb8Div = this.$refs.mb8;
+      const mb8Div = this.$refs.mb8
       this.maxTableHeight =
-        windowInnerHeight -
+        windowInnerHeight - 134 -
-        134 -
         this.getBoxPadding(layoutDiv) -
         this.getBoxHeight(mb8Div) -
-        this.getBoxHeight(formDiv);
+        this.getBoxHeight(formDiv)
     },
     // 屏幕resize监听
     screenChange() {
       // 屏幕resize监听事件：一旦屏幕宽高发生变化，就会执行resize
-      window.addEventListener("resize", this.getMaxTableHeight, true);
+      window.addEventListener('resize', this.getMaxTableHeight, true)
       // 将屏幕监听事件移除
       // 这步是必须的。离开页面时不移除，再返回，或者进入到别的有相同元素的页面会报错
       // 或者将这里的方法直接写在beforeDestroy函数中也可以
-      this.$once("hook:beforeDestroy", () => {
+      this.$once('hook:beforeDestroy', () => {
-        window.removeEventListener("resize", this.getMaxTableHeight, true);
+        window.removeEventListener('resize', this.getMaxTableHeight, true)
-      });
+      })
     },
-  },
+  }
 };
 </script>
 <style scoped lang="scss">