From bf6643a35299f19ae9147864e6f3b6b4670da98a Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期六, 09 十一月 2024 11:42:59 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/discharge/index.vue |  332 ++++++++++++++++++++++++++----------------------------
 1 files changed, 161 insertions(+), 171 deletions(-)

diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 3dae2ed..780a4eb 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -1,29 +1,29 @@
 <template>
   <div class="app-container">
-    <div class="leftvlue" style="margin-bottom: 20px;">
-        <el-row :gutter="10">
-          <el-col :span="2.5" v-for="(item, index) in cardlist" :key="index">
-            <el-card
-              shadow="hover"
-              :body-style="item.router ? ' cursor: pointer' : 'cursor: default'"
-            >
-              <div style="padding: 8px" @click="$router.push(item.router)">
-                <span>{{ item.name }}</span>
-                <div
-                  style="
-                    text-align: center;
-                    font-size: 18px;
-                    margin-top: 10px;
-                    font-weight: 600;
-                  "
-                >
-                  {{ item.value }}
-                </div>
+    <div class="leftvlue" style="margin-bottom: 20px">
+      <el-row :gutter="10">
+        <el-col :span="2.5" v-for="(item, index) in cardlist" :key="index">
+          <el-card
+            shadow="hover"
+            :body-style="item.router ? ' cursor: pointer' : 'cursor: default'"
+          >
+            <div style="padding: 8px" @click="$router.push(item.router)">
+              <span>{{ item.name }}</span>
+              <div
+                style="
+                  text-align: center;
+                  font-size: 18px;
+                  margin-top: 10px;
+                  font-weight: 600;
+                "
+              >
+                {{ item.value }}
               </div>
-            </el-card>
-          </el-col>
-        </el-row>
-      </div>
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+    </div>
     <el-row :gutter="20">
       <!--鐢ㄦ埛鏁版嵁-->
       <el-form
@@ -35,7 +35,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="鍑洪櫌鏃堕棿">
@@ -155,8 +158,8 @@
       <el-table
         v-loading="loading"
         :data="userList"
-         height="660"
-         :row-class-name="tableRowClassName"
+        height="660"
+        :row-class-name="tableRowClassName"
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="50" align="center" />
@@ -177,80 +180,61 @@
           prop="sendname"
         />
         <el-table-column
-        label="浠诲姟鐘舵��"
-        align="center"
-        key="sendstate"
-        prop="sendstate"
-        width="120"
+          label="浠诲姟鐘舵��"
+          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>
-          <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
           label="浠诲姟寮傚父璇存槑"
           width="120"
           align="center"
           key="remark"
-          prop="remark"
+          prop="remark" -->
         />
 
-          <!-- <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"
-              />
-            </div>
-            <div v-else>
-              <span></span>
-            </div>
-          </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
@@ -272,34 +256,34 @@
           </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
+          <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"
+          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.longSendTime) }}</span>
           </template></el-table-column
-          >
-          <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 + "澶�" : "鏃ユ湡缂哄け"
@@ -334,7 +318,6 @@
           key="drname"
           prop="drname"
         />
-
 
         <!-- <el-table-column
           label="鐥呭巻鍙�"
@@ -382,59 +365,50 @@
           prop="templatename"
           width="200"
         />
-
-
-        <!-- <el-table-column
-          label="璐d换鍖诲笀"
+        <el-table-column
+          label="浠诲姟鎵ц鏂瑰紡"
           align="center"
-          key="drname"
-          prop="drname"
-          width="120"
-        /> -->
-
-        <!-- <el-table-column
-          label="鍑洪櫌鏃堕棿"
-          sortable
-          align="center"
-          prop="createTime"
+          key="preachform"
+          prop="preachform"
           width="160"
-        >
-          <template slot-scope="scope">
-            <span>{{ formatTime(scope.row.createTime) }}</span>
-          </template>
-        </el-table-column> -->
-        <!-- <el-table-column
-          label="闅忚鏃堕棿"
-          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
-          label="浠诲姟鐘舵��"
-          fixed="right"
-          align="center"
-          key="sendstate"
-          prop="sendstate"
-          width="120"
           :show-overflow-tooltip="true"
         >
           <template slot-scope="scope">
-            <dict-tag :options="serviceState" :value="scope.row.sendstate" />
+            <span v-for="item in scope.row.preachform">{{ item }}銆� </span>
           </template>
-        </el-table-column> -->
-
+        </el-table-column>
+        <el-table-column
+          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
+          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 }}</el-tag
+            >
+            <el-tag type="warning" v-else>{{ scope.row.remark }}</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column
           label="鎿嶄綔"
-          fixed="right"
           align="center"
           width="200"
           class-name="small-padding fixed-width"
@@ -773,7 +747,7 @@
         pageNum: 1,
         pageSize: 10,
         serviceType: 2,
-        searchscope:2,
+        searchscope: 2,
       },
       propss: { multiple: true },
       options: [],
@@ -815,6 +789,7 @@
         },
       ],
       serviceState: [],
+      checkboxlist: [],
       // 琛ㄥ崟鏍¢獙
       rules: {},
     };
@@ -822,6 +797,8 @@
   watch: {},
   created() {
     this.serviceState = store.getters.serviceState;
+    this.checkboxlist = store.getters.checkboxlist;
+
     this.getList();
     this.getConfigKey("sys.user.initPassword").then((response) => {
       this.initPassword = response.msg;
@@ -852,20 +829,33 @@
       this.loading = true;
       getTaskservelist(this.topqueryParams).then((response) => {
         this.userList = response.rows[0].serviceSubtaskList;
-        this.cardlist[0].value=Number(response.rows[0].wzx)+Number(response.rows[0].ysf);
-        this.cardlist[1].value=response.rows[0].ysf;
-        this.cardlist[2].value=response.rows[0].wzx;
-        this.cardlist[3].value=response.rows[0].yc;
-        this.cardlist[4].value=response.rows[0].fssb;
-        this.cardlist[5].value=response.rows[0].blq;
-        this.cardlist[6].value=response.rows[0].yfs;
+        this.total=response.total
+        this.cardlist[0].value =
+          Number(response.rows[0].wzx) + Number(response.rows[0].ysf);
+        this.cardlist[1].value = response.rows[0].ysf;
+        this.cardlist[2].value = response.rows[0].wzx;
+        this.cardlist[3].value = response.rows[0].yc;
+        this.cardlist[4].value = response.rows[0].fssb;
+        this.cardlist[5].value = response.rows[0].blq;
+        this.cardlist[6].value = response.rows[0].yfs;
+        this.loading = false;
         this.userList.forEach((item) => {
+          const idArray = null;
           if (item.endtime) {
             item.endDay = this.daysBetween(item.endtime);
           }
+          if (item.endtime) {
+           idArray = item.preachform.split(",");
+          }
+
+          item.preachform = idArray.map((value) => {
+            // 鏌ユ壘id瀵瑰簲鐨勫璞�
+            const item = this.checkboxlist.find((item) => item.value == value);
+            // 濡傛灉鎵惧埌瀵瑰簲鐨刬d锛岃繑鍥瀕abel鍊硷紝鍚﹀垯杩斿洖null
+            return item ? item.label : null;
+          });
         });
         this.total = response.total;
-        this.loading = false;
       });
     },
     // 鏌ョ湅闂ㄨ瘖闅忚璇︽儏
@@ -955,7 +945,7 @@
         pageNum: 1,
         pageSize: 10,
         serviceType: 2,
-        searchscope:2,
+        searchscope: 2,
       };
       this.handleQuery();
     },
@@ -1100,10 +1090,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();
     },
@@ -1118,12 +1108,12 @@
       );
     },
     // 寮傚父鍒楁覆鏌�
-    tableRowClassName({row, rowIndex}) {
-        if (row.excep == 1) {
-          return 'warning-row';
-        }
-        return '';
+    tableRowClassName({ row, rowIndex }) {
+      if (row.excep == 1) {
+        return "warning-row";
       }
+      return "";
+    },
   },
 };
 </script>
@@ -1140,8 +1130,8 @@
   height: 50px;
 }
 ::v-deep.el-table .warning-row {
-    background: #eec4c4;
-  }
+  background: #eec4c4;
+}
 
 .documentf {
   display: flex;

--
Gitblit v1.9.3