Merge branch 'dev-phase1-0111' of...

Merge branch 'dev-phase1-0111' of 192.168.110.53:com.pica.cloud.education.frontend/pica-admin-IM into dev-phase1-0111

* 'dev-phase1-0111' of 192.168.110.53:com.pica.cloud.education.frontend/pica-admin-IM:
  列表查询

src/views/IM/chain-history/detail.vue

@@ -62,7 +62,7 @@ export default {
     // 获取历史群发数据
     getData() {
       this.loading = true;
-      let url = `im/group/info/${this.historyId}`
+      let url = `/im/group/info/${this.historyId}`
       this.GET(url).then(res => {
         this.loading = false;
         if (res.code == "000000") {

src/views/IM/chain-history/list.vue

@@ -4,10 +4,17 @@
       <el-row :gutter="30" class="row" type="flex" style="margin-top: 10px;margin-right:0px;">
         <el-form ref="serchForm" inline :model="searchParam" label-width="15px" style="width:100%;text-align:right;">
             <el-form-item label="">
-                <el-input clearable v-model="searchParam.messageLogId" size="mini" placeholder="请输入任务编号" ><el-button slot="append" icon="el-icon-search" @click="search()"></el-button></el-input>
+                <el-input clearable v-model="searchParam.messageLogId" size="mini" placeholder="请输入任务编号" @change="search(1)">
+                  <el-button slot="append" icon="el-icon-search"></el-button>
+                </el-input>
             </el-form-item>
             <el-form-item label="" style="position:relative;top:-8px;left:0;margin-bottom: 0px;">
-                <el-date-picker v-model="searchParam.chooseDate" size="mini" type="date" placeholder="请选择日期"></el-date-picker>
+                <el-date-picker 
+                v-model="date" 
+                size="mini" 
+                type="date" 
+                placeholder="请选择日期" 
+                @change="search(1)"></el-date-picker>
             </el-form-item>              
         </el-form>
       </el-row>
@@ -69,16 +76,17 @@ export default {
       tableData: [],
       totalRows: 0,
       loading: false,
+      date: ''
     };
   },
   computed: {},
   filters: {
     statusFilter(index) {
       let str = "";
-      if (index == 1) {
+      if (index == 1 || index == 0) {
         str = "发送中";
       } else if (index == 2) {
-        str = "发送成功";
+        str = "已发送";
       } else if (index == 3) {
         str = "发送失败";
       }
@@ -95,8 +103,10 @@ export default {
   },
   methods: {
     // 列表查询
-    search() {
+    search(a) {
+      if(a) this.searchParam.pageNo = 1;
       this.loading = true;
+      this.searchParam.chooseDate = this.date ? new Date(this.date).getTime() : '';
       const {pageNo, pageSize, chooseDate, messageLogId} = this.searchParam;
       let url = `/im/group/list?pageNo=${pageNo}&pageSize=${pageSize}&chooseDate=${chooseDate}&messageLogId=${messageLogId}`;
       this.GET(url).then(res => {

src/views/IM/search-message/detail.vue

@@ -77,7 +77,7 @@ export default {
 		
 	},
   	methods: {
-		  // 获取详情数据以及下拉加载历史数据
+		// 获取详情数据以及下拉加载历史数据
 		getDeatailData(param) {
 			let url = '/im/msg/forward';
 			let req = {
@@ -90,7 +90,7 @@ export default {
 			}
 			this.POST(url, req).then((res) => {
 				if(res.code == '000000') {
-					this.detailData = res.data.reverse();
+					this.detailData = res.data;
 				}
 			})
 		},

src/views/IM/search-message/list.vue

@@ -4,13 +4,19 @@
       <el-row :gutter="30" class="row" type="flex" style="margin-top: 10px;margin-right:0px;">
         <el-form ref="serchForm" inline :model="searchParam" label-width="15px" style="width:100%;text-align:right;">
             <el-form-item label="">
-              <el-input clearable v-model="searchParam.userMobile" size="mini" placeholder="请输入用户电话" @change="searchMessage(1)"><el-button slot="append" icon="el-icon-search" @click="searchMessage(1)"></el-button></el-input>
+              <el-input clearable v-model="searchParam.userMobile" size="mini" placeholder="请输入用户电话" @change="searchMessage(1)">
+                <el-button slot="append" icon="el-icon-search"></el-button>
+              </el-input>
             </el-form-item>
             <el-form-item label="">
-              <el-input clearable v-model="searchParam.userName" size="mini" placeholder="请输入用户名称" @change="searchMessage(1)"><el-button slot="append" icon="el-icon-search" @click="searchMessage(1)"></el-button></el-input>
+              <el-input clearable v-model="searchParam.userName" size="mini" placeholder="请输入用户名称" @change="searchMessage(1)">
+                <el-button slot="append" icon="el-icon-search"></el-button>
+              </el-input>
             </el-form-item>
             <el-form-item label="">
-              <el-input clearable v-model="searchParam.adminName" size="mini" placeholder="请输入客服名" @change="searchMessage(1)"><el-button slot="append" icon="el-icon-search" @click="searchMessage(1)"></el-button></el-input>
+              <el-input clearable v-model="searchParam.adminName" size="mini" placeholder="请输入客服名" @change="searchMessage(1)">
+                <el-button slot="append" icon="el-icon-search"></el-button>
+              </el-input>
             </el-form-item>
             <el-form-item label="" style="position:relative;top:-8px;left:0;margin-bottom: 0px;">
                 <el-date-picker 
@@ -108,6 +114,7 @@ export default {
     // 列表查询
     searchMessage(a) {
       if(a) this.searchParam.pageNo = 1;
+      if(a == 2) return;
       this.loading = true;
       let url = `/im/system/message/list`;
       this.searchParam.chooseDate = this.date ? new Date(this.date).getTime() : '';