diff --git a/src/api/distribution/dataMessage.js b/src/api/distribution/dataMessage.js
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3d6b278acc4df9b194a99024c5a9a180e0da582f 100644
--- a/src/api/distribution/dataMessage.js
+++ b/src/api/distribution/dataMessage.js
@@ -0,0 +1,17 @@
+ /*
+ * @Descripttion:
+ * @Author:xiayujia
+ * @Date: 2021-07-3 00:24:27
+ * @LastEditors: xiayujia
+ * @LastEditTime: 2021-07-3 00:48:28
+ */
+ import request from '@/utils/request'
+
+
+ //获得列表
+ export function getDataList(officeName,startDate,endDate){
+   return request({
+     url:'/distribution/receiptManager/getReceipt?officeName='+officeName+'&beginTime='+startDate+'&endTime='+endDate,
+     method: 'get', 
+   })
+ } 
\ No newline at end of file
diff --git a/src/api/distribution/memberManager.js b/src/api/distribution/memberManager.js
index d3399bc0c0304e25b6459672797dee78fdbd1c24..bb20cd2d0e9a71876a77741b3557de2a901391dc 100644
--- a/src/api/distribution/memberManager.js
+++ b/src/api/distribution/memberManager.js
@@ -3,19 +3,9 @@
  * @Author:zhengminjie,xiayujia
  * @Date: 2021-05-13 11:27:27
  * @LastEditors: xiayujia
- * @LastEditTime: 2021-06-11 11:27:28
+ * @LastEditTime: 2021-06-30 11:27:28
  */
 import request from '@/utils/request'
-
-
-//搜索群组除自己的群
-// export function searchAllGroup(groupNum,groupName){
-//   return request({
-//     url:'/distribution/groupManager/searchAll?groupNum='+groupNum+'&groupName='+groupName,
-//     method: 'get',
-//   })
-// } 
-
 //选择群组
 export function selectGroup(userIdentity){
   return request({
diff --git a/src/api/distribution/sendMessage.js b/src/api/distribution/sendMessage.js
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..42a15fb73513445cae47f9428c8225ce288bdb55 100644
--- a/src/api/distribution/sendMessage.js
+++ b/src/api/distribution/sendMessage.js
@@ -0,0 +1,24 @@
+ /*
+ * @Descripttion:
+ * @Author:xiayujia
+ * @Date: 2021-07-1 10:55:27
+ * @LastEditors: xiayujia
+ * @LastEditTime: 2021-07-2 23:55:28
+ */
+ import request from '@/utils/request'
+//数据信息初始化列表
+export function getDataList(){
+    return request({
+      url:'/distribution/receiptManager/getList',
+      method: 'get',
+    })
+  }  
+  
+//查找关键词获得列表
+export function searchDataList(officeName,startDate,endDate){
+  return request({
+    url:'/distribution/receiptManager/search?officeName='+officeName+'&beginTime='+startDate+'&endTime='+endDate,
+    method: 'get', 
+    // params:query
+  })
+} 
diff --git a/src/views/distribution/dataMessage/index.vue b/src/views/distribution/dataMessage/index.vue
index 127cff6286d07b160b4816bdd339184d9a7079e1..5b12c9aba84563d1c7634d2e153d6b539de44c31 100644
--- a/src/views/distribution/dataMessage/index.vue
+++ b/src/views/distribution/dataMessage/index.vue
@@ -3,7 +3,7 @@
  * @Author: xiayujia
  * @Date: 2021-04-06 13:23:43
  * @LastEditors: xiayujia
- * @LastEditTime: 2021-04-06 16:08:14
+ * @LastEditTime: 2021-07-03 00:48:14
 -->
 <template>
   <div class="app-container">
@@ -15,13 +15,14 @@
           clearable
           size="small"
           style="width:300px"
-          @keyup.enter.native="handleQuery"
+          @keyup.enter.native="getList"
         />
       </el-form-item>
       <el-form-item label="选择时间" style="margin-bottom:0px">
         <el-date-picker
           v-model="dateRange"
           type="daterange"
+          value-format="yyyy-MM-dd hh:mm:ss"
           size="small"
           align="right"
           unlink-panels
@@ -40,7 +41,7 @@
               plain
               size="mini"
               icon="el-icon-search"
-              @click="handleQuery"
+              @click="getList"
             >查找</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -117,6 +118,8 @@
 </template>
 
 <script>
+import {getDataList} from '@/api/distribution/dataMessage'
+
 export default {
   name: "dataForm",
   data(){
@@ -134,23 +137,7 @@ export default {
       // 显示搜索条件
       showSearch: true,
       // 表格数据
-      dataMessageList:[{
-        projectname:"分发系统项目",
-        //distrigroup:"群组3",
-        distributer:"张三",
-        dataMessage:"表格1.xls",
-        dataType:"表格",
-        dataDate:"2021-4-12"
-      },
-      {
-        projectname:"信息管理项目",
-       // distrigroup:"群组2",
-        distributer:"李四",
-        dataMessage:"文件1.doc",
-        dataType:"文件",
-        dataDate:"2021-3-12"
-      }
-      ],
+      dataMessageList:[],
       //详细信息
       dataDetail:[],
       // 总条数
@@ -160,6 +147,7 @@ export default {
           dataSearch:undefined,
           pageNum:1,
           pageSize:10,
+          officeName:undefined,
       },
       //时间选择器
         pickerOptions: {
@@ -199,19 +187,44 @@ export default {
   methods:{
     /** 刷新列表 */
     getList(){
-       this.loading = false;
-      listType(this.addDateRange(this.dataForm, this.dateRange)).then(response => {
+      this.loading=true;
+      let officeName="";
+       let startDate="";
+       let endDate="";
+       officeName=this.dataForm.dataSearch;
+       console.log(officeName);
+      //  let date=this.dateRange[0];
+      if(this.dateRange!=null)
+      {
+        startDate=this.dateRange[0];
+        endDate=this.dateRange[1];
+      }
+       console.log(startDate);
+       console.log(endDate);
+       console.log(typeof endDate);
+      getDataList(officeName,startDate,endDate).then(response => {
+          console.log(response);
           this.dataMessageList = response.rows;
-          this.total = response.total;
+          let i=0;
+          response.rows.forEach(item => {
+            this.dataMessageList[i].projectname=item.projectName;
+            this.dataMessageList[i].distributer=item.userName;
+            this.dataMessageList[i].dataMessage=item.officeName;
+            this.dataMessageList[i].dataDate=item.createTime;
+            if( item.type='0')
+            {
+              this.dataMessageList[i].dataType="表格";
+            }
+            else
+              this.dataMessageList[i].dataType="文件";
+            i++;
+          });
           this.loading = false;
         }
       );
+      this.dataForm.pageNum=1;
     },
-    /** 搜索按钮操作 */
-    handleQuery(){
-      this.dataMessage.pageNum=1;
-      this.getList();
-    },
+
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.roleId)
@@ -234,8 +247,7 @@ export default {
         }
         this.detailopen=true;
       }
-
-    }
+    },
   }
 }
 
diff --git a/src/views/distribution/memberManager/index.vue b/src/views/distribution/memberManager/index.vue
index 9bcfe0f34a865d5a321af99a66b9b553eeea3ee7..bd8c038236a9ac9e3c0524adceb7a2e051bfd259 100644
--- a/src/views/distribution/memberManager/index.vue
+++ b/src/views/distribution/memberManager/index.vue
@@ -3,7 +3,7 @@
  * @Author: zhengminjie,xiayujia
  * @Date: 2021-04-05 19:16:43
  * @LastEditors: xiayujia
- * @LastEditTime: 2021-06-12 19:38:14
+ * @LastEditTime: 2021-06-30 11:37:14
 -->
 <template>
   <div class="app-container">
diff --git a/src/views/distribution/sendMessage/index.vue b/src/views/distribution/sendMessage/index.vue
index ce301de5734e56601c077bd94ff8c18e321ca7d5..4fb1e4d8fda80dbbb3cbe8ea95925301ad97fd3c 100644
--- a/src/views/distribution/sendMessage/index.vue
+++ b/src/views/distribution/sendMessage/index.vue
@@ -3,25 +3,26 @@
  * @Author: xiayujia
  * @Date: 2021-04-06 13:23:43
  * @LastEditors: xiayujia
- * @LastEditTime: 2021-04-06 16:08:14
+ * @LastEditTime: 2021-07-02 23:55:14
 -->
 <template>
   <div class="app-container">
     <el-form :model="sendForm" ref="sendForm" v-show="showSearch" :inline="true">
-      <el-form-item label="表格/文件" prop="dataSearch" style="margin-bottom:0px">
+      <el-form-item label="表格/文件" prop="dataSearch" style="margin-bottom:0px" @load="getList">
         <el-input
           v-model="sendForm.dataSearch"
           placeholder="请输入要查找的表格/文件关键字"
           clearable
           size="small"
           style="width:300px"
-          @keyup.enter.native="handleQuery"
+          @keyup.enter.native="Search"
         />
       </el-form-item>
       <el-form-item label="选择时间" style="margin-bottom:0px">
         <el-date-picker
           v-model="dateRange"
           type="daterange"
+          value-format="yyyy-MM-dd hh:mm:ss"
           size="small"
           align="right"
           unlink-panels
@@ -40,7 +41,7 @@
               plain
               size="mini"
               icon="el-icon-search"
-             @click="handleQuery"
+             @click="Search"
             >查找</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -75,19 +76,16 @@
                   >编辑</el-button>
                     <el-popconfirm
                     title="你确定要删除该文件?"
-                    @confirm ="Deletedata"
-                    >
+                    @confirm ="Deletedata">
                       <el-button
                       size="mini"
                       type="danger"
                       icon="el-icon-delete"
-                      
                       v-hasPermi="['system:data:remove']"
                       >删除</el-button>
                     </el-popconfirm>
                 </template>
               </el-table-column>
-          <!-- </el-form> -->
         </el-table>
      </div>
    </el-dialog>
@@ -99,14 +97,9 @@
       <el-table-column prop="projectname" label="项目名称" align="center" :show-overflow-tooltip="true"/>
      <!-- <el-table-column prop="distrigroup" label="发布群组" align="center" :show-overflow-tooltip="true"/>-->
       <el-table-column prop="receiver" label="收件人" align="center" :show-overflow-tooltip="true"/>
-      <el-table-column prop="dataMessage" label="数据信息" align="center" :show-overflow-tooltip="true">
-
-      </el-table-column>
+      <el-table-column prop="dataMessage" label="数据信息" align="center" :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="dataType" label="文件类型" align="center" :show-overflow-tooltip="true"/>
-      <el-table-column	prop="dataDate" label="时间"  align="center" :show-overflow-tooltip="true" sortable style:default-sort ="{prop:'dataDate',order:'descending'}" >
-       
-      </el-table-column>
-      
+      <el-table-column	prop="dataDate" label="时间"  align="center" :show-overflow-tooltip="true" sortable style:default-sort ="{prop:'dataDate',order:'descending'}" ></el-table-column>
     </el-table>
 
 
@@ -122,6 +115,9 @@
 </template>
 
 <script>
+import {getDataList,searchDataList} from '@/api/distribution/sendMessage'
+
+
 export default {
   name: "sendForm",
   data(){
@@ -139,30 +135,17 @@ export default {
       // 显示搜索条件
       showSearch: true,
       // 表格数据
-      dataMessageList:[{
-        projectname:"分发系统项目",
-        //distrigroup:"群组3",
-        receiver:"刘大彪",
-        dataMessage:"表格1.xls",
-        dataType:"表格",
-        dataDate:"2021-4-12"
-      },
-      {
-        projectname:"信息管理项目",
-       // distrigroup:"群组2",
-        receiver:"赵岑",
-        dataMessage:"文件1.doc",
-        dataType:"文件",
-        dataDate:"2021-3-12"
-      }
-      ],
+      dataMessageList:[],
       // 总条数
       total: 0,
+      //具体
+      dataDetail:[],
       //查询参数
       sendForm:{
           dataSearch:undefined,
           pageNum:1,
           pageSize:10,
+          officeName:undefined,
       },
       //时间选择器
         pickerOptions: {
@@ -202,20 +185,68 @@ export default {
   methods:{
     /** 刷新列表 */
     getList(){
-      //  this.loading = false;
-      // listType(this.addDateRange(this.sendForm, this.dateRange)).then(response => {
-      //     this.dataMessageList = response.rows;
-      //     this.total = response.total;
+        this.loading = true;
+      getDataList().then(response => {
+          console.log(response);
+          this.dataMessageList = response.rows;
+          let i=0;
+          response.rows.forEach(item => {
+            this.dataMessageList[i].projectname=item.projectName;
+            this.dataMessageList[i].receiver=item.userName;
+            this.dataMessageList[i].dataMessage=item.officeName;
+            this.dataMessageList[i].dataDate=item.createTime;
+            if( item.type='0')
+            {
+              this.dataMessageList[i].dataType="表格";
+            }
+            else
+              this.dataMessageList[i].dataType="文件";
+            i++;
+          });
           this.loading = false;
-      //   }
-      // );
-     // this.loading = true;
+        }
+      );
+      this.sendForm.pageNum=1;
     },
     /** 搜索按钮操作 */
-    // handleQuery(){
-    //   this.dataMessage.pageNum=1;
-    //   this.getList();
-    // },
+     Search(){
+      //  this.dataMessage.pageNum=1;
+       let officeName="";
+       let startDate="";
+       let endDate="";
+       officeName=this.sendForm.dataSearch;
+       console.log(officeName);
+      //  let date=this.dateRange[0];
+      if(this.dateRange!=null)
+      {
+        startDate=this.dateRange[0];
+        endDate=this.dateRange[1];
+      }
+       console.log(startDate);
+       console.log(endDate);
+       console.log(typeof endDate);
+      //  console.log(this.dateRange);
+       searchDataList(officeName,startDate,endDate).then(res=>{
+         console.log(res);
+         this.dataMessageList=[];
+         this.dataMessageList = res.rows;
+         let i=0;
+          res.rows.forEach(item=>{
+            this.dataMessageList[i].projectname=item.projectName;
+            this.dataMessageList[i].receiver=item.userName;
+            this.dataMessageList[i].dataMessage=item.officeName;
+            this.dataMessageList[i].dataDate=item.createTime;
+            if( item.type='0')
+            {
+              this.dataMessageList[i].dataType="表格";
+            }
+            else
+              this.dataMessageList[i].dataType="文件";
+            i++;
+          })
+       })
+     },
+     
 
     // 多选框选中数据
     handleSelectionChange(selection) {