From b7092c2bf77696eb13fd680cb006211c17b48f5c Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 15 五月 2025 18:00:15 +0800
Subject: [PATCH] 测试完成

---
 src/views/patient/questionnaire/index.vue |   47 +++++++++++++++++++++++++++--------------------
 1 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/views/patient/questionnaire/index.vue b/src/views/patient/questionnaire/index.vue
index 9e92295..3685514 100644
--- a/src/views/patient/questionnaire/index.vue
+++ b/src/views/patient/questionnaire/index.vue
@@ -154,7 +154,6 @@
                 icon="el-icon-upload2"
                 size="medium"
                 @click="handleExport"
-                v-hasPermi="['system:user:export']"
                 >瀵煎嚭</el-button
               >
             </div>
@@ -192,7 +191,7 @@
       <el-table
         v-loading="loading"
         :data="userList"
-        height="660"
+        height="808"
         :row-class-name="tableRowClassName"
         @selection-change="handleSelectionChange"
       >
@@ -208,6 +207,7 @@
         <!-- <el-table-column label="搴忓彿" fixed align="center" key="id" prop="id" /> -->
         <el-table-column
           label="濮撳悕"
+          width="100"
           fixed
           align="center"
           key="sendname"
@@ -228,7 +228,7 @@
             </div>
             <div v-if="scope.row.sendstate == 2">
               <el-tag type="primary" :disable-transitions="false"
-                >寰呮墽琛�</el-tag
+                >寰呴殢璁�</el-tag
               >
             </div>
             <div v-if="scope.row.sendstate == 3">
@@ -258,7 +258,7 @@
         />
 
         <el-table-column
-          label="浜哄伐澶勭悊鎰忚"
+          label="澶勭悊鎰忚"
           align="center"
           key="suggest"
           prop="suggest"
@@ -274,12 +274,12 @@
         <el-table-column
           label="闅忚浜哄憳"
           align="center"
-          key="createBy"
-          prop="createBy"
+          key="updateBy"
+          prop="updateBy"
           width="120"
         />
         <el-table-column
-          label="闅忚鏃堕棿"
+          label="闅忚瀹屾垚鏃堕棿"
           sortable
           align="center"
           prop="finishtime"
@@ -361,7 +361,7 @@
         /> -->
 
         <!-- <el-table-column label="骞撮緞" align="center" key="age" prop="age" /> -->
-        <!-- <el-table-column label="鎬у埆" align="center" key="sex" prop="sex" /> -->
+        <!-- <el-table-column label="鎬у埆"width="100" align="center" key="sex" prop="sex" /> -->
         <!-- <el-table-column label="搴婂彿" align="center" key="badNo" prop="badNo" /> -->
         <el-table-column
           label="绉戝"
@@ -718,10 +718,10 @@
           name: "鍑洪櫌鏈嶅姟鎬婚噺",
           value: 0,
         },
-        {
-          name: "鎮ｈ�呰繃婊�",
-          value: 0,
-        },
+        // {
+        //   name: "鎮ｈ�呰繃婊�",
+        //   value: 0,
+        // },
         {
           name: "搴旈殢璁�",
           value: 0,
@@ -736,7 +736,7 @@
           value: 0,
         },
         {
-          name: "寰呮墽琛�",
+          name: "寰呴殢璁�",
           value: 0,
         },
         {
@@ -765,6 +765,7 @@
         pageSize: 10,
         serviceType: 7,
         searchscope: 3,
+        sendstate:2,
         scopetype: [],
         leaveldeptcodes: [],
         leavehospitaldistrictcodes: [],
@@ -779,7 +780,7 @@
         },
         {
           value: 2,
-          label: "寰呮墽琛�",
+          label: "寰呴殢璁�",
         },
         {
           value: 3,
@@ -866,18 +867,23 @@
         console.log(this.topqueryParams.leavehospitaldistrictcodes, "11");
       }
       this.loading = true;
+      if (this.topqueryParams.leavehospitaldistrictcodes[0]&&this.topqueryParams.leaveldeptcodes[0]) {
+        this.topqueryParams.deptOrDistrict=2;
+      }else{
+        this.topqueryParams.deptOrDistrict=1;
+      }
       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.cardlist[1].value = response.rows[0].wzx;
+          this.cardlist[1].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.cardlist[2].value = response.rows[0].fssb;
+          this.cardlist[3].value = response.rows[0].dfs;
+          this.cardlist[4].value = response.rows[0].yfs2;
           this.yfsvalue = response.rows[0].yfs;
         }
         this.loading = false;
@@ -1004,6 +1010,7 @@
         pageSize: 10,
         serviceType: 7,
         searchscope: 2,
+        sendstate:2,
       };
       this.handleQuery(1);
     },
@@ -1173,7 +1180,7 @@
       this.topqueryParams.pageNum = null;
       this.topqueryParams.pageSize = null;
       this.download(
-        "smartor/serviceSubtask/export",
+        "smartor/serviceSubtask/patItemExport",
         {
           ...this.topqueryParams,
         },

--
Gitblit v1.9.3