From 855fe88415a9d5429f929381ada56267305678bf Mon Sep 17 00:00:00 2001
From: xinlaa <1570728529@qq.com>
Date: Mon, 4 Jan 2021 01:52:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E8=AF=A6=E6=83=85=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/groupMessage/TabContent.vue     | 74 ++++++++++++++
 linkwe-ui/src/views/groupMessage/detail.vue   | 97 +++----------------
 2 files changed, 90 insertions(+), 81 deletions(-)
 create mode 100644 linkwe-ui/src/views/groupMessage/TabContent.vue

diff --git a/linkwe-ui/src/views/groupMessage/TabContent.vue b/linkwe-ui/src/views/groupMessage/TabContent.vue
new file mode 100644
index 00000000..3e5cba6d
--- /dev/null
+++ b/linkwe-ui/src/views/groupMessage/TabContent.vue
@@ -0,0 +1,74 @@
+<script>
+import { getPushResult } from "@/api/groupMessage";
+
+export default {
+  components: {},
+  props: {
+    type: {
+      type: Number | String,
+      default: "1"
+    },
+    total: {
+      type: Number | String,
+      default: 0
+    }
+  },
+  data() {
+    return {
+      // 查询参数
+      query: {
+        pageNum: 1,
+        pageSize: 10,
+        messageId: undefined,
+        status: 0
+      },
+      loading: false,
+      list: []
+    };
+  },
+  watch: {},
+  computed: {},
+  created() {
+    this.query.messageId = this.$route.query.id;
+    this.query.status = this.type;
+    this.getList();
+  },
+  mounted() {},
+  methods: {
+    /** 查询 */
+    getList(page) {
+      page && (this.query.pageNum = page);
+      this.loading = true;
+      getPushResult(this.query)
+        .then(({ rows, total }) => {
+          this.list = rows;
+          this.loading = false;
+          this.$emit("update:total", +total);
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    }
+  }
+};
+</script>
+
+<template>
+  <div>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="发送员工" align="center" prop="userName" />
+      <el-table-column label="发送客户" align="center" prop="customers">
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="query.pageNum"
+      :limit.sync="query.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<style lang="less" scoped></style>
diff --git a/linkwe-ui/src/views/groupMessage/detail.vue b/linkwe-ui/src/views/groupMessage/detail.vue
index a4264e1e..0da2057a 100644
--- a/linkwe-ui/src/views/groupMessage/detail.vue
+++ b/linkwe-ui/src/views/groupMessage/detail.vue
@@ -1,104 +1,39 @@
 <script>
-import { getPushResult } from "@/api/groupMessage";
+import TabContent from "./TabContent";
 
 export default {
-  components: {},
+  components: {
+    TabContent
+  },
   props: {},
   data() {
     return {
-      query: {
-        pageNum: 1,
-        pageSize: 10,
-        messageId: "",
-        status: 0
-      },
-      // 表格数据
-      list: [],
-      form: {},
-      activeName: "1",
+      activeName: "0",
       total1: 0,
-      total2: 0
+      total0: 0
     };
   },
   watch: {},
   computed: {},
-  created() {
-    this.id = this.$route.query.id;
-    this.id && this.getList();
-  },
+  created() {},
   mounted() {},
   methods: {
-    getList(page) {
-      this.query = {
-        messageId: this.id,
-        status: 0
-      };
-      page && (this.query.pageNum = page);
-      this.loading = true;
-      getPushResult(this.query)
-        .then(({ rows, total }) => {
-          this.list = rows;
-          this.total = +total;
-          this.loading = false;
-          this.ids = [];
-        })
-        .catch(() => {
-          this.loading = false;
-        });
-    }
+    notice() {}
   }
 };
 </script>
 
 <template>
   <div>
-    <el-tabs v-model="activeName" @tab-click="handleClick">
-      <el-tab-pane :label="`待发送(${total1})`" name="1">
-        <div class="ar">
-          <el-button type="primary">发布动态</el-button>
-        </div>
-        <el-table
-          v-loading="loading"
-          :data="list"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column label="发送员工" align="center" prop="title" />
-          <el-table-column label="发送客户" align="center" prop="operTime">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.operTime) }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="query.pageNum"
-          :limit.sync="query.pageSize"
-          @pagination="getList"
-        />
+    <!-- <el-button class="notice" type="primary" @click="notice"
+      >通知员工发送</el-button
+    > -->
+    <el-tabs v-model="activeName">
+      <el-tab-pane :label="`待发送(${total0})`" name="0">
+        <TabContent type="0" :total.sync="total0"></TabContent>
       </el-tab-pane>
-      <el-tab-pane :label="`已发送(${total2})`" name="2">
-        <el-table
-          v-loading="loading"
-          :data="list"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column label="发送员工" align="center" prop="title" />
-          <el-table-column label="发送客户" align="center" prop="operTime">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.operTime) }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="query.pageNum"
-          :limit.sync="query.pageSize"
-          @pagination="getList"
-        />
+      <el-tab-pane :label="`已发送(${total1})`" name="1">
+        <TabContent type="1" :total.sync="total1"></TabContent>
       </el-tab-pane>
     </el-tabs>
   </div>
-- 
GitLab