From b1d81d016019a2c59e445dd6752c9134e184c8c4 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 31 十二月 2024 14:16:31 +0800
Subject: [PATCH] 测试完成

---
 src/views/repositoryai/templateku/configurat/measurement.vue |    4 
 src/views/patient/physical/index.vue                         |  916 ++++++++++++++++++++++++++++--------------
 dist (2).zip                                                 |    0 
 dist.zip                                                     |    0 
 src/views/login.vue                                          |    9 
 vue.config.js                                                |    4 
 src/views/knowledge/questionnaire/compilequer/index.vue      |   60 +-
 src/views/patient/patient/index.vue                          |  106 +++-
 src/router/index.js                                          |   26 
 src/views/patient/propaganda/particty.vue                    |   31 -
 src/views/patient/propaganda/QuestionnaireTask.vue           |   56 +-
 11 files changed, 780 insertions(+), 432 deletions(-)

diff --git "a/dist \0502\051.zip" "b/dist \0502\051.zip"
index 629576d..19408f9 100644
--- "a/dist \0502\051.zip"
+++ "b/dist \0502\051.zip"
Binary files differ
diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..8081485
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/router/index.js b/src/router/index.js
index 84042a6..6f4d0f9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -96,19 +96,19 @@
     component: () => import('@/views/error/401'),
     hidden: true
   },
-  {
-    path: '',
-    component: Layout,
-    redirect: 'index',
-    children: [
-      {
-        path: 'index',
-        component: () => import('@/views/index'),
-        name: 'Index',
-        meta: { title: '棣栭〉', icon: 'dashboard', affix: true }
-      }
-    ]
-  },
+  // {
+  //   path: '',
+  //   component: Layout,
+  //   redirect: 'index',
+  //   children: [
+  //     {
+  //       path: 'index',
+  //       component: () => import('@/views/index'),
+  //       name: 'Index',
+  //       meta: { title: '棣栭〉', icon: 'dashboard', affix: true }
+  //     }
+  //   ]
+  // },
   {
     path: '/user',
     component: Layout,
diff --git a/src/views/knowledge/questionnaire/compilequer/index.vue b/src/views/knowledge/questionnaire/compilequer/index.vue
index ce30b40..5467535 100644
--- a/src/views/knowledge/questionnaire/compilequer/index.vue
+++ b/src/views/knowledge/questionnaire/compilequer/index.vue
@@ -259,7 +259,7 @@
                   filterable
                   placeholder="璇烽�夋嫨绉戝"
                 >
-                <el-option
+                  <el-option
                     class="ruleFormaa"
                     v-for="item in flatArray"
                     :key="item.deptCode"
@@ -282,7 +282,7 @@
                   filterable
                   placeholder="璇烽�夋嫨鐥呭尯"
                 >
-                <el-option
+                  <el-option
                     class="ruleFormaa"
                     v-for="item in flatArray"
                     :key="item.deptCode"
@@ -543,7 +543,7 @@
                   <el-col :span="12">
                     <el-form-item
                       label="闂鍒嗗��"
-                      v-if="topicobj.scoretype == 1"
+                      v-if="ruleForm.scoreType == 1"
                     >
                       <el-input
                         v-model="topicobj.score"
@@ -605,7 +605,7 @@
                     v-for="item in topicobj.svyLibTemplateTargetoptions"
                   >
                     <el-row :gutter="5">
-                      <el-col :span="16"
+                      <el-col :span="12"
                         ><el-form-item label="閫夐」鍚嶇О">
                           <el-input
                             type="text"
@@ -615,9 +615,9 @@
                           >
                           </el-input> </el-form-item
                       ></el-col>
-                      <el-col :span="8">
+                      <el-col :span="12">
                         <el-form-item
-                          v-if="topicobj.scoretype == 1"
+                          v-if="ruleForm.scoreType == 1"
                           label="閫夐」鍒嗗��"
                         >
                           <el-input
@@ -630,7 +630,7 @@
                           </el-input>
                         </el-form-item>
                         <el-form-item
-                          v-else-if="topicobj.scoretype == 2"
+                          v-else-if="ruleForm.scoreType == 2"
                           label="ABC绛夌骇"
                         >
                           <el-radio-group v-model="item.score">
@@ -640,7 +640,7 @@
                           </el-radio-group>
                         </el-form-item>
                         <el-form-item
-                          v-else-if="topicobj.scoretype == 3"
+                          v-else-if="ruleForm.scoreType == 3"
                           label="浼樿壇绛夌骇"
                         >
                           <el-radio-group v-model="item.score">
@@ -981,7 +981,7 @@
                     <el-col :span="12">
                       <el-form-item label="璇勪环绫诲瀷">
                         <el-select
-                          v-model="indexform.scoretype"
+                          v-model="indexform.scoreType"
                           placeholder="璇烽�夋嫨鍒嗙被"
                         >
                           <el-option
@@ -1130,7 +1130,7 @@
                       ></el-col>
                       <el-col :span="11">
                         <el-form-item
-                          v-if="indexform.scoretype == 1"
+                          v-if="indexform.scoreType == 1"
                           label="鍒嗗��"
                         >
                           <el-input
@@ -1142,7 +1142,7 @@
                           </el-input>
                         </el-form-item>
                         <el-form-item
-                          v-else-if="indexform.scoretype == 2"
+                          v-else-if="indexform.scoreType == 2"
                           label="ABC绛夌骇"
                         >
                           <el-radio-group v-model="item.score">
@@ -1152,7 +1152,7 @@
                           </el-radio-group>
                         </el-form-item>
                         <el-form-item
-                          v-else-if="indexform.scoretype == 3"
+                          v-else-if="indexform.scoreType == 3"
                           label="浼樿壇绛夌骇"
                         >
                           <el-radio-group v-model="item.score">
@@ -1165,7 +1165,7 @@
 
                       <el-col
                         :span="2"
-                        :offsset="indexform.scoretype == 4 ? 11 : 0"
+                        :offsset="indexform.scoreType == 4 ? 11 : 0"
                       >
                         <el-button
                           type="danger"
@@ -1263,7 +1263,6 @@
 import OptionalForm from "@/components/OptionalForm"; //姝e垯缁勪欢
 import { getToken } from "@/utils/auth";
 import { deptTreeSelect } from "@/api/system/user";
-
 
 export default {
   name: "Questionnaireinfo",
@@ -1384,7 +1383,7 @@
       illnessVisible: false, //鎸囨爣鐤剧梾寮规
       Operateit: true,
       deptOptions: [],
-      flatArray:[],
+      flatArray: [],
       optionsillness: [],
       delScriptVOList: [],
       illnesslistapi: [],
@@ -1592,23 +1591,24 @@
         this.ruleForm.categoryid = -1;
       }
       // 棰樼洰淇濆瓨澶勭悊
-        //   鎻愪氦
-        this.ruleForm.svyTemplateLibScripts.forEach((res) => {
+      //   鎻愪氦
+      this.ruleForm.svyTemplateLibScripts.forEach((res) => {
         if (!res.isoperation) {
           res.isoperation = 2;
         }
-        res.ivrLibaScriptTargetoptionList =
-          res.svyLibTemplateTargetoptions.map((item) => {
+        res.ivrLibaScriptTargetoptionList = res.svyLibTemplateTargetoptions.map(
+          (item) => {
             if (!item.isoperation) {
               item.isoperation = 2;
               item.templateID = this.ruleForm.id;
             }
             return item;
-          });
+          }
+        );
       });
-      this.delScriptVOList.forEach((item)=>{
-          this.ruleForm.svyTemplateLibScripts.push(item)
-        })
+      this.delScriptVOList.forEach((item) => {
+        this.ruleForm.svyTemplateLibScripts.push(item);
+      });
       if (this.id) {
         this.ruleForm.isoperation = 2;
         this.ruleForm.tempDetpRelevances = null;
@@ -1725,7 +1725,7 @@
     // 鑾峰彇闂鍒楄〃
     getaddtopiclist() {
       this.drawer = true;
-      this.queryParams.scoretype = this.ruleForm.scoreType;
+      this.queryParams.scoreType = this.ruleForm.scoreType;
       getissuelist(this.queryParams).then((res) => {
         this.loading = false;
         this.userList = res.rows;
@@ -1914,12 +1914,12 @@
     },
     // 淇濆瓨绉戝/鐥呭尯
     putbelongDepts(id) {
-      this.tempDetpRelevanceslistform.forEach(item=>{
-        if (!item.tempid) item.tempid=id;
-      })
-      this.tempbelongWardsform.forEach(item=>{
-        if (!item.tempid) item.tempid=id;
-      })
+      this.tempDetpRelevanceslistform.forEach((item) => {
+        if (!item.tempid) item.tempid = id;
+      });
+      this.tempbelongWardsform.forEach((item) => {
+        if (!item.tempid) item.tempid = id;
+      });
       if (this.tempDetpRelevanceslistform.length > 0) {
         depthospgetson(this.tempDetpRelevanceslistform).then((res) => {
           if (res.code == 200) {
diff --git a/src/views/login.vue b/src/views/login.vue
index 143db87..cb4c138 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -37,7 +37,7 @@
         </el-input>
       </el-form-item>
       <!-- 涓�===================姘� -->
-      <!-- <el-form-item prop="guid">
+      <el-form-item prop="guid">
         <el-select style="width: 100%;" v-model="loginForm.guid"  placeholder="璇烽�夋嫨闄㈠尯">
           <el-option
             v-for="item in options"
@@ -48,7 +48,7 @@
           </el-option>
           <i slot="prefix" class="el-icon-mobile"></i>
         </el-select>
-      </el-form-item> -->
+      </el-form-item>
       <!-- <el-form-item prop="code" v-if="captchaEnabled">
         <el-input
           v-model="loginForm.code"
@@ -126,7 +126,7 @@
         password: [
           { required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勫瘑鐮�" },
         ],
-        // guid: [{ required: true, trigger: "blur", message: "璇烽�夋嫨闄㈠尯" }],
+        guid: [{ required: true, trigger: "blur", message: "璇烽�夋嫨闄㈠尯" }],
       },
       loading: false,
       // 楠岃瘉鐮佸紑鍏�
@@ -195,7 +195,8 @@
           this.$store
             .dispatch("Login", this.loginForm)
             .then(() => {
-              this.$router.push({ path: this.redirect || "/" }).catch(() => {});
+              // this.$router.push({ path: this.redirect || "/" }).catch(() => {});
+              this.$router.push({ path:"/patient/patient" }).catch(() => {});
             })
             .catch(() => {
               this.loading = false;
diff --git a/src/views/patient/patient/index.vue b/src/views/patient/patient/index.vue
index fb70456..03d2a4a 100644
--- a/src/views/patient/patient/index.vue
+++ b/src/views/patient/patient/index.vue
@@ -110,19 +110,19 @@
                 />
               </el-form-item>
               <el-form-item label="鎮h�呰寖鍥�" prop="tagId">
-            <el-select
-                v-model="queryParams.searchscope"
-                placeholder="璇烽�夋嫨鎮h�呰寖鍥�"
-              >
-                <el-option
-                  v-for="item in source"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+                <el-select
+                  v-model="queryParams.searchscope"
+                  placeholder="璇烽�夋嫨鎮h�呰寖鍥�"
                 >
-                </el-option>
-              </el-select>
-          </el-form-item>
+                  <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="telcode">
                 <el-input
                   v-model="queryParams.telcode"
@@ -215,7 +215,7 @@
             <el-table
               v-loading="loading"
               :data="userList"
-               height="660"
+              height="660"
               @selection-change="handleSelectionChange"
             >
               <el-table-column type="selection" width="50" align="center" />
@@ -275,7 +275,7 @@
                   </span>
                 </template>
               </el-table-column>
-             <el-table-column
+              <el-table-column
                 label="璇佷欢鍙风爜"
                 align="center"
                 key="idcardno"
@@ -297,7 +297,7 @@
                 prop="createTime"
                 width="160"
               >
-              <template slot-scope="scope">
+                <template slot-scope="scope">
                   <span>{{ formatTime(scope.row.createTime) }}</span>
                 </template>
               </el-table-column>
@@ -340,12 +340,20 @@
                       ><i class="el-icon-edit"></i>鎮h�呰繃婊�</span
                     ></el-button
                   >
-                  <el-button
+                  <!-- <el-button
                     size="medium"
                     type="text"
                     @click="Distributionservice(scope.row)"
                     ><span class="button-textxg"
                       ><i class="el-icon-menu"></i>鏈嶅姟</span
+                    ></el-button
+                  > -->
+                  <el-button
+                    size="medium"
+                    type="text"
+                    @click="RiskMarker(scope.row)"
+                    ><span class="button-textxg"
+                      ><i class="el-icon-menu"></i>椋庨櫓鏍囪</span
                     ></el-button
                   >
                 </template>
@@ -524,7 +532,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row  v-if="!amendtag">
+        <el-row v-if="!amendtag">
           <el-col :span="8">
             <el-form-item label="姘戞棌" prop="name">
               <el-input
@@ -575,7 +583,7 @@
         </el-row>
 
         <el-row>
-          <el-col :span="amendtag?12:24"v-if="!amendtag" >
+          <el-col :span="amendtag ? 12 : 24" v-if="!amendtag">
             <el-form-item label="鎮h�呯被鍨�">
               <el-select v-model="form.pattype" placeholder="璇烽�夋嫨绫诲瀷">
                 <el-option
@@ -773,6 +781,32 @@
         <el-button type="primary" @click="CreateService">鍒涘缓鏈嶅姟</el-button>
       </div>
     </el-dialog>
+    <!-- 椋庨櫓绫诲瀷 -->
+    <el-dialog title="閫夋嫨椋庨櫓绫诲瀷" :visible.sync="RiskVisible">
+      <el-card class="box-card">
+        <el-form>
+          <el-form-item label="椋庨櫓绫诲瀷">
+            <el-radio-group v-model="Riskradio">
+              <el-radio :label="1">姝e父</el-radio>
+              <el-radio :label="2">杞诲井</el-radio>
+              <el-radio :label="3">楂樺嵄</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="娲诲姩鎬ц川">
+            <el-checkbox-group v-model="Risklist">
+              <el-checkbox label="鎯呭喌1" name="type"></el-checkbox>
+              <el-checkbox label="鎯呭喌2" name="type"></el-checkbox>
+              <el-checkbox label="鎯呭喌3" name="type"></el-checkbox>
+              <el-checkbox label="鎯呭喌4" name="type"></el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+        </el-form>
+      </el-card>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="RiskVisible = false">鍙� 娑�</el-button>
+        <el-button type="primary" @click="RiskService">纭淇敼</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -797,7 +831,12 @@
 
 export default {
   name: "Patient",
-  dicts: ["sys_normal_disable", "task_status", "sys_user_sex",'futter_patient'],
+  dicts: [
+    "sys_normal_disable",
+    "task_status",
+    "sys_user_sex",
+    "futter_patient",
+  ],
   components: { Treeselect },
   data() {
     return {
@@ -814,6 +853,7 @@
       // 鎬绘潯鏁�
       total: 0,
       tasktotal: 0,
+      Risklist: [],
       // 鐢ㄦ埛琛ㄦ牸鏁版嵁
       userList: null,
       taskuserList: null,
@@ -832,7 +872,10 @@
       serviceVisible: false,
       serviceradio: 1,
       distributeVisible: false,
+      RiskVisible: false,
       tasktopic: "5", //鏂板绫诲瀷
+      Riskradio: 1,
+      RiskObj: {},
       // 鏌ヨ鍙傛暟
       topqueryParams: {
         pageNum: 1,
@@ -874,7 +917,6 @@
           value: 2,
           label: "濂�",
         },
-
       ],
 
       cardlist: [
@@ -956,7 +998,7 @@
         pageNum: 1,
         allhosp: "1",
         pageSize: 10,
-        searchscope:2,
+        searchscope: 2,
         idcardno: undefined,
         name: undefined,
         status: undefined,
@@ -1024,11 +1066,11 @@
         this.queryParams.leaveldeptcodes = store.getters.belongDepts.map(
           (obj) => obj.deptCode
         );
-        this.queryParams.leavehospitaldistrictcodes=null;
+        this.queryParams.leavehospitaldistrictcodes = null;
       } else if (this.queryParams.searchscope == 2) {
         this.queryParams.leavehospitaldistrictcodes =
           store.getters.belongWards.map((obj) => obj.districtCode);
-          this.queryParams.leaveldeptcodes=null;
+        this.queryParams.leaveldeptcodes = null;
       } else {
         this.queryParams.leaveldeptcodes = store.getters.belongDepts.map(
           (obj) => obj.deptCode
@@ -1076,6 +1118,10 @@
     Distributionservice(row) {
       this.serviceVisible = true;
     },
+    RiskMarker(row) {
+      this.RiskVisible = true;
+      this.RiskObj=row;
+    },
 
     // 鍙栨秷鎸夐挳
     cancel() {
@@ -1098,7 +1144,6 @@
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
-
       this.queryParams.pageNum = 1;
       this.getList();
     },
@@ -1186,6 +1231,19 @@
         query: { type: this.serviceradio },
       });
     },
+    RiskService() {
+
+      this.RiskObj.visitFlag = this.Risklist.join(", ");
+      this.RiskObj.visitType = this.Riskradio;
+      alterpatient(this.RiskObj).then((res) => {
+        if (res.code==200) {
+          this.getList();
+          this.Risklist=[];
+          this.Riskradio=1;
+          this.$modal.msgSuccess("寮傚父璁板綍鎴愬姛");
+        }
+      });
+    },
     distribute() {
       this.distributeVisible = true;
       if (this.tasktopic == 1) {
diff --git a/src/views/patient/physical/index.vue b/src/views/patient/physical/index.vue
index 8d06a79..0518e42 100644
--- a/src/views/patient/physical/index.vue
+++ b/src/views/patient/physical/index.vue
@@ -1,8 +1,69 @@
 <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-col :span="2.5">
+          <div class="ysfleftvlue">
+            <el-card shadow="hover">
+              <div style="padding: 8px">
+                <span>宸插彂閫佹湭棰嗗彇</span>
+                <div
+                  style="
+                    text-align: center;
+                    font-size: 18px;
+                    margin-top: 10px;
+                    font-weight: 600;
+                  "
+                >
+                  {{ yfsvalue }}
+                </div>
+              </div>
+            </el-card>
+          </div>
+        </el-col>
+        <el-col :span="2.5">
+          <div class="errleftvlue">
+            <el-card shadow="hover">
+              <div style="padding: 8px">
+                <span>寮傚父</span>
+                <div
+                  style="
+                    text-align: center;
+                    font-size: 18px;
+                    margin-top: 10px;
+                    font-weight: 600;
+                  "
+                >
+                  {{ ycvalue }}
+                </div>
+              </div>
+            </el-card>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
     <el-row :gutter="20">
       <!--鐢ㄦ埛鏁版嵁-->
-
       <el-form
         :model="topqueryParams"
         ref="queryForm"
@@ -11,10 +72,14 @@
         v-show="showSearch"
         label-width="98px"
       >
-        <el-form-item label="浣撴浜哄鍚�">
-          <el-input v-model="topqueryParams.name"></el-input>
+        <el-form-item label="浠诲姟鍚嶇О">
+          <el-input
+            v-model="topqueryParams.taskName"
+            placeholder="璇烽�夋嫨浠诲姟鍚嶇О"
+          ></el-input>
         </el-form-item>
-        <el-form-item label="浣撴鏃堕棿">
+
+        <el-form-item label="鍑洪櫌鏃堕棿">
           <el-date-picker
             v-model="dateRange"
             style="width: 240px"
@@ -25,8 +90,26 @@
             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="鎮h�呭鍚�" prop="sendname">
+          <el-input
+            v-model="topqueryParams.sendname"
+            placeholder="璇疯緭鍏ユ偅鑰呭鍚�"
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item label="鎮h�呰寖鍥�" prop="status">
+          <el-cascader
+            v-model="topqueryParams.scopetype"
+            placeholder="榛樿鍏ㄩ儴"
+            :options="sourcetype"
+            :props="{ expandTrigger: 'hover' }"
+            @change="handleChange"
+          ></el-cascader>
+        </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"
@@ -36,34 +119,13 @@
             </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-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>
           <el-button
             type="primary"
             icon="el-icon-search"
             size="medium"
-            @click="handleQuery"
+            @click="handleQuery(1)"
             >鎼滅储</el-button
           >
           <el-button icon="el-icon-refresh" size="medium" @click="resetQuery"
@@ -80,7 +142,6 @@
             icon="el-icon-plus"
             size="medium"
             @click="handleAdd"
-            v-hasPermi="['system:user:add']"
             >鏂板</el-button
           >
         </el-col>
@@ -103,40 +164,12 @@
           <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>
@@ -145,182 +178,305 @@
           <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-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="搴忓彿"
+          label="浠诲姟鍚嶇О"
           fixed
           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="patientname"
-          prop="patientname"
+          key="sendname"
+          prop="sendname"
         />
-
         <el-table-column
-          label="灏辫瘖缂栧彿"
+          label="浠诲姟鐘舵��"
           align="center"
-          sortable
-          key="hospno"
-          prop="hospno"
+          key="sendstate"
+          prop="sendstate"
           width="120"
-        />
-        <el-table-column label="骞撮緞" align="center" key="age" prop="age" />
-        <el-table-column
-          label="浣撴鍗曚綅"
-          align="center"
-          key="depname"
-          prop="depname"
-          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>鍏ヨ亴浣撴A</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="浠诲姟寮傚父璇存槑"
+          width="120"
+          align="center"
+          key="remark"
+          prop="remark" -->
+        />
+
+        <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="闅忚浜哄憳"
           align="center"
-          key="topicnumber"
-          prop="topicnumber"
-          width="120"
-          :show-overflow-tooltip="true"
-        >
-          <template slot-scope="scope">
-            <div>鍥㈡</div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="閫氱煡鍐呭"
-          align="center"
-          key="topicnumberaa"
-          prop="topicnumberaa"
+          key="createBy"
+          prop="createBy"
           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"
-        />
-
-        <el-table-column
-          label="浣撴鏃堕棿"
+          label="闅忚鏃堕棿"
           sortable
           align="center"
-          prop="createTime"
+          prop="finishtime"
           width="160"
         >
           <template slot-scope="scope">
-            <span>{{ formatTime(scope.row.createTime) }}</span>
+            <span>{{ parseTime(scope.row.finishtime) }}</span>
           </template>
         </el-table-column>
         <el-table-column
-          label="鎶ュ憡鏃堕棿"
-          sortable
+          label="鍑洪櫌鏃ユ湡"
+          width="200"
           align="center"
-          prop="createTime"
-          width="160"
+          key="endtime"
+          prop="endtime"
         >
           <template slot-scope="scope">
-            <span>{{ formatTime(scope.row.createTime) }}</span>
+            <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="鍥炲鏃堕棿"
-          sortable
+          label="韬唤璇佸彿鐮�"
+          width="200"
           align="center"
-          prop="createTime"
-          width="160"
+          key="sfzh"
+          prop="sfzh"
+        />
+        <el-table-column
+          label="鑱旂郴鐢佃瘽"
+          width="200"
+          align="center"
+          key="phone"
+          prop="phone"
+        />
+        <el-table-column
+          label="璐d换鎶ゅ+"
+          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"
         >
-          <template slot-scope="scope">
-            <span>{{ formatTime(scope.row.createTime) }}</span>
-          </template>
+        </el-table-column>
+        <el-table-column
+          label="鐥呭尯"
+          align="center"
+          key="leavehospitaldistrictname"
+          prop="leavehospitaldistrictname"
+          width="120"
+        >
         </el-table-column>
 
-        <el-table-column
-          label="閫氱煡鐘舵��"
-          fixed="right"
+        <!-- <el-table-column
+          label="鐤剧梾鍚嶇О"
           align="center"
-          key="topicnumber"
-          prop="topicnumber"
+          key="icdName"
+          prop="icdName"
           width="120"
           :show-overflow-tooltip="true"
         >
+        </el-table-column> -->
+
+        <el-table-column
+          label="鍑洪櫌闅忚妯℃澘鍚嶇О"
+          align="center"
+          key="templatename"
+          prop="templatename"
+          width="200"
+        />
+        <el-table-column
+          label="浠诲姟鎵ц鏂瑰紡"
+          align="center"
+          key="preachform"
+          prop="preachform"
+          width="160"
+          :show-overflow-tooltip="true"
+        >
           <template slot-scope="scope">
-            <div>鏈畬鎴�</div>
+            <span v-for="item in scope.row.preachform">{{ item }}銆� </span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column
+          label="浠诲姟鍙戦�佹祦绋�"
+          align="center"
+          key="serviceSubtaskRecordList"
+          prop="serviceSubtaskRecordList"
+          width="160"
+          :show-overflow-tooltip="true"
+        >
+          <template slot-scope="scope">
+            <span v-for="item in scope.row.serviceSubtaskRecordList"
+              >{{ item.remark }}銆�
+            </span>
+          </template>
+        </el-table-column> -->
+        <el-table-column
+          label="浠诲姟缁撴灉璇存槑"
+          width="200"
+          align="center"
+          key="remark"
+          prop="remark"
+        >
+          <template slot-scope="scope" v-if="scope.row.remark">
+            <el-tag
+              type="warning"
+              v-if="scope.row.sendstate != 5 && scope.row.sendstate != 4"
+              >{{ scope.row.remark }}</el-tag
+            >
+            <el-tag type="warning" v-else>{{ scope.row.remark }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column
           label="鎿嶄綔"
-          fixed="right"
           align="center"
+          fixed="right"
           width="200"
           class-name="small-padding fixed-width"
         >
           <template slot-scope="scope">
-            <!-- <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
+              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-button
-              size="medium"
-              type="text"
-              @click="Seedetails(scope.row)"
-              v-hasPermi="['system:user:edit']"
+              <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
@@ -479,15 +635,14 @@
   resetUserPwd,
   changeUserStatus,
 } from "@/api/system/user";
-import {
-  getTaskservelist
-} 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 {
@@ -524,7 +679,10 @@
       },
       dynamicTags: ["閫夐」涓�", "閫夐」浜�", "閫夐」涓�"], //閫夐」
       inputVisible: false,
+      ycvalue: "",
+      yfsvalue: "",
       inputValue: "",
+      preachform: "",
       previewVisible: false, //闂ㄨ瘖闅忚棰勮寮规
       radio: "",
       radios: [],
@@ -537,63 +695,61 @@
       },
       value: [],
       list: [],
-      loading: false,
-      states: [
-        "Alabama",
-        "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();
+
+      sourcetype: [
+        {
+          value: 1,
+          label: "绉戝",
+          children: [],
         },
-        shortcuts: [
-          {
-            text: "浠婂ぉ",
-            onClick(picker) {
-              picker.$emit("pick", new Date());
-            },
-          },
-          {
-            text: "鏄ㄥぉ",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24);
-              picker.$emit("pick", date);
-            },
-          },
-          {
-            text: "涓�鍛ㄥ墠",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", date);
-            },
-          },
-        ],
-      },
+        {
+          value: 2,
+          label: "鐥呭尯",
+          children: [],
+        },
+        {
+          value: 3,
+          label: "鍏ㄩ儴",
+        },
+      ],
+      loading: false,
+      cardlist: [
+        {
+          name: "鍑洪櫌鏈嶅姟鎬婚噺",
+          value: 0,
+        },
+        {
+          name: "鎮h�呰繃婊�",
+          value: 0,
+        },
+        {
+          name: "搴旈殢璁�",
+          value: 0,
+        },
+
+        // {
+        //   name: "寮傚父",
+        //   value: 0,
+        // },
+        {
+          name: "鍙戦�佸け璐�",
+          value: 0,
+        },
+        {
+          name: "寰呭彂閫�",
+          value: 0,
+        },
+        {
+          name: "宸插彂閫�",
+          value: 0,
+        },
+
+        // {
+        //   name: "宸插彂閫佹湭棰嗗彇",
+        //   value: 0,
+        // },
+      ],
+
       // 琛ㄥ崟鍙傛暟
       form: {
         phonenumber: "",
@@ -607,7 +763,11 @@
       topqueryParams: {
         pageNum: 1,
         pageSize: 10,
-        serviceType:1,
+        serviceType: 1,
+        searchscope: 3,
+        scopetype: [],
+        leaveldeptcodes: [],
+        leavehospitaldistrictcodes: [],
       },
       propss: { multiple: true },
       options: [],
@@ -615,93 +775,136 @@
       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: "姝e父",
+        },
+      ],
+      errtype: "",
+      leavehospitaldistrictcode: "",
+      serviceState: [],
+      checkboxlist: [],
       // 琛ㄥ崟鏍¢獙
-      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.getList();
+    this.serviceState = store.getters.serviceState;
+    this.checkboxlist = store.getters.checkboxlist;
+    this.errtype = this.$route.query.errtype;
+    this.leavehospitaldistrictcode =
+      this.$route.query.leavehospitaldistrictcode;
+    this.sourcetype[0].children = store.getters.belongDepts.map((dept) => {
+      return {
+        label: dept.deptName,
+        value: dept.deptCode,
+      };
+    });
+    this.sourcetype[1].children = store.getters.belongWards.map((dept) => {
+      return {
+        label: dept.districtName,
+        value: dept.districtCode,
+      };
+    });
+    if (this.errtype) {
+      this.toleadExport(2);
+    } else {
+      this.getList(1);
+    }
     this.getConfigKey("sys.user.initPassword").then((response) => {
       this.initPassword = response.msg;
     });
   },
-  // 鎼滅储
-  mounted() {
-    this.list = this.states.map((item) => {
-      return { value: `value:${item}`, label: `label:${item}` };
-    });
+  activated() {
+    this.getList(1);
   },
   methods: {
-    /** 鏌ヨ闂ㄨ瘖闅忚鍒楄〃 */
-    getList() {
+    /** 鏌ヨ闂ㄨ瘖闅忚鏈嶅姟鍒楄〃 */
+    getList(refresh) {
+      // 榛樿鍏ㄩ儴
+      if (this.topqueryParams.searchscope == 3) {
+        this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+          (obj) => obj.deptCode
+        );
+        this.topqueryParams.leavehospitaldistrictcodes =
+          store.getters.belongWards.map((obj) => obj.districtCode);
+      }
+      // 鎺ュ彈寮傚父璺宠浆
+      if (this.errtype) {
+        this.topqueryParams.leavehospitaldistrictcodes.push(
+          this.leavehospitaldistrictcode
+        );
+        console.log(this.topqueryParams.leavehospitaldistrictcodes, "11");
+      }
       this.loading = true;
-      getTaskservelist(this.topqueryParams).then(
-        (response) => {
-          this.userList = response.rows;
-          this.total = response.total;
-          this.loading = false;
+      getTaskservelist(this.topqueryParams).then((response) => {
+        this.userList = response.rows[0].serviceSubtaskList;
+        this.total = response.total;
+        if (refresh) {
+          this.cardlist[0].value =
+            Number(response.rows[0].wzx) + Number(response.rows[0].ysf);
+          this.cardlist[1].value = response.rows[0].wzx;
+          this.cardlist[2].value = response.rows[0].ysf;
+          this.ycvalue = response.rows[0].yc;
+          this.cardlist[3].value = response.rows[0].fssb;
+          this.cardlist[4].value = response.rows[0].dfs;
+          this.cardlist[5].value = response.rows[0].yfs2;
+          this.yfsvalue = response.rows[0].yfs;
         }
-      );
+        this.loading = false;
+        this.userList.forEach((item) => {
+          let idArray = null;
+          if (item.endtime) {
+            item.endDay = this.daysBetween(item.endtime);
+          }
+
+          if (item.preachform) {
+            if (item.endtime) {
+              item.preachformson = item.preachform;
+              idArray = item.preachform.split(",");
+            }
+
+            item.preachform = idArray.map((value) => {
+              // 鏌ユ壘id瀵瑰簲鐨勫璞�
+              const item = this.checkboxlist.find(
+                (item) => item.value == value
+              );
+              // 濡傛灉鎵惧埌瀵瑰簲鐨刬d锛岃繑鍥瀕abel鍊硷紝鍚﹀垯杩斿洖null
+              return item ? item.label : null;
+            });
+          }
+        });
+        this.total = response.total;
+      });
     },
     // 鏌ョ湅闂ㄨ瘖闅忚璇︽儏
     Referencequestion(row) {
@@ -760,17 +963,49 @@
       this.resetForm("form");
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
-    handleQuery() {
+    handleQuery(refresh) {
+      if (this.topqueryParams.searchscope == 3) {
+        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();
+      this.topqueryParams.startOutHospTime = this.dateRange[0];
+      this.topqueryParams.endOutHospTime = this.dateRange[1];
+
+      this.getList(refresh);
+    },
+    // 鎮h�呰寖鍥村鐞�
+    handleChange(value) {
+      let type = value[0];
+      let code = value.slice(-1)[0];
+      this.topqueryParams.leavehospitaldistrictcodes = [];
+      this.topqueryParams.leaveldeptcodes = [];
+
+      if (type == 1) {
+        this.topqueryParams.leaveldeptcodes.push(code);
+        this.topqueryParams.leavehospitaldistrictcodes = [];
+        this.topqueryParams.searchscope = 1;
+      } else if (type == 2) {
+        this.topqueryParams.leavehospitaldistrictcodes.push(code);
+        this.topqueryParams.leaveldeptcodes = [];
+        this.topqueryParams.searchscope = 2;
+      } else {
+        this.topqueryParams.searchscope = 3;
+      }
     },
     /** 閲嶇疆鎸夐挳鎿嶄綔 */
     resetQuery() {
       this.dateRange = [];
-      this.resetForm("queryForm");
-      this.topqueryParams.deptId = undefined;
-      this.$refs.tree.setCurrentKey(null);
-      this.handleQuery();
+      this.topqueryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        serviceType: 1,
+        searchscope: 2,
+      };
+      this.handleQuery(1);
     },
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
@@ -834,13 +1069,13 @@
             updateUser(this.form).then((response) => {
               this.$modal.msgSuccess("淇敼鎴愬姛");
               this.open = false;
-              this.getList();
+              this.getList(1);
             });
           } else {
             addUser(this.form).then((response) => {
               this.$modal.msgSuccess("鏂板鎴愬姛");
               this.open = false;
-              this.getList();
+              this.getList(1);
             });
           }
         }
@@ -855,7 +1090,7 @@
           return delUser(userIds);
         })
         .then(() => {
-          this.getList();
+          this.getList(1);
           this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
         })
         .catch(() => {});
@@ -868,7 +1103,7 @@
           return console.log("鍋滄鎴愬姛");
         })
         .then(() => {
-          this.getList();
+          this.getList(1);
           this.$modal.msgWarning("鍋滄鎴愬姛");
         })
         .catch(() => {});
@@ -881,7 +1116,7 @@
           return console.log("寮�鍚垚鍔�");
         })
         .then(() => {
-          this.getList();
+          this.getList(1);
           this.$modal.msgSuccess("寮�鍚垚鍔�");
         })
         .catch(() => {});
@@ -894,7 +1129,7 @@
           return console.log("閫変腑鎴愬姛");
         })
         .then(() => {
-          this.getList();
+          this.getList(1);
           this.$modal.msgSuccess("閲嶇疆鎴愬姛");
         })
         .catch(() => {});
@@ -905,22 +1140,52 @@
     },
     // 璺宠浆璇︽儏椤�
     Seedetails(row) {
+      let type = "";
+      console.log(row, "rwo");
+      if (row.preachformson) {
+        if (row.preachformson.includes("3")) {
+          type = 1;
+          console.log(type, "rwo");
+        }
+      }
       this.$router.push({
         path: "/followvisit/record/detailpage/",
-        query: { taskid: row.taskid, patid: row.patid },
+        query: {
+          taskid: row.taskid,
+          patid: row.patid,
+          id: row.id,
+          Voicetype: type,
+        },
       });
     },
-    // 瀵煎叆鎸夐挳
-    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.topqueryParams.pageNum = null;
+      this.topqueryParams.pageSize = null;
       this.download(
-        "system/user/export",
+        "smartor/serviceSubtask/export",
         {
           ...this.topqueryParams,
         },
         `user_${new Date().getTime()}.xlsx`
       );
+    },
+    // 寮傚父鍒楁覆鏌�
+    tableRowClassName({ row, rowIndex }) {
+      if (row.excep == 1) {
+        return "warning-row";
+      }
+      return "";
     },
   },
 };
@@ -936,6 +1201,9 @@
 .document {
   // width: 100px;
   height: 50px;
+}
+::v-deep.el-table .warning-row {
+  background: #eec4c4;
 }
 
 .documentf {
@@ -1015,6 +1283,28 @@
     }
   }
 }
+::v-deep.leftvlue .el-card__body {
+  background: #d0e9fd;
+}
+::v-deep.leftvlue .el-card__body:hover {
+  background: #8dc8f8;
+  cursor: pointer; /* 榧犳爣鎮诞鏃跺彉涓烘墜褰� */
+}
+::v-deep.errleftvlue .el-card__body {
+  background: #fdd0d7;
+}
+::v-deep.errleftvlue .el-card__body:hover {
+  background: #f88d96;
+  cursor: pointer; /* 榧犳爣鎮诞鏃跺彉涓烘墜褰� */
+}
+
+::v-deep.ysfleftvlue .el-card__body {
+  background: #d0fdd8;
+}
+::v-deep.ysfleftvlue .el-card__body:hover {
+  background: #8df8a4;
+  cursor: pointer; /* 榧犳爣鎮诞鏃跺彉涓烘墜褰� */
+}
 .button-bb {
   font-weight: 500;
   background-color: #2ba05c;
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index a6254b2..7683230 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -1252,8 +1252,7 @@
             value: "5",
             label: "寰俊鍏紬鍙�",
           },
-        { label: "寰俊灏忕▼搴�", value: 6 },
-
+          { label: "寰俊灏忕▼搴�", value: 6 },
         ];
       } else if (this.form.serviceType == 6) {
         this.checkboxlist = [
@@ -1362,6 +1361,7 @@
           xh: 1,
         },
       ];
+
       if (this.checkList[0]) {
         this.form.preachform = this.checkList.join(",");
       } else {
@@ -1404,6 +1404,12 @@
       this.form.leavehospitaldistrictcodes = store.getters.belongWards.map(
         (obj) => obj.districtCode
       );
+      console.log(this.form.longTask);
+      console.log(this.form.preachform);
+
+      if (this.form.longTask && this.form.preachform == 6) {
+        this.form.patCycle = 1;
+      }
       Editsingletask(this.form).then((res) => {
         if (res.code == 200) {
           if (this.form.taskid) {
@@ -1425,11 +1431,12 @@
         if (res.code == 200) {
           this.objyl = res.data;
           if (this.objyl.taskid == data.taskId) {
-          this.objyl.isoperation = 2;
-          }else{
-          this.objyl.isoperation = 1;
+            this.objyl.isoperation = 2;
+          } else {
+            this.objyl.isoperation = 1;
           }
           this.objyl.taskid = data.taskId;
+          this.objyl.sendDay='5',
           TaskQuestioncomit(this.objyl).then((response) => {
             this.previewtf = false;
             this.form.libtemplateid = this.objyl.svyid;
@@ -1540,7 +1547,11 @@
       this.overallCase.forEach((item) => {
         this.allpids.push(item.patid);
       });
-      if (this.patientqueryParams.allhosp == 1||(this.patientqueryParams.allhosp == 1&&this.patientqueryParams.cry == 1)) {
+      if (
+        this.patientqueryParams.allhosp == 1 ||
+        (this.patientqueryParams.allhosp == 1 &&
+          this.patientqueryParams.cry == 1)
+      ) {
         this.tableLabelhz = [
           // { label: "鍏ラ櫌鏃ユ湡", width: "170", prop: "starttime" },
           { label: "鍑洪櫌鏃ユ湡", width: "150", prop: "endtime" },
@@ -1556,7 +1567,7 @@
         ];
       } else if (this.patientqueryParams.allhosp == 4) {
         this.tableLabelhz = [
-        { label: "鍏ラ櫌鏃ユ湡", width: "150", prop: "starttime" },
+          { label: "鍏ラ櫌鏃ユ湡", width: "150", prop: "starttime" },
           { label: "鎮h��", width: "", prop: "name" },
           { label: "韬唤璇�", width: "200", prop: "idcardno" },
           { label: "鎬у埆", width: "", prop: "sex" },
@@ -1578,7 +1589,7 @@
         this.patientqueryParams.cry = 1;
       } else if (this.patientqueryParams.allhosp == 4) {
         this.patientqueryParams.cry = 0;
-        this.patientqueryParams.allhosp = '1';
+        this.patientqueryParams.allhosp = "1";
       }
       // 鏉ユ簮鍒ゆ柇
 
@@ -1760,25 +1771,25 @@
             this.$modal.msgError(res.code);
           }
 
-        if (this.newadd) {
-          this.neWaddfn();
-        }
+          if (this.newadd) {
+            this.neWaddfn();
+          }
         });
       }
     },
     // 渚濈収鏂板鏃跺鐞�
-    neWaddfn(){
-      this.id=null;
-      this.form.taskName='';
+    neWaddfn() {
+      this.id = null;
+      this.form.taskName = "";
       this.form.taskid = null;
-      this.overallCase=[];
-      this.form.patTaskRelevances=[];
-      this.daytime=[]; //鏃ユ湡
-      this.applydaytime=[]; //璁$畻鏃ユ湡
-      this.time1=""; //涓婂崍鏃堕棿娈�
-      this.time2=""; //涓嬪崍鏃堕棿娈�
-      this.time3=""; //鏅氫笂鏃堕棿娈�
-      this.time4=""; //鏅氫笂鏃堕棿娈�
+      this.overallCase = [];
+      this.form.patTaskRelevances = [];
+      this.daytime = []; //鏃ユ湡
+      this.applydaytime = []; //璁$畻鏃ユ湡
+      this.time1 = ""; //涓婂崍鏃堕棿娈�
+      this.time2 = ""; //涓嬪崍鏃堕棿娈�
+      this.time3 = ""; //鏅氫笂鏃堕棿娈�
+      this.time4 = ""; //鏅氫笂鏃堕棿娈�
     },
     // 鑾峰彇绉戝鍒楄〃
     listDept() {
@@ -1907,6 +1918,7 @@
 
       this.objyl.isoperation = 1;
       console.log(this.objyl.id);
+      this.objyl.sendDay='5';
 
       if (this.objyl.id) {
         deleteTaskQuestioncomit(this.objyl.id).then((res) => {
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 85af048..e2bd2f7 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -398,25 +398,8 @@
                     </el-col>
 
                     <el-col :span="1.5">
-                      <div v-if="form.longTask">
-                        <el-tooltip
-                          class="item"
-                          effect="dark"
-                          content="闀挎湡浠诲姟涓嶆敮鎸佹墜鍔ㄦ坊鍔犳偅鑰咃紒"
-                          placement="top-start"
-                        >
-                          <el-button
-                            type="primary"
-                            plain
-                            disabled
-                            icon="el-icon-plus"
-                            size="medium"
-                            @click="handleQuery"
-                            >鏂板</el-button
-                          >
-                        </el-tooltip>
-                      </div>
-                      <div v-else>
+
+
                         <el-button
                           type="primary"
                           plain
@@ -426,7 +409,7 @@
                           @click="handleQuery"
                           >鏂板</el-button
                         >
-                      </div>
+
                     </el-col>
 
                     <!-- <el-col :span="1.5">
@@ -1194,7 +1177,6 @@
       ],
       // 绉戝/鐥呭尯
       belongWards: [],
-      belongWards: [],
       deptlist: [],
       hosplist: [],
       tempDetpRelevanceslist: [], //绉戝鏁版嵁
@@ -1220,6 +1202,7 @@
         tempid: "",
         type: 2,
       },
+      belongDepts:[],
       quote: false,
       serviceType: null,
     };
@@ -1517,6 +1500,9 @@
           this.objyl = res.data;
           this.objyl.isoperation = 2;
           this.objyl.taskid = data.taskId;
+          this.objyl.sendDay='5',
+          console.log(this.objyl.sendDay,'this.objyl.sendDay');
+
           Taskparticty(this.objyl).then((response) => {
             this.previewtf = false;
             this.form.libtemplateid = this.objyl.id;
@@ -1541,7 +1527,7 @@
           if (res.code == 200) {
             this.objyl = res.data;
             if (this.form.longTask) {
-              this.objyl.longTemp = 5;
+              this.objyl.sendDay = 5;
             }
             this.queryParamsdept.type = 2;
             this.queryParamsdept.tempid = row.id;
@@ -1994,6 +1980,7 @@
       if (this.form.id) {
         this.objyl.taskid = this.form.id;
       }
+      this.objyl.sendDay='5';
       if (this.form.templateid) {
         deleteTaskparticty(this.form.templateid).then((res) => {
           if (res.code == 200) {
diff --git a/src/views/repositoryai/templateku/configurat/measurement.vue b/src/views/repositoryai/templateku/configurat/measurement.vue
index b48369b..d9fc2a2 100644
--- a/src/views/repositoryai/templateku/configurat/measurement.vue
+++ b/src/views/repositoryai/templateku/configurat/measurement.vue
@@ -164,7 +164,7 @@
       };
       // 鍙戣捣ws璇锋眰
       sendWebsocket(
-        "ws://192.168.2.10:8095/chat?userId="+this.userid,
+        "ws://9.208.2.190:8095/chat?userId="+this.userid,
         obj,
         this.wsMessage,
         this.wsError
@@ -246,7 +246,7 @@
       console.log(obj, "鍏ュ弬");
       // 鍙戣捣ws璇锋眰
       sendWebsocket(
-        "ws://192.168.2.10:8095/chat?userId="+this.userid,
+        "ws://9.208.2.190:8095/chat?userId="+this.userid,
         obj,
         this.wsMessage,
         this.wsError
diff --git a/vue.config.js b/vue.config.js
index 3304542..7e0400f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -37,8 +37,8 @@
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://192.168.168.60:8095`,
         // target: `http://10.202.20.185:8095`,
-        target: `http://192.168.2.10:8095`,
-        // target:`http://localhost:8095`,
+        // target: `http://192.168.100.184:8095`,
+        target:`http://localhost:8095`,
         // target: `http://192.168.101.135:8095`,
         // target: `http://192.168.101.166:8093`,
         // target: `http://192.168.191.181:8095`,

--
Gitblit v1.9.3