From ba4eee2e5ced6aef3e85a7c7b8317817b7ad3cae Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 14 八月 2025 10:05:53 +0800
Subject: [PATCH] Merge branch 'lishui-Smartor' of http://116.62.18.175:6699/r/~yxh/smartor-web

---
 src/views/patient/questionnaire/index.vue |   39 ++++++++++++++++++---------------------
 1 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/views/patient/questionnaire/index.vue b/src/views/patient/questionnaire/index.vue
index 00d347f..15a7093 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"
       >
@@ -275,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"
@@ -719,10 +718,10 @@
           name: "鍑洪櫌鏈嶅姟鎬婚噺",
           value: 0,
         },
-        {
-          name: "鎮ｈ�呰繃婊�",
-          value: 0,
-        },
+        // {
+        //   name: "鎮ｈ�呰繃婊�",
+        //   value: 0,
+        // },
         {
           name: "搴旈殢璁�",
           value: 0,
@@ -740,10 +739,10 @@
           name: "寰呴殢璁�",
           value: 0,
         },
-        {
-          name: "宸插彂閫�",
-          value: 0,
-        },
+        // {
+        //   name: "宸插彂閫�",
+        //   value: 0,
+        // },
 
         // {
         //   name: "琛ㄥ崟宸插彂閫�",
@@ -879,12 +878,12 @@
         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].dsf;
+          // this.cardlist[4].value = response.rows[0].yfs2;
           this.yfsvalue = response.rows[0].yfs;
         }
         this.loading = false;
@@ -895,10 +894,8 @@
           }
 
           if (item.preachform) {
-            if (item.endtime) {
               item.preachformson = item.preachform;
               idArray = item.preachform.split(",");
-            }
 
             item.preachform = idArray.map((value) => {
               // 鏌ユ壘id瀵瑰簲鐨勫璞�
@@ -1181,7 +1178,7 @@
       this.topqueryParams.pageNum = null;
       this.topqueryParams.pageSize = null;
       this.download(
-        "smartor/serviceSubtask/export",
+        "smartor/serviceSubtask/patItemExport",
         {
           ...this.topqueryParams,
         },

--
Gitblit v1.9.3