diff --git a/src/views/emis/emisSmsSendRecord/index.vue b/src/views/emis/emisSmsSendRecord/index.vue
index d8014e89..42abbf5b 100644
--- a/src/views/emis/emisSmsSendRecord/index.vue
+++ b/src/views/emis/emisSmsSendRecord/index.vue
@@ -1,45 +1,44 @@
 <template>
   <div class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-   
-      <el-form-item label="" prop="billCode">
-        <el-input
-          v-model="queryParams.billCode"
-          :placeholder="$t('运单号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+    <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"   v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+      <!-- label-width="68px" -->
+      <el-form-item label="运单号" prop="billCode">
+        <!-- <div slot="label">
+              <el-radio-group class="query-label" v-model="queryOrderType">
+                <el-radio :key="1" label="1">运单号</el-radio>
+                <el-radio :key="0" label="0">手机号</el-radio>
+              </el-radio-group>
+          </div> -->
+          <XdTextareaInput
+            v-model="queryParams.billCode"
+            :placeholder="$t('多个流水号逗号或换行隔开')"
+            clearable
+            :rows="2"
+          />
+                <!-- @keyup.enter.native="handleQuery" -->
       </el-form-item>
-      <el-form-item label="" prop="sendSiteCode">
+      <el-form-item label="手机号" prop="phone">
         <el-input
-          v-model="queryParams.sendSiteCode"
-          :placeholder="$t('发送站点编码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+                    v-model="queryParams.phone"
+                    :placeholder="$t('手机号码')"
+                    clearable
+                  />
       </el-form-item>
-      <el-form-item label="" prop="sendManCode">
-        <el-input
-          v-model="queryParams.sendManCode"
-          :placeholder="$t('发送人编码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="发送网点" prop="sendSiteCode">
+        <EmisSiteSimplePicker1 :placeholder="$t('发送网点')"  v-model="queryParams.sendSiteCode"  :isInitiated="true"  ></EmisSiteSimplePicker1>
       </el-form-item>
-      <el-form-item label="" prop="sendDate">
-        <el-date-picker clearable
-          v-model="queryParams.sendDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('发送时间')">
-        </el-date-picker>
+      <el-form-item label="发送人" prop="sendManCode">
+        <EmisUserSimplePicker0  :placeholder="$t('发送人')" v-model="queryParams.sendManCode"></EmisUserSimplePicker0>
+      </el-form-item>
+      <el-form-item label="发送时间" prop="sendDate">
+        <elDateSimplePicker v-model="dateTimeRange"  ></elDateSimplePicker>
       </el-form-item>
     </SearchForm>
 
-   
-    <XdTable v-loading="loading" 
+
+    <XdTable v-loading="loading"
            border stripe
-           size="small"
+           size="mini"
            :data="emisSmsSendRecordList"
            :showSearch.sync="showSearch"
            :queryParams="queryParams"
@@ -48,10 +47,10 @@
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
            >
-      
+
       <div slot="toolbar">
         <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
+              <!-- <el-col :span="1.5">
                 <el-button
                   type="primary"
                   plain
@@ -60,8 +59,8 @@
                   @click="handleAdd"
                   v-hasPermi="['emis:emisSmsSendRecord:add']"
                 >新增</el-button>
-              </el-col>
-              <!-- 
+              </el-col> -->
+              <!--
               <el-col :span="1.5">
                 <el-button
                   type="success"
@@ -73,7 +72,7 @@
                   v-hasPermi="['emis:emisSmsSendRecord:edit']"
                 >修改</el-button>
               </el-col> -->
-              <el-col :span="1.5">
+              <!-- <el-col :span="1.5">
                 <el-button
                   type="danger"
                   plain
@@ -83,8 +82,8 @@
                   @click="handleDelete"
                   v-hasPermi="['emis:emisSmsSendRecord:remove']"
                 >删除</el-button>
-              </el-col>
-              <!-- <el-col :span="1.5">
+              </el-col> -->
+              <el-col :span="1.5">
                 <el-button
                   type="warning"
                   plain
@@ -93,10 +92,10 @@
                   @click="handleExport"
                   v-hasPermi="['emis:emisSmsSendRecord:export']"
                 >导出</el-button>
-              </el-col> -->
+              </el-col>
           </el-row>
       </div>
-      
+
       <el-table-column type="selection" width="55" align="center" />
       <!--
       <el-table-column label="序号" align="center" min-width="60">
@@ -104,7 +103,7 @@
                 <span v-text="getIndex(scope.$index)"> </span>
              </template>
       </el-table-column>
-       
+
        <el-table-column label="xxx" align="left" prop="xxx" min-width="180">
         <template slot-scope="scope">
             <div  class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
@@ -135,44 +134,39 @@
           </el-table-column>
       -->
 
-      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
-      <el-table-column :label="$t('站点名称')" align="center" prop="sendSiteName" min-width="100" />
-      <el-table-column :label="$t('发件人名称')" align="center" prop="sendManName" min-width="100" />
-      <el-table-column :label="$t('发送人编码')" align="center" prop="sendManCode" min-width="100" />
-      <el-table-column :label="$t('短信类型')" align="center" prop="smsType" min-width="100" />
-      <el-table-column :label="$t('目标号码')" align="center" prop="phone" min-width="100" />
-      <el-table-column :label="$t('短信内容')" align="center" prop="content" min-width="100" />
-      <el-table-column :label="$t('单条发送费用')" align="center" prop="fee" min-width="100" />
-      <el-table-column :label="$t('发送时间')" align="center" prop="sendDate" min-width="100" />
-      <el-table-column :label="$t('渠道发送状态')" align="center" prop="sendStatus" min-width="100" />
-      <el-table-column :label="$t('渠道错误代码')" align="center" prop="errCode" min-width="100" />
-      <el-table-column :label="$t('渠道错误信息')" align="center" prop="errMsg" min-width="100" />
-      <el-table-column :label="$t('任务处理时间')" align="center" prop="taskDate" min-width="100" />
-      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
+      <el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="160" />
+      <el-table-column :label="$t('手机号码')" align="center" prop="phone" min-width="130" />
+      <el-table-column :label="$t('短信内容')" align="center" prop="content" min-width="300" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('发送网点')" align="center" prop="sendSiteName" min-width="100" />
+      <el-table-column :label="$t('发件人')" align="center" prop="sendManName" min-width="100" />
+      <el-table-column :label="$t('发送人编号')" align="center" prop="sendManCode" min-width="100" />
+      <el-table-column :label="$t('发送时间')" align="center" prop="createTime" min-width="170" />
+      <el-table-column :label="$t('短信类型')" align="center" prop="smsType" min-width="80" >
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['emis:emisSmsSendRecord:edit']"
-          >修改</el-button>
-          <!-- 
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['emis:emisSmsSendRecord:remove']"
-          >删除</el-button> -->
-        </template>
-      </el-table-column>
+             <span v-if="scope.row.smsType==1">寄件</span>
+             <span v-if="scope.row.smsType==2">签收</span>
+             <span v-if="scope.row.smsType==3">问题件</span>
+          </template>
+        </el-table-column>
+      <el-table-column :label="$t('渠道发送状态')" align="center" prop="sendStatus" min-width="160" >
+        <template slot-scope="scope">
+             <span v-if="scope.row.sendStatus==1">已发送</span>
+             <span v-if="scope.row.sendStatus==0">未发送</span>
+             <span v-if="scope.row.sendStatus==-1">发送异常</span>
+          </template>
+        </el-table-column>
+      <el-table-column :label="$t('渠道异常信息')" align="center" prop="errMsg" min-width="170"  :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('任务处理时间')" align="center" prop="taskDate" min-width="170" />
+
+      <!-- <el-table-column :label="$t('单条发送费用')" align="center" prop="fee" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('渠道错误代码')" align="center" prop="errCode" min-width="100" /> -->
+
     </XdTable>
 
     <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
       <emisSmsSendRecordForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSmsSendRecordForm>
     </el-dialog>
-    
+
 
     <!--
     <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
@@ -188,10 +182,13 @@ import { listEmisSmsSendRecord, getEmisSmsSendRecord, delEmisSmsSendRecord, addE
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 // import emisSmsSendRecordView from '@/views/emis/emisSmsSendRecord/emisSmsSendRecordView';
 import emisSmsSendRecordForm from '@/views/emis/emisSmsSendRecord/emisSmsSendRecordForm';
+import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
 
 export default {
   name: "emisSmsSendRecord",
-  components: { elDateSimplePicker,emisSmsSendRecordForm },
+  components: { elDateSimplePicker,emisSmsSendRecordForm,EmisSiteSimplePicker1,EmisUserSimplePicker0 },
   dicts: [
   ],
   data() {
@@ -208,11 +205,13 @@ export default {
       showSearch: true,
       // 创建时间搜索
       dateTimeRange:[],
+
+      queryOrderType:null,
       // 总条数
       total: 0,
       // 短信发送记录表表格数据
       emisSmsSendRecordList: [],
-    
+
       currentId:null,
       openForm: false,
       titleForm: "",
@@ -236,11 +235,11 @@ export default {
         billCode: null,
         sendSiteCode: null,
         sendManCode: null,
-        sendDate: null,
       },
     };
   },
   created() {
+    this.queryOrderType=1;
     this.getList();
   },
   methods: {
@@ -248,29 +247,17 @@ export default {
     getList() {
       this.loading = true;
       this.queryParams.params = {};
-      if (null != this.daterangeSendDate && '' != this.daterangeSendDate) {
-        this.queryParams.params["beginSendDate"] = this.daterangeSendDate[0];
-        this.queryParams.params["endSendDate"] = this.daterangeSendDate[1];
+      if(this.queryOrderType==0){
+        this.queryParams.phone=this.queryParams.billCode;
+        this.queryParams.billCode=null;
       }
-      if (null != this.daterangeTaskDate && '' != this.daterangeTaskDate) {
-        this.queryParams.params["beginTaskDate"] = this.daterangeTaskDate[0];
-        this.queryParams.params["endTaskDate"] = this.daterangeTaskDate[1];
-      }
-      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
-        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
-        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
-      }
-      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
-        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
-        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
-      }
-      listEmisSmsSendRecord(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+      listEmisSmsSendRecord(this.addDateRange(this.queryParams, this.dateTimeRange,"createTime")).then(response => {
         this.emisSmsSendRecordList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
-    
+
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;