From 8941a645e3528816e24d1292299b22dafe0b64f6 Mon Sep 17 00:00:00 2001
From: liuzhipeng <1747191978@qq.com>
Date: Sat, 15 Feb 2025 17:52:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8F=82=E6=95=B0=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4-=E6=95=B0=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 acupuncture-ui/src/views/followFile/index.vue | 138 ++++++++++--------
 .../src/views/followFile/subjects.vue         |   2 +-
 acupuncture-ui/src/views/followFile/work.vue  |   2 +-
 .../src/views/medicalFile/index.vue           |   2 +-
 .../src/views/patientFile/index.vue           |   2 +-
 5 files changed, 78 insertions(+), 68 deletions(-)

diff --git a/acupuncture-ui/src/views/followFile/index.vue b/acupuncture-ui/src/views/followFile/index.vue
index cdb839c3..72245100 100644
--- a/acupuncture-ui/src/views/followFile/index.vue
+++ b/acupuncture-ui/src/views/followFile/index.vue
@@ -69,14 +69,14 @@
         label="队列名称"
         align="center"
         prop="name"
-        width="100"
+        min-width="130"
       />
       <el-table-column
         label="随访方式"
         align="center"
         prop="followupMethod"
         show-overflow-tooltip
-        width="100"
+        min-width="100"
       >
         <template slot-scope="scope">
           <span v-if="scope.row.followupMethod == 0">电话随访</span>
@@ -89,7 +89,7 @@
         label="随访类型"
         align="center"
         show-overflow-tooltip
-        width="150"
+        min-width="150"
       >
         <template slot-scope="scope">
           <span v-if="scope.row.followupType == 0">单次</span>
@@ -101,29 +101,28 @@
         align="center"
         prop="frequency"
         show-overflow-tooltip
-        width="100"
+        min-width="100"
       />
       <el-table-column
         label="状态"
         align="center"
         prop="status"
         show-overflow-tooltip
-        width="100"
+        min-width="100"
       >
         <template slot-scope="scope">
-          <span v-if="scope.row.status == 0">禁用</span>
-          <span v-if="scope.row.status == 1">启用</span>
+          <span v-if="scope.row.status == 0" style="color: red">禁用</span>
+          <span v-if="scope.row.status == 1" style="color: green">启用</span>
         </template>
       </el-table-column>
       <el-table-column
-        label="创建人"
+        label="创建人/创建时间"
         align="center"
-        prop="createBy"
-        show-overflow-tooltip
-        width="100"
-      />
-      <el-table-column label="创建时间" align="center" width="130">
+        min-width="130"
+        fixed="right"
+      >
         <template slot-scope="scope">
+          <div>{{ scope.row.createBy }}</div>
           <span>{{
             parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}")
           }}</span>
@@ -179,8 +178,8 @@
         <el-form-item label="随访方式" prop="followupMethod">
           <el-select v-model="form.followupMethod" placeholder="请选择">
             <el-option label="电话随访" :value="0"> </el-option>
-            <el-option label="电话随访" :value="1"> </el-option>
-            <el-option label="电话随访" :value="2"> </el-option>
+            <el-option label="入户随访" :value="1"> </el-option>
+            <el-option label="到院随访" :value="2"> </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="随访类型" prop="followupType">
@@ -189,13 +188,25 @@
             <el-radio :label="1">周期</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="随访频次" prop="frequency">
-          <el-input v-model="form.frequency" placeholder="请输入" />
+        <el-form-item label="随访频次" prop="followupType">
+          <el-input v-model="form.frequency" placeholder="请输入cron执行表达式">
+            <template slot="append">
+              <el-button
+                style="width: 110px"
+                type="primary"
+                @click="handleShowCron"
+              >
+                生成表达式
+                <i class="el-icon-time el-icon--right"></i>
+              </el-button>
+            </template>
+          </el-input>
         </el-form-item>
+
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status">
-            <el-radio :label="0">禁用</el-radio>
             <el-radio :label="1">启用</el-radio>
+            <el-radio :label="0">禁用</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -204,10 +215,24 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog
+      title="Cron表达式生成器"
+      :visible.sync="openCron"
+      append-to-body
+      destroy-on-close
+      class="scrollbar"
+    >
+      <crontab
+        @hide="openCron = false"
+        @fill="crontabFill"
+        :expression="expression"
+      ></crontab>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import Crontab from "@/components/Crontab";
 import {
   followupQuery,
   followupAdd,
@@ -216,8 +241,13 @@ import {
 } from "@/api/followupFile";
 export default {
   name: "Notice",
+  components: { Crontab },
   data() {
     return {
+      // 是否显示Cron表达式弹出层
+      openCron: false,
+      // 传入的表达式
+      expression: "",
       idCardType: [
         {
           label: "身份证",
@@ -267,30 +297,18 @@ export default {
       // 表单校验
       rules: {
         name: [
-          { required: true, message: "患者姓名不能为空", trigger: "blur" },
-        ],
-        gender: [
-          { required: true, message: "性别不能为空", trigger: "change" },
-        ],
-        phone: [
-          { required: true, message: "手机号码不能为空", trigger: "blur" },
+          { required: true, message: "队列名称不能为空", trigger: "blur" },
         ],
-        ethnicity: [
-          { required: true, message: "民族不能为空", trigger: "blur" },
+        followupMethod: [
+          { required: true, message: "随访方式不能为空", trigger: "change" },
         ],
-        idCardType: [
-          { required: true, message: "证件类型不能为空", trigger: "blur" },
+        followupType: [
+          { required: true, message: "随访类型不能为空", trigger: "blur" },
         ],
-        idCard: [
-          { required: true, message: "证件号码不能为空", trigger: "blur" },
-        ],
-        currentIllnessHistory: [
-          {
-            required: true,
-            message: "现病史不能为空",
-            trigger: "blur",
-          },
+        frequency: [
+          { required: true, message: "随访频次不能为空", trigger: "blur" },
         ],
+        status: [{ required: true, message: "状态不能为空", trigger: "blur" }],
       },
     };
   },
@@ -298,6 +316,15 @@ export default {
     this.getList();
   },
   methods: {
+    /** cron表达式按钮操作 */
+    handleShowCron() {
+      this.expression = this.form.cronExpression;
+      this.openCron = true;
+    },
+    /** 确定后回传值 */
+    crontabFill(value) {
+      this.form.frequency = value;
+    },
     /** 查询公告列表 */
     getList() {
       this.loading = true;
@@ -316,15 +343,10 @@ export default {
     reset() {
       this.form = {
         name: "", // 姓名
-        gender: 0, // 性别
-        birthDate: "", // 出生日期
-        ethnicity: "", // 民族
-        educationYears: "", // 教育程度
-        phone: "", // 联系电话
-        idCardType: "", // 证件类型
-        idCard: "", // 证件号码
-        currentIllnessHistory: [], // 现病史
-        currentIllnessHistoryQT: "", // 现病史
+        followupMethod: 0, // 随访方式
+        followupType: 0, // 随访类型
+        frequency: "", // cron执行表达式
+        status: 1, // 状态
       };
       this.resetForm("form");
     },
@@ -348,24 +370,12 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "新增患者档案";
-      this.formDisabled = false;
+      this.title = "新增随访队列";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.open = true;
-      this.title = "修改患者档案";
-      this.formDisabled = false;
-      this.form = JSON.parse(JSON.stringify(row));
-      // 字符串转数组
-      this.form.currentIllnessHistory =
-        this.form.currentIllnessHistory.split(",");
-    },
-    /** 详情按钮操作 */
-    handleDetails(row) {
-      this.open = true;
-      this.title = "患者档案详情";
-      this.formDisabled = true;
+      this.title = "修改随访队列";
       this.form = JSON.parse(JSON.stringify(row));
     },
     /** 提交按钮 */
@@ -373,13 +383,13 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != undefined) {
-            patientUpd(this.form).then((response) => {
+            followupUpd(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            patientAdd(this.form).then((response) => {
+            followupAdd(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -391,7 +401,7 @@ export default {
 
     /** 删除按钮操作 */
     handleDelete(row) {
-      const idList = row.id || this.ids;
+      const idList = row.id ? [row.id] : this.ids;
       this.$modal
         .confirm("是否确认删除当前选择的患者数据？")
         .then(function () {
diff --git a/acupuncture-ui/src/views/followFile/subjects.vue b/acupuncture-ui/src/views/followFile/subjects.vue
index 53b68ea0..b1147333 100644
--- a/acupuncture-ui/src/views/followFile/subjects.vue
+++ b/acupuncture-ui/src/views/followFile/subjects.vue
@@ -350,7 +350,7 @@ export default {
 
     /** 删除按钮操作 */
     handleDelete(row) {
-      const idList = row.id || this.ids;
+      const idList = row.id ? [row.id] : this.ids;
       this.$modal
         .confirm("是否确认删除当前选择的患者数据？")
         .then(function () {
diff --git a/acupuncture-ui/src/views/followFile/work.vue b/acupuncture-ui/src/views/followFile/work.vue
index 371fbb33..7578609b 100644
--- a/acupuncture-ui/src/views/followFile/work.vue
+++ b/acupuncture-ui/src/views/followFile/work.vue
@@ -351,7 +351,7 @@ export default {
 
     /** 删除按钮操作 */
     handleDelete(row) {
-      const idList = row.id || this.ids;
+      const idList = row.id ? [row.id] : this.ids;
       this.$modal
         .confirm("是否确认删除当前选择的患者数据？")
         .then(function () {
diff --git a/acupuncture-ui/src/views/medicalFile/index.vue b/acupuncture-ui/src/views/medicalFile/index.vue
index 991f51a8..60de4d19 100644
--- a/acupuncture-ui/src/views/medicalFile/index.vue
+++ b/acupuncture-ui/src/views/medicalFile/index.vue
@@ -1594,7 +1594,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const idList = row.id || this.ids;
+      const idList = row.id ? [row.id] : this.ids;
       this.$modal
         .confirm("是否确认删除当前选择的患者数据？")
         .then(function () {
diff --git a/acupuncture-ui/src/views/patientFile/index.vue b/acupuncture-ui/src/views/patientFile/index.vue
index fa6f6469..1a60120b 100644
--- a/acupuncture-ui/src/views/patientFile/index.vue
+++ b/acupuncture-ui/src/views/patientFile/index.vue
@@ -652,7 +652,7 @@ export default {
 
     /** 删除按钮操作 */
     handleDelete(row) {
-      const idList = row.id || this.ids;
+      const idList = row.id ? [row.id] : this.ids;
       this.$modal
         .confirm("是否确认删除当前选择的患者数据？")
         .then(function () {