From 45f9797c4e878d5f87a8d04d5ee07af8d39b5567 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 10 六月 2025 11:26:26 +0800
Subject: [PATCH] 测试完成

---
 src/views/patient/propaganda/index.vue |   39 ++++++++++++++++++++++++---------------
 1 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/views/patient/propaganda/index.vue b/src/views/patient/propaganda/index.vue
index 6f91cc9..8b7a8cf 100644
--- a/src/views/patient/propaganda/index.vue
+++ b/src/views/patient/propaganda/index.vue
@@ -108,7 +108,6 @@
                 icon="el-icon-upload2"
                 size="medium"
                 @click="handleExport"
-                v-hasPermi="['system:user:export']"
                 >瀵煎嚭</el-button
               >
             </div>
@@ -149,7 +148,6 @@
         height="560"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="50" align="center" />
         <el-table-column
           label="浠诲姟鍚嶇О"
           fixed
@@ -161,6 +159,7 @@
         <!-- <el-table-column label="搴忓彿" fixed align="center" key="id" prop="id" /> -->
         <el-table-column
           label="濮撳悕"
+          width="100"
           fixed
           align="center"
           key="sendname"
@@ -176,17 +175,17 @@
           <template slot-scope="scope">
             <div v-if="scope.row.sendstate == 1">
               <el-tag type="primary" :disable-transitions="false"
-                >琚鍙�</el-tag
+                >琛ㄥ崟宸查鍙�</el-tag
               >
             </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">
               <el-tag type="success" :disable-transitions="false"
-                >宸插彂閫佹湭棰嗗彇</el-tag
+                >琛ㄥ崟宸插彂閫�</el-tag
               >
             </div>
             <div v-if="scope.row.sendstate == 4">
@@ -268,7 +267,7 @@
         >
           <template slot-scope="scope">
             <span>{{
-              scope.row.endDay ? scope.row.endDay + "澶�" : "鏃ユ湡缂哄け"
+              scope.row.endDay ? scope.row.endDay + "澶�" : ""
             }}</span>
           </template>
         </el-table-column>
@@ -305,7 +304,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="绉戝"
@@ -351,7 +350,7 @@
           width="120"
         />
 
-        <el-table-column
+        <!-- <el-table-column
         fixed="right"
           label="浠诲姟鍙戦�佹祦绋�"
           align="center"
@@ -365,7 +364,7 @@
               >{{ item.remark }}銆�
             </span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
         fixed="right"
           label="浠诲姟缁撴灉璁板綍"
@@ -724,6 +723,7 @@
         pageSize: 10,
         serviceType: 4,
         searchscope: 2,
+        sendstate:2,
       },
       propss: { multiple: true },
       options: [],
@@ -731,15 +731,15 @@
       topicoptions: [
         {
           value: 1,
-          label: "琚鍙�",
+          label: "琛ㄥ崟宸查鍙�",
         },
         {
           value: 2,
-          label: "寰呭彂閫�",
+          label: "寰呴殢璁�",
         },
         {
           value: 3,
-          label: "宸插彂閫佹湭棰嗗彇",
+          label: "琛ㄥ崟宸插彂閫�",
         },
         {
           value: 4,
@@ -772,6 +772,8 @@
   watch: {},
   created() {
     this.serviceState = store.getters.serviceState;
+    console.log(this.serviceState,'this.serviceState');
+
     this.getList();
     this.getConfigKey("sys.user.initPassword").then((response) => {
       this.initPassword = response.msg;
@@ -793,11 +795,11 @@
         this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
           (obj) => obj.deptCode
         );
-        this.topqueryParams.leavehospitaldistrictcodes = null;
+        this.topqueryParams.leavehospitaldistrictcodes = [];
       } else if (this.topqueryParams.searchscope == 2) {
         this.topqueryParams.leavehospitaldistrictcodes =
           store.getters.belongWards.map((obj) => obj.districtCode);
-        this.topqueryParams.leaveldeptcodes = null;
+        this.topqueryParams.leaveldeptcodes = [];
       } else {
         this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
           (obj) => obj.deptCode
@@ -806,6 +808,12 @@
           store.getters.belongWards.map((obj) => obj.districtCode);
       }
       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.userList.forEach((item) => {
@@ -904,6 +912,7 @@
         pageNum: 1,
         pageSize: 10,
         serviceType: 4,
+        sendstate:2,
       };
       this.handleQuery();
     },
@@ -1010,7 +1019,7 @@
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
       this.download(
-        "system/user/export",
+        "smartor/serviceSubtask/patItemExport",
         {
           ...this.topqueryParams,
         },

--
Gitblit v1.9.3