创建任务模块调整

src/views/system/CreatePushTask/index.vue

@@ -287,6 +287,14 @@ export default {
             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);
             }
           });
         }

src/views/system/batchSendTaskInfo/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"
@@ -41,16 +44,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="就诊/体检时间" prop="visitDate" label-width="100px">
-        <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="patientName">
         <el-input
           v-model="queryParams.patientName"
@@ -98,6 +91,22 @@
           </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"
@@ -211,6 +220,7 @@
       v-loading="loading"
       :data="batchSendTaskInfoList"
       @selection-change="handleSelectionChange"
+      style="margin-bottom: 40px"
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column
@@ -220,24 +230,6 @@
         show-overflow-tooltip
       />
       <el-table-column label="导入批次" align="center" prop="importName" />
-      <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="patientName" />
       <el-table-column
         label="电话"
@@ -252,6 +244,25 @@
         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="总结标签"
@@ -263,6 +274,7 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
+        width="120"
       >
         <template slot-scope="scope">
           <el-button
@@ -297,7 +309,7 @@
     <el-dialog
       title="请确认创建推送任务的名单"
       :visible.sync="createPushTaskOpen"
-      width="90%"
+      width="85%"
       append-to-body
     >
       <el-table
@@ -306,11 +318,26 @@
         border
         style="width: 100%"
       >
-        <el-table-column label="流水号" align="center" prop="sn" width="120" />
+        <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="就诊/体检时间"
+          label="就诊/出院/体检时间"
           align="center"
           prop="visitDate"
           width="180"
@@ -319,22 +346,14 @@
             <span>{{ parseTime(scope.row.visitDate, "{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="姓名" align="center" prop="patientName" />
+        <el-table-column label="操作" align="center" width="100">
-        <el-table-column
+          <template slot-scope="scope">
-          label="电话"
+            <el-button size="mini" type="text" @click="removeRow(scope.$index)"
-          align="center"
+              >移除</el-button
-          prop="patientPhone"
+            >
-          width="120"
+          </template>
-        />
+        </el-table-column>
-        <el-table-column label="年龄" align="center" prop="age" />
-        <el-table-column
-          label="身份证号"
-          align="center"
-          prop="cardNo"
-          width="190"
-        />
       </el-table>
-
       <pagination
         v-show="createPushTaskTotal > 0"
         :total="createPushTaskTotal"
@@ -355,75 +374,105 @@
     </el-dialog>
 
     <!-- 添加或修改批量推送任务信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="135px">
-        <el-form-item label="序号" prop="orderNum">
+        <el-row :gutter="20">
-          <el-input v-model="form.orderNum" placeholder="请输入序号" />
+          <el-col :span="12">
-        </el-form-item>
             <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-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-form-item label="所属机构ID" prop="hospitalAgencyId">
+          </el-col>
-          <el-input
+          <el-col :span="12">
-            v-model="form.hospitalAgencyId"
+            <el-form-item label="所属医院" prop="hospitalAgencyName">
-            placeholder="请输入所属机构ID"
-          />
-        </el-form-item>
-        <el-form-item label="所属医院名称" prop="hospitalAgencyName">
               <el-input
                 v-model="form.hospitalAgencyName"
-            placeholder="请输入所属医院名称"
+                placeholder="请输入所属医院"
               />
             </el-form-item>
-        <el-form-item label="科室ID" prop="departmentId">
+          </el-col>
-          <el-input v-model="form.departmentId" placeholder="请输入科室ID" />
+        </el-row>
-        </el-form-item>
+        <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-form-item label="就诊/体检时间" prop="visitDate">
+          </el-col>
-          <el-date-picker
+          <el-col :span="12">
-            clearable
+            <el-form-item label="患者姓名" prop="patientName">
-            v-model="form.visitDate"
+              <el-input
-            type="date"
+                v-model="form.patientName"
-            value-format="yyyy-MM-dd"
+                placeholder="请输入患者姓名"
-            placeholder="请选择就诊/体检时间"
+              />
-          >
-          </el-date-picker>
             </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-form-item label="患者姓名" prop="patientName">
+          </el-col>
-          <el-input v-model="form.patientName" placeholder="请输入患者姓名" />
+          <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-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-form-item label="人群id" prop="crowdId">
+          </el-col>
-          <el-input v-model="form.crowdId" placeholder="请输入人群id" />
+          <el-col :span="12">
-        </el-form-item>
             <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"
@@ -431,12 +480,16 @@
           <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>
@@ -507,6 +560,8 @@ export default {
       },
       // 查询参数
       queryParams: {
+        startDate: null,
+        endDate: null,
         orderNum: null,
         sn: null,
         importName: null,
@@ -641,6 +696,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.startDate = null;
+      this.queryParams.endDate = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -663,7 +720,7 @@ export default {
       getBatchSendTaskInfo(id).then((response) => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改批量推送任务信息";
+        this.title = "信息详情";
       });
     },
     /** 提交按钮 */
@@ -763,6 +820,24 @@ export default {
         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

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" style="max-height: 100vh; overflow-y: auto">
     <el-form
       :model="queryParams"
       ref="queryForm"
@@ -86,9 +86,15 @@
       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" />
+      <el-table-column
+        label="任务编号"
+        align="center"
+        prop="batchTaskNumber"
+        show-overflow-tooltip
+      />
       <el-table-column label="任务名称" align="center" prop="batchTaskName" />
       <el-table-column
         label="执行时间"
@@ -123,10 +129,10 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-view"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:batchSendTaskRecordInfo:edit']"
-            >修改</el-button
+            >查看</el-button
           >
           <el-button
             size="mini"
@@ -149,21 +155,51 @@
     />
 
     <!-- 添加或修改批量推送任务记录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      :title="title"
-        <el-form-item label="批量发送任务编号" prop="batchTaskNumber">
+      :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="请输入批量发送任务编号"
+                placeholder="请输入任务编号"
               />
             </el-form-item>
-        <el-form-item label="批量发送任务名称" prop="batchTaskName">
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="任务名称" prop="batchTaskName">
               <el-input
                 v-model="form.batchTaskName"
-            placeholder="请输入批量发送任务名称"
+                placeholder="请输入任务名称"
               />
             </el-form-item>
-        <el-form-item label="任务计划执行时间" prop="nodePlanTime">
+          </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"
@@ -173,51 +209,92 @@
               >
               </el-date-picker>
             </el-form-item>
-        <el-form-item
+          </el-col>
-          label="模版类型，短信：message；电话：telephone"
+        </el-row>
-          prop="batchTaskSource"
-        >
-          <el-input
-            v-model="form.batchTaskSource"
-            placeholder="请输入模版类型，短信：message；电话：telephone"
-          />
-        </el-form-item>
-        <el-form-item label="模板表id" prop="templateId">
-          <el-input v-model="form.templateId" placeholder="请输入模板表id" />
-        </el-form-item>
-        <el-form-item label="电话模板名称" prop="templateName">
-          <el-input
-            v-model="form.templateName"
-            placeholder="请输入电话模板名称"
-          />
-        </el-form-item>
-        <el-form-item label="第三方平台模板ID" prop="robotPublishId">
-          <el-input
-            v-model="form.robotPublishId"
-            placeholder="请输入第三方平台模板ID"
-          />
-        </el-form-item>
         <el-form-item label="内容">
-          <editor v-model="form.nodeContent" :min-height="192" />
+          <el-input
+            v-model="form.nodeContent"
+            type="textarea"
+            :autosize="{ minRows: 2, maxRows: 10 }"
+          />
         </el-form-item>
-        <el-form-item
+        <el-form-item label="总结标签" prop="physicalExaminationLabel">
-          label="总结标签，逗号隔断"
-          prop="physicalExaminationLabel"
-        >
           <el-input
             v-model="form.physicalExaminationLabel"
-            placeholder="请输入总结标签，逗号隔断"
+            placeholder="请输入总结标签"
-          />
-        </el-form-item>
-        <el-form-item label="删除标识，0：未删除，1：已删除" prop="delFlag">
-          <el-input
-            v-model="form.delFlag"
-            placeholder="请输入删除标识，0：未删除，1：已删除"
           />
         </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 type="primary" @click="submitForm">确 定</el-button> -->
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -347,7 +424,7 @@ export default {
       getBatchSendTaskRecordInfo(id).then((response) => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改批量推送任务记录";
+        this.title = "任务记录详情";
       });
     },
     /** 提交按钮 */