Z пре 2 година
родитељ
комит
d45244778c
2 измењених фајлова са 86 додато и 19 уклоњено
  1. 2 2
      src/api/bpm/task.js
  2. 84 17
      src/views/bpm/message/index.vue

+ 2 - 2
src/api/bpm/task.js

@@ -143,8 +143,8 @@ export function outinApproveNotPass(data) {
 export async function notifyMessagePageAPI(data) {
   const res = await request({
     url: `/sys/notifymessage/page`,
-    method: 'get',
-    params: data
+    method: 'post',
+    data: data
   });
   if (res.data.code == 0) {
     return res.data.data;

+ 84 - 17
src/views/bpm/message/index.vue

@@ -1,6 +1,60 @@
 <template>
   <div class="ele-body">
+
     <el-card shadow="never">
+      <div class="filter-container">
+        <el-form
+          label-width="100px"
+          class="ele-form-search"
+          @keyup.enter.native="reload"
+          @submit.native.prevent
+        >
+          <el-row :gutter="15">
+            <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+              <el-form-item label="状态:" prop="readStatus">
+                <el-select
+                  style="width: 100%"
+                  v-model="params.readStatus"
+                  placeholder="请选择状态"
+                  clearable
+                >
+                  <el-option :value="1" label="已读"></el-option>
+                  <el-option :value="0" label="未读"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col
+              v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+              <el-form-item label="发送时间:" prop="createTime">
+                <el-date-picker
+                  v-model="params.createTime"
+                  style="width: 100%"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  :default-time="['00:00:00', '23:59:59']"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+              <div class="ele-form-actions">
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  class="ele-btn-icon"
+                  @click="reload('search')"
+                >
+                  查询
+                </el-button>
+                <el-button @click="reload('reset')">重置</el-button>
+              </div>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
       <ele-pro-table ref="table" :columns="columns" :datasource="datasource">
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
@@ -29,6 +83,10 @@ export default {
   data() {
     return {
       addOrEditDialogFlag: false,
+      params: {
+        createTime: null,
+        readStatus: null,
+      },
       columns: [
         {
           columnKey: 'index',
@@ -39,21 +97,16 @@ export default {
           showOverflowTooltip: true,
           fixed: 'left'
         },
-        {
-          prop: 'templateNickname',
-          label: '发送人',
-          minWidth: '60',
-          align: "center",
-        },
+
         {
           prop: 'templateContent',
           label: '内容',
-          minWidth: '150',
+          minWidth: '250',
           align: "center",
         },
         {
           prop: 'readStatus',
-          label: '是否已读',
+          label: '状态',
           minWidth: '60',
           align: "center",
           formatter: (_row, _column, cellValue) => {
@@ -63,14 +116,20 @@ export default {
         {
           prop: 'readTime',
           label: '阅读时间',
-          minWidth: '120',
+          minWidth: '100',
           align: "center",
           showOverflowTooltip: true,
         },
+        {
+          prop: 'templateNickname',
+          label: '发送人',
+          minWidth: '60',
+          align: "center",
+        },
         {
           prop: 'createTime',
           label: '发送时间',
-          minWidth: '120',
+          minWidth: '100',
           align: "center",
           showOverflowTooltip: true,
         },
@@ -91,17 +150,27 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['user'])
+    ...mapGetters(['user']),
+    // 是否开启响应式布局
+    styleResponsive() {
+      return this.$store.state.theme.styleResponsive;
+    }
   },
   methods: {
     //新增或修改模板
-   async handleAddOrEdit(row) {
+    async handleAddOrEdit(row) {
       await updateNotifyMessageReadByIdAPI([row.id]);
       this.$refs.table.reload()
     },
-    reload(params) {
-      params.userId = this.user.info.userId
-      this.$refs.table.reload({pageNum: 1, where: params});
+    reload(type) {
+      if (type == 'reset') {
+        this.params = {
+          createTime: null,
+          readStatus: null,
+
+        }
+      }
+      this.$refs.table.reload({pageNum: 1, where: this.params});
     },
     datasource({page, where, limit, ...row}) {
       return notifyMessagePageAPI({
@@ -111,8 +180,6 @@ export default {
         userId: this.user.info.userId
       });
     },
-    reset() {
-    },
   }
 };
 </script>