分发列表

src/api/orderList.js

@@ -20,5 +20,16 @@ export default {
         data: data
       })
     }
+  },
+
+  dispatch:{
+      // /orderManagement/dispatchSearch
+    Search(data){
+      return request({
+        url: '/orderManagement/dispatchSearch',
+        method: 'post',
+        data: data
+      })
+    }
   }
 }

src/views/orderList/Distribute.vue

@@ -1,50 +1,6 @@
 <template>
   <div class="app-container">
     <div class="filter-container" style="margin: 10px 0 10px 0">
-      <!-- <el-row :gutter="20" style="marginBottom:20px">
-          <el-col :span="8"  :xs="12"  :lg="8">
-              <div>
-                  <span class="textSpan">
-                     订单号：
-                  </span>
-                <el-input
-                        v-model="body.orderId"
-                        style="width: 70%;"
-                        placeholder="请输入订单号"
-                        size="small"
-                        clearable
-                    />
-              </div>
-          </el-col>
-          <el-col :span="8"  :xs="12"  :lg="8">
-              <div>
-                  <span class="textSpan">
-                     商户订单号:
-                  </span>
-                <el-input
-                        v-model="body.extorderId"
-                        style="width: 70%;"
-                        placeholder="请输入商户订单号"
-                        size="small"
-                        clearable
-                    />
-              </div>
-          </el-col>
-          <el-col :span="8"  :xs="12"  :lg="8">
-              <div>
-                  <span class="textSpan">
-                     手机号码：
-                  </span>
-                <el-input
-                        v-model="body.usedMobile"
-                        style="width: 70%;"
-                        placeholder="请输入手机号码"
-                        size="small"
-                        clearable
-                    />
-              </div>
-          </el-col>
-      </el-row> -->
       <div class="flex">
         <div class="w_input">
           <span class="textSpan">　订单号：</span>
@@ -56,75 +12,32 @@
             clearable
           />
         </div>
-        <div class="w_input">
-          <span class="textSpan">客户订单号：</span>
-          <el-input
-            v-model="body.extorderId"
-            style="width: 65%;"
-            placeholder="请输入客户订单号"
-            size="small"
-            clearable
-          />
-        </div>
         <div class="w_input stylephone">
-          <div class="textSpan marginphone">通道订单号：</div>
+          <div class="textSpan marginphone">手机号：</div>
           <el-input
-            v-model="body.Id"
-            style="width: 67%;"
-            placeholder="请输入通道订单号"
+            v-model="body.phoneNo"
+            type="textarea"
+            :autosize="{ minRows: 1.1, maxRows: 5}"
+            class="phone"
             size="small"
+            placeholder="请输入内容"
             clearable
           />
         </div>
-      </div>
-      <div class="flex">
-        <div class="w_date">
-          <span class="textSpan">回调时间：</span>
-          <el-date-picker
-            v-model="checkTimeStart"
-            size="small"
-            type="datetimerange"
-            range-separator="至"
-            style="width:78%"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            :default-time="[&quot;00:00:00&quot;,&quot;23:59:59&quot;]"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            @change="oncheckTimeStart"
-          />
-
-        </div>
-        <div class="w_date">
-          <span class="textSpan">发送时间：</span>
-          <el-date-picker
-            v-model="applyDateStart"
-            size="small"
-            type="datetimerange"
-            style="width:79%"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            :default-time="[&quot;00:00:00&quot;,&quot;23:59:59&quot;]"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            @change="oncustom"
-          />
-
-        </div>
-
-      </div>
-      <div class="flex">
         <div class="w_input">
           <span class="textSpan">通道名称：</span>
           <el-input
-            v-model="body.channelIdDesc"
+            v-model="body.channelName"
             style="width:65%;"
             placeholder="请输入通道名称"
             size="small"
             clearable
           />
         </div>
+      </div>
+      <div class="flex">
         <div class="w_input">
-          <span class="textSpan">　订单状态：</span>
+          <span class="textSpan">订单状态：</span>
           <el-select v-model="body.status" size="small" clearable placeholder="请选择订单状态" style="width: 65%" @change="changeScope">
             <el-option
               v-for="item in status"
@@ -135,20 +48,7 @@
           </el-select>
         </div>
         <div class="w_input">
-          <span class="textSpan">　　运营商：</span>
-          <el-select v-model="body.mobileOperator" size="small" clearable placeholder="请选择运营商" style="width: 65%" @change="changeoperator">
-            <el-option
-              v-for="item in mobileOperator"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </div>
-      </div>
-      <div class="flex">
-        <div class="w_input">
-          <span class="textSpan">　　面额：</span>
+          <span class="textSpan">　面额：</span>
           <el-input
             v-model="flowAmount"
             style="width:65%;"
@@ -159,70 +59,67 @@
           />
         </div>
         <div class="w_input">
-          <span class="textSpan">　客户名称：</span>
+          <span class="textSpan">　归属地：</span>
           <el-input
-            v-model="body.enterpriseIdDesc"
+            v-model="body.phoneHome"
             style="width: 65%;"
-            placeholder="请输入客户名称"
+            placeholder="请选择归属地"
             size="small"
             clearable
           />
         </div>
+      </div>
+      <div class="flex">
         <div class="w_input">
-          <span class="textSpan">　　归属地：</span>
+          <span class="textSpan">分发ID号：</span>
           <el-input
-            v-model="body.mobileHome"
-            style="width: 65%;"
-            placeholder="请选择归属地"
+            v-model="body.recId"
+            style="width:65%;"
+            placeholder="请输入订单号"
             size="small"
             clearable
           />
         </div>
-      </div>
-      <div class="flex">
-        <div class="w_input">
-          <span class="textSpan">回调状态：</span>
-          <el-select v-model="body.dealFlag" size="small" clearable placeholder="请选择订单状态" style="width: 65%" @change="changeScope">
+
+         <div class="w_input">
+          <span class="textSpan">运营商：</span>
+          <el-select v-model="body.phoneOperator" size="small" clearable placeholder="请选择运营商" style="width: 65%" @change="changeoperator">
             <el-option
-              v-for="item in dealFlag"
+              v-for="item in mobileOperator"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
           </el-select>
         </div>
-        <div class="w_input stylephone">
-          <div class="textSpan marginphone">　　手机号：</div>
-          <el-input
-            v-model="body.usedMobile"
-            type="textarea"
-            :autosize="{ minRows: 1.1, maxRows: 5}"
-            class="phone"
+
+      </div>
+      <div class="flex">
+        <div class="w_date" >
+          <span class="textSpan">发送时间：</span>
+          <el-date-picker
+            v-model="applyDateStart"
             size="small"
-            placeholder="请输入内容"
-            clearable
-          />
+            type="datetimerange"
+            style="width:70%"
+            range-separator="至"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            :default-time="[&quot;00:00:00&quot;,&quot;23:59:59&quot;]"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期" 
+            @change="oncustom"
+            />
 
         </div>
+
       </div>
       <div class="flexend">
-        <el-button class="filter-item" type="info" icon="el-icon-edit" plain @click="handleReset">至重发
-        </el-button>
-        <el-button class="filter-item" type="warning" icon="el-icon-message" plain @click="handleReset">至回调
-        </el-button>
-
-        <el-button class="filter-item" icon="el-icon-delete" type="danger" plain @click="handleReset">至失败
-        </el-button>
-        <el-button class="filter-item" type="success" icon="el-icon-check" plain @click="handleReset">至成功
-        </el-button>
-
         <el-button class="classitem" style="marginRight:50px" type="primary" plain icon="el-icon-star-off" @click="handleReset">导出
         </el-button>
         <el-button class="filter-item" icon="el-icon-search" type="primary" plain @click="handleSearch">搜索</el-button>
       </div>
     </div>
     <el-table v-loading="loading" :data="tableData" border style="width: 100%">
-      <el-table-column type="selection" width="40" />
 
       <el-table-column label="订单号" width="120" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
@@ -238,13 +135,13 @@
 
       <el-table-column label="客户名称" width="100" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span>{{ scope.row.user }}</span>
+          <span>{{ scope.row.customerName }}</span>
         </template>
       </el-table-column>
 
       <el-table-column label="手机号码" width="110" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span>{{ scope.row.mobile }}</span>
+          <span>{{ scope.row.phoneNo }}</span>
         </template>
       </el-table-column>
 
@@ -256,19 +153,22 @@
 
       <el-table-column label="运营商" width="70" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span>{{ scope.row.mobileOperator }}</span>
+          <!-- 运营商：1、移动 2、电信 3、联通 -->
+          <span v-if="scope.row.phoneOperator==1">移动</span>
+          <span v-if="scope.row.phoneOperator==2">电信</span>
+          <span v-if="scope.row.phoneOperator==3">联通</span>
         </template>
       </el-table-column>
 
       <el-table-column label="归属地" width="100" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span>{{ scope.row.mobileHome }}</span>
+          <span>{{ scope.row.phoneHome }}</span>
         </template>
       </el-table-column>
 
       <el-table-column label="发送时间" width="160" align="center">
         <template slot-scope="scope">
-          <span>{{ scope.row.limitedDate }}</span>
+          <span>{{ scope.row.createDate}}</span>
         </template>
       </el-table-column>
 
@@ -304,48 +204,24 @@
         </template>
       </el-table-column>
 
-      <el-table-column
-        label="用时"
-        width="90"
-        align="center"
-        prop="createTime"
-        show-overflow-tooltip
-      >
-        <template slot-scope="scope">
-          <span>{{ scope.row.usedTime }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="回调状态"
-        width="90"
-        align="center"
-        prop="createTime"
-        show-overflow-tooltip
-      >
+      <el-table-column label="通道订单号" width="120" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
-          <!-- <span>{{ scope.row.dealFlag }}</span> -->
-          <el-tag v-if="scope.row.dealFlag === '1'" size="small">成功</el-tag>
-          <el-tag v-if="scope.row.dealFlag === '2'" size="small">失败</el-tag>
+          <span>{{ scope.row.gwSeqNo }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="客户订单号" width="120" align="center" show-overflow-tooltip>
+      <el-table-column label="通道错误代码" width="120" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span>{{ scope.row.extorderId }}</span>
+          <span>{{ scope.row.gwErrorCode }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="通道订单号" width="120" align="center" show-overflow-tooltip>
+      <el-table-column label="通道错误信息" width="120" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span>{{ scope.row.gwSeqNo }}</span>
+          <span>{{ scope.row.gwErrorMsg }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="通道错误代码" width="120" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row.gwErrorCode }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="运营商订单号" width="120" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ scope.row.operatorId }}</span>
@@ -372,110 +248,40 @@
 </template>
 
 <script>
-import { ordersearch } from '@/api/orderList'
+import api from '@/api/orderList'
 export default {
   data() {
     return {
       Name: '',
-      // phone:true,    //控制批量手机号
       tableData: [],
-      // tableData: [
-      //   { orderId: '1618675202869450462',
-      //     userName: 'test',
-      //     extorderId: 'CD2104253953427952',
-      //     usedMobile: '18820454014',
-      //     applyDateStart: '2021-04-26 00:00:00',
-      //     applyDateEnd: '2021-04-26 23:59:59',
-      //     enterpriseIdDesc: '山东茶蛋信息技术有限公司',
-      //     channelIdDesc: 'BF移动',
-      //     status: '充值成功',
-      //     mobileOperator: '移动',
-      //     flowAmount: '10',
-      //     checkTimeStart: '2021-04-25 00:39:53',
-      //     checkTimeEnd: '2021-04-25 23:39:53',
-      //     dealFlag: '已回调',
-      //     mobileHome: '广东-茂名-移动' },
-      //   { orderId: '1618675202869450462',
-      //     userName: 'test',
-      //     extorderId: 'CD2104253953427952',
-      //     usedMobile: '18820454014',
-      //     applyDateStart: '2021-04-26 00:00:00',
-      //     applyDateEnd: '2021-04-26 23:59:59',
-      //     enterpriseIdDesc: '山东茶蛋信息技术有限公司',
-      //     channelIdDesc: 'BF移动',
-      //     status: '充值成功',
-      //     mobileOperator: '移动',
-      //     flowAmount: '10',
-      //     checkTimeStart: '2021-04-25 00:39:53',
-      //     checkTimeEnd: '2021-04-25 23:39:53',
-      //     dealFlag: '已回调',
-      //     mobileHome: '广东-茂名-移动' },
-      //   { orderId: '1618675202869450462',
-      //     userName: 'test',
-      //     extorderId: 'CD2104253953427952',
-      //     usedMobile: '18820454014',
-      //     applyDateStart: '2021-04-26 00:00:00',
-      //     applyDateEnd: '2021-04-26 23:59:59',
-      //     enterpriseIdDesc: '山东茶蛋信息技术有限公司',
-      //     channelIdDesc: 'BF移动',
-      //     status: '充值成功',
-      //     mobileOperator: '移动',
-      //     flowAmount: '10',
-      //     checkTimeStart: '2021-04-25 00:39:53',
-      //     checkTimeEnd: '2021-04-25 23:39:53',
-      //     dealFlag: '已回调',
-      //     mobileHome: '广东-茂名-移动' },
-      //   { orderId: '1618675202869450462',
-      //     userName: 'test',
-      //     extorderId: 'CD2104253953427952',
-      //     usedMobile: '18820454014',
-      //     applyDateStart: '2021-04-26 00:00:00',
-      //     applyDateEnd: '2021-04-26 23:59:59',
-      //     enterpriseIdDesc: '山东茶蛋信息技术有限公司',
-      //     channelIdDesc: 'BF移动',
-      //     status: '充值成功',
-      //     mobileOperator: '移动',
-      //     flowAmount: '10',
-      //     checkTimeStart: '2021-04-25 00:39:53',
-      //     checkTimeEnd: '2021-04-25 23:39:53',
-      //     dealFlag: '已回调',
-      //     mobileHome: '广东-茂名-移动' }
-      // ],
       applyDateStart: '', // 发送时间
       checkTimeStart: '', // 回调时间
       flowAmount: '', // 面额乘以10000
       body: {
-        Id: '',
         orderId: '',
-        extorderId: '',
-        usedMobile: '',
-        applyDateStart: '',
-        applyDateEnd: '',
-        enterpriseIdDesc: '',
-        channelIdDesc: '',
-        status: '',
-        mobileOperator: '',
-        flowAmount: '',
-        checkTimeStart: '',
-        checkTimeEnd: '',
-        dealFlag: '',
-        mobileHome: '',
+        channelName:'',
+        createDateEnd:'',
+        createDateStart:'',
+        flowAmount:'',
+        phoneHome:'',
+        phoneNo:'',
+        phoneOperator:'',
+        recId:'',
+        sendStatus:'',
         page: 1,
         size: 10
       },
       total: 0, // 总数据
       loading: false,
       status: [
-        { id: 1, name: '待发' },
         { id: 2, name: '已发' },
         { id: 6, name: '成功' },
         { id: 4, name: '失败' },
-        { id: 5, name: '风控' }
       ],
       mobileOperator: [
-        { id: 'YD', name: '移动' },
-        { id: 'LT', name: '联通' },
-        { id: 'DX', name: '电信' }
+        { id: 1, name: '移动' },
+        { id: 3, name: '联通' },
+        { id: 2, name: '电信' }
       ],
       dealFlag: [
         { id: '0', name: '运营商处理中' },
@@ -495,8 +301,8 @@ export default {
     const systemTime = date.year + '-' + date.month + '-' + date.date
     // this.body.applyDateStart = "2021-05-14 + " 00:00:00"
     this.applyDateStart = [systemTime + ' 00:00:00', systemTime + ' 23:59:59']
-    this.body.applyDateStart = systemTime + ' 00:00:00'
-    this.body.applyDateEnd = systemTime + ' 23:59:59'
+    this.body.createDateStart = systemTime + ' 00:00:00'
+    this.body.createDateEnd = systemTime + ' 23:59:59'
     // this.body.applyDateEnd = systemTime + " 23:59:59"
     // this.
     this.getTenantList()
@@ -505,7 +311,7 @@ export default {
     // 获取数据
     getTenantList() {
       this.loading = true
-      ordersearch(this.body).then(res => {
+      api.dispatch.Search(this.body).then(res => {
         this.loading = false
         // this.tableData=res.data.data.records
         // limitedDate ：发送时间
@@ -540,13 +346,13 @@ export default {
     changeflow() {
       const flow = this.flowAmount
       // let body=this.body.flowAmount;
-      this.body.flowAmount = flow * 10000
+      this.body.flowAmount = flow //* 10000
     },
     // 搜索发送时间
     oncustom() {
       const applyDateStart = this.applyDateStart
-      this.body.applyDateStart = applyDateStart[0]
-      this.body.applyDateEnd = applyDateStart[1]
+      this.body.createDateStart = applyDateStart[0]
+      this.body.createDateEnd = applyDateStart[1]
       // console.log(applyDateStart)
       // console.log(this.body.applyDateStart)
     },