Merge branch 'develop' into prod

src/api/dash/index.js

@@ -52,10 +52,36 @@ export default {
     return fetch('/wutong-base/notice/list', params, 'get')
   },
   /**
-   * 通知消息详情
+   * 代办事项列表
    * @returns {Promise | Promise<unknown>}
    */
-  noticeDetail(params) {
-    return fetch('/wutong-base/notice/detail', params, 'get')
+  agencyList(params) {
+    return fetch(
+      '/blade-project-manage-v2/index/v2/v2/todo-list',
+      params,
+      'get'
+    )
+  },
+  /**
+   * 内容更新列表
+   * @returns {Promise | Promise<unknown>}
+   */
+  newInfoList(params) {
+    return fetch(
+      '/blade-project-manage-v2/index/v2/v2/notice-list',
+      params,
+      'get'
+    )
+  },
+  /**
+   * 内容/代办修改状态
+   * @returns {Promise | Promise<unknown>}
+   */
+  messageDetail(params) {
+    return fetch(
+      '/blade-project-manage-v2/index/v2/v2/message-detail',
+      params,
+      'get'
+    )
   }
 }

src/views/dash/compoents/agency.vue

@@ -1,7 +1,23 @@
 <template>
   <div class="full-width flex flex-col">
-    <div class="bold font-16 full-width text-left">{{ title }}</div>
-    <el-empty description="暂无数据"></el-empty>
+    <div class="bold font-16 full-width text-left mb-10">{{ title }}</div>
+    <el-empty
+      v-if="agencyList && agencyList.length === 0"
+      description="暂无数据"
+    />
+    <div
+      v-else
+      class="flex flex-center flex-justify-between mt-10 pointer"
+      v-for="item in agencyList"
+      @click="open(item)"
+    >
+      <div class="main-color">{{ item.content }}</div>
+      <div class="flex flex-center">
+        <span class="mr-20 grey-9 font-13">{{ item.createTime }}</span>
+        <div v-if="item.isRead === 0" class="no-read"></div>
+        <div v-else class="read"></div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -26,7 +42,48 @@ export default {
   },
   data() {
     return {
-      title: '代办事项'
+      title: '代办事项',
+      params: {
+        current: 1,
+        size: 10,
+        isRead: 0
+      },
+      agencyList: []
+    }
+  },
+  created() {
+    this.getAgencyList()
+  },
+  methods: {
+    getAgencyList() {
+      if (this.type === 1) {
+        this.$api.dash.agencyList(this.params).then(res => {
+          if (res.code === 200) {
+            this.agencyList = res.data.records
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+      } else {
+        this.$api.dash.newInfoList(this.params).then(res => {
+          if (res.code === 200) {
+            this.agencyList = res.data.records
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+      }
+    },
+    open(item) {
+      this.$api.dash.messageDetail({ id: item.id }).then(res => {
+        if (res.code === 200) {
+          this.$router.push({
+            path: item.openUrl
+          })
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
     }
   }
 }
@@ -34,12 +91,18 @@ export default {
 
 <style lang="scss" scoped>
 .read {
-  background: #bf863c;
-  padding: 2px;
-  color: white;
-  border-radius: 3px;
-  font-size: 12px;
-  width: 40px;
-  font-weight: 500;
+  background: white;
+  border-radius: 10px;
+  width: 9px;
+  height: 9px;
+  margin-left: -12px;
+}
+
+.no-read {
+  background: #b64b33;
+  border-radius: 10px;
+  width: 9px;
+  height: 9px;
+  margin-left: -12px;
 }
 </style>