From 476569c60192a7ff3b2c291e7eb72f1c2c6b9aaa Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 27 九月 2024 18:13:03 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/tasklist/index.vue                 |   49 
 src/views/followvisit/outpatient/index.vue               |    2 
 src/views/outsideChainxj.vue                             |   11 
 src/views/followvisit/tasklist/FollowupDetails/index.vue |   23 
 vue.config.js                                            |    4 
 src/views/sfstatistics/statement/index.vue               |    2 
 src/views/patient/patient/index.vue                      |   43 
 src/views/patient/questionnaire/index.vue                |    2 
 src/views/patient/propaganda/QuestionnaireTask.vue       |    6 
 src/views/register.vue                                   |    4 
 src/views/sfstatistics/propaganda/index.vue              |    2 
 src/views/login.vue                                      |    4 
 src/views/patient/propaganda/index.vue                   |  838 ++++++++++++++----
 src/views/followvisit/record/detailpage/index.vue        |   12 
 src/views/followvisit/satisfaction/particulars/index.vue |   21 
 src/views/sfstatistics/percentage/index.vue              |    2 
 src/views/patient/patient/hospital.vue                   |   28 
 src/views/patient/patient/behospitalized.vue             |   14 
 src/views/patient/medtechnician/index.vue                |  795 +++++++++++++-----
 src/views/patient/propaganda/Missioncreation.vue         |  105 +
 src/api/AiCentre/external.js                             |    1 
 src/views/followvisit/discharge/index.vue                |  568 ++++++------
 src/views/patient/follow/index.vue                       |   36 
 23 files changed, 1,712 insertions(+), 860 deletions(-)

diff --git a/src/api/AiCentre/external.js b/src/api/AiCentre/external.js
index aacc838..41d5d1b 100644
--- a/src/api/AiCentre/external.js
+++ b/src/api/AiCentre/external.js
@@ -19,7 +19,6 @@
   });
 }
 
-
 // 缂撳瓨闂嵎
 export function Cachequestionnaire(data) {
   return request({
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index bd9c873..3dae2ed 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -1,5 +1,29 @@
 <template>
   <div class="app-container">
+    <div class="leftvlue" style="margin-bottom: 20px;">
+        <el-row :gutter="10">
+          <el-col :span="2.5" v-for="(item, index) in cardlist" :key="index">
+            <el-card
+              shadow="hover"
+              :body-style="item.router ? ' cursor: pointer' : 'cursor: default'"
+            >
+              <div style="padding: 8px" @click="$router.push(item.router)">
+                <span>{{ item.name }}</span>
+                <div
+                  style="
+                    text-align: center;
+                    font-size: 18px;
+                    margin-top: 10px;
+                    font-weight: 600;
+                  "
+                >
+                  {{ item.value }}
+                </div>
+              </div>
+            </el-card>
+          </el-col>
+        </el-row>
+      </div>
     <el-row :gutter="20">
       <!--鐢ㄦ埛鏁版嵁-->
       <el-form
@@ -11,12 +35,10 @@
         label-width="98px"
       >
         <el-form-item label="浠诲姟鍚嶇О">
-          <el-input v-model="topqueryParams.taskName"></el-input>
+          <el-input v-model="topqueryParams.taskName" placeholder="璇烽�夋嫨浠诲姟鍚嶇О"></el-input>
         </el-form-item>
-        <!-- <el-form-item label="鍙戣捣浜�">
-          <el-input v-model="topqueryParams.createBy"></el-input>
-        </el-form-item> -->
-        <!-- <el-form-item label="瀹℃牳鏃堕棿">
+
+        <el-form-item label="鍑洪櫌鏃堕棿">
           <el-date-picker
             v-model="dateRange"
             style="width: 240px"
@@ -27,36 +49,29 @@
             end-placeholder="缁撴潫鏃ユ湡"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item label="闅忚绫诲瀷" prop="status">
-          <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
+
+        <el-form-item label="鎮ｈ�呭鍚�" prop="sendname">
+          <el-input
+            v-model="topqueryParams.sendname"
+            placeholder="璇疯緭鍏ユ偅鑰呭鍚�"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="鎮ｈ�呰寖鍥�" prop="status">
+          <el-select
+            v-model="topqueryParams.searchscope"
+            placeholder="璇烽�夋嫨鎮ｈ�呰寖鍥�"
+          >
             <el-option
-              v-for="item in topicoptions"
+              v-for="item in source"
               :key="item.value"
               :label="item.label"
               :value="item.value"
             >
             </el-option>
           </el-select>
-        </el-form-item> -->
-        <el-form-item label="鎮ｈ�呭鍚�" prop="sendname">
-          <el-input v-model="topqueryParams.sendname" placeholder="璇疯緭鍏ユ偅鑰呭鍚�"></el-input>
-        </el-form-item>
-        <el-form-item label="鎮ｈ�呮潵婧�" prop="status">
-          <el-select
-                v-model="topqueryParams.searchscope"
-                placeholder="璇烽�夋嫨鎮ｈ�呮潵婧�"
-              >
-                <el-option
-                  v-for="item in source"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
         </el-form-item>
 
-        <el-form-item label="闅忚鐘舵��" prop="status">
+        <el-form-item label="浠诲姟鐘舵��" prop="status">
           <el-select v-model="topqueryParams.sendstate" placeholder="璇烽�夋嫨">
             <el-option
               v-for="item in topicoptions"
@@ -67,17 +82,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="缁撴灉鐘舵��" prop="status">
-          <el-select v-model="topqueryParams.excep" placeholder="璇烽�夋嫨">
-            <el-option
-              v-for="item in topicoptionsyj"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
+
         <el-form-item>
           <el-button
             type="primary"
@@ -103,7 +108,7 @@
             >鏂板</el-button
           >
         </el-col>
-        <!-- <el-col :span="1.5">
+        <el-col :span="1.5">
           <div class="documentf">
             <div class="document">
               <el-button
@@ -122,55 +127,12 @@
           <div class="documentf">
             <div class="document">
               <el-button
-                type="success"
-                plain
-                icon="el-icon-download"
-                size="medium"
-                @click="toleadExport"
-                v-hasPermi="['system:user:export']"
-                >瀵煎叆</el-button
-              >
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="1.5">
-          <div class="documentf">
-            <div class="document">
-              <el-button
-                type="info"
-                icon="el-icon-refresh"
-                size="medium"
-                @click="TaskReset"
-                v-hasPermi="['system:user:export']"
-                >浠诲姟閲嶇疆</el-button
-              >
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="1.5">
-          <div class="documentf">
-            <div class="document">
-              <el-button
-                type="success"
-                icon="el-icon-position"
-                size="medium"
-                @click="AllStarted"
-                v-hasPermi="['system:user:export']"
-                >鍏ㄩ儴寮�濮�</el-button
-              >
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="1.5">
-          <div class="documentf">
-            <div class="document">
-              <el-button
                 type="warning"
-                icon="el-icon-remove"
+                plain
+                icon="el-icon-warning-outline"
                 size="medium"
-                @click="AllStop"
-                v-hasPermi="['system:user:export']"
-                >鍏ㄩ儴鍋滄</el-button
+                @click="toleadExport(1)"
+                >鎵ц澶辫触</el-button
               >
             </div>
           </div>
@@ -179,27 +141,28 @@
           <div class="documentf">
             <div class="document">
               <el-button
-                type="primary"
-                icon="el-icon-remove"
+                type="danger"
+                plain
+                icon="el-icon-warning"
                 size="medium"
-                @click="Sendtimesetting"
-                v-hasPermi="['system:user:export']"
-                >鍙戦�佹椂闂磋缃�</el-button
+                @click="toleadExport(2)"
+                >缁撴灉寮傚父</el-button
               >
             </div>
           </div>
-        </el-col> -->
-
-        <!-- <el-col :span="1.5"> </el-col> -->
+        </el-col>
       </el-row>
       <el-table
         v-loading="loading"
         :data="userList"
+         height="660"
+         :row-class-name="tableRowClassName"
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="50" align="center" />
         <el-table-column
           label="浠诲姟鍚嶇О"
+          fixed
           align="center"
           key="taskName"
           prop="taskName"
@@ -208,10 +171,141 @@
         <!-- <el-table-column label="搴忓彿" fixed align="center" key="id" prop="id" /> -->
         <el-table-column
           label="濮撳悕"
+          fixed
           align="center"
           key="sendname"
           prop="sendname"
         />
+        <el-table-column
+        label="浠诲姟鐘舵��"
+        align="center"
+        key="sendstate"
+        prop="sendstate"
+        width="120"
+        >
+        <template slot-scope="scope">
+          <div v-if="scope.row.sendstate == 1">
+            <el-tag type="primary" :disable-transitions="false"
+                >琚鍙�</el-tag
+                >
+              </div>
+              <div v-if="scope.row.sendstate == 2">
+                <el-tag type="primary" :disable-transitions="false"
+                >寰呭彂閫�</el-tag
+                >
+              </div>
+              <div v-if="scope.row.sendstate == 3">
+                <el-tag type="success" :disable-transitions="false"
+                >宸插彂閫佹湭棰嗗彇</el-tag
+                >
+              </div>
+              <div v-if="scope.row.sendstate == 4">
+                <el-tag type="info" :disable-transitions="false">涓嶆墽琛�</el-tag>
+              </div>
+              <div v-if="scope.row.sendstate == 5">
+                <el-tag type="danger" :disable-transitions="false"
+                >鍙戦�佸け璐�</el-tag
+                >
+              </div>
+              <div v-if="scope.row.sendstate == 6">
+                <el-tag type="danger" :disable-transitions="false">宸插畬鎴�</el-tag>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+          label="浠诲姟寮傚父璇存槑"
+          width="120"
+          align="center"
+          key="remark"
+          prop="remark"
+        />
+
+          <!-- <el-table-column
+          label="缁撴灉鐘舵��"
+          align="center"
+          key="excep"
+          prop="excep"
+          width="120"
+          >
+          <template slot-scope="scope">
+            <div v-if="scope.row.sendstate == 6">
+              <dict-tag
+              :options="dict.type.sys_yujing"
+              :value="scope.row.excep"
+              />
+            </div>
+            <div v-else>
+              <span></span>
+            </div>
+          </template>
+        </el-table-column> -->
+        <el-table-column
+        label="浜哄伐澶勭悊鎰忚"
+        align="center"
+        key="suggest"
+        prop="suggest"
+        width="120"
+        >
+        <template slot-scope="scope">
+          <dict-tag
+          :options="dict.type.sys_suggest"
+          :value="scope.row.suggest"
+          />
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="闅忚浜哄憳"
+          align="center"
+          key="createBy"
+          prop="createBy"
+          width="120"
+        />
+        <el-table-column
+          label="闅忚鏃堕棿"
+          sortable
+          align="center"
+          prop="finishtime"
+          width="160"
+        >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.finishtime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+        label="鍑洪櫌鏃ユ湡"
+        width="200"
+        align="center"
+        key="endtime"
+        prop="endtime"
+        >
+        <template slot-scope="scope">
+          <span>{{ formatTime(scope.row.endtime) }}</span>
+        </template></el-table-column
+        >
+        <el-table-column
+        label="搴旈殢璁挎棩鏈�"
+        width="200"
+        align="center"
+        key="longSendTime"
+        prop="longSendTime"
+        >
+        <template slot-scope="scope">
+          <span>{{ formatTime(scope.row.longSendTime) }}</span>
+          </template></el-table-column
+          >
+          <el-table-column
+          label="鍑洪櫌澶╂暟"
+          width="120"
+          align="center"
+          key="endDay"
+          prop="endDay"
+          >
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.endDay ? scope.row.endDay + "澶�" : "鏃ユ湡缂哄け"
+            }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           label="韬唤璇佸彿鐮�"
           width="200"
@@ -220,99 +314,12 @@
           prop="sfzh"
         />
         <el-table-column
-          label="闅忚鐘舵��"
-          align="center"
-          key="sendstate"
-          prop="sendstate"
-          width="120"
-        >
-          <template slot-scope="scope">
-            <div v-if="scope.row.sendstate == 1">
-              <el-tag type="primary"
-              :disable-transitions="false">琚鍙�</el-tag></div>
-            <div v-if="scope.row.sendstate == 2">
-              <el-tag type="primary"
-              :disable-transitions="false">寰呭彂閫�</el-tag>
-              </div>
-            <div v-if="scope.row.sendstate == 3"> <el-tag type="success"
-              :disable-transitions="false">宸插彂閫�</el-tag></div>
-            <div v-if="scope.row.sendstate == 4"> <el-tag type="info"
-              :disable-transitions="false">涓嶆墽琛�</el-tag></div>
-            <div v-if="scope.row.sendstate == 5"> <el-tag type="danger"
-              :disable-transitions="false">鍙戦�佸け璐�</el-tag></div>
-              <div v-if="scope.row.sendstate == 6"> <el-tag type="danger"
-                :disable-transitions="false">宸插畬鎴�</el-tag></div>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          label="缁撴灉鐘舵��"
-          align="center"
-          key="excep"
-          prop="excep"
-          width="120"
-        >
-          <template slot-scope="scope">
-            <div v-if="scope.row.sendstate == 6">
-              <dict-tag
-                :options="dict.type.sys_yujing"
-                :value="scope.row.excep"
-              />
-            </div>
-            <div v-else>
-              <span></span>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="澶勭悊鎰忚"
-          align="center"
-          key="suggest"
-          prop="suggest"
-          width="120"
-        >
-          <template slot-scope="scope">
-            <dict-tag
-              :options="dict.type.sys_suggest"
-              :value="scope.row.suggest"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="鍑洪櫌鏃ユ湡"
+          label="鑱旂郴鐢佃瘽"
           width="200"
           align="center"
-          key="endtime"
-          prop="endtime"
-        >
-          <template slot-scope="scope">
-            <span>{{ formatTime(scope.row.endtime) }}</span>
-          </template></el-table-column
-        >
-        <el-table-column
-          label="搴旈殢璁挎棩鏈�"
-          width="200"
-          align="center"
-          key="longSendTime"
-          prop="longSendTime"
-        >
-          <template slot-scope="scope">
-            <span>{{ formatTime(scope.row.longSendTime) }}</span>
-          </template></el-table-column
-        >
-        <el-table-column
-          label="鍑洪櫌澶╂暟"
-          width="120"
-          align="center"
-          key="endDay"
-          prop="endDay"
-        >
-          <template slot-scope="scope">
-            <span>{{
-              scope.row.endDay ? scope.row.endDay + "澶�" : "鏃ユ湡缂哄け"
-            }}</span>
-          </template>
-        </el-table-column>
+          key="phone"
+          prop="phone"
+        />
         <el-table-column
           label="璐ｄ换鎶ゅ＋"
           width="120"
@@ -326,13 +333,6 @@
           align="center"
           key="drname"
           prop="drname"
-        />
-        <el-table-column
-          label="闅忚寮傚父璁板綍"
-          width="120"
-          align="center"
-          key="remark"
-          prop="remark"
         />
 
 
@@ -376,20 +376,14 @@
         </el-table-column> -->
 
         <el-table-column
-          label="妯℃澘鍚嶇О"
+          label="鍑洪櫌闅忚妯℃澘鍚嶇О"
           align="center"
           key="templatename"
           prop="templatename"
           width="200"
         />
 
-        <el-table-column
-          label="闅忚浜哄憳"
-          align="center"
-          key="createBy"
-          prop="createBy"
-          width="120"
-        />
+
         <!-- <el-table-column
           label="璐ｄ换鍖诲笀"
           align="center"
@@ -423,19 +417,9 @@
             <span v-else>鍗冲埢鍙戦��</span>
           </template>
         </el-table-column> -->
-        <el-table-column
-          label="闅忚鏃堕棿"
-          sortable
-          align="center"
-          prop="finishtime"
-          width="160"
-        >
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.finishtime) }}</span>
-          </template>
-        </el-table-column>
+
         <!-- <el-table-column
-          label="闅忚鐘舵��"
+          label="浠诲姟鐘舵��"
           fixed="right"
           align="center"
           key="sendstate"
@@ -483,20 +467,6 @@
                 @click="handlestop(scope.row)"
                 v-hasPermi="['system:user:edit']"
                 ><span class="button-sc"><i class="el-icon-delete"></i></span
-              ></el-button>
-            </el-tooltip> -->
-            <!-- <el-tooltip
-              class="item"
-              effect="dark"
-              content="鏌ョ湅浠诲姟璇︽儏"
-              placement="top"
-            >
-              <el-button
-                size="medium"
-                type="text"
-                @click="Seedetails(scope.row)"
-                v-hasPermi="['system:user:edit']"
-                ><span class="button-zx"><i class="el-icon-s-order"></i></span
               ></el-button>
             </el-tooltip> -->
             <el-button size="medium" type="text" @click="Seedetails(scope.row)"
@@ -730,57 +700,35 @@
         },
       ],
       loading: false,
-      states: [
-        "Alabama",
-        "Alaska",
-        "Arizona",
-        "Arkansas",
-        "California",
-        "Colorado",
-        "Connecticut",
-        "Delaware",
-        "Florida",
-        "Georgia",
-        "Hawaii",
-        "Idaho",
-        "Illinois",
-        "Indiana",
-        "Iowa",
-        "Kansas",
-        "Kentucky",
-        "Louisiana",
-        "Maine",
-        "Maryland",
-        "Massachusetts",
-        "Michigan",
-        "Minnesota",
-        "Mississippi",
-        "Missouri",
-        "Montana",
-        "Nebraska",
-        "Nevada",
-        "New Hampshire",
-        "New Jersey",
-        "New Mexico",
-        "New York",
-        "North Carolina",
-        "North Dakota",
-        "Ohio",
-        "Oklahoma",
-        "Oregon",
-        "Pennsylvania",
-        "Rhode Island",
-        "South Carolina",
-        "South Dakota",
-        "Tennessee",
-        "Texas",
-        "Utah",
-        "Vermont",
-        "Virginia",
-        "Washington",
-        "West Virginia",
-        "Wisconsin",
-        "Wyoming",
+      cardlist: [
+        {
+          name: "鍏ㄩ儴鏈嶅姟",
+          value: 0,
+        },
+        {
+          name: "搴旈殢璁�",
+          value: 0,
+        },
+        {
+          name: "涓嶆墽琛�",
+          value: 0,
+        },
+        {
+          name: "寮傚父",
+          value: 0,
+        },
+        {
+          name: "鍙戦�佸け璐�",
+          value: 0,
+        },
+        {
+          name: "琚鍙�",
+          value: 0,
+        },
+        {
+          name: "宸插彂閫佹湭棰嗗彇",
+          value: 0,
+        },
       ],
       pickerOptions: {
         disabledDate(time) {
@@ -825,6 +773,7 @@
         pageNum: 1,
         pageSize: 10,
         serviceType: 2,
+        searchscope:2,
       },
       propss: { multiple: true },
       options: [],
@@ -840,7 +789,7 @@
         },
         {
           value: 3,
-          label: "宸插彂閫�",
+          label: "宸插彂閫佹湭棰嗗彇",
         },
         {
           value: 4,
@@ -878,11 +827,8 @@
       this.initPassword = response.msg;
     });
   },
-  // 鎼滅储
-  mounted() {
-    this.list = this.states.map((item) => {
-      return { value: `value:${item}`, label: `label:${item}` };
-    });
+  activated() {
+    this.getList();
   },
   methods: {
     /** 鏌ヨ闂ㄨ瘖闅忚鏈嶅姟鍒楄〃 */
@@ -891,11 +837,11 @@
         this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
           (obj) => obj.deptCode
         );
-        this.topqueryParams.leavehospitaldistrictcodes=null;
+        this.topqueryParams.leavehospitaldistrictcodes = null;
       } else if (this.topqueryParams.searchscope == 2) {
         this.topqueryParams.leavehospitaldistrictcodes =
           store.getters.belongWards.map((obj) => obj.districtCode);
-          this.topqueryParams.leaveldeptcodes=null;
+        this.topqueryParams.leaveldeptcodes = null;
       } else {
         this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
           (obj) => obj.deptCode
@@ -905,7 +851,14 @@
       }
       this.loading = true;
       getTaskservelist(this.topqueryParams).then((response) => {
-        this.userList = response.rows;
+        this.userList = response.rows[0].serviceSubtaskList;
+        this.cardlist[0].value=Number(response.rows[0].wzx)+Number(response.rows[0].ysf);
+        this.cardlist[1].value=response.rows[0].ysf;
+        this.cardlist[2].value=response.rows[0].wzx;
+        this.cardlist[3].value=response.rows[0].yc;
+        this.cardlist[4].value=response.rows[0].fssb;
+        this.cardlist[5].value=response.rows[0].blq;
+        this.cardlist[6].value=response.rows[0].yfs;
         this.userList.forEach((item) => {
           if (item.endtime) {
             item.endDay = this.daysBetween(item.endtime);
@@ -977,11 +930,11 @@
         this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
           (obj) => obj.deptCode
         );
-        this.topqueryParams.leavehospitaldistrictcodes=null;
+        this.topqueryParams.leavehospitaldistrictcodes = null;
       } else if (this.topqueryParams.searchscope == 2) {
         this.topqueryParams.leavehospitaldistrictcodes =
           store.getters.belongWards.map((obj) => obj.districtCode);
-          this.topqueryParams.leaveldeptcodes=null;
+        this.topqueryParams.leaveldeptcodes = null;
       } else {
         this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
           (obj) => obj.deptCode
@@ -990,12 +943,20 @@
           store.getters.belongWards.map((obj) => obj.districtCode);
       }
       this.topqueryParams.pageNum = 1;
+      this.topqueryParams.startOutHospTime = this.dateRange[0];
+      this.topqueryParams.endOutHospTime = this.dateRange[1];
+
       this.getList();
     },
     /** 閲嶇疆鎸夐挳鎿嶄綔 */
     resetQuery() {
       this.dateRange = [];
-      this.topqueryParams = {};
+      this.topqueryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        serviceType: 2,
+        searchscope:2,
+      };
       this.handleQuery();
     },
     // 澶氶�夋閫変腑鏁版嵁
@@ -1133,11 +1094,19 @@
     Seedetails(row) {
       this.$router.push({
         path: "/followvisit/record/detailpage/",
-        query: { taskid: row.taskid, patid: row.patid,id: row.id},
+        query: { taskid: row.taskid, patid: row.patid, id: row.id },
       });
     },
-    // 瀵煎叆鎸夐挳
-    toleadExport() {},
+    // 渚挎嵎鎸夐挳
+    toleadExport(too) {
+      if (too == 1) {
+        this.topqueryParams.sendstate=4;
+        this.topqueryParams.excep=null;
+      } else if (too == 2) {
+        this.topqueryParams.excep=1;
+      }
+      this.handleQuery();
+    },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
       this.download(
@@ -1148,6 +1117,13 @@
         `user_${new Date().getTime()}.xlsx`
       );
     },
+    // 寮傚父鍒楁覆鏌�
+    tableRowClassName({row, rowIndex}) {
+        if (row.excep == 1) {
+          return 'warning-row';
+        }
+        return '';
+      }
   },
 };
 </script>
@@ -1163,6 +1139,9 @@
   // width: 100px;
   height: 50px;
 }
+::v-deep.el-table .warning-row {
+    background: #eec4c4;
+  }
 
 .documentf {
   display: flex;
@@ -1241,6 +1220,13 @@
     }
   }
 }
+::v-deep.leftvlue .el-card__body {
+  background: #d0e9fd;
+}
+::v-deep.leftvlue .el-card__body:hover {
+  background: #8dc8f8;
+  cursor: pointer; /* 榧犳爣鎮诞鏃跺彉涓烘墜褰� */
+}
 .button-bb {
   font-weight: 500;
   background-color: #2ba05c;
diff --git a/src/views/followvisit/outpatient/index.vue b/src/views/followvisit/outpatient/index.vue
index 45c29f5..ae3ac46 100644
--- a/src/views/followvisit/outpatient/index.vue
+++ b/src/views/followvisit/outpatient/index.vue
@@ -632,7 +632,7 @@
         },
         {
           value: 3,
-          label: "宸插彂閫�",
+          label: "宸插彂閫佹湭棰嗗彇",
         },
       ],
       serviceState:[],
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index 18d5de0..21bb617 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -36,7 +36,7 @@
               :disable-transitions="false">寰呭彂閫�</el-tag>
               </div>
             <div v-if="scope.row.sendstate == 3"> <el-tag type="success"
-              :disable-transitions="false">宸插彂閫�</el-tag></div>
+              :disable-transitions="false">宸插彂閫佹湭棰嗗彇</el-tag></div>
             <div v-if="scope.row.sendstate == 4"> <el-tag type="info"
               :disable-transitions="false">涓嶆墽琛�</el-tag></div>
             <div v-if="scope.row.sendstate == 5"> <el-tag type="danger"
@@ -167,9 +167,9 @@
           <el-button type="primary" @click="Editsingletaskson('3')"
             >閫氱煡灏辫瘖</el-button
           >
-          <el-button type="danger" @click="Editsingletaskson('4')"
+          <!-- <el-button type="danger" @click="Editsingletaskson('4')"
             >澶辫</el-button
-          >
+          > -->
           <el-button type="info" @click="Editsingletaskson('5')"
             >浜哄伐闅忚</el-button
           >
@@ -432,7 +432,7 @@
         taskid: taskid,
       }).then((res) => {
         if (res.code == 200) {
-          this.logsheetlist = res.rows;
+          this.logsheetlist = res.rows[0].serviceSubtaskList;
         }
       });
     },
@@ -461,7 +461,9 @@
         taskid: this.taskid,
       }).then((res) => {
         if (res.code == 200) {
-          objson = res.rows[0];
+          objson = res.rows[0].serviceSubtaskList[0];
+          console.log(objson,'obj');
+
           objson.excep = excep;
           Editsingletaskson(objson).then((res) => {
             if (res.code) {
diff --git a/src/views/followvisit/satisfaction/particulars/index.vue b/src/views/followvisit/satisfaction/particulars/index.vue
index 798e865..08d9c15 100644
--- a/src/views/followvisit/satisfaction/particulars/index.vue
+++ b/src/views/followvisit/satisfaction/particulars/index.vue
@@ -205,11 +205,11 @@
 
                     <el-form-item label="鎮ｈ�呰寖鍥�" prop="status">
                       <el-select
-                        v-model="topqueryParams.topic"
+                        v-model="topqueryParams.searchscope"
                         placeholder="璇烽�夋嫨"
                       >
                         <el-option
-                          v-for="item in taskoptions"
+                          v-for="item in source"
                           :key="item.value"
                           :label="item.label"
                           :value="item.value"
@@ -362,7 +362,7 @@
               <el-form-item label="鎮ｈ�呭悕绉帮細">
                 <el-input v-model="patientqueryParams.name"></el-input>
               </el-form-item>
-              <el-form-item label="鎮ｈ�呮潵婧�" prop="status">
+              <el-form-item label="鎮ｈ�呰寖鍥�" prop="status">
                 <el-select
                   v-model="patientqueryParams.topic"
                   placeholder="璇烽�夋嫨"
@@ -518,6 +518,7 @@
       topqueryParams: {
         pageNum: 1, //
         pageSize: 10,
+        searchscope:2,
       },
       checkList: [],
       deliverytopqueryParams: {
@@ -554,6 +555,20 @@
         resource: "",
         desc: "",
       },
+      source: [
+        {
+          value: 0,
+          label: "鎵�灞炴偅鑰�",
+        },
+        {
+          value: 1,
+          label: "绉戝鎮ｈ��",
+        },
+        {
+          value: 2,
+          label: "鐥呭尯鎮ｈ��",
+        },
+      ],
       options: [
         {
           value: "閫夐」1",
diff --git a/src/views/followvisit/tasklist/FollowupDetails/index.vue b/src/views/followvisit/tasklist/FollowupDetails/index.vue
index 49c199d..3fcbb81 100644
--- a/src/views/followvisit/tasklist/FollowupDetails/index.vue
+++ b/src/views/followvisit/tasklist/FollowupDetails/index.vue
@@ -845,13 +845,13 @@
               <el-form-item label="鎮ｈ�呭悕绉帮細">
                 <el-input v-model="patientqueryParams.name"></el-input>
               </el-form-item>
-              <el-form-item label="鎮ｈ�呮潵婧�" prop="status">
+              <el-form-item label="鎮ｈ�呰寖鍥�" prop="status">
                 <el-select
-                  v-model="patientqueryParams.topic"
+                  v-model="patientqueryParams.searchscope"
                   placeholder="璇烽�夋嫨"
                 >
                   <el-option
-                    v-for="item in topicoptions"
+                    v-for="item in source"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
@@ -928,7 +928,7 @@
               />
 
               <el-table-column
-                label="鎮ｈ�呮潵婧�"
+                label="鎮ｈ�呰寖鍥�"
                 align="center"
                 key="sourcefrom"
                 prop="sourcefrom"
@@ -1011,6 +1011,7 @@
       patientqueryParams: {
         pageNum: 1, //
         pageSize: 10,
+        searchscope:2,
       },
       topicoptions: [],
       showSearch: true, //
@@ -1038,6 +1039,20 @@
         resource: "",
         desc: "",
       },
+      source: [
+        {
+          value: 0,
+          label: "鎵�灞炴偅鑰�",
+        },
+        {
+          value: 1,
+          label: "绉戝鎮ｈ��",
+        },
+        {
+          value: 2,
+          label: "鐥呭尯鎮ｈ��",
+        },
+      ],
       options: [
         {
           value: "閫夐」1",
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index 1f385ea..0d4f58b 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -23,7 +23,7 @@
             @keyup.enter.native="handleQuery"
           ></el-input>
         </el-form-item>
-        <el-form-item label="鍒涘缓鏃堕棿">
+        <el-form-item label="鍒涘彂閫佹椂闂�">
           <el-date-picker
             v-model="dateRange"
             style="width: 240px"
@@ -181,7 +181,7 @@
           width="120"
         >
           <template slot-scope="scope">
-            <span>{{ scope.row.longTask?'闀挎湡浠诲姟':'闈為暱鏈�' }}</span>
+            <span>{{ scope.row.longTask ? "闀挎湡浠诲姟" : "闈為暱鏈�" }}</span>
           </template>
         </el-table-column>
 
@@ -229,7 +229,10 @@
         >
           <template slot-scope="scope">
             <el-button
-              v-if="(scope.row.sendState == 1 || scope.row.sendState == 3)&&!scope.row.longTask"
+              v-if="
+                (scope.row.sendState == 1 || scope.row.sendState == 3) &&
+                !scope.row.longTask
+              "
               size="medium"
               type="text"
               @click="sponsor(scope.row)"
@@ -242,7 +245,10 @@
                 ><i class="el-icon-circle-plus-outline"></i>缁堟</span
               ></el-button
             > -->
-            <el-button size="medium" type="text" @click="handleUpdate(scope.row,1)"
+            <el-button
+              size="medium"
+              type="text"
+              @click="handleUpdate(scope.row, 1)"
               ><span class="button-xj"
                 ><i class="el-icon-circle-plus-outline"></i>渚濈収鏂板</span
               ></el-button
@@ -394,7 +400,7 @@
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
-  name: "User",
+  name: "Tasklist",
   dicts: ["sys_normal_disable", "sys_user_sex", "task_status"],
   components: { Treeselect },
   data() {
@@ -427,7 +433,7 @@
       postOptions: [],
       // 瑙掕壊閫夐」
       roleOptions: [],
-      longTask:0,
+      longTask: 0,
       taskform: {
         showDate: [],
         showTimeMorn: [],
@@ -449,13 +455,13 @@
       previewvalue: {
         username: "杩欎釜鍖荤敓瀵逛綘鎬庝箞鏍�",
       },
-      longtermlist:[
-      {
-          value: '1',
+      longtermlist: [
+        {
+          value: "1",
           label: "闀挎湡浠诲姟",
         },
         {
-          value: '0',
+          value: "0",
           label: "鏅�氫换鍔�",
         },
       ],
@@ -651,8 +657,11 @@
   },
   watch: {},
   created() {
-    this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(obj=>obj.deptCode);
-    this.topqueryParams.leavehospitaldistrictcodes = store.getters.belongWards.map(obj=>obj.districtCode);
+    this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+      (obj) => obj.deptCode
+    );
+    this.topqueryParams.leavehospitaldistrictcodes =
+      store.getters.belongWards.map((obj) => obj.districtCode);
     this.tasktopic = this.$route.query.tasktopic
       ? this.$route.query.tasktopic
       : this.tasktopic;
@@ -661,6 +670,9 @@
       this.initPassword = response.msg;
     });
     // this.taskoptions = store.getters.Serviceauthority;
+  },
+  activated() {
+    this.getList();
   },
   // 鎼滅储
   mounted() {
@@ -696,7 +708,9 @@
       //   this.taskoptions,
       //   this.tasktopic
       // );
-      getTasklist(this.addDateRange(this.topqueryParams, this.dateRange)).then(
+      this.topqueryParams.startOutHospTime = this.dateRange[0];
+      this.topqueryParams.endOutHospTime = this.dateRange[1];
+      getTasklist(this.topqueryParams).then(
         (response) => {
           this.userList = response.rows;
           this.total = response.total;
@@ -810,7 +824,7 @@
       }
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
-    handleUpdate(row,newadd) {
+    handleUpdate(row, newadd) {
       if (this.topqueryParams.type == 1) {
         this.$router.push({
           path: "/followvisit/particty",
@@ -818,7 +832,7 @@
             id: row.taskid,
             type: this.topqueryParams.type,
             serviceType: this.tasktopic,
-            newadd:newadd,//鏄惁渚濈収鏂板缓
+            newadd: newadd, //鏄惁渚濈収鏂板缓
           },
         });
       } else if (this.topqueryParams.type == 2) {
@@ -828,7 +842,7 @@
             id: row.taskid,
             type: this.topqueryParams.type,
             serviceType: this.tasktopic,
-            newadd:newadd,
+            newadd: newadd,
           },
         });
       } else if (this.topqueryParams.type == 3) {
@@ -838,7 +852,7 @@
             id: row.taskid,
             type: this.topqueryParams.type,
             serviceType: this.tasktopic,
-            newadd:newadd,
+            newadd: newadd,
           },
         });
       }
@@ -950,7 +964,6 @@
           .catch(() => {});
       }
     },
-
 
     // 鏆傚仠
     stop(row) {
diff --git a/src/views/login.vue b/src/views/login.vue
index b442523..9a160c8 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -78,9 +78,9 @@
       </el-form-item>
     </el-form>
     <!--  搴曢儴  -->
-    <div class="el-login-footer">
+    <!-- <div class="el-login-footer">
       <span style="color: #568FBD; font-size: 25px;">Copyright 漏 2018-2022 ruoyi.vip All Rights Reserved.</span>
-    </div>
+    </div> -->
   </div>
 </template>
 
diff --git a/src/views/outsideChainxj.vue b/src/views/outsideChainxj.vue
index b73380c..51889fb 100644
--- a/src/views/outsideChainxj.vue
+++ b/src/views/outsideChainxj.vue
@@ -32,15 +32,18 @@
             margin-bottom: 10px;
           "
         >
-          鎰熻阿鎮ㄧ殑闃呰!
-        </div>
-        <div style="font-size: 20px">
+        {{
+            jsy
+              ? jsy
+              : "鐢熸椿涓婅鍔抽�哥粨鍚堬紝娉ㄦ剰浼戞伅鍜岃惀鍏伙紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈瀹ｆ暀鍐呭灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒"
+          }}        </div>
+        <!-- <div style="font-size: 20px">
           {{
             jsy
               ? jsy
               : "鐢熸椿涓婅鍔抽�哥粨鍚堬紝娉ㄦ剰浼戞伅鍜岃惀鍏伙紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈瀹ｆ暀鍐呭灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒"
           }}
-        </div>
+        </div> -->
       </div>
     </div>
   </div>
diff --git a/src/views/patient/follow/index.vue b/src/views/patient/follow/index.vue
index d59e1d8..02ca1e1 100644
--- a/src/views/patient/follow/index.vue
+++ b/src/views/patient/follow/index.vue
@@ -21,21 +21,20 @@
             />
           </el-form-item>
 
-          <el-form-item label="鎮ｈ�呰寖鍥�" prop="tagId">
+          <!-- <el-form-item label="鎮ｈ�呰寖鍥�" prop="tagId">
             <el-select
-              v-model="queryParams.Patientid"
-              multiple
+              v-model="queryParams.searchscope"
               placeholder="璇烽�夋嫨"
             >
               <el-option
                 v-for="item in Patientrange"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
               >
               </el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
 
 
           <el-row>
@@ -184,7 +183,7 @@
                     query: { id: scope.row.patid },
                   })
                 "
-                v-hasPermi="['system:user:edit']"
+
                 ><span class="button-textsc"
                   ><i class="el-icon-zoom-in"></i>鏌ョ湅</span
                 ></el-button
@@ -193,7 +192,7 @@
                 size="medium"
                 type="text"
                 @click="handleDelete(scope.row)"
-                v-hasPermi="['system:user:edit']"
+
                 ><span class="button-textxga"
                   ><i class="el-icon-edit"></i>鍙栨秷杩囨护</span
                 ></el-button
@@ -294,17 +293,17 @@
       propss: { multiple: true },
       optionstag: [], //鏍囩鍒楄〃
       Patientrange: [
-        // {
-        //   name: "闂ㄨ瘖",
-        //   id: 1,
-        // },
-        {
-          name: "浣忛櫌",
-          id: 2,
+      {
+          value: 0,
+          label: "鎵�灞炴偅鑰�",
         },
         {
-          name: "浣撴",
-          id: 3,
+          value: 1,
+          label: "绉戝鎮ｈ��",
+        },
+        {
+          value: 2,
+          label: "鐥呭尯鎮ｈ��",
         },
       ],
       whether: [
@@ -368,6 +367,7 @@
     /** 鏌ヨ鎮ｈ�呭垪琛� */
     getList() {
       this.loading = true;
+
       messagelistpatient(this.queryParams).then((response) => {
         console.log(response);
         this.userList = response.rows;
diff --git a/src/views/patient/medtechnician/index.vue b/src/views/patient/medtechnician/index.vue
index e5bda87..0611c3e 100644
--- a/src/views/patient/medtechnician/index.vue
+++ b/src/views/patient/medtechnician/index.vue
@@ -11,12 +11,12 @@
         label-width="98px"
       >
         <el-form-item label="浠诲姟鍚嶇О">
-          <el-input v-model="topqueryParams.name"></el-input>
+          <el-input v-model="topqueryParams.taskName"></el-input>
         </el-form-item>
-        <el-form-item label="瀹℃牳浜�">
-          <el-input v-model="topqueryParams.name"></el-input>
-        </el-form-item>
-        <el-form-item label="瀹℃牳鏃堕棿">
+        <!-- <el-form-item label="鍙戣捣浜�">
+          <el-input v-model="topqueryParams.createBy"></el-input>
+        </el-form-item> -->
+        <!-- <el-form-item label="瀹℃牳鏃堕棿">
           <el-date-picker
             v-model="dateRange"
             style="width: 240px"
@@ -27,7 +27,7 @@
             end-placeholder="缁撴潫鏃ユ湡"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item label="闅忚绫诲瀷" prop="status">
+        <el-form-item label="瀹ｆ暀绫诲瀷" prop="status">
           <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
             <el-option
               v-for="item in topicoptions"
@@ -37,9 +37,27 @@
             >
             </el-option>
           </el-select>
+        </el-form-item> -->
+        <el-form-item label="鎮ｈ�呭鍚�" prop="sendname">
+          <el-input v-model="topqueryParams.sendname" placeholder="璇疯緭鍏ユ偅鑰呭鍚�"></el-input>
         </el-form-item>
-        <el-form-item label="妯℃澘" prop="status">
-          <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
+        <el-form-item label="鎮ｈ�呰寖鍥�" prop="status">
+          <el-select
+                v-model="topqueryParams.searchscope"
+                placeholder="璇烽�夋嫨鎮ｈ�呰寖鍥�"
+              >
+                <el-option
+                  v-for="item in source"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+        </el-form-item>
+
+        <el-form-item label="浠诲姟鐘舵��" prop="status">
+          <el-select v-model="topqueryParams.sendstate" placeholder="璇烽�夋嫨">
             <el-option
               v-for="item in topicoptions"
               :key="item.value"
@@ -49,10 +67,10 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="闂ㄨ瘖闅忚鐘舵��" prop="status">
-          <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
+        <el-form-item label="缁撴灉鐘舵��" prop="status">
+          <el-select v-model="topqueryParams.excep" placeholder="璇烽�夋嫨">
             <el-option
-              v-for="item in topicoptions"
+              v-for="item in topicoptionsyj"
               :key="item.value"
               :label="item.label"
               :value="item.value"
@@ -82,41 +100,16 @@
             icon="el-icon-plus"
             size="medium"
             @click="handleAdd"
-            v-hasPermi="['system:user:add']"
             >鏂板</el-button
           >
         </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="success"
-            plain
-            icon="el-icon-edit"
-            size="medium"
-            :disabled="single"
-            @click="handleUpdate"
-            v-hasPermi="['system:user:edit']"
-            >淇敼</el-button
-          >
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="danger"
-            plain
-            icon="el-icon-delete"
-            size="medium"
-            :disabled="multiple"
-            @click="handleDelete"
-            v-hasPermi="['system:user:remove']"
-            >鍒犻櫎</el-button
-          >
-        </el-col>
-        <el-col :span="19">
+        <!-- <el-col :span="1.5">
           <div class="documentf">
             <div class="document">
               <el-button
                 type="warning"
                 plain
-                icon="el-icon-download"
+                icon="el-icon-upload2"
                 size="medium"
                 @click="handleExport"
                 v-hasPermi="['system:user:export']"
@@ -125,6 +118,78 @@
             </div>
           </div>
         </el-col>
+        <el-col :span="1.5">
+          <div class="documentf">
+            <div class="document">
+              <el-button
+                type="success"
+                plain
+                icon="el-icon-download"
+                size="medium"
+                @click="toleadExport"
+                v-hasPermi="['system:user:export']"
+                >瀵煎叆</el-button
+              >
+            </div>
+          </div>
+        </el-col>
+        <el-col :span="1.5">
+          <div class="documentf">
+            <div class="document">
+              <el-button
+                type="info"
+                icon="el-icon-refresh"
+                size="medium"
+                @click="TaskReset"
+                v-hasPermi="['system:user:export']"
+                >浠诲姟閲嶇疆</el-button
+              >
+            </div>
+          </div>
+        </el-col>
+        <el-col :span="1.5">
+          <div class="documentf">
+            <div class="document">
+              <el-button
+                type="success"
+                icon="el-icon-position"
+                size="medium"
+                @click="AllStarted"
+                v-hasPermi="['system:user:export']"
+                >鍏ㄩ儴寮�濮�</el-button
+              >
+            </div>
+          </div>
+        </el-col>
+        <el-col :span="1.5">
+          <div class="documentf">
+            <div class="document">
+              <el-button
+                type="warning"
+                icon="el-icon-remove"
+                size="medium"
+                @click="AllStop"
+                v-hasPermi="['system:user:export']"
+                >鍏ㄩ儴鍋滄</el-button
+              >
+            </div>
+          </div>
+        </el-col>
+        <el-col :span="1.5">
+          <div class="documentf">
+            <div class="document">
+              <el-button
+                type="primary"
+                icon="el-icon-remove"
+                size="medium"
+                @click="Sendtimesetting"
+                v-hasPermi="['system:user:export']"
+                >鍙戦�佹椂闂磋缃�</el-button
+              >
+            </div>
+          </div>
+        </el-col> -->
+
         <!-- <el-col :span="1.5"> </el-col> -->
       </el-row>
       <el-table
@@ -134,92 +199,186 @@
       >
         <el-table-column type="selection" width="50" align="center" />
         <el-table-column
-          label="搴忓彿"
-          fixed
+          label="浠诲姟鍚嶇О"
           align="center"
-          key="userId"
-          prop="userId"
+          key="taskName"
+          prop="taskName"
+          width="180"
         />
+        <!-- <el-table-column label="搴忓彿" fixed align="center" key="id" prop="id" /> -->
         <el-table-column
           label="濮撳悕"
-          fixed
           align="center"
-          key="types"
-          prop="types"
+          key="sendname"
+          prop="sendname"
         />
-
         <el-table-column
-          label="鐥呭巻鍙�"
+          label="韬唤璇佸彿鐮�"
+          width="200"
           align="center"
-          sortable
-          key="userName"
-          prop="userName"
+          key="sfzh"
+          prop="sfzh"
+        />
+        <el-table-column
+          label="浠诲姟鐘舵��"
+          align="center"
+          key="sendstate"
+          prop="sendstate"
           width="120"
-        />
-        <el-table-column
-          label="骞撮緞"
-          align="center"
-          key="nickName"
-          prop="nickName"
-        />
-        <el-table-column
-          label="搴婂彿"
-          align="center"
-          key="nickName"
-          prop="nickName"
-        />
-        <el-table-column
-          label="绉戝/鐥呭尯"
-          align="center"
-          key="phonenumber"
-          prop="phonenumber"
-          width="120"
-        >
-        </el-table-column>
-
-        <el-table-column
-          label="鐤剧梾鍚嶇О"
-          align="center"
-          key="topicnumber"
-          prop="topicnumber"
-          width="120"
-          :show-overflow-tooltip="true"
         >
           <template slot-scope="scope">
-            <div>杞诲害楠ㄨ</div>
+            <div v-if="scope.row.sendstate == 1">
+              <el-tag type="primary"
+              :disable-transitions="false">琚鍙�</el-tag></div>
+            <div v-if="scope.row.sendstate == 2">
+              <el-tag type="primary"
+              :disable-transitions="false">寰呭彂閫�</el-tag>
+              </div>
+            <div v-if="scope.row.sendstate == 3"> <el-tag type="success"
+              :disable-transitions="false">宸插彂閫佹湭棰嗗彇</el-tag></div>
+            <div v-if="scope.row.sendstate == 4"> <el-tag type="info"
+              :disable-transitions="false">涓嶆墽琛�</el-tag></div>
+            <div v-if="scope.row.sendstate == 5"> <el-tag type="danger"
+              :disable-transitions="false">鍙戦�佸け璐�</el-tag></div>
+              <div v-if="scope.row.sendstate == 6"> <el-tag type="danger"
+                :disable-transitions="false">宸插畬鎴�</el-tag></div>
           </template>
         </el-table-column>
         <el-table-column
-          label="瀹ｆ暀鍐呭"
-          align="center"
-          key="topicnumberaa"
-          prop="topicnumberaa"
+          label="瀹ｆ暀寮傚父璁板綍"
           width="120"
-        />
-        <el-table-column
-          label="瀹ｆ暀鏉愭枡"
           align="center"
-          key="topicnumberaa"
-          prop="topicnumberaa"
-          width="120"
-        />
-        <el-table-column
-          label="瀹ｆ暀鏂瑰紡"
-          align="center"
-          key="topicnumberaa"
-          prop="topicnumberaa"
-          width="120"
+          key="remark"
+          prop="remark"
         />
         <el-table-column
           label="瀹ｆ暀浜哄憳"
           align="center"
-          key="topicnumberaa"
-          prop="topicnumberaa"
+          key="createBy"
+          prop="createBy"
           width="120"
         />
+        <el-table-column
+          label="瀹ｆ暀鏃堕棿"
+          sortable
+          align="center"
+          prop="finishtime"
+          width="160"
+        >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.finishtime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="鍑洪櫌鏃ユ湡"
+          width="200"
+          align="center"
+          key="endtime"
+          prop="endtime"
+        >
+          <template slot-scope="scope">
+            <span>{{ formatTime(scope.row.endtime) }}</span>
+          </template></el-table-column
+        >
+        <el-table-column
+          label="搴斿鏁欐棩鏈�"
+          width="200"
+          align="center"
+          key="longSendTime"
+          prop="longSendTime"
+        >
+          <template slot-scope="scope">
+            <span>{{ formatTime(scope.row.longSendTime) }}</span>
+          </template></el-table-column
+        >
+        <el-table-column
+          label="鍑洪櫌澶╂暟"
+          width="120"
+          align="center"
+          key="endDay"
+          prop="endDay"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.endDay ? scope.row.endDay + "澶�" : "鏃ユ湡缂哄け"
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="璐ｄ换鎶ゅ＋"
+          width="120"
+          align="center"
+          key="nurseName"
+          prop="nurseName"
+        />
+        <el-table-column
+          label="涓绘不鍖荤敓"
+          width="120"
+          align="center"
+          key="drname"
+          prop="drname"
+        />
+
+
+
+        <!-- <el-table-column
+          label="鐥呭巻鍙�"
+          align="center"
+          sortable
+          key="medicalRecordNo"
+          prop="medicalRecordNo"
+          width="120"
+        /> -->
+
+        <!-- <el-table-column label="骞撮緞" align="center" key="age" prop="age" /> -->
+        <!-- <el-table-column label="鎬у埆" align="center" key="sex" prop="sex" /> -->
+        <!-- <el-table-column label="搴婂彿" align="center" key="badNo" prop="badNo" /> -->
+        <el-table-column
+          label="绉戝"
+          align="center"
+          key="deptname"
+          prop="deptname"
+          width="120"
+        >
+        </el-table-column>
+        <el-table-column
+          label="鐥呭尯"
+          align="center"
+          key="leavehospitaldistrictname"
+          prop="leavehospitaldistrictname"
+          width="120"
+        >
+        </el-table-column>
+
+        <!-- <el-table-column
+          label="鐤剧梾鍚嶇О"
+          align="center"
+          key="icdName"
+          prop="icdName"
+          width="120"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column> -->
 
         <el-table-column
-          label="灏辫瘖鏃堕棿"
+          label="瀹ｆ暀妯℃澘鍚嶇О"
+          align="center"
+          key="templatename"
+          prop="templatename"
+          width="200"
+        />
+
+
+        <!-- <el-table-column
+          label="璐ｄ换鍖诲笀"
+          align="center"
+          key="drname"
+          prop="drname"
+          width="120"
+        /> -->
+
+        <!-- <el-table-column
+          label="鍑洪櫌鏃堕棿"
           sortable
           align="center"
           prop="createTime"
@@ -228,8 +387,8 @@
           <template slot-scope="scope">
             <span>{{ formatTime(scope.row.createTime) }}</span>
           </template>
-        </el-table-column>
-        <el-table-column
+        </el-table-column> -->
+        <!-- <el-table-column
           label="瀹ｆ暀鏃堕棿"
           sortable
           align="center"
@@ -237,58 +396,67 @@
           width="160"
         >
           <template slot-scope="scope">
-            <span>{{ formatTime(scope.row.createTime) }}</span>
+            <span v-if="scope.row.sendType != 3">{{
+              formatTime(scope.row.createTime)
+            }}</span>
+            <span v-else>鍗冲埢鍙戦��</span>
           </template>
-        </el-table-column>
-        <el-table-column
-          label="鍥炲鏃堕棿"
-          sortable
-          align="center"
-          prop="createTime"
-          width="160"
-        >
-          <template slot-scope="scope">
-            <span>{{ formatTime(scope.row.createTime) }}</span>
-          </template>
-        </el-table-column>
+        </el-table-column> -->
 
-        <el-table-column
-          label="閫氱煡鐘舵��"
+        <!-- <el-table-column
+          label="浠诲姟鐘舵��"
           fixed="right"
           align="center"
-          key="topicnumber"
-          prop="topicnumber"
+          key="sendstate"
+          prop="sendstate"
           width="120"
           :show-overflow-tooltip="true"
         >
           <template slot-scope="scope">
-            <div>鏈畬鎴�</div>
+            <dict-tag :options="serviceState" :value="scope.row.sendstate" />
           </template>
-        </el-table-column>
+        </el-table-column> -->
+
         <el-table-column
-          label="浠诲姟璇︽儏"
+          label="鎿嶄綔"
           fixed="right"
           align="center"
           width="200"
           class-name="small-padding fixed-width"
         >
           <template slot-scope="scope">
-            <el-button
-              size="medium"
-              type="text"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['system:user:edit']"
-              ><span class="button-xq"
-                ><i class="el-icon-s-data"></i>璇︽儏</span
-              ></el-button
+            <!-- <el-tooltip
+              class="item"
+              effect="dark"
+              content="閲嶆柊瀹ｆ暀"
+              placement="top"
             >
-            <el-button
-              size="medium"
-              type="text"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['system:user:edit']"
-              ><span class="button-sc"
-                ><i class="el-icon-delete"></i>鍒犻櫎</span
+              <el-button
+                size="medium"
+                type="text"
+                @click="followupvisit(scope.row)"
+                v-hasPermi="['system:user:edit']"
+                ><span class="button-bb"
+                  ><i class="el-icon-s-promotion"></i></span
+              ></el-button>
+            </el-tooltip> -->
+            <!-- <el-tooltip
+              class="item"
+              effect="dark"
+              content="鍋滄"
+              placement="top"
+            >
+              <el-button
+                size="medium"
+                type="text"
+                @click="handlestop(scope.row)"
+                v-hasPermi="['system:user:edit']"
+                ><span class="button-sc"><i class="el-icon-delete"></i></span
+              ></el-button>
+            </el-tooltip> -->
+            <el-button size="medium" type="text" @click="Seedetails(scope.row)"
+              ><span class="button-zx"
+                ><i class="el-icon-s-order"></i>鏌ョ湅璇︽儏</span
               ></el-button
             >
           </template>
@@ -303,7 +471,7 @@
         @pagination="getList"
       />
     </el-row>
-    <!-- 娣诲姞鎴栦慨鏀归棬璇婇殢璁垮璇濇 -->
+    <!-- 娣诲姞鎴栦慨鏀归棬璇婂鏁欏璇濇 -->
     <el-dialog
       :title="title"
       :visible.sync="addalteropen"
@@ -327,8 +495,8 @@
         ></el-row>
         <el-row :gutter="20">
           <el-col :span="24"
-            ><el-form-item label="闅忚绫诲瀷">
-              <el-select v-model="form.region" placeholder="璇烽�夋嫨闅忚绫诲瀷">
+            ><el-form-item label="瀹ｆ暀绫诲瀷">
+              <el-select v-model="form.region" placeholder="璇烽�夋嫨瀹ｆ暀绫诲瀷">
                 <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
                 <el-option label="鍖哄煙浜�" value="beijing"></el-option>
               </el-select> </el-form-item
@@ -346,7 +514,7 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="24">
-            <el-form-item label="闂ㄨ瘖闅忚瑕佹眰">
+            <el-form-item label="闂ㄨ瘖瀹ｆ暀瑕佹眰">
               <el-input type="textarea" v-model="form.desc"></el-input>
             </el-form-item>
           </el-col>
@@ -356,6 +524,81 @@
         <el-button type="primary" @click="submitForm">鎻� 浜�</el-button>
         <el-button @click="cancel">杩� 鍥�</el-button>
       </div>
+    </el-dialog>
+    <!-- 淇敼鍙戦�佹椂闂村璇濇 -->
+    <el-dialog
+      title="鍙戦�佹椂闂磋缃�"
+      :visible.sync="modificationVisible"
+      width="45%"
+    >
+      <div style="margin-bottom: 20px; color: red">
+        缁熶竴淇敼褰撳ぉ鏈彂閫佺殑浠诲姟鏃堕棿
+      </div>
+
+      <el-form
+        :model="ruleForm"
+        :rules="rules"
+        ref="ruleForm"
+        label-width="120px"
+        class="demo-ruleForm"
+      >
+        <el-form-item label="鍙戦�佹棩鏈�">
+          <el-date-picker
+            v-model="ruleForm.value1"
+            type="date"
+            placeholder="閫夋嫨鏃ユ湡"
+          >
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="鏃堕棿娈�" prop="type">
+          <el-checkbox-group v-model="ruleForm.type">
+            <el-checkbox label="涓婂崍" name="type"></el-checkbox>
+            <el-checkbox label="涓嬪崍" name="type"></el-checkbox>
+            <el-checkbox label="鏅氫笂" name="type"></el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+        <el-form-item label="涓婂崍鏃堕棿鍖洪棿" required>
+          <el-time-picker
+            is-range
+            v-model="ruleForm.value2"
+            range-separator="鑷�"
+            start-placeholder="寮�濮嬫椂闂�"
+            end-placeholder="缁撴潫鏃堕棿"
+            placeholder="閫夋嫨鏃堕棿鑼冨洿"
+          >
+          </el-time-picker>
+        </el-form-item>
+        <el-form-item label="涓嬪崍鏃堕棿鍖洪棿" required>
+          <el-time-picker
+            is-range
+            v-model="ruleForm.value3"
+            range-separator="鑷�"
+            start-placeholder="寮�濮嬫椂闂�"
+            end-placeholder="缁撴潫鏃堕棿"
+            placeholder="閫夋嫨鏃堕棿鑼冨洿"
+          >
+          </el-time-picker>
+        </el-form-item>
+        <el-form-item label="鏅氫笂鏃堕棿鍖洪棿" required>
+          <el-time-picker
+            is-range
+            v-model="ruleForm.value4"
+            range-separator="鑷�"
+            start-placeholder="寮�濮嬫椂闂�"
+            end-placeholder="缁撴潫鏃堕棿"
+            placeholder="閫夋嫨鏃堕棿鑼冨洿"
+          >
+          </el-time-picker>
+        </el-form-item>
+      </el-form>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="modificationVisible = false">鍙� 娑�</el-button>
+        <el-button type="primary" @click="modificationVisible = false"
+          >纭� 瀹�</el-button
+        >
+      </span>
     </el-dialog>
   </div>
 </template>
@@ -370,12 +613,14 @@
   resetUserPwd,
   changeUserStatus,
 } from "@/api/system/user";
+import { getTaskservelist } from "@/api/AiCentre/index";
 import Treeselect from "@riophae/vue-treeselect";
+import store from "@/store";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
-  name: "User",
-  dicts: ["sys_normal_disable", "sys_user_sex"],
+  name: "Discharge",
+  dicts: ["sys_normal_disable", "sys_user_sex", "sys_yujing", "sys_suggest"],
   components: { Treeselect },
   data() {
     return {
@@ -394,9 +639,11 @@
       // 鐢ㄦ埛琛ㄦ牸鏁版嵁
       userList: null,
       // 寮瑰嚭灞傛爣棰�
-      title: "鏂板闂ㄨ瘖闅忚",
+      title: "鏂板闂ㄨ瘖瀹ｆ暀",
       // 鏄惁鏄剧ず淇敼銆佹坊鍔犲脊鍑哄眰
       addalteropen: false,
+      // 淇敼鍙戦�佹椂闂村璇濇
+      modificationVisible: false,
       // 閮ㄩ棬鍚嶇О
       deptName: undefined,
       // 榛樿瀵嗙爜
@@ -405,23 +652,38 @@
       dateRange: [],
       // 宀椾綅閫夐」
       postOptions: [],
-      // 瑙掕壊閫夐」
-      roleOptions: [],
+      ruleForm: {
+        type: [],
+      },
       dynamicTags: ["閫夐」涓�", "閫夐」浜�", "閫夐」涓�"], //閫夐」
       inputVisible: false,
       inputValue: "",
-      previewVisible: false, //闂ㄨ瘖闅忚棰勮寮规
+      previewVisible: false, //闂ㄨ瘖瀹ｆ暀棰勮寮规
       radio: "",
       radios: [],
-      previewtype: 2, //棰勮闂ㄨ瘖闅忚绫诲瀷
+      previewtype: 2, //棰勮闂ㄨ瘖瀹ｆ暀绫诲瀷
       total: 0, // 鎬绘潯鏁�
-      ImportQuantity: 999, //瀵奸棬璇婇殢璁挎暟閲�
-      //棰勮闂ㄨ瘖闅忚淇℃伅
+      ImportQuantity: 999, //瀵奸棬璇婂鏁欐暟閲�
+      //棰勮闂ㄨ瘖瀹ｆ暀淇℃伅
       previewvalue: {
         username: "杩欎釜鍖荤敓瀵逛綘鎬庝箞鏍�",
       },
       value: [],
       list: [],
+      source: [
+        {
+          value: 0,
+          label: "鎵�灞炴偅鑰�",
+        },
+        {
+          value: 1,
+          label: "绉戝鎮ｈ��",
+        },
+        {
+          value: 2,
+          label: "鐥呭尯鎮ｈ��",
+        },
+      ],
       loading: false,
       states: [
         "Alabama",
@@ -517,9 +779,8 @@
       topqueryParams: {
         pageNum: 1,
         pageSize: 10,
-        userName: undefined,
-        tagid: undefined,
-        topic: undefined,
+        serviceType: 4,
+        searchscope:2,
       },
       propss: { multiple: true },
       options: [],
@@ -527,71 +788,47 @@
       topicoptions: [
         {
           value: 1,
-          label: "寰呭鏍�",
+          label: "琚鍙�",
         },
         {
           value: 2,
-          label: "鎵ц涓�",
+          label: "寰呭彂閫�",
         },
         {
           value: 3,
-          label: "鎵ц瀹屾垚",
+          label: "宸插彂閫佹湭棰嗗彇",
         },
         {
           value: 4,
-          label: "宸插仠姝�",
+          label: "涓嶆墽琛�",
+        },
+        {
+          value: 5,
+          label: "鍙戦�佸け璐�",
+        },
+        {
+          value: 6,
+          label: "宸插畬鎴�",
         },
       ],
+      topicoptionsyj: [
+        {
+          value: 1,
+          label: "寮傚父",
+        },
+        {
+          value: 0,
+          label: "姝ｅ父",
+        },
+      ],
+      serviceState: [],
       // 琛ㄥ崟鏍￠獙
-      rules: {
-        userName: [
-          { required: true, message: "鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖", trigger: "blur" },
-          {
-            min: 2,
-            max: 20,
-            message: "鐢ㄦ埛鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿",
-            trigger: "blur",
-          },
-        ],
-        nickName: [
-          { required: true, message: "鐢ㄦ埛鏄电О涓嶈兘涓虹┖", trigger: "blur" },
-        ],
-        password: [
-          { required: true, message: "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" },
-          {
-            min: 5,
-            max: 20,
-            message: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿",
-            trigger: "blur",
-          },
-        ],
-        email: [
-          {
-            type: "email",
-            message: "璇疯緭鍏ユ纭殑閭鍦板潃",
-            trigger: ["blur", "change"],
-          },
-        ],
-        phonenumber: [
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "璇疯緭鍏ユ纭殑鎵嬫満鍙风爜",
-            trigger: "blur",
-          },
-        ],
-        IDnumber: [
-          {
-            pattern:
-              /^\d{6}((((((19|20)\d{2})(0[13-9]|1[012])(0[1-9]|[12]\d|30))|(((19|20)\d{2})(0[13578]|1[02])31)|((19|20)\d{2})02(0[1-9]|1\d|2[0-8])|((((19|20)([13579][26]|[2468][048]|0[48]))|(2000))0229))\d{3})|((((\d{2})(0[13-9]|1[012])(0[1-9]|[12]\d|30))|((\d{2})(0[13578]|1[02])31)|((\d{2})02(0[1-9]|1\d|2[0-8]))|(([13579][26]|[2468][048]|0[048])0229))\d{2}))(\d|X|x)$/,
-            message: "璇疯緭鍏ユ纭殑韬唤璇佸彿鐮�",
-            trigger: "blur",
-          },
-        ],
-      },
+      rules: {},
     };
   },
   watch: {},
   created() {
+    this.serviceState = store.getters.serviceState;
     this.getList();
     this.getConfigKey("sys.user.initPassword").then((response) => {
       this.initPassword = response.msg;
@@ -604,18 +841,37 @@
     });
   },
   methods: {
-    /** 鏌ヨ闂ㄨ瘖闅忚鍒楄〃 */
+    /** 鏌ヨ闂ㄨ瘖瀹ｆ暀鏈嶅姟鍒楄〃 */
     getList() {
+      if (this.topqueryParams.searchscope == 1) {
+        this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+          (obj) => obj.deptCode
+        );
+        this.topqueryParams.leavehospitaldistrictcodes=null;
+      } else if (this.topqueryParams.searchscope == 2) {
+        this.topqueryParams.leavehospitaldistrictcodes =
+          store.getters.belongWards.map((obj) => obj.districtCode);
+          this.topqueryParams.leaveldeptcodes=null;
+      } else {
+        this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+          (obj) => obj.deptCode
+        );
+        this.topqueryParams.leavehospitaldistrictcodes =
+          store.getters.belongWards.map((obj) => obj.districtCode);
+      }
       this.loading = true;
-      listUser(this.addDateRange(this.topqueryParams, this.dateRange)).then(
-        (response) => {
-          this.userList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
+      getTaskservelist(this.topqueryParams).then((response) => {
+        this.userList = response.rows;
+        this.userList.forEach((item) => {
+          if (item.endtime) {
+            item.endDay = this.daysBetween(item.endtime);
+          }
+        });
+        this.total = response.total;
+        this.loading = false;
+      });
     },
-    // 鏌ョ湅闂ㄨ瘖闅忚璇︽儏
+    // 鏌ョ湅闂ㄨ瘖瀹ｆ暀璇︽儏
     Referencequestion(row) {
       this.previewVisible = true;
     },
@@ -633,7 +889,7 @@
         this.options = [];
       }
     },
-    // 闂ㄨ瘖闅忚鐘舵�佷慨鏀�
+    // 闂ㄨ瘖浠诲姟鐘舵�佷慨鏀�
     handleStatusChange(row) {
       let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
       this.$modal
@@ -673,15 +929,29 @@
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
+      if (this.topqueryParams.searchscope == 1) {
+        this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+          (obj) => obj.deptCode
+        );
+        this.topqueryParams.leavehospitaldistrictcodes=null;
+      } else if (this.topqueryParams.searchscope == 2) {
+        this.topqueryParams.leavehospitaldistrictcodes =
+          store.getters.belongWards.map((obj) => obj.districtCode);
+          this.topqueryParams.leaveldeptcodes=null;
+      } else {
+        this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+          (obj) => obj.deptCode
+        );
+        this.topqueryParams.leavehospitaldistrictcodes =
+          store.getters.belongWards.map((obj) => obj.districtCode);
+      }
       this.topqueryParams.pageNum = 1;
       this.getList();
     },
     /** 閲嶇疆鎸夐挳鎿嶄綔 */
     resetQuery() {
       this.dateRange = [];
-      this.resetForm("queryForm");
-      this.topqueryParams.deptId = undefined;
-      this.$refs.tree.setCurrentKey(null);
+      this.topqueryParams = {};
       this.handleQuery();
     },
     // 澶氶�夋閫変腑鏁版嵁
@@ -713,17 +983,14 @@
     /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
       this.$router.push({
-        path: "/followvisit/particty",
-        query: { type: 8 },
+        path: "/followvisit/Missioncreation",
+        query: {
+          type: 3,
+          serviceType: 4,
+        },
       });
     },
-    /** 淇敼鎸夐挳鎿嶄綔 */
-    handleUpdate(row) {
-      this.$router.push({
-        path: "/followvisit/record/detailpage/",
-        query: { id: "1" },
-      });
-    },
+
     /** 閲嶇疆瀵嗙爜鎸夐挳鎿嶄綔 */
     handleResetPwd(row) {
       this.$prompt('璇疯緭鍏�"' + row.userName + '"鐨勬柊瀵嗙爜', "鎻愮ず", {
@@ -775,6 +1042,58 @@
         })
         .catch(() => {});
     },
+    // 鍏ㄩ儴鍋滄
+    AllStop() {
+      this.$modal
+        .confirm("鏄惁鍋滄鍏ㄩ儴浠诲姟锛�")
+        .then(function () {
+          return console.log("鍋滄鎴愬姛");
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgWarning("鍋滄鎴愬姛");
+        })
+        .catch(() => {});
+    },
+    // 鍏ㄩ儴寮�濮�
+    AllStarted() {
+      this.$modal
+        .confirm("鏄惁寮�鍚叏閮ㄤ换鍔★紵")
+        .then(function () {
+          return console.log("寮�鍚垚鍔�");
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("寮�鍚垚鍔�");
+        })
+        .catch(() => {});
+    },
+    // 浠诲姟閲嶇疆
+    TaskReset() {
+      this.$modal
+        .confirm("鏄惁閲嶇疆閫変腑鐨勪换鍔￠」锛�")
+        .then(function () {
+          return console.log("閫変腑鎴愬姛");
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("閲嶇疆鎴愬姛");
+        })
+        .catch(() => {});
+    },
+    // 璁剧疆鍙戦�佹椂闂�
+    Sendtimesetting() {
+      this.modificationVisible = true;
+    },
+    // 璺宠浆璇︽儏椤�
+    Seedetails(row) {
+      this.$router.push({
+        path: "/followvisit/record/detailpage/",
+        query: { taskid: row.taskid, patid: row.patid,id: row.id},
+      });
+    },
+    // 瀵煎叆鎸夐挳
+    toleadExport() {},
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
       this.download(
@@ -797,7 +1116,7 @@
 }
 
 .document {
-  width: 100px;
+  // width: 100px;
   height: 50px;
 }
 
@@ -880,15 +1199,24 @@
 }
 .button-bb {
   font-weight: 500;
-  color: #2ba05c;
+  background-color: #2ba05c;
+  padding: 5px;
+  border-radius: 1px;
+  color: #ffffff;
 }
 .button-xq {
   font-weight: 500;
-  color: #409eff;
+  background-color: #409eff;
+  padding: 5px;
+  border-radius: 1px;
+  color: #ffffff;
 }
 .button-sc {
   font-weight: 500;
-  color: #dd302a;
+  background-color: #dd302a;
+  padding: 5px;
+  border-radius: 1px;
+  color: #ffffff;
 }
 .button-zx {
   background: #4fabe9;
@@ -903,9 +1231,10 @@
   }
 }
 
-::v-deep.el-checkbox-group {
-  span {
-    font-size: 24px;
-  }
-}
+// 閫夐」瀛椾綋鏀惧ぇ
+// ::v-deep.el-checkbox-group {
+//   span {
+//     font-size: 24px;
+//   }
+// }
 </style>
diff --git a/src/views/patient/patient/behospitalized.vue b/src/views/patient/patient/behospitalized.vue
index 7d2a37f..d99bafb 100644
--- a/src/views/patient/patient/behospitalized.vue
+++ b/src/views/patient/patient/behospitalized.vue
@@ -11,7 +11,7 @@
           v-show="showSearch"
           label-width="98px"
         >
-          <el-form-item label="濮撳悕" prop="name">
+          <el-form-item label="鎮ｈ�呭鍚�" prop="name">
             <el-input
               v-model="queryParams.patname"
               placeholder="璇疯緭鍏ュ鍚�"
@@ -19,7 +19,7 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="鎮ｈ�呬綇闄㈠彿" prop="patid">
+          <el-form-item label="浣忛櫌鍙�" prop="patid">
             <el-input
               v-model="queryParams.patid"
               placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�"
@@ -28,10 +28,10 @@
             />
           </el-form-item>
 
-          <el-form-item label="鎮ｈ�呮潵婧�" prop="tagId">
+          <el-form-item label="鎮ｈ�呰寖鍥�" prop="tagId">
             <el-select
                 v-model="queryParams.searchscope"
-                placeholder="璇烽�夋嫨鎮ｈ�呮潵婧�"
+                placeholder="璇烽�夋嫨鎮ｈ�呰寖鍥�"
               >
                 <el-option
                   v-for="item in source"
@@ -42,7 +42,7 @@
                 </el-option>
               </el-select>
           </el-form-item>
-          <el-form-item label=" 鍏ラ櫌鏃ユ湡鑼冨洿 " prop="createTime">
+          <el-form-item label=" 鍏ラ櫌鏃ユ湡 " prop="createTime">
             <el-date-picker
             v-model="dateRange"
             style="width: 240px"
@@ -115,6 +115,7 @@
         <el-table
           v-loading="loading"
           :data="userList"
+           height="660"
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="selection" width="50" align="center" />
@@ -468,6 +469,7 @@
         pageNum: 1,
         pageSize: 10,
         cry: 0,
+        searchscope:2,
         idcardno: undefined,
         name: undefined,
         status: undefined,
@@ -623,6 +625,8 @@
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
+      this.queryParams.startInHospTime = this.dateRange[0];
+      this.queryParams.endInHospTime = this.dateRange[1];
       this.queryParams.pageNum = 1;
       this.getList();
     },
diff --git a/src/views/patient/patient/hospital.vue b/src/views/patient/patient/hospital.vue
index d8360e7..3f5d488 100644
--- a/src/views/patient/patient/hospital.vue
+++ b/src/views/patient/patient/hospital.vue
@@ -11,7 +11,7 @@
           v-show="showSearch"
           label-width="98px"
         >
-          <el-form-item label="濮撳悕" prop="name">
+          <el-form-item label="鎮ｈ�呭鍚�" prop="name">
             <el-input
               v-model="queryParams.patname"
               placeholder="璇疯緭鍏ュ鍚�"
@@ -20,7 +20,7 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="鎮ｈ�呯紪鍙�" prop="patid">
+          <el-form-item label="浣忛櫌鍙�" prop="patid">
             <el-input
               v-model="queryParams.patid"
               placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�"
@@ -30,21 +30,11 @@
             />
           </el-form-item>
 
-          <el-form-item label="鎶ょ悊绛夌骇" prop="tagId">
-            <el-select v-model="queryParams.Patientid" placeholder="璇烽�夋嫨">
-              <el-option
-                v-for="dict in dict.type.nursinggrade"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="鎮ｈ�呮潵婧�" prop="tagId">
+
+          <el-form-item label="鎮ｈ�呰寖鍥�" prop="tagId">
             <el-select
                 v-model="queryParams.searchscope"
-                placeholder="璇烽�夋嫨鎮ｈ�呮潵婧�"
+                placeholder="璇烽�夋嫨鎮ｈ�呰寖鍥�"
               >
                 <el-option
                   v-for="item in source"
@@ -55,7 +45,7 @@
                 </el-option>
               </el-select>
           </el-form-item>
-          <el-form-item label=" 鍏ラ櫌鏃ユ湡 " prop="createTime">
+          <el-form-item label=" 鍑洪櫌鏃ユ湡 " prop="createTime">
             <el-date-picker
             v-model="dateRange"
             style="width: 240px"
@@ -128,6 +118,7 @@
         <el-table
           v-loading="loading"
           :data="userList"
+           height="660"
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="selection" width="50" align="center" />
@@ -173,7 +164,7 @@
             align="center"
             key="age"
             prop="age"
-            width="120"
+            width="80"
           />
           <el-table-column
             label="鑱旂郴鐢佃瘽"
@@ -492,6 +483,7 @@
         pageNum: 1,
         pageSize: 10,
         cry: 1,
+        searchscope:2,
         idcardno: undefined,
         name: undefined,
         status: undefined,
@@ -605,6 +597,8 @@
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
+      this.queryParams.startOutHospTime = this.dateRange[0];
+      this.queryParams.endOutHospTime = this.dateRange[1];
       this.queryParams.pageNum = 1;
       this.getList();
     },
diff --git a/src/views/patient/patient/index.vue b/src/views/patient/patient/index.vue
index 2e9b795..44a9947 100644
--- a/src/views/patient/patient/index.vue
+++ b/src/views/patient/patient/index.vue
@@ -22,7 +22,7 @@
     <!-- 鍙充晶鏁版嵁 -->
 
     <div class="leftvlue">
-      <div>
+      <!-- <div>
         <el-row :gutter="10">
           <el-col :span="2.5" v-for="(item, index) in cardlist" :key="index">
             <el-card
@@ -45,7 +45,7 @@
             </el-card>
           </el-col>
         </el-row>
-      </div>
+      </div> -->
       <div class="leftvlue-bg">
         <el-row :gutter="20">
           <!--鐢ㄦ埛鏁版嵁-->
@@ -109,10 +109,10 @@
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
-              <el-form-item label="鎮ｈ�呮潵婧�" prop="tagId">
+              <el-form-item label="鎮ｈ�呰寖鍥�" prop="tagId">
             <el-select
                 v-model="queryParams.searchscope"
-                placeholder="璇烽�夋嫨鎮ｈ�呮潵婧�"
+                placeholder="璇烽�夋嫨鎮ｈ�呰寖鍥�"
               >
                 <el-option
                   v-for="item in source"
@@ -215,6 +215,7 @@
             <el-table
               v-loading="loading"
               :data="userList"
+               height="660"
               @selection-change="handleSelectionChange"
             >
               <el-table-column type="selection" width="50" align="center" />
@@ -956,6 +957,7 @@
         pageNum: 1,
         allhosp: "1",
         pageSize: 10,
+        searchscope:2,
         idcardno: undefined,
         name: undefined,
         status: undefined,
@@ -1016,6 +1018,22 @@
   methods: {
     /** 鏌ヨ鎮ｈ�呭垪琛� */
     getList() {
+      if (this.queryParams.searchscope == 1) {
+        this.queryParams.leaveldeptcodes = store.getters.belongDepts.map(
+          (obj) => obj.deptCode
+        );
+        this.queryParams.leavehospitaldistrictcodes=null;
+      } else if (this.queryParams.searchscope == 2) {
+        this.queryParams.leavehospitaldistrictcodes =
+          store.getters.belongWards.map((obj) => obj.districtCode);
+          this.queryParams.leaveldeptcodes=null;
+      } else {
+        this.queryParams.leaveldeptcodes = store.getters.belongDepts.map(
+          (obj) => obj.deptCode
+        );
+        this.queryParams.leavehospitaldistrictcodes =
+          store.getters.belongWards.map((obj) => obj.districtCode);
+      }
       this.loading = true;
       messagelistpatient(this.queryParams).then((response) => {
         this.userList = response.rows;
@@ -1078,22 +1096,7 @@
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
-      if (this.queryParams.searchscope == 1) {
-        this.queryParams.leaveldeptcodes = store.getters.belongDepts.map(
-          (obj) => obj.deptCode
-        );
-        this.queryParams.leavehospitaldistrictcodes=null;
-      } else if (this.queryParams.searchscope == 2) {
-        this.queryParams.leavehospitaldistrictcodes =
-          store.getters.belongWards.map((obj) => obj.districtCode);
-          this.queryParams.leaveldeptcodes=null;
-      } else {
-        this.queryParams.leaveldeptcodes = store.getters.belongDepts.map(
-          (obj) => obj.deptCode
-        );
-        this.queryParams.leavehospitaldistrictcodes =
-          store.getters.belongWards.map((obj) => obj.districtCode);
-      }
+
       this.queryParams.pageNum = 1;
       this.getList();
     },
diff --git a/src/views/patient/propaganda/Missioncreation.vue b/src/views/patient/propaganda/Missioncreation.vue
index 71c70bb..3aaec8c 100644
--- a/src/views/patient/propaganda/Missioncreation.vue
+++ b/src/views/patient/propaganda/Missioncreation.vue
@@ -56,7 +56,23 @@
                       @click="drawermb = true"
                       circle
                     ></el-button>
+                    <el-button
+                      v-if="form.templatename"
+                      type="success"
+                      icon="el-icon-search"
+                      @click="previewfnm"
+                      circle
+                    ></el-button>
                   </el-col>
+                  <!-- <el-col :span="2">
+                    <el-button
+                      v-if="form.templatename"
+                      type="success"
+                      icon="el-icon-search"
+                      @click="previewfnm"
+                      circle
+                    ></el-button>
+                  </el-col> -->
                 </el-row>
 
                 <el-form-item label="浠诲姟鎻忚堪">
@@ -69,7 +85,6 @@
                 <el-row>
                   <el-col :span="20"
                     ><el-form-item label="閫傜敤绉戝" prop="region">
-
                       <el-select
                         v-model="form.deptcode"
                         style="width: 400px"
@@ -91,7 +106,6 @@
                 <el-row>
                   <el-col :span="20"
                     ><el-form-item label="閫傜敤鐥呭尯" prop="region">
-
                       <el-select
                         v-model="form.leavehospitaldistrictcode"
                         style="width: 400px"
@@ -148,9 +162,7 @@
                 <el-form-item label="鍙戦�佹椂闂存锛�" v-if="form.sendType == 1">
                   <div style="display: flex">
                     <div style="margin-right: 10px">
-                      <span style="font-size: 18px; margin-right: 10px"
-                        >鈶�</span
-                      >
+                      <span style="font-size: 18px; margin-right: 10px">鈶�</span>
                       <el-time-picker
                         is-range
                         arrow-control
@@ -165,9 +177,7 @@
                       </el-time-picker>
                     </div>
                     <div style="margin-right: 10px">
-                      <span style="font-size: 18px; margin-right: 10px"
-                        >鈶�</span
-                      >
+                      <span style="font-size: 18px; margin-right: 10px">鈶�</span>
                       <el-time-picker
                         is-range
                         arrow-control
@@ -182,9 +192,7 @@
                       </el-time-picker>
                     </div>
                     <div style="margin-right: 10px">
-                      <span style="font-size: 18px; margin-right: 10px"
-                        >鈶�</span
-                      >
+                      <span style="font-size: 18px; margin-right: 10px">鈶�</span>
                       <el-time-picker
                         is-range
                         arrow-control
@@ -504,7 +512,7 @@
         <div v-html="htmlRichText"></div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="previewGo">鍓嶅線妯℃澘璇︽儏淇敼</el-button>
+        <!-- <el-button @click="previewGo">鍓嶅線妯℃澘璇︽儏淇敼</el-button> -->
         <el-button type="primary" @click="previewFn">纭浣跨敤</el-button>
       </span>
     </el-dialog>
@@ -527,10 +535,7 @@
               v-show="showSearch"
               label-width="98px"
             >
-              <el-form-item
-                label="瀹ｆ暀鍚嶇О"
-
-              >
+              <el-form-item label="瀹ｆ暀鍚嶇О">
                 <el-input v-model="topqueryParams.preachname"></el-input>
               </el-form-item>
               <el-form-item label="瀹ｆ暀鍒嗙被" prop="region">
@@ -679,8 +684,8 @@
         { label: "绉戝", width: "240", prop: "dept" },
         { label: "鐥呭尯", width: "240", prop: "leavehospitaldistrictname" },
       ],
-        // 鎮ｈ�呰〃鍗�
-        tableLabelhzwb: [
+      // 鎮ｈ�呰〃鍗�
+      tableLabelhzwb: [
         { label: "鍑洪櫌鏃ユ湡", width: "150", prop: "endtime" },
         { label: "鎮ｈ��", width: "", prop: "name" },
         { label: "韬唤璇�", width: "200", prop: "sfzh" },
@@ -693,8 +698,8 @@
       ],
 
       tableLabelxj: [
-      { label: "鍒涘缓浜�", width: "", prop: "createBy" },
-      { label: "瀹ｆ暀鍚嶇О", width: "180", prop: "preachname" },
+        { label: "鍒涘缓浜�", width: "", prop: "createBy" },
+        { label: "瀹ｆ暀鍚嶇О", width: "180", prop: "preachname" },
         { label: "瀹ｆ暀鎻忚堪", width: "180", prop: "preachcontent" },
         // { label: "瀹ｆ暀褰㈠紡", width: "", prop: "playType" },
         { label: "閫傜敤鏂瑰紡", width: "", prop: "suitway" },
@@ -826,6 +831,7 @@
   created() {
     this.id = this.$route.query.id;
     this.form.type = this.$route.query.type;
+    this.newadd = this.$route.query.newadd;
     this.belongWards = store.getters.belongWards;
     this.belongDepts = store.getters.belongDepts;
     this.form.typename = this.$route.query.typename;
@@ -969,8 +975,12 @@
       if (!this.form.type) {
         this.form.type = this.$route.query.type;
       }
-      this.form.leaveldeptcodes = store.getters.belongDepts.map(obj=>obj.deptCode);
-      this.form.leavehospitaldistrictcodes = store.getters.belongWards.map(obj=>obj.districtCode);
+      this.form.leaveldeptcodes = store.getters.belongDepts.map(
+        (obj) => obj.deptCode
+      );
+      this.form.leavehospitaldistrictcodes = store.getters.belongWards.map(
+        (obj) => obj.districtCode
+      );
       Editsingletask(this.form).then((res) => {
         if (res.code == 200) {
           if (this.form.taskid) {
@@ -986,7 +996,7 @@
       });
     },
     // ----------------------琛ㄦ牸瀛愮粍浠朵簨浠�
-    // 纭閫夋嫨妯℃澘鏀惧叆浠诲姟妯℃澘
+    // 閫夋嫨妯℃澘骞堕瑙�
     selectfn(row, type) {
       // 妯℃澘鎯呭喌涓嬭幏鍙栨ā鏉夸俊鎭�
       this.libName = row.preachname;
@@ -1010,6 +1020,27 @@
           this.$modal.msgError("鑾峰彇瀵屾枃鏈け璐�");
           console.error("Failed to fetch file:", error);
         });
+    },
+    // 棰勮妯℃澘
+    previewfnm() {
+      getlibrarylist({ id: this.form.libtemplateid }).then((res) => {
+        this.libName = res.rows[0].preachname;
+        this.htmlRichText = null;
+        this.libId = res.rows[0].id;
+        this.Tasktemplate = res.rows[0];
+        this.previewtf = true;
+        this.previewid = res.rows[0].svyid;
+        axios
+          .get(res.rows[0].htmlRichText)
+          .then((response) => {
+            this.htmlRichText = response.data;
+            this.htmlRichText = this.addStyleToImages(this.htmlRichText);
+          })
+          .catch((error) => {
+            this.$modal.msgError("鑾峰彇瀵屾枃鏈け璐�");
+            console.error("Failed to fetch file:", error);
+          });
+      });
     },
     addStyleToImages(html) {
       return html.replace(
@@ -1054,7 +1085,7 @@
       });
       if (this.patientqueryParams.allhosp == 1) {
         this.tableLabelhz = [
-        { label: "鍑洪櫌鏃ユ湡", width: "150", prop: "endtime" },
+          { label: "鍑洪櫌鏃ユ湡", width: "150", prop: "endtime" },
           { label: "鎮ｈ��", width: "", prop: "name" },
           { label: "韬唤璇�", width: "200", prop: "sfzh" },
           { label: "鎬у埆", width: "", prop: "sex" },
@@ -1183,10 +1214,11 @@
         templatename: "",
         templateid: null,
         libtemplateid: null,
-        serviceType:Number(this.$route.query.serviceType),
+        serviceType: Number(this.$route.query.serviceType),
         kcb: "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�",
         jsy: "鐢熸椿涓婅鍔抽�哥粨鍚堬紝娉ㄦ剰浼戞伅鍜岃惀鍏伙紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
       };
+
       if (this.id) {
         getTaskInfo({ taskid: this.id }).then((res) => {
           let filteredArray = "";
@@ -1199,9 +1231,10 @@
               : [];
             this.overallCase = this.form.patTaskRelevances.concat();
             this.checkList = this.form.preachform.split(",");
-
             console.log(this.form.showDate, "this.form");
-            this.daytime = this.form.showDate.split(",");
+            if (this.form.daytime)this.daytime = this.form.showDate.split(",");
+            console.log(this.newadd, "渚濈収");
+
             if (this.form.showTimeMorn) {
               if (this.form.sendType == 3) {
                 this.time4 = this.form.showTimeMorn;
@@ -1219,9 +1252,27 @@
           } else {
             this.$modal.msgError(res.code);
           }
+          if (this.newadd) {
+            this.neWaddfn();
+          }
         });
       }
     },
+    // 渚濈収鏂板鏃跺鐞�
+    neWaddfn() {
+      this.id = null;
+      // this.form.taskName = "";
+      this.form.taskid = null;
+      console.log("渚濈収");
+      this.overallCase = [];
+      this.form.patTaskRelevances = [];
+      this.daytime = []; //鏃ユ湡
+      this.applydaytime = []; //璁＄畻鏃ユ湡
+      this.time1 = ""; //涓婂崍鏃堕棿娈�
+      this.time2 = ""; //涓嬪崍鏃堕棿娈�
+      this.time3 = ""; //鏅氫笂鏃堕棿娈�
+      this.time4 = ""; //鏅氫笂鏃堕棿娈�
+    },
     getheLibraryAssort() {
       // 瀹ｆ暀鍒嗙被
       getheLibraryAssort({}).then((res) => {
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index 7734577..d3fd30b 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -460,7 +460,7 @@
               </el-form-item>
               <el-select
                 v-model="patientqueryParams.searchscope"
-                placeholder="璇烽�夋嫨鎮ｈ�呮潵婧�"
+                placeholder="璇烽�夋嫨鎮ｈ�呰寖鍥�"
               >
                 <el-option
                   v-for="item in source"
@@ -997,7 +997,7 @@
       patientqueryParams: {
         pageNum: 1, //
         pageSize: 10,
-        topica: 0, //0鍏ㄩ儴1绉戝2鐥呭尯
+        topica: 1, //0鍏ㄩ儴1绉戝2鐥呭尯
       },
       topicoptions: [{ children: [{ children: [] }] }],
       showSearch: true, //
@@ -1763,7 +1763,7 @@
     neWaddfn(){
       this.id=null;
       this.form.taskName='';
-      this.form.taskName='';
+      this.form.taskid = null;
       this.overallCase=[];
       this.form.patTaskRelevances=[];
       this.daytime=[]; //鏃ユ湡
diff --git a/src/views/patient/propaganda/index.vue b/src/views/patient/propaganda/index.vue
index 2e435ec..4f2c6bb 100644
--- a/src/views/patient/propaganda/index.vue
+++ b/src/views/patient/propaganda/index.vue
@@ -11,12 +11,12 @@
         label-width="98px"
       >
         <el-form-item label="浠诲姟鍚嶇О">
-          <el-input v-model="topqueryParams.name"></el-input>
+          <el-input v-model="topqueryParams.taskName" placeholder="璇烽�夋嫨浠诲姟鍚嶇О"></el-input>
         </el-form-item>
-        <el-form-item label="瀹℃牳浜�">
-          <el-input v-model="topqueryParams.name"></el-input>
-        </el-form-item>
-        <el-form-item label="瀹℃牳鏃堕棿">
+        <!-- <el-form-item label="鍙戣捣浜�">
+          <el-input v-model="topqueryParams.createBy"></el-input>
+        </el-form-item> -->
+        <el-form-item label="鍑洪櫌鏃堕棿">
           <el-date-picker
             v-model="dateRange"
             style="width: 240px"
@@ -27,10 +27,20 @@
             end-placeholder="缁撴潫鏃ユ湡"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item label="瀹ｆ暀绫诲瀷" prop="status">
-          <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
+
+        <el-form-item label="鎮ｈ�呭鍚�" prop="sendname">
+          <el-input
+            v-model="topqueryParams.sendname"
+            placeholder="璇疯緭鍏ユ偅鑰呭鍚�"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="鎮ｈ�呰寖鍥�" prop="status">
+          <el-select
+            v-model="topqueryParams.searchscope"
+            placeholder="璇烽�夋嫨鎮ｈ�呰寖鍥�"
+          >
             <el-option
-              v-for="item in topicoptions"
+              v-for="item in source"
               :key="item.value"
               :label="item.label"
               :value="item.value"
@@ -38,21 +48,22 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="妯℃澘" prop="status">
-          <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
-            <el-option
-              v-for="item in topicoptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
+
         <el-form-item label="瀹ｆ暀鐘舵��" prop="status">
-          <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
+          <el-select v-model="topqueryParams.sendstate" placeholder="璇烽�夋嫨">
             <el-option
               v-for="item in topicoptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="缁撴灉鐘舵��" prop="status">
+          <el-select v-model="topqueryParams.excep" placeholder="璇烽�夋嫨">
+            <el-option
+              v-for="item in topicoptionsyj"
               :key="item.value"
               :label="item.label"
               :value="item.value"
@@ -82,41 +93,16 @@
             icon="el-icon-plus"
             size="medium"
             @click="handleAdd"
-            v-hasPermi="['system:user:add']"
             >鏂板</el-button
           >
         </el-col>
         <el-col :span="1.5">
-          <el-button
-            type="success"
-            plain
-            icon="el-icon-edit"
-            size="medium"
-            :disabled="single"
-            @click="handleUpdate"
-            v-hasPermi="['system:user:edit']"
-            >淇敼</el-button
-          >
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="danger"
-            plain
-            icon="el-icon-delete"
-            size="medium"
-            :disabled="multiple"
-            @click="handleDelete"
-            v-hasPermi="['system:user:remove']"
-            >鍒犻櫎</el-button
-          >
-        </el-col>
-        <el-col :span="19">
           <div class="documentf">
             <div class="document">
               <el-button
                 type="warning"
                 plain
-                icon="el-icon-download"
+                icon="el-icon-upload2"
                 size="medium"
                 @click="handleExport"
                 v-hasPermi="['system:user:export']"
@@ -125,15 +111,51 @@
             </div>
           </div>
         </el-col>
-        <!-- <el-col :span="1.5"> </el-col> -->
+        <el-col :span="1.5">
+          <div class="documentf">
+            <div class="document">
+              <el-button
+                type="warning"
+                plain
+                icon="el-icon-warning-outline"
+                size="medium"
+                @click="toleadExport(1)"
+                >鎵ц澶辫触</el-button
+              >
+            </div>
+          </div>
+        </el-col>
+        <el-col :span="1.5">
+          <div class="documentf">
+            <div class="document">
+              <el-button
+                type="danger"
+                plain
+                icon="el-icon-warning"
+                size="medium"
+                @click="toleadExport(2)"
+                >缁撴灉寮傚父</el-button
+              >
+            </div>
+          </div>
+        </el-col>
       </el-row>
       <el-table
         v-loading="loading"
         :data="userList"
+         height="660"
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="50" align="center" />
-        <el-table-column fixed label="搴忓彿" align="center" key="id" prop="id" />
+        <el-table-column
+          label="浠诲姟鍚嶇О"
+          fixed
+          align="center"
+          key="taskName"
+          prop="taskName"
+          width="180"
+        />
+        <!-- <el-table-column label="搴忓彿" fixed align="center" key="id" prop="id" /> -->
         <el-table-column
           label="濮撳悕"
           fixed
@@ -142,26 +164,169 @@
           prop="sendname"
         />
         <el-table-column
+        label="瀹ｆ暀鐘舵��"
+        align="center"
+        key="sendstate"
+        prop="sendstate"
+        width="120"
+        >
+        <template slot-scope="scope">
+          <div v-if="scope.row.sendstate == 1">
+            <el-tag type="primary" :disable-transitions="false"
+                >琚鍙�</el-tag
+                >
+              </div>
+              <div v-if="scope.row.sendstate == 2">
+                <el-tag type="primary" :disable-transitions="false"
+                >寰呭彂閫�</el-tag
+                >
+              </div>
+              <div v-if="scope.row.sendstate == 3">
+                <el-tag type="success" :disable-transitions="false"
+                >宸插彂閫佹湭棰嗗彇</el-tag
+                >
+              </div>
+              <div v-if="scope.row.sendstate == 4">
+                <el-tag type="info" :disable-transitions="false">涓嶆墽琛�</el-tag>
+              </div>
+              <div v-if="scope.row.sendstate == 5">
+                <el-tag type="danger" :disable-transitions="false"
+                >鍙戦�佸け璐�</el-tag
+                >
+              </div>
+              <div v-if="scope.row.sendstate == 6">
+                <el-tag type="danger" :disable-transitions="false">宸插畬鎴�</el-tag>
+              </div>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+          label="缁撴灉鐘舵��"
+          align="center"
+          key="excep"
+          prop="excep"
+          width="120"
+          >
+          <template slot-scope="scope">
+            <div v-if="scope.row.sendstate == 6">
+              <dict-tag
+              :options="dict.type.sys_yujing"
+              :value="scope.row.excep"
+              />
+            </div>
+            <div v-else>
+              <span></span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+        label="澶勭悊鎰忚"
+        align="center"
+        key="suggest"
+        prop="suggest"
+        width="120"
+        >
+        <template slot-scope="scope">
+          <dict-tag
+          :options="dict.type.sys_suggest"
+          :value="scope.row.suggest"
+          />
+          </template>
+        </el-table-column>
+        <el-table-column
+        label="鍑洪櫌鏃ユ湡"
+        width="200"
+        align="center"
+        key="endtime"
+        prop="endtime"
+        >
+        <template slot-scope="scope">
+          <span>{{ formatTime(scope.row.endtime) }}</span>
+        </template></el-table-column
+        >
+        <el-table-column
+        label="搴斿鏁欐棩鏈�"
+        width="200"
+        align="center"
+        key="longSendTime"
+        prop="longSendTime"
+        >
+        <template slot-scope="scope">
+          <span>{{ formatTime(scope.row.longSendTime) }}</span>
+          </template></el-table-column
+          >
+          <el-table-column
+          label="鍑洪櫌澶╂暟"
+          width="120"
+          align="center"
+          key="endDay"
+          prop="endDay"
+          >
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.endDay ? scope.row.endDay + "澶�" : "鏃ユ湡缂哄け"
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="韬唤璇佸彿鐮�"
+          width="200"
+          align="center"
+          key="sfzh"
+          prop="sfzh"
+        />
+        <el-table-column
+          label="璐ｄ换鎶ゅ＋"
+          width="120"
+          align="center"
+          key="nurseName"
+          prop="nurseName"
+        />
+        <el-table-column
+          label="涓绘不鍖荤敓"
+          width="120"
+          align="center"
+          key="drname"
+          prop="drname"
+        />
+        <el-table-column
+          label="瀹ｆ暀寮傚父璁板綍"
+          width="120"
+          align="center"
+          key="remark"
+          prop="remark"
+        />
+
+        <!-- <el-table-column
           label="鐥呭巻鍙�"
           align="center"
           sortable
           key="medicalRecordNo"
           prop="medicalRecordNo"
           width="120"
-        />
+        /> -->
 
-        <el-table-column label="骞撮緞" align="center" key="age" prop="age" />
-        <el-table-column label="搴婂彿" align="center" key="badNo" prop="badNo" />
+        <!-- <el-table-column label="骞撮緞" align="center" key="age" prop="age" /> -->
+        <!-- <el-table-column label="鎬у埆" align="center" key="sex" prop="sex" /> -->
+        <!-- <el-table-column label="搴婂彿" align="center" key="badNo" prop="badNo" /> -->
         <el-table-column
-          label="绉戝/鐥呭尯"
+          label="绉戝"
           align="center"
-          key="dept"
-          prop="dept"
+          key="deptname"
+          prop="deptname"
+          width="120"
+        >
+        </el-table-column>
+        <el-table-column
+          label="鐥呭尯"
+          align="center"
+          key="leavehospitaldistrictname"
+          prop="leavehospitaldistrictname"
           width="120"
         >
         </el-table-column>
 
-        <el-table-column
+        <!-- <el-table-column
           label="鐤剧梾鍚嶇О"
           align="center"
           key="icdName"
@@ -169,77 +334,81 @@
           width="120"
           :show-overflow-tooltip="true"
         >
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column
-          label="瀹ｆ暀妯℃澘"
+          label="妯℃澘鍚嶇О"
           align="center"
           key="templatename"
           prop="templatename"
-          width="120"
-        >
-        </el-table-column>
-        <el-table-column
-          label="瀹ｆ暀鏂瑰紡"
-          align="center"
-          key="serviceform"
-          prop="serviceform"
-          width="120"
-        >
-        </el-table-column>
-        <el-table-column
-          label="鎿嶄綔浜哄憳"
-          align="center"
-          key="operatePerson"
-          prop="operatePerson"
-          width="120"
+          width="200"
         />
 
         <el-table-column
-          label="灏辫瘖鏃堕棿"
+          label="瀹ｆ暀浜哄憳"
           align="center"
-          key="visitTime"
-          prop="visitTime"
-          width="160"
-        >
-        </el-table-column>
-        <el-table-column
-          label="瀹ｆ暀鏃堕棿"
+          key="createBy"
+          prop="createBy"
+          width="120"
+        />
+        <!-- <el-table-column
+          label="璐ｄ换鍖诲笀"
           align="center"
-          key="senddate"
-          prop="senddate"
-          width="160"
-        >
-        </el-table-column>
+          key="drname"
+          prop="drname"
+          width="120"
+        /> -->
 
-        <el-table-column
-          fixed="right"
-          label="浠诲姟璇︽儏"
+        <!-- <el-table-column
+          label="鍑洪櫌鏃堕棿"
+          sortable
           align="center"
-          width="200"
-          class-name="small-padding fixed-width"
+          prop="createTime"
+          width="160"
         >
           <template slot-scope="scope">
-            <el-button
-              size="medium"
-              type="text"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['system:user:edit']"
-              ><span class="button-xq"
-                ><i class="el-icon-s-data"></i>璇︽儏</span
-              ></el-button
-            >
-            <el-button
-              size="medium"
-              type="text"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['system:user:edit']"
-              ><span class="button-sc"
-                ><i class="el-icon-delete"></i>鍒犻櫎</span
-              ></el-button
-            >
+            <span>{{ formatTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column> -->
+        <!-- <el-table-column
+          label="瀹ｆ暀鏃堕棿"
+          sortable
+          align="center"
+          prop="createTime"
+          width="160"
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.sendType != 3">{{
+              formatTime(scope.row.createTime)
+            }}</span>
+            <span v-else>鍗冲埢鍙戦��</span>
+          </template>
+        </el-table-column> -->
+        <el-table-column
+          label="瀹ｆ暀鏃堕棿"
+          sortable
+          align="center"
+          prop="finishtime"
+          width="160"
+        >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.finishtime) }}</span>
           </template>
         </el-table-column>
+        <!-- <el-table-column
+          label="瀹ｆ暀鐘舵��"
+          fixed="right"
+          align="center"
+          key="sendstate"
+          prop="sendstate"
+          width="120"
+          :show-overflow-tooltip="true"
+        >
+          <template slot-scope="scope">
+            <dict-tag :options="serviceState" :value="scope.row.sendstate" />
+          </template>
+        </el-table-column> -->
+
       </el-table>
 
       <pagination
@@ -250,6 +419,135 @@
         @pagination="getList"
       />
     </el-row>
+    <!-- 娣诲姞鎴栦慨鏀归棬璇婂鏁欏璇濇 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="addalteropen"
+      width="700px"
+      append-to-body
+    >
+      <el-form ref="form" :model="form" label-width="100px">
+        <el-row :gutter="20">
+          <el-col :span="12"
+            ><el-form-item label="浠诲姟鍚嶇О">
+              <el-input v-model="form.name"></el-input> </el-form-item
+          ></el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24"
+            ><el-form-item label="鎵�灞炵瀹�">
+              <el-select v-model="form.region" placeholder="璇烽�夋嫨绉戝">
+                <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
+                <el-option label="鍖哄煙浜�" value="beijing"></el-option>
+              </el-select> </el-form-item></el-col
+        ></el-row>
+        <el-row :gutter="20">
+          <el-col :span="24"
+            ><el-form-item label="瀹ｆ暀绫诲瀷">
+              <el-select v-model="form.region" placeholder="璇烽�夋嫨瀹ｆ暀绫诲瀷">
+                <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
+                <el-option label="鍖哄煙浜�" value="beijing"></el-option>
+              </el-select> </el-form-item
+          ></el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="鏈嶅姟妯″潡">
+              <el-select v-model="form.region" placeholder="璇烽�夋嫨妯″潡">
+                <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
+                <el-option label="鍖哄煙浜�" value="beijing"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="闂ㄨ瘖瀹ｆ暀瑕佹眰">
+              <el-input type="textarea" v-model="form.desc"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </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>
+    <!-- 淇敼鍙戦�佹椂闂村璇濇 -->
+    <el-dialog
+      title="鍙戦�佹椂闂磋缃�"
+      :visible.sync="modificationVisible"
+      width="45%"
+    >
+      <div style="margin-bottom: 20px; color: red">
+        缁熶竴淇敼褰撳ぉ鏈彂閫佺殑浠诲姟鏃堕棿
+      </div>
+
+      <el-form
+        :model="ruleForm"
+        :rules="rules"
+        ref="ruleForm"
+        label-width="120px"
+        class="demo-ruleForm"
+      >
+        <el-form-item label="鍙戦�佹棩鏈�">
+          <el-date-picker
+            v-model="ruleForm.value1"
+            type="date"
+            placeholder="閫夋嫨鏃ユ湡"
+          >
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="鏃堕棿娈�" prop="type">
+          <el-checkbox-group v-model="ruleForm.type">
+            <el-checkbox label="涓婂崍" name="type"></el-checkbox>
+            <el-checkbox label="涓嬪崍" name="type"></el-checkbox>
+            <el-checkbox label="鏅氫笂" name="type"></el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+        <el-form-item label="涓婂崍鏃堕棿鍖洪棿" required>
+          <el-time-picker
+            is-range
+            v-model="ruleForm.value2"
+            range-separator="鑷�"
+            start-placeholder="寮�濮嬫椂闂�"
+            end-placeholder="缁撴潫鏃堕棿"
+            placeholder="閫夋嫨鏃堕棿鑼冨洿"
+          >
+          </el-time-picker>
+        </el-form-item>
+        <el-form-item label="涓嬪崍鏃堕棿鍖洪棿" required>
+          <el-time-picker
+            is-range
+            v-model="ruleForm.value3"
+            range-separator="鑷�"
+            start-placeholder="寮�濮嬫椂闂�"
+            end-placeholder="缁撴潫鏃堕棿"
+            placeholder="閫夋嫨鏃堕棿鑼冨洿"
+          >
+          </el-time-picker>
+        </el-form-item>
+        <el-form-item label="鏅氫笂鏃堕棿鍖洪棿" required>
+          <el-time-picker
+            is-range
+            v-model="ruleForm.value4"
+            range-separator="鑷�"
+            start-placeholder="寮�濮嬫椂闂�"
+            end-placeholder="缁撴潫鏃堕棿"
+            placeholder="閫夋嫨鏃堕棿鑼冨洿"
+          >
+          </el-time-picker>
+        </el-form-item>
+      </el-form>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="modificationVisible = false">鍙� 娑�</el-button>
+        <el-button type="primary" @click="modificationVisible = false"
+          >纭� 瀹�</el-button
+        >
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -263,18 +561,14 @@
   resetUserPwd,
   changeUserStatus,
 } from "@/api/system/user";
-import {
-  getTaskservelist,
-  getTaskInfo,
-  Editsingletask,
-} from "@/api/AiCentre/index";
-import { gethetasklist, delhetaskinfo } from "@/api/AiCentre/index";
+import { getTaskservelist } from "@/api/AiCentre/index";
 import Treeselect from "@riophae/vue-treeselect";
+import store from "@/store";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
-  name: "User",
-  dicts: ["sys_normal_disable", "sys_user_sex"],
+  name: "Discharge",
+  dicts: ["sys_normal_disable", "sys_user_sex", "sys_yujing", "sys_suggest"],
   components: { Treeselect },
   data() {
     return {
@@ -294,7 +588,10 @@
       userList: null,
       // 寮瑰嚭灞傛爣棰�
       title: "鏂板闂ㄨ瘖瀹ｆ暀",
-
+      // 鏄惁鏄剧ず淇敼銆佹坊鍔犲脊鍑哄眰
+      addalteropen: false,
+      // 淇敼鍙戦�佹椂闂村璇濇
+      modificationVisible: false,
       // 閮ㄩ棬鍚嶇О
       deptName: undefined,
       // 榛樿瀵嗙爜
@@ -303,8 +600,9 @@
       dateRange: [],
       // 宀椾綅閫夐」
       postOptions: [],
-      // 瑙掕壊閫夐」
-      roleOptions: [],
+      ruleForm: {
+        type: [],
+      },
       dynamicTags: ["閫夐」涓�", "閫夐」浜�", "閫夐」涓�"], //閫夐」
       inputVisible: false,
       inputValue: "",
@@ -320,8 +618,73 @@
       },
       value: [],
       list: [],
+      source: [
+        {
+          value: 0,
+          label: "鎵�灞炴偅鑰�",
+        },
+        {
+          value: 1,
+          label: "绉戝鎮ｈ��",
+        },
+        {
+          value: 2,
+          label: "鐥呭尯鎮ｈ��",
+        },
+      ],
       loading: false,
-      states: ["Alabama", "North Dakota", "Ohio", "Oklahoma", "Oregon", ,],
+      states: [
+        "Alabama",
+        "Alaska",
+        "Arizona",
+        "Arkansas",
+        "California",
+        "Colorado",
+        "Connecticut",
+        "Delaware",
+        "Florida",
+        "Georgia",
+        "Hawaii",
+        "Idaho",
+        "Illinois",
+        "Indiana",
+        "Iowa",
+        "Kansas",
+        "Kentucky",
+        "Louisiana",
+        "Maine",
+        "Maryland",
+        "Massachusetts",
+        "Michigan",
+        "Minnesota",
+        "Mississippi",
+        "Missouri",
+        "Montana",
+        "Nebraska",
+        "Nevada",
+        "New Hampshire",
+        "New Jersey",
+        "New Mexico",
+        "New York",
+        "North Carolina",
+        "North Dakota",
+        "Ohio",
+        "Oklahoma",
+        "Oregon",
+        "Pennsylvania",
+        "Rhode Island",
+        "South Carolina",
+        "South Dakota",
+        "Tennessee",
+        "Texas",
+        "Utah",
+        "Vermont",
+        "Virginia",
+        "Washington",
+        "West Virginia",
+        "Wisconsin",
+        "Wyoming",
+      ],
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() > Date.now();
@@ -364,7 +727,8 @@
       topqueryParams: {
         pageNum: 1,
         pageSize: 10,
-        type: 1,
+        serviceType: 4,
+        searchscope:2,
       },
       propss: { multiple: true },
       options: [],
@@ -372,75 +736,54 @@
       topicoptions: [
         {
           value: 1,
-          label: "寰呭鏍�",
+          label: "琚鍙�",
         },
         {
           value: 2,
-          label: "鎵ц涓�",
+          label: "寰呭彂閫�",
         },
         {
           value: 3,
-          label: "鎵ц瀹屾垚",
+          label: "宸插彂閫佹湭棰嗗彇",
         },
         {
           value: 4,
-          label: "宸插仠姝�",
+          label: "涓嶆墽琛�",
+        },
+        {
+          value: 5,
+          label: "鍙戦�佸け璐�",
+        },
+        {
+          value: 6,
+          label: "宸插畬鎴�",
         },
       ],
+      topicoptionsyj: [
+        {
+          value: 1,
+          label: "寮傚父",
+        },
+        {
+          value: 0,
+          label: "姝ｅ父",
+        },
+      ],
+      serviceState: [],
       // 琛ㄥ崟鏍￠獙
-      rules: {
-        userName: [
-          { required: true, message: "鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖", trigger: "blur" },
-          {
-            min: 2,
-            max: 20,
-            message: "鐢ㄦ埛鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿",
-            trigger: "blur",
-          },
-        ],
-        nickName: [
-          { required: true, message: "鐢ㄦ埛鏄电О涓嶈兘涓虹┖", trigger: "blur" },
-        ],
-        password: [
-          { required: true, message: "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" },
-          {
-            min: 5,
-            max: 20,
-            message: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿",
-            trigger: "blur",
-          },
-        ],
-        email: [
-          {
-            type: "email",
-            message: "璇疯緭鍏ユ纭殑閭鍦板潃",
-            trigger: ["blur", "change"],
-          },
-        ],
-        phonenumber: [
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "璇疯緭鍏ユ纭殑鎵嬫満鍙风爜",
-            trigger: "blur",
-          },
-        ],
-        IDnumber: [
-          {
-            pattern:
-              /^\d{6}((((((19|20)\d{2})(0[13-9]|1[012])(0[1-9]|[12]\d|30))|(((19|20)\d{2})(0[13578]|1[02])31)|((19|20)\d{2})02(0[1-9]|1\d|2[0-8])|((((19|20)([13579][26]|[2468][048]|0[48]))|(2000))0229))\d{3})|((((\d{2})(0[13-9]|1[012])(0[1-9]|[12]\d|30))|((\d{2})(0[13578]|1[02])31)|((\d{2})02(0[1-9]|1\d|2[0-8]))|(([13579][26]|[2468][048]|0[048])0229))\d{2}))(\d|X|x)$/,
-            message: "璇疯緭鍏ユ纭殑韬唤璇佸彿鐮�",
-            trigger: "blur",
-          },
-        ],
-      },
+      rules: {},
     };
   },
   watch: {},
   created() {
+    this.serviceState = store.getters.serviceState;
     this.getList();
     this.getConfigKey("sys.user.initPassword").then((response) => {
       this.initPassword = response.msg;
     });
+  },
+  activated() {
+    this.getList();
   },
   // 鎼滅储
   mounted() {
@@ -449,11 +792,32 @@
     });
   },
   methods: {
-    /** 鏌ヨ闂ㄨ瘖瀹ｆ暀鍒楄〃 */
+    /** 鏌ヨ闂ㄨ瘖瀹ｆ暀鏈嶅姟鍒楄〃 */
     getList() {
+      if (this.topqueryParams.searchscope == 1) {
+        this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+          (obj) => obj.deptCode
+        );
+        this.topqueryParams.leavehospitaldistrictcodes = null;
+      } else if (this.topqueryParams.searchscope == 2) {
+        this.topqueryParams.leavehospitaldistrictcodes =
+          store.getters.belongWards.map((obj) => obj.districtCode);
+        this.topqueryParams.leaveldeptcodes = null;
+      } else {
+        this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+          (obj) => obj.deptCode
+        );
+        this.topqueryParams.leavehospitaldistrictcodes =
+          store.getters.belongWards.map((obj) => obj.districtCode);
+      }
       this.loading = true;
       getTaskservelist(this.topqueryParams).then((response) => {
-        this.userList = response.rows;
+        this.userList = response.rows[0].serviceSubtaskList;
+        this.userList.forEach((item) => {
+          if (item.endtime) {
+            item.endDay = this.daysBetween(item.endtime);
+          }
+        });
         this.total = response.total;
         this.loading = false;
       });
@@ -482,7 +846,7 @@
       this.$modal
         .confirm('纭瑕�"' + text + '""' + row.userName + '"鐢ㄦ埛鍚楋紵')
         .then(function () {
-          return changeUserStatus(row.id, row.status);
+          return changeUserStatus(row.userId, row.status);
         })
         .then(() => {
           this.$modal.msgSuccess(text + "鎴愬姛");
@@ -499,7 +863,7 @@
     // 琛ㄥ崟閲嶇疆
     reset() {
       this.form = {
-        id: undefined,
+        userId: undefined,
         deptId: undefined,
         userName: undefined,
         nickName: undefined,
@@ -516,15 +880,36 @@
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
+      if (this.topqueryParams.searchscope == 1) {
+        this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+          (obj) => obj.deptCode
+        );
+        this.topqueryParams.leavehospitaldistrictcodes = null;
+      } else if (this.topqueryParams.searchscope == 2) {
+        this.topqueryParams.leavehospitaldistrictcodes =
+          store.getters.belongWards.map((obj) => obj.districtCode);
+        this.topqueryParams.leaveldeptcodes = null;
+      } else {
+        this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+          (obj) => obj.deptCode
+        );
+        this.topqueryParams.leavehospitaldistrictcodes =
+          store.getters.belongWards.map((obj) => obj.districtCode);
+      }
       this.topqueryParams.pageNum = 1;
+      this.topqueryParams.startOutHospTime = this.dateRange[0];
+      this.topqueryParams.endOutHospTime = this.dateRange[1];
+
       this.getList();
     },
     /** 閲嶇疆鎸夐挳鎿嶄綔 */
     resetQuery() {
       this.dateRange = [];
-      this.resetForm("queryForm");
-      this.topqueryParams.deptId = undefined;
-      this.$refs.tree.setCurrentKey(null);
+      this.topqueryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        serviceType: 4,
+      };
       this.handleQuery();
     },
     // 澶氶�夋閫変腑鏁版嵁
@@ -558,31 +943,74 @@
       this.$router.push({
         path: "/followvisit/Missioncreation",
         query: {
-          type: 1,
+          type: 3,
           serviceType: 4,
         },
       });
     },
-    /** 淇敼鎸夐挳鎿嶄綔 */
-    handleUpdate(row) {
-      this.$router.push({
-        path: "/followvisit/record/detailpage/",
-        query: { id: "1", type: row.hosptype },
+
+    /** 鎻愪氦鎸夐挳 */
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.userId != undefined) {
+            updateUser(this.form).then((response) => {
+              this.$modal.msgSuccess("淇敼鎴愬姛");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addUser(this.form).then((response) => {
+              this.$modal.msgSuccess("鏂板鎴愬姛");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
       });
     },
-    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-    handleDelete(row) {
-      const userIds = row.id || this.ids;
+
+    // 鍏ㄩ儴鍋滄
+    AllStop() {
       this.$modal
-        .confirm('鏄惁纭鍒犻櫎鐢ㄦ埛缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�')
+        .confirm("鏄惁鍋滄鍏ㄩ儴浠诲姟锛�")
         .then(function () {
-          return delhetaskinfo(ids);
+          return console.log("鍋滄鎴愬姛");
         })
         .then(() => {
           this.getList();
-          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+          this.$modal.msgWarning("鍋滄鎴愬姛");
         })
         .catch(() => {});
+    },
+    // 鍏ㄩ儴寮�濮�
+    AllStarted() {
+      this.$modal
+        .confirm("鏄惁寮�鍚叏閮ㄤ换鍔★紵")
+        .then(function () {
+          return console.log("寮�鍚垚鍔�");
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("寮�鍚垚鍔�");
+        })
+        .catch(() => {});
+    },
+
+    // 璁剧疆鍙戦�佹椂闂�
+    Sendtimesetting() {
+      this.modificationVisible = true;
+    },
+
+    // 渚挎嵎鎸夐挳
+    toleadExport(too) {
+      if (too == 1) {
+        this.topqueryParams.sendstate=4;
+        this.topqueryParams.excep=null;
+      } else if (too == 2) {
+        this.topqueryParams.excep=1;
+      }
+      this.handleQuery();
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
@@ -606,7 +1034,7 @@
 }
 
 .document {
-  width: 100px;
+  // width: 100px;
   height: 50px;
 }
 
@@ -689,15 +1117,24 @@
 }
 .button-bb {
   font-weight: 500;
-  color: #2ba05c;
+  background-color: #2ba05c;
+  padding: 5px;
+  border-radius: 1px;
+  color: #ffffff;
 }
 .button-xq {
   font-weight: 500;
-  color: #409eff;
+  background-color: #409eff;
+  padding: 5px;
+  border-radius: 1px;
+  color: #ffffff;
 }
 .button-sc {
   font-weight: 500;
-  color: #dd302a;
+  background-color: #dd302a;
+  padding: 5px;
+  border-radius: 1px;
+  color: #ffffff;
 }
 .button-zx {
   background: #4fabe9;
@@ -712,9 +1149,10 @@
   }
 }
 
-::v-deep.el-checkbox-group {
-  span {
-    font-size: 24px;
-  }
-}
+// 閫夐」瀛椾綋鏀惧ぇ
+// ::v-deep.el-checkbox-group {
+//   span {
+//     font-size: 24px;
+//   }
+// }
 </style>
diff --git a/src/views/patient/questionnaire/index.vue b/src/views/patient/questionnaire/index.vue
index d4087fd..2212a6a 100644
--- a/src/views/patient/questionnaire/index.vue
+++ b/src/views/patient/questionnaire/index.vue
@@ -271,7 +271,7 @@
           :show-overflow-tooltip="true"
         >
           <template slot-scope="scope">
-            <div>宸插彂閫�</div>
+            <div>宸插彂閫佹湭棰嗗彇</div>
           </template>
         </el-table-column>
         <el-table-column
diff --git a/src/views/register.vue b/src/views/register.vue
index 0f89d7e..88bcb52 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -88,9 +88,9 @@
       </el-form-item>
     </el-form>
     <!--  搴曢儴  -->
-    <div class="el-register-footer">
+    <!-- <div class="el-register-footer">
       <span>Copyright 漏 2018-2022 ruoyi.vip All Rights Reserved.</span>
-    </div>
+    </div> -->
   </div>
 </template>
 
diff --git a/src/views/sfstatistics/percentage/index.vue b/src/views/sfstatistics/percentage/index.vue
index 15dda78..52cd9b9 100644
--- a/src/views/sfstatistics/percentage/index.vue
+++ b/src/views/sfstatistics/percentage/index.vue
@@ -3,7 +3,7 @@
     <!-- 宸︿晶鏍� -->
     <div class="sidecolumn">
       <div class="sidecolumn-top">
-        <div class="top-wj">鎮ｈ�呮潵婧�</div>
+        <div class="top-wj">鎮ｈ�呰寖鍥�</div>
       </div>
 
       <div class="bottom-fl">
diff --git a/src/views/sfstatistics/propaganda/index.vue b/src/views/sfstatistics/propaganda/index.vue
index 5c0f8cc..12167c2 100644
--- a/src/views/sfstatistics/propaganda/index.vue
+++ b/src/views/sfstatistics/propaganda/index.vue
@@ -3,7 +3,7 @@
     <!-- 宸︿晶鏍� -->
     <div class="sidecolumn">
       <div class="sidecolumn-top">
-        <div class="top-wj">鎮ｈ�呮潵婧�</div>
+        <div class="top-wj">鎮ｈ�呰寖鍥�</div>
       </div>
 
       <div class="bottom-fl">
diff --git a/src/views/sfstatistics/statement/index.vue b/src/views/sfstatistics/statement/index.vue
index ec481aa..74e75db 100644
--- a/src/views/sfstatistics/statement/index.vue
+++ b/src/views/sfstatistics/statement/index.vue
@@ -3,7 +3,7 @@
     <!-- 宸︿晶鏍� -->
     <div class="sidecolumn">
       <div class="sidecolumn-top">
-        <div class="top-wj">鎮ｈ�呮潵婧�</div>
+        <div class="top-wj">鎮ｈ�呰寖鍥�</div>
       </div>
 
       <div class="bottom-fl">
diff --git a/vue.config.js b/vue.config.js
index 994fb51..4467d90 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,9 +36,9 @@
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://192.168.168.60:8095`,
-        target: `http://192.168.1.10:8095`,
+        // target: `http://192.168.1.10:8095`,
         // target:`http://localhost:8095`,
-        // target: `http://192.168.101.135:8095`,
+        target: `http://192.168.101.135:8095`,
         // target: `http://192.168.101.166:8093`,
         // target: `http://192.168.191.181:8095`,
         changeOrigin: true,

--
Gitblit v1.9.3