From 6f35ca70caf02e1c2b7dbab32794c1cc1f5dbf60 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 24 十月 2024 11:15:47 +0800
Subject: [PATCH] 测试完成

---
 src/views/patient/propaganda/index.vue |  219 ++++++++++++++++++++++++++----------------------------
 1 files changed, 107 insertions(+), 112 deletions(-)

diff --git a/src/views/patient/propaganda/index.vue b/src/views/patient/propaganda/index.vue
index 4f2c6bb..b2c50d3 100644
--- a/src/views/patient/propaganda/index.vue
+++ b/src/views/patient/propaganda/index.vue
@@ -11,7 +11,10 @@
         label-width="98px"
       >
         <el-form-item label="浠诲姟鍚嶇О">
-          <el-input v-model="topqueryParams.taskName" placeholder="璇烽�夋嫨浠诲姟鍚嶇О"></el-input>
+          <el-input
+            v-model="topqueryParams.taskName"
+            placeholder="璇烽�夋嫨浠诲姟鍚嶇О"
+          ></el-input>
         </el-form-item>
         <!-- <el-form-item label="鍙戣捣浜�">
           <el-input v-model="topqueryParams.createBy"></el-input>
@@ -135,7 +138,7 @@
                 size="medium"
                 @click="toleadExport(2)"
                 >缁撴灉寮傚父</el-button
-              >
+              >-
             </div>
           </div>
         </el-col>
@@ -143,7 +146,7 @@
       <el-table
         v-loading="loading"
         :data="userList"
-         height="660"
+        height="560"
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="50" align="center" />
@@ -164,54 +167,54 @@
           prop="sendname"
         />
         <el-table-column
-        label="瀹f暀鐘舵��"
-        align="center"
-        key="sendstate"
-        prop="sendstate"
-        width="120"
+          label="瀹f暀鐘舵��"
+          align="center"
+          key="sendstate"
+          prop="sendstate"
+          width="120"
         >
-        <template slot-scope="scope">
-          <div v-if="scope.row.sendstate == 1">
-            <el-tag type="primary" :disable-transitions="false"
+          <template slot-scope="scope">
+            <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"
+              >
+            </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"
+              >
+            </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"
+              >
+            </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>
+              >
+            </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
+        <el-table-column
           label="缁撴灉鐘舵��"
           align="center"
           key="excep"
           prop="excep"
           width="120"
-          >
+        >
           <template slot-scope="scope">
             <div v-if="scope.row.sendstate == 6">
               <dict-tag
-              :options="dict.type.sys_yujing"
-              :value="scope.row.excep"
+                :options="dict.type.sys_yujing"
+                :value="scope.row.excep"
               />
             </div>
             <div v-else>
@@ -220,48 +223,49 @@
           </template>
         </el-table-column>
         <el-table-column
-        label="澶勭悊鎰忚"
-        align="center"
-        key="suggest"
-        prop="suggest"
-        width="120"
+          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 slot-scope="scope">
+            <dict-tag
+              :options="dict.type.sys_suggest"
+              :value="scope.row.suggest"
+            />
           </template>
         </el-table-column>
+
         <el-table-column
-        label="鍑洪櫌鏃ユ湡"
-        width="200"
-        align="center"
-        key="endtime"
-        prop="endtime"
+          label="鍑洪櫌鏃ユ湡"
+          width="200"
+          align="center"
+          key="endtime"
+          prop="endtime"
         >
-        <template slot-scope="scope">
-          <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 slot-scope="scope">
+            <span>{{ formatTime(scope.row.endtime) }}</span>
           </template></el-table-column
-          >
-          <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 + "澶�" : "鏃ユ湡缂哄け"
@@ -289,13 +293,7 @@
           key="drname"
           prop="drname"
         />
-        <el-table-column
-          label="瀹f暀寮傚父璁板綍"
-          width="120"
-          align="center"
-          key="remark"
-          prop="remark"
-        />
+
 
         <!-- <el-table-column
           label="鐥呭巻鍙�"
@@ -341,6 +339,7 @@
           align="center"
           key="templatename"
           prop="templatename"
+          :show-overflow-tooltip="true"
           width="200"
         />
 
@@ -351,40 +350,37 @@
           prop="createBy"
           width="120"
         />
-        <!-- <el-table-column
-          label="璐d换鍖诲笀"
-          align="center"
-          key="drname"
-          prop="drname"
-          width="120"
-        /> -->
 
-        <!-- <el-table-column
-          label="鍑洪櫌鏃堕棿"
-          sortable
-          align="center"
-          prop="createTime"
-          width="160"
-        >
-          <template slot-scope="scope">
-            <span>{{ formatTime(scope.row.createTime) }}</span>
-          </template>
-        </el-table-column> -->
-        <!-- <el-table-column
-          label="瀹f暀鏃堕棿"
-          sortable
-          align="center"
-          prop="createTime"
-          width="160"
-        >
-          <template slot-scope="scope">
-            <span v-if="scope.row.sendType != 3">{{
-              formatTime(scope.row.createTime)
-            }}</span>
-            <span v-else>鍗冲埢鍙戦��</span>
-          </template>
-        </el-table-column> -->
         <el-table-column
+        fixed="right"
+          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
+        fixed="right"
+          label="浠诲姟缁撴灉璁板綍"
+          width="120"
+          align="center"
+          key="remark"
+          prop="remark"
+        >
+        <template slot-scope="scope" v-if="scope.row.remark">
+          <el-tag type="success" v-if="scope.row.sendstate!=5&&scope.row.sendstate!=4&&scope.row.remark">{{ scope.row.remark }}</el-tag>
+          <el-tag type="warning" v-else>{{ scope.row.remark }}</el-tag>
+        </template>
+      </el-table-column>
+        <el-table-column
+        fixed="right"
           label="瀹f暀鏃堕棿"
           sortable
           align="center"
@@ -408,7 +404,6 @@
             <dict-tag :options="serviceState" :value="scope.row.sendstate" />
           </template>
         </el-table-column> -->
-
       </el-table>
 
       <pagination
@@ -728,7 +723,7 @@
         pageNum: 1,
         pageSize: 10,
         serviceType: 4,
-        searchscope:2,
+        searchscope: 2,
       },
       propss: { multiple: true },
       options: [],
@@ -1005,10 +1000,10 @@
     // 渚挎嵎鎸夐挳
     toleadExport(too) {
       if (too == 1) {
-        this.topqueryParams.sendstate=4;
-        this.topqueryParams.excep=null;
+        this.topqueryParams.sendstate = 4;
+        this.topqueryParams.excep = null;
       } else if (too == 2) {
-        this.topqueryParams.excep=1;
+        this.topqueryParams.excep = 1;
       }
       this.handleQuery();
     },

--
Gitblit v1.9.3