From 12eb16cb5a087588fa5f598376b1f36d15ac81a3 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 14 三月 2025 10:45:15 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/discharge/index.vue |   97 ++++++++++++++++++++++++++++++++----------------
 1 files changed, 65 insertions(+), 32 deletions(-)

diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index c1c47d8..773b2af 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -90,6 +90,17 @@
             end-placeholder="缁撴潫鏃ユ湡"
           ></el-date-picker>
         </el-form-item>
+        <el-form-item label="搴旈殢璁挎椂闂�">
+          <el-date-picker
+            v-model="dateRange"
+            style="width: 240px"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="寮�濮嬫棩鏈�"
+            end-placeholder="缁撴潫鏃ユ湡"
+          ></el-date-picker>
+        </el-form-item>
 
         <el-form-item label="鎮h�呭鍚�" prop="sendname">
           <el-input
@@ -213,6 +224,8 @@
         <el-table-column
           label="浠诲姟鍚嶇О"
           fixed
+          width="150"
+          show-overflow-tooltip
           align="center"
           key="taskName"
           prop="taskName"
@@ -665,7 +678,7 @@
     </el-dialog>
     <!-- 鍐嶆闅忚 -->
     <el-dialog title="鎮h�呭啀娆¢殢璁�" :visible.sync="dialogFormVisible">
-      <el-form ref="form" :model="zcform" label-width="80px">
+      <el-form ref="zcform" :rules="zcrules" :model="zcform" label-width="80px">
         <el-form-item label="浠诲姟鍚嶇О">
           <el-input
             style="width: 400px"
@@ -702,7 +715,7 @@
           ></el-input>
         </el-form-item>
 
-        <el-form-item label="闅忚鏂瑰紡">
+        <el-form-item label="闅忚鏂瑰紡" prop="resource">
           <el-radio-group v-model="zcform.resource">
             <el-radio label="1">鏈梾鍖洪殢璁�</el-radio>
             <el-radio label="2">闅忚涓績闅忚</el-radio>
@@ -711,7 +724,7 @@
         <!-- <el-form-item label="鍗冲埢鍙戦��">
           <el-switch v-model="zcform.delivery"></el-switch>
         </el-form-item> -->
-        <el-form-item label="闅忚鏃堕棿">
+        <el-form-item label="闅忚鏃堕棿" prop="date1">
           <el-date-picker
             type="date"
             placeholder="閫夋嫨鏃ユ湡"
@@ -739,7 +752,11 @@
   resetUserPwd,
   changeUserStatus,
 } from "@/api/system/user";
-import { getTaskservelist, buidegetTasklist,addserviceSubtask } from "@/api/AiCentre/index";
+import {
+  getTaskservelist,
+  buidegetTasklist,
+  addserviceSubtask,
+} from "@/api/AiCentre/index";
 import Treeselect from "@riophae/vue-treeselect";
 import store from "@/store";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -855,7 +872,14 @@
         //   value: 0,
         // },
       ],
-
+      zcrules: {
+        date1: [
+          { required: true, message: "璇烽�夋嫨闅忚鏂瑰紡", trigger: "change" },
+        ],
+        resource: [
+          { required: true, message: "璇烽�夋嫨闅忚鏃堕棿", trigger: "blur" },
+        ],
+      },
       // 琛ㄥ崟鍙傛暟
       form: {
         phonenumber: "",
@@ -869,6 +893,8 @@
       topqueryParams: {
         pageNum: 1,
         pageSize: 10,
+        sendstate:2,
+        sort: 1,
         serviceType: 2,
         searchscope: 3,
         scopetype: [],
@@ -972,12 +998,15 @@
         console.log(this.topqueryParams.leavehospitaldistrictcodes, "11");
       }
       this.loading = true;
-      if (this.topqueryParams.leavehospitaldistrictcodes[0]&&this.topqueryParams.leaveldeptcodes[0]) {
-        this.topqueryParams.deptOrDistrict=2;
-      }else{
-        this.topqueryParams.deptOrDistrict=1;
+      if (
+        this.topqueryParams.leavehospitaldistrictcodes[0] &&
+        this.topqueryParams.leaveldeptcodes[0]
+      ) {
+        this.topqueryParams.deptOrDistrict = 2;
+      } else {
+        this.topqueryParams.deptOrDistrict = 1;
       }
-            getTaskservelist(this.topqueryParams).then((response) => {
+      getTaskservelist(this.topqueryParams).then((response) => {
         this.userList = response.rows[0].serviceSubtaskList;
         this.total = response.total;
         if (refresh) {
@@ -1176,7 +1205,9 @@
         pageNum: 1,
         pageSize: 10,
         serviceType: 2,
+        sendstate:2,
         searchscope: 2,
+        sort: 1,
       };
       this.handleQuery(1);
     },
@@ -1318,7 +1349,6 @@
       if (row.preachformson) {
         if (row.preachformson.includes("3")) {
           type = 1;
-          console.log(type, "rwo");
         }
       }
       this.$router.push({
@@ -1396,28 +1426,31 @@
       }
       return "";
     },
-      // 鍒涘缓鍐嶆闅忚鏈嶅姟
-      setupsubtask() {
-      console.log(this.zcform);
-      let form = structuredClone(this.zcform);
-      form.longSendTime = this.formatTime(form.date1);
-      if (form.resource) {
-        if (form.resource == 2) {
-          form.serviceType = 10;
+    // 鍒涘缓鍐嶆闅忚鏈嶅姟
+    setupsubtask() {
+      this.$refs['zcform'].validate((valid) => {
+        if (valid) {
+          let form = structuredClone(this.zcform);
+          form.longSendTime = this.formatTime(form.date1);
+          if (form.resource) {
+            if (form.resource == 2) {
+              form.serviceType = 10;
+            }
+          } else {
+            this.$modal.msgError("鏈�夋嫨闅忚鏂瑰紡");
+          }
+          form.id = null;
+          form.sendstate = 2;
+          form.preachform = form.preachformson;
+          addserviceSubtask(form).then((res) => {
+            if (res.code == 200) {
+              this.$modal.msgSuccess("鍒涘缓鎴愬姛");
+            } else {
+              this.$modal.msgError("鍒涘缓澶辫触");
+            }
+            this.dialogFormVisible = false;
+          });
         }
-      } else {
-        this.$modal.msgError("鏈�夋嫨闅忚鏂瑰紡");
-      }
-      form.id = null;
-      form.sendstate = 2;
-      form.preachform = form.preachformson;
-      addserviceSubtask(form).then((res) => {
-        if (res.code == 200) {
-          this.$modal.msgSuccess("鍒涘缓鎴愬姛");
-        }else{
-          this.$modal.msgError("鍒涘缓澶辫触");
-        }
-        this.dialogFormVisible=false;
       });
     },
   },

--
Gitblit v1.9.3