From 2c4c416bf7950c72ffa2543a218e4fd993ee2af2 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 12 九月 2024 12:04:32 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/discharge/index.vue |  196 ++++++++++++++++++++++++++----------------------
 1 files changed, 105 insertions(+), 91 deletions(-)

diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 67bdf09..6b568b6 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/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"
@@ -37,20 +37,12 @@
             >
             </el-option>
           </el-select>
+        </el-form-item> -->
+        <el-form-item label="妯℃澘鍚嶇О" prop="status">
+          <el-input v-model="topqueryParams.templatename"></el-input>
         </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-form-item label="闅忚鐘舵��" prop="status">
+          <el-select v-model="topqueryParams.sendstate" placeholder="璇烽�夋嫨">
             <el-option
               v-for="item in topicoptions"
               :key="item.value"
@@ -86,7 +78,7 @@
             >鏂板</el-button
           >
         </el-col>
-        <el-col :span="1.5">
+        <!-- <el-col :span="1.5">
           <div class="documentf">
             <div class="document">
               <el-button
@@ -171,7 +163,7 @@
               >
             </div>
           </div>
-        </el-col>
+        </el-col> -->
 
         <!-- <el-col :span="1.5"> </el-col> -->
       </el-row>
@@ -181,44 +173,6 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="50" align="center" />
-        <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"
-          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="icdName"
-          prop="icdName"
-          width="120"
-          :show-overflow-tooltip="true"
-        >
-        </el-table-column>
         <el-table-column
           label="浠诲姟鍚嶇О"
           align="center"
@@ -226,33 +180,88 @@
           prop="taskName"
           width="120"
         />
+        <!-- <el-table-column label="搴忓彿" fixed align="center" key="id" prop="id" /> -->
+        <el-table-column
+          label="濮撳悕"
+
+          align="center"
+          key="sendname"
+          prop="sendname"
+        />
+        <el-table-column
+          label="韬唤璇佸彿鐮�"
+
+          width="200"
+          align="center"
+          key="sfzh"
+          prop="sfzh"
+        />
+        <!-- <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="serviceform"
-          prop="serviceform"
-          width="120"
+          key="templatename"
+          prop="templatename"
+          width="200"
         />
+
         <el-table-column
           label="闅忚浜哄憳"
           align="center"
-          key="operator"
-          prop="operator"
+          key="createBy"
+          prop="createBy"
           width="120"
         />
 
-        <el-table-column
-          label="灏辫瘖鏃堕棿"
+        <!-- <el-table-column
+          label="鍑洪櫌鏃堕棿"
           sortable
           align="center"
-          prop="admindate"
+          prop="createTime"
           width="160"
         >
           <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.admindate) }}</span>
+            <span>{{ formatTime(scope.row.createTime) }}</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <!-- <el-table-column
           label="闅忚鏃堕棿"
           sortable
@@ -262,7 +271,7 @@
         >
           <template slot-scope="scope">
             <span v-if="scope.row.sendType != 3">{{
-              parseTime(scope.row.createTime)
+              formatTime(scope.row.createTime)
             }}</span>
             <span v-else>鍗冲埢鍙戦��</span>
           </template>
@@ -275,10 +284,10 @@
           width="160"
         >
           <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.finishtime) }}</span>
+            <span>{{ formatTime(scope.row.finishtime) }}</span>
           </template>
         </el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           label="闅忚鐘舵��"
           fixed="right"
           align="center"
@@ -290,7 +299,7 @@
           <template slot-scope="scope">
             <dict-tag :options="serviceState" :value="scope.row.sendstate" />
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column
           label="鎿嶄綔"
@@ -300,7 +309,7 @@
           class-name="small-padding fixed-width"
         >
           <template slot-scope="scope">
-            <el-tooltip
+            <!-- <el-tooltip
               class="item"
               effect="dark"
               content="閲嶆柊闅忚"
@@ -314,8 +323,8 @@
                 ><span class="button-bb"
                   ><i class="el-icon-s-promotion"></i></span
               ></el-button>
-            </el-tooltip>
-            <el-tooltip
+            </el-tooltip> -->
+            <!-- <el-tooltip
               class="item"
               effect="dark"
               content="鍋滄"
@@ -328,8 +337,8 @@
                 v-hasPermi="['system:user:edit']"
                 ><span class="button-sc"><i class="el-icon-delete"></i></span
               ></el-button>
-            </el-tooltip>
-            <el-tooltip
+            </el-tooltip> -->
+            <!-- <el-tooltip
               class="item"
               effect="dark"
               content="鏌ョ湅浠诲姟璇︽儏"
@@ -342,7 +351,16 @@
                 v-hasPermi="['system:user:edit']"
                 ><span class="button-zx"><i class="el-icon-s-order"></i></span
               ></el-button>
-            </el-tooltip>
+            </el-tooltip> -->
+            <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
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -649,7 +667,7 @@
       topqueryParams: {
         pageNum: 1,
         pageSize: 10,
-        hospType: 1,
+        serviceType:2,
       },
       propss: { multiple: true },
       options: [],
@@ -657,19 +675,15 @@
       topicoptions: [
         {
           value: 1,
-          label: "寰呭鏍�",
+          label: "琚鍙�",
         },
         {
           value: 2,
-          label: "鎵ц涓�",
+          label: "寰呭彂閫�",
         },
         {
           value: 3,
-          label: "鎵ц瀹屾垚",
-        },
-        {
-          value: 4,
-          label: "宸插仠姝�",
+          label: "宸插彂閫�",
         },
       ],
       serviceState: [],
@@ -799,9 +813,9 @@
     /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
       this.$router.push({
-        path: "/followvisit/particty",
+        path: "/followvisit/QuestionnaireTask",
         query: {
-          type: 3,
+          type: 2,
           serviceType: 2,
         },
       });
@@ -902,10 +916,10 @@
       this.modificationVisible = true;
     },
     // 璺宠浆璇︽儏椤�
-    Seedetails() {
+    Seedetails(row) {
       this.$router.push({
         path: "/followvisit/record/detailpage/",
-        query: { id: "1" },
+        query: { taskid: row.taskid, patid: row.patid },
       });
     },
     // 瀵煎叆鎸夐挳

--
Gitblit v1.9.3