冲突修改

config/index.js

@@ -9,8 +9,8 @@ module.exports = {
     proxyTable: {
       '/pre': {
         // target: 'http://app.bluefire.top:7999',//后端接口地址
+        // target: 'http://192.168.101.15:8081',//后端接口地址
         target: 'http://192.168.101.104:8081',//后端接口地址
-        // target: 'http://192.168.101.104:8081',//后端接口地址
         changeOrigin: true,  //是否跨域
         pathRewrite: {
           '^/pre': '/',//重写,

src/App.vue

@@ -9,3 +9,13 @@ export default {
   name: 'App'
 }
 </script>
+
+<style>
+    .textSpan{
+   position: relative;
+   top: 0;
+     font-size: 14px;
+     font-weight: 600;
+     color:rgb(87, 86, 86)
+ }
+</style>

src/api/channel.js

@@ -1,12 +1,40 @@
 import request from '@/utils/request'
 
 export default {
+  //列表
   Search: function(operator) {
     return request({
       url: '/supplier/list',
       method: 'POST',
       data: operator
     })
+  },
+
+  //新增
+  channelAdd: function(data){
+    return request({
+      url: '/supplier/add',
+      method: 'post',
+      data: data
+    })
+  },
+  //编辑
+  channelEdit: function(data){
+    return request({
+      url: '/supplier/update',
+      method: 'post',
+      data: data
+    })
+  },
+  //编辑
+  channelDelete: function(data){
+    return request({
+      url: '/supplier/delete',
+      method: 'put',
+      data: data
+    })
   }
 
+  
+
 }

src/api/orderList.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 订单查询
+//订单查询
 export function ordersearch(data) {
   return request({
     url: '/orderManagement/search',
@@ -9,6 +9,7 @@ export function ordersearch(data) {
   })
 }
 
+
 export default {
   finance: {
     // /orderManagement/searchFinance

src/views/orderList/finance.vue

@@ -1,50 +1,7 @@
 <template>
   <div class="app-container oderList">
     <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>
@@ -70,7 +27,7 @@
         <div class="w_input stylephone">
           <div class="textSpan marginphone">　　手机号：</div>
           <el-input
-            v-model="body.usedMobile"
+            v-model="body.phoneNo"
             type="textarea"
             :autosize="{ minRows: 1.1, maxRows: 5 }"
             class="phone"
@@ -88,7 +45,7 @@
         <div class="w_date">
           <span class="textSpan">回调时间：</span>
           <el-date-picker
-            v-model="checkTimeStart"
+            v-model="callbackTimeEnd"
             size="small"
             type="datetimerange"
             range-separator="至"
@@ -148,7 +105,7 @@
         <div class="w_input">
           <span class="textSpan">　　运营商：</span>
           <el-select
-            v-model="body.mobileOperator"
+            v-model="body.phoneOperator"
             size="small"
             clearable
             placeholder="请选择运营商"
@@ -167,19 +124,36 @@
       <div class="flex">
         <div class="w_input">
           <span class="textSpan">　　面额：</span>
-          <el-input
+          <!-- <el-input
             v-model="flowAmount"
             style="width: 65%"
             placeholder="请输入订单号"
             size="small"
             clearable
             @change="changeflow"
-          />
+          /> -->
+           <el-input
+                v-model="flowAmount"
+                @clear="changeflow(flowAmount)"
+                style="width:26%"
+                placeholder="请输入面额"
+                size="small"
+                clearable
+            />
+            <span>　-　</span>
+                <el-input
+                v-model="flowAmount1"
+                    @clear="changeflow1(flowAmount)"
+                style="width:26%"
+                placeholder="请输入面额"
+                size="small"
+                clearable
+            />
         </div>
         <div class="w_input">
           <span class="textSpan">　客户名称：</span>
           <el-input
-            v-model="body.enterpriseIdDesc"
+            v-model="body.customerName"
             style="width: 65%"
             placeholder="请输入客户名称"
             size="small"
@@ -189,7 +163,7 @@
         <div class="w_input">
           <span class="textSpan">　　归属地：</span>
           <el-input
-            v-model="body.mobileHome"
+            v-model="body.phoneHome"
             style="width: 65%"
             placeholder="请选择归属地"
             size="small"
@@ -201,7 +175,7 @@
         <div class="w_input">
           <span class="textSpan">回调状态：</span>
           <el-select
-            v-model="body.dealFlag"
+            v-model="body.callbackStatus"
             size="small"
             clearable
             placeholder="请选择订单状态"
@@ -216,42 +190,19 @@
             />
           </el-select>
         </div>
+         <div class="w_input stylephone">
+                <div class="textSpan marginphone">通道订单号：</div>
+                    <el-input
+                        v-model="body.gwSeqNo"
+                        style="width: 67%;"
+                        placeholder="请输入通道订单号"
+                        size="small"
+                        clearable
+                    />
+            </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"
@@ -270,20 +221,23 @@
         >搜索</el-button>
       </div>
     </div>
-    <div style="paddingbottom: 15px; marginright: 15px">
-      <el-tag
+    <div class="tag">
+      <span
         class="money"
-      >客户结算总价：<span class="money_span">{{ sum }}</span></el-tag>
-      <el-tag
+      >客户结算总价:</span>
+      <span class="money_span">{{ sumPrice }}</span>
+      <span
         class="money"
-      >合作伙伴结算总价：<span class="money_span">{{ sum }}</span></el-tag>
-      <el-tag
+      >合作伙伴结算总价:</span>
+      <span class="money_span">{{ sumPartnerPrice }}</span>
+      <span
         class="money"
-      >运营商结算总价：<span class="money_span">{{ sum }}</span></el-tag>
+      >运营商结算总价:</span>
+      <span class="money_span">{{ sumOperatorPrice }}</span>
     </div>
 
     <el-table v-loading="loading" :data="tableData" border style="width: 100%">
-      <el-table-column type="selection" width="40" />
+      <!-- <el-table-column type="selection" width="40" /> -->
 
       <el-table-column
         label="订单号"
@@ -303,7 +257,7 @@
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          <span>{{ scope.row.flowAmount }}</span>
+          <span>{{ scope.row.flowAmount / 10000 }}</span>
         </template>
       </el-table-column>
 
@@ -332,7 +286,9 @@
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          <span>{{ scope.row.mobileOperator }}</span>
+           <el-tag v-if="scope.row.phoneOperator === 2" size="small">电信</el-tag>
+            <el-tag v-if="scope.row.phoneOperator === 1" size="small">移动</el-tag>
+            <el-tag v-if="scope.row.phoneOperator === 3" size="small">联通</el-tag>
         </template>
       </el-table-column>
 
@@ -343,7 +299,7 @@
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          <span>{{ scope.row.mobileHome }}</span>
+          <span>{{ scope.row.phoneHome }}</span>
         </template>
       </el-table-column>
 
@@ -354,7 +310,7 @@
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          <span>{{ scope.row.usedMobile }}</span>
+          <span>{{ scope.row.phoneNo }}</span>
         </template>
       </el-table-column>
 
@@ -399,12 +355,12 @@
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.status === 1" size="small">充值中</el-tag>
-          <el-tag v-if="scope.row.status === 2" size="small">待充值</el-tag>
-          <el-tag v-if="scope.row.status === 3" size="small">重发</el-tag>
-          <el-tag v-if="scope.row.status === 4" size="small">充值成功</el-tag>
-          <el-tag v-if="scope.row.status === 5" size="small">回调</el-tag>
-          <el-tag v-if="scope.row.status === 6" size="small">充值失败</el-tag>
+            <el-tag v-if="scope.row.status === 2" size="small">充值中</el-tag>
+            <el-tag v-if="scope.row.status === 1" size="small">待充值</el-tag>
+            <!-- <el-tag v-if="scope.row.status === 3" size="small">重发</el-tag> -->
+            <el-tag v-if="scope.row.status === 4" size="small" >充值失败</el-tag>
+            <!-- <el-tag v-if="scope.row.status === 5" size="small">回调</el-tag> -->
+            <el-tag v-if="scope.row.status === 6" size="small">充值成功</el-tag>
         </template>
       </el-table-column>
 
@@ -453,8 +409,9 @@ export default {
       // phone:true,    //控制批量手机号
       tableData: [],
       applyDateStart: '', // 发送时间
-      checkTimeStart: '', // 回调时间
+      callbackTimeEnd: '', // 回调时间
       flowAmount: '', // 面额乘以10000
+      flowAmount1: '', // 面额乘以10000
       body: {
         Id: '',
         orderId: '',
@@ -469,13 +426,16 @@ export default {
         flowAmount: '',
         checkTimeStart: '',
         checkTimeEnd: '',
-        dealFlag: '',
+        gwSeqNo: '',
         mobileHome: '',
         page: 1,
         size: 10
       },
+      sumOperatorPrice: "",
+    sumPartnerPrice: "",
+    sumPrice: "",
       total: 0, // 总数据
-      sum: 10100,
+    //   sum: 10100,
       loading: false,
       status: [
         { id: 1, name: '待发' },
@@ -485,15 +445,14 @@ export default {
         { 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: '运营商处理中' },
-        { id: '1', name: '待回调' },
-        { id: '3', name: '以回调' },
-        { id: '2', name: '无需回调' }
+        { id: '6', name: '成功' },
+        { id: '4', name: '失败' },
+ 
       ]
     }
   },
@@ -520,8 +479,8 @@ export default {
       api.finance.Search(this.body).then((res) => {
         this.loading = false
         // this.tableData=res.data.data.records
-        // limitedDate ：发送时间
-        // lastModifyDate ：回调
+        // limitedDate ：发送时间
+        // lastModifyDate ：回调
         // usedTime   ：用时
         const tableData = res.data.data.records
         const arry = tableData.map((res) => {
@@ -539,6 +498,9 @@ export default {
           return res
         })
         this.tableData = arry
+        this.sumOperatorPrice = res.data.data.sumOperatorPrice
+        this.sumPartnerPrice = res.data.data .sumPartnerPrice
+        this.sumPrice = res.data.data .sumPrice
         console.log(arry)
         this.total = res.data.data.total
         console.log(res.data.data.records)
@@ -548,12 +510,16 @@ export default {
     onphon() {
       console.log(this.phone)
     },
-    // 搜索面额
-    changeflow() {
-      const flow = this.flowAmount
-      // let body=this.body.flowAmount;
-      this.body.flowAmount = flow * 10000
-    },
+    //清除面额
+      changeflow(flow){
+        this.flowAmount = ""
+
+      },
+      //清除面额
+      changeflow1(flow){
+        this.flowAmount1 = ""
+
+      },
     // 搜索发送时间
     oncustom() {
       const applyDateStart = this.applyDateStart
@@ -566,9 +532,9 @@ export default {
     oncheckTimeStart() {
       // checkTimeStart:"",
       //   checkTimeEnd:"",
-      const checkTimeStart = this.checkTimeStart
-      this.body.checkTimeStart = checkTimeStart[0]
-      this.body.checkTimeEnd = checkTimeStart[1]
+      const checkTimeStart = this.callbackTimeEnd
+      this.body.callbackTimeStart = checkTimeStart[0]
+      this.body.callbackTimeEnd = checkTimeStart[1]
     },
     // 搜索状态
     changeScope() {
@@ -587,15 +553,27 @@ export default {
         this.body.applyDateEnd = ''
         this.body.applyDateStart = ''
       }
-      if (this.checkTimeStart == null) {
+      if (this.callbackTimeEnd == null) {
         // 回调时间
-        this.body.checkTimeStart = ''
-        this.body.checkTimeEnd = ''
-      }
-      if (this.flowAmount == null || this.flowAmount == 0) {
-        // 面额
-        this.body.flowAmount = ''
+        this.body.callbackTimeStart = ''
+        this.body.callbackTimeEnd = ''
       }
+        //面额前后为空判断
+         let flowAmount=this.flowAmount * 10000;
+        let flowAmount1=this.flowAmount1 * 10000;
+        if(this.flowAmount1 != "" && this.flowAmount != ""){   //面额
+          this.body.flowAmount = flowAmount  + "-" + flowAmount1 
+        }
+       if(this.flowAmount == "" && this.flowAmount1 == ""){
+          this.body.flowAmount = ""
+          // console.log(this.body.flowAmount)
+        }
+        else if(this.flowAmount == ""){   //面额
+          this.body.flowAmount = 0 + "-" + flowAmount1 
+        }
+        else if(this.flowAmount1 == ""){
+          this.body.flowAmount = flowAmount + "-" + 10000000
+        }
       this.currentPage = '1'
       this.getTenantList()
     },
@@ -616,10 +594,7 @@ export default {
 </script>
 
 <style scoped>
-.money {
-  font-size: 15px;
-  font-weight: 650;
-}
+
 
 .textSpan {
   position: relative;
@@ -651,9 +626,27 @@ export default {
 .flexend {
   display: flex;
   justify-content: flex-end;
-  padding-top: 20px;
+  /* padding-top: 20px; */
   padding-right: 40px;
 }
+.tag{
+    margin-bottom: 20px;
+}
+.money {
+  font-size: 14px;
+  /* font-weight: 600; */
+  color: rgb(87, 86, 86);
+  position: relative;
+  bottom: 2px;
+}
+.money_span{
+    font-weight: 600;
+    margin-right: 20px;
+    font-weight: 500px;
+    font-size: 20px;
+    color:salmon
+
+}
 .phone {
   width: 66% !important ;
   z-index: 100;
@@ -661,4 +654,4 @@ export default {
 /* .classitem{
    background: salmon;
  } */
-</style>
+</style>

src/views/orderList/index.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>
@@ -69,7 +25,7 @@
              <div class="w_input stylephone">
                 <div class="textSpan marginphone">通道订单号：</div>
                     <el-input
-                        v-model="body.Id"
+                        v-model="body.gwSeqNo"
                         style="width: 67%;"
                         placeholder="请输入通道订单号"
                         size="small"
@@ -81,7 +37,7 @@
             <div class="w_date">
                 <span class="textSpan">回调时间：</span>
                 <el-date-picker
-                v-model="checkTimeStart"
+                v-model="callbackTimeEnd"
                 size="small"
                 type="datetimerange"
                 range-separator="至"
@@ -138,7 +94,7 @@
             </div>
              <div class="w_input">
                 <span class="textSpan">　　运营商：</span>
-                <el-select size="small" v-model="body.mobileOperator" clearable placeholder="请选择运营商" style="width: 65%" @change="changeoperator">
+                <el-select size="small" v-model="body.phoneOperator" clearable placeholder="请选择运营商" style="width: 65%" @change="changeoperator">
                 <el-option
                 v-for="item in mobileOperator"
                 :key="item.id"
@@ -150,12 +106,33 @@
         </div>
          <div class="flex">
             <div class="w_input">
+              <!-- <el-col :span="5"> -->
                 <span class="textSpan">　　面额：</span>
-                 <el-input
+              <!-- </el-col> -->
+                
+                 <!-- <el-input
                         v-model="flowAmount"
                         @change="changeflow"
                         style="width:65%;"
-                        placeholder="请输入订单号"
+                        placeholder="请输入面额"
+                        size="small"
+                        clearable
+                    /> -->
+                    <!-- <el-col :span="6"> -->
+                      <el-input
+                        v-model="flowAmount"
+                        @clear="changeflow(flowAmount)"
+                        style="width:26%"
+                        placeholder="请输入面额"
+                        size="small"
+                        clearable
+                    />
+                    <span>　-　</span>
+                      <el-input
+                        v-model="flowAmount1"
+                         @clear="changeflow1(flowAmount)"
+                        style="width:26%"
+                        placeholder="请输入面额"
                         size="small"
                         clearable
                     />
@@ -163,7 +140,7 @@
              <div class="w_input">
                 <span class="textSpan">　客户名称：</span>
                  <el-input
-                        v-model="body.enterpriseIdDesc"
+                        v-model="body.customerName"
                         style="width: 65%;"
                         placeholder="请输入客户名称"
                         size="small"
@@ -173,7 +150,7 @@
              <div class="w_input">
                 <span class="textSpan">　　归属地：</span>
                  <el-input
-                        v-model="body.mobileHome"
+                        v-model="body.phoneHome"
                         style="width: 65%;"
                         placeholder="请选择归属地"
                         size="small"
@@ -184,7 +161,7 @@
         <div class="flex">
           <div class="w_input">
                 <span class="textSpan">回调状态：</span>
-                <el-select size="small" v-model="body.dealFlag" clearable placeholder="请选择订单状态" style="width: 65%" @change="changeScope">
+                <el-select size="small" v-model="body.callbackStatus" clearable placeholder="请选择订单状态" style="width: 65%" @change="changeScope">
                 <el-option
                 v-for="item in dealFlag"
                 :key="item.id"
@@ -197,11 +174,11 @@
                 <div class="textSpan marginphone">　　手机号：</div>
                     <el-input
                       type="textarea"
-                      v-model="body.usedMobile"
+                      v-model="body.phoneNo"
                       :autosize="{ minRows: 1.1, maxRows: 5}"
                       class="phone"
                       size="small"
-                      placeholder="请输入内容"
+                      placeholder="请输入手机号"
                       clearable
                       >
                     </el-input>
@@ -209,14 +186,14 @@
             </div>
         </div>
           <div class="flexend">
-            <el-button class="filter-item" type="info" icon="el-icon-edit"  plain @click="handleReset">至重发
+            <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 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 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 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">导出
@@ -233,26 +210,36 @@
         </template>
       </el-table-column>
 
+        <!-- <el-table-column
+          label="appID"
+          width="100"
+          align="center"
+          prop="createTime"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.appId }}</span>
+          </template>
+        </el-table-column> -->
       <el-table-column
-        label="appID"
+        label="客户名称"
         width="100"
         align="center"
         prop="createTime"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          <span>{{ scope.row.appId }}</span>
+          <span>{{ scope.row.customerName }}</span>
         </template>
       </el-table-column>
       <el-table-column
-        label="客户名称"
-        width="100"
+        label="面额"
+        width="70"
         align="center"
-        prop="createTime"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          <span>{{ scope.row.user }}</span>
+          <span>{{ scope.row.flowAmount / 10000 }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -269,7 +256,7 @@
 
        <el-table-column label="手机号码" width="110" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span>{{ scope.row.usedMobile }}</span>
+          <span>{{ scope.row.phoneNo }}</span>
         </template>
       </el-table-column>
 
@@ -281,7 +268,10 @@
         show-overflow-tooltip
        >
         <template slot-scope="scope">
-          <span>{{ scope.row.mobileOperator }}</span>
+          <!-- <span>{{ scope.row.phoneOperator }}</span> -->
+          <el-tag v-if="scope.row.phoneOperator === 2" size="small">电信</el-tag>
+            <el-tag v-if="scope.row.phoneOperator === 1" size="small">移动</el-tag>
+            <el-tag v-if="scope.row.phoneOperator === 3" size="small">联通</el-tag>
         </template>
       </el-table-column>
       <el-table-column
@@ -292,17 +282,19 @@
         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">
+      <el-table-column label="发送时间" width="170" align="center" show-overflow-tooltip> 
          <template slot-scope="scope">
+            <i class="el-icon-time"></i>
            <span>{{ scope.row.limitedDate }}</span>
          </template>
       </el-table-column>
-      <el-table-column label="回调时间" width="160" align="center">
+      <el-table-column label="回调时间" width="170" align="center" show-overflow-tooltip>
          <template slot-scope="scope">
+            <i v-if="scope.row.lastModifyDate" class="el-icon-time"></i>
            <span>{{ scope.row.lastModifyDate }}</span>
          </template>
       </el-table-column>
@@ -314,12 +306,12 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.status === 1" size="small">充值中</el-tag>
-            <el-tag v-if="scope.row.status === 2" size="small">待充值</el-tag>
-            <el-tag v-if="scope.row.status === 3" size="small">重发</el-tag>
-            <el-tag v-if="scope.row.status === 4" size="small" >充值成功</el-tag>
-            <el-tag v-if="scope.row.status === 5" size="small">回调</el-tag>
-            <el-tag v-if="scope.row.status === 6" size="small">充值失败</el-tag>
+            <el-tag v-if="scope.row.status === 2" size="small">充值中</el-tag>
+            <el-tag v-if="scope.row.status === 1" size="small">待充值</el-tag>
+            <!-- <el-tag v-if="scope.row.status === 3" size="small">重发</el-tag> -->
+            <el-tag v-if="scope.row.status === 4" size="small" >充值失败</el-tag>
+            <!-- <el-tag v-if="scope.row.status === 5" size="small">回调</el-tag> -->
+            <el-tag v-if="scope.row.status === 6" size="small">充值成功</el-tag>
           </template> 
         </el-table-column>
 
@@ -343,8 +335,8 @@
       >
         <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>
+          <el-tag v-if="scope.row.callbackStatus === 6" size="small">成功</el-tag>
+          <el-tag v-if="scope.row.callbackStatus === 4" size="small">失败</el-tag>
         </template> 
       </el-table-column>
        
@@ -364,6 +356,11 @@
           <span>{{ scope.row.extorderId }}</span>
         </template>
       </el-table-column>   
+      <el-table-column label="通道订单号" width="120" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.gwSeqNo }}</span>
+        </template>
+      </el-table-column>   
 
       <el-table-column label="通道错误代码" width="120" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
@@ -403,86 +400,27 @@ export default {
       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:"",  //回调时间
+     callbackTimeEnd:"",  //回调时间
      flowAmount:"",   //面额乘以10000
+     flowAmount1:"",   //面额乘以10000
      body:{
           Id:"",
+          gwSeqNo:"",
           orderId:"",
           extorderId:"",
-          usedMobile:"",
+          phoneNo:"",
           applyDateStart:"",
           applyDateEnd:"",
-          enterpriseIdDesc:"",
+          customerName:"",
           channelIdDesc:"",
+          phoneHome:"",
           status:"",
-          mobileOperator:"",
+          phoneOperator:"",
           flowAmount:"",
-          checkTimeStart:"",
-          checkTimeEnd:"",
-          dealFlag:"",
+          callbackTimeStart:"",
+          callbackTimeEnd:"",
+          callbackStatus:"",
           mobileHome:"",
           page:1,
           size:10,
@@ -491,21 +429,18 @@ export default {
       loading:false,
       status:[
         {id:1,name:"待发"},
-        {id:2,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:"运营商处理中"},
-        {id:"1",name:"待回调"},
-        {id:"3",name:"以回调"},
-        {id:"2",name:"无需回调"},
+        {id:"4",name:"失败"},
+        {id:"6",name:"成功"},
       ]
     }
   },
@@ -546,25 +481,29 @@ export default {
                  let modify =new Date(lastModifyDate)
                  let last = modify.valueOf()
                  let  used = last - time
-                res.usedTime = used
+                res.usedTime = used / 1000
              }
              return res
           })
           this.tableData=arry
-          console.log(arry)
+          // console.log(arry)
           this.total=res.data.data.total
-          console.log(res.data.data.records)
+          // console.log(res.data.data.records)
         })
     },
     //搜索手机号
     onphon(){
       console.log(this.phone)
     },
-      //搜索面额
-      changeflow(){
-        let flow=this.flowAmount;
-        // let body=this.body.flowAmount;
-        this.body.flowAmount=flow * 10000;
+      //清除面额
+      changeflow(flow){
+        this.flowAmount = ""
+
+      },
+      //清除面额
+      changeflow1(flow){
+        this.flowAmount1 = ""
+
       },
       //搜索发送时间
      oncustom(){
@@ -578,9 +517,9 @@ export default {
       oncheckTimeStart(){
         // checkTimeStart:"",
         //   checkTimeEnd:"",
-        let checkTimeStart =this.checkTimeStart
-        this.body.checkTimeStart= checkTimeStart[0]
-          this.body.checkTimeEnd=checkTimeStart[1]
+        let callbackTimeStart =this.callbackTimeEnd
+        this.body.callbackTimeStart= callbackTimeStart[0]
+          this.body.callbackTimeEnd	=callbackTimeStart[1]
       },
       //搜索状态
       changeScope(){
@@ -592,18 +531,30 @@ export default {
       },
       //搜索
       handleSearch(){
-        console.log(this.applyDateStart)
         this.body.page = 1
         if(this.applyDateStart == null){ //发送时间为空时清空 body 里的发送时间
           this.body.applyDateEnd = ""
           this.body.applyDateStart = ""
         }
-        if(this.checkTimeStart == null){ //回调时间
-          this.body.checkTimeStart = ""
-          this.body.checkTimeEnd = ""
+        if(this.callbackTimeEnd == null){ //回调时间
+          this.body.callbackTimeStart = ""
+          this.body.callbackTimeEnd = ""
+        }
+        //面额前后为空判断
+        let flowAmount=this.flowAmount * 10000;
+        let flowAmount1=this.flowAmount1 * 10000;
+        if(this.flowAmount1 != "" && this.flowAmount != ""){   //面额
+          this.body.flowAmount = flowAmount  + "-" + flowAmount1 
         }
-        if(this.flowAmount == null || this.flowAmount == 0){   //面额
+       if(this.flowAmount == "" && this.flowAmount1 == ""){
           this.body.flowAmount = ""
+          // console.log(this.body.flowAmount)
+        }
+        else if(this.flowAmount == ""){   //面额
+          this.body.flowAmount = 0 + "-" + flowAmount1 
+        }
+        else if(this.flowAmount1 == ""){
+          this.body.flowAmount = flowAmount + "-" + 10000000
         }
         this.currentPage="1"
         this.getTenantList()

src/views/product/index.vue

@@ -79,7 +79,7 @@
 
         <el-table-column label="产品所属地区" width="120" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span>{{ scope.row.zone }}</span>
+            <span>{{ scope.row.areaName }}</span>
           </template>
         </el-table-column>
 
@@ -109,7 +109,7 @@
         </div>
       <!-- 添加或修改对话框 -->
         <el-dialog :title="operation?'新增产品':'编辑产品'" :visible.sync="dialogFormVisible" center>
-          <el-form :model="dataForm" :rules="rules2" label-width="80px" size="small" label-position="right">
+          <el-form ref="dataForm" :model="dataForm" :rules="rules2" label-width="80px" size="small" label-position="right">
 
             <el-form-item label="产品名称" :label-width="formLabelWidth" prop="productName" >
               <el-input v-model.trim="dataForm.productName" style="width: 90%;"  placeholder="请输入产品名称" />
@@ -117,9 +117,12 @@
             <el-form-item label="面额" :label-width="formLabelWidth"  >
               <el-input v-model.trim="dataForm.productPrice" style="width: 90%;"  placeholder="请输入面额" />
             </el-form-item>
+            <el-form-item label="流量包ID" :label-width="formLabelWidth"  >
+              <el-input v-model.trim="dataForm.packageId" style="width: 90%;"  placeholder="请输入流量包ID" />
+            </el-form-item>
             <el-form-item label="产品所属地区" :label-width="formLabelWidth"  >
               <!-- <el-input v-model="dataForm.ZONE" style="width: 90%;" placeholder="请选择产品地区" /> -->
-              <el-select size="small" v-model="dataForm.zone" clearable placeholder="请选择产品地区" style="width: 90%" >
+              <el-select size="small" v-model="dataForm.areaName" clearable placeholder="请选择产品地区" style="width: 90%" >
                 <el-option
                 v-for="item in provinceList"
                 :key="item.name"
@@ -138,9 +141,22 @@
                 />
                 </el-select>
             </el-form-item>
+            <el-form-item label="产品类型" :label-width="formLabelWidth"  >
+               <el-select size="small" v-model="dataForm.productType"  placeholder="请选择产品类型" style="width: 90%" >
+                <el-option
+                v-for="item in type"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+                />
+                </el-select>
+            </el-form-item>
             <el-form-item label="产品编码" :label-width="formLabelWidth" >
               <el-input v-model.trim="dataForm.productCode" style="width: 90%;"  placeholder="请输入产品编码" />
             </el-form-item>
+            <el-form-item label="产品描述" :label-width="formLabelWidth" >
+              <el-input v-model.trim="dataForm.productDesc" style="width: 90%;"  placeholder="请输入产品描述" />
+            </el-form-item>
 
           </el-form>
           <div slot="footer" class="dialog-footer">
@@ -164,14 +180,21 @@ export default {
           Isp:""
       },
       provinceList:[],   //省份
+      type:[{
+        id:1,
+        name:"话费"
+      },{
+        id:2,
+        name:"流量"
+      }],
       status:[{  
-          id:"1",
+          id:1,
           name:"移动"
       },{  
-          id:"2",
+          id:2,
           name:"电信"
       },{  
-          id:"3",
+          id:3,
           name:"联通"
       },
       ],
@@ -186,9 +209,11 @@ export default {
       dataForm:{
         productName:"",
         productPrice:"",
-        zone:"",
+        areaName:"",
         operator:"",
-        productCode:""
+        productCode:"",
+        productType:"",
+        productDesc:""
       },
       page:1,
       size:10,
@@ -239,7 +264,7 @@ export default {
       this.dataForm={
         productName:"",
         productPrice:"",
-        zone:"",
+        areaName:"",
         operator:"",
         productCode:""
       }
@@ -257,42 +282,46 @@ export default {
     },
     //新增或修改API
     submitForm(){
-       if (!this.operation) {
-        // 编辑
-        ProductEdit(this.dataForm).then(response => {
-          if (response.status === 200) {
-            this.$message({
-              type: 'success',
-              message: '操作成功'
-            })
-            this.dialogFormVisible = false
-            this.getTenantList()
-          } else {
-            this.$message({
-              type: 'error',
-              message: response.data.msg
-            })
-          }
-        })
-      } else {
-        console.log(this.dataForm)
-      //   // 添加
-        ProductAdd(this.dataForm).then(response => {
-          if (response.status === 200) {
-            this.$message({
-              type: 'success',
-              message: '操作成功'
-            })
-            this.dialogFormVisible = false
-            this.getTenantList()
-          } else {
-            this.$message({
-              type: 'error',
-              message: response.data.msg
-            })
+        this.$refs['dataForm'].validate((valid) => {
+          if (valid) {
+            if (!this.operation) {
+              // 编辑
+              ProductEdit(this.dataForm).then(response => {
+                if (response.status === 200) {
+                  this.$message({
+                    type: 'success',
+                    message: '操作成功'
+                  })
+                  this.dialogFormVisible = false
+                  this.getTenantList()
+                } else {
+                  this.$message({
+                    type: 'error',
+                    message: response.data.msg
+                  })
+                }
+              })
+            } else {
+              console.log(this.dataForm)
+            //   // 添加
+              ProductAdd(this.dataForm).then(response => {
+                if (response.status === 200) {
+                  this.$message({
+                    type: 'success',
+                    message: '操作成功'
+                  })
+                  this.dialogFormVisible = false
+                  this.getTenantList()
+                } else {
+                  this.$message({
+                    type: 'error',
+                    message: response.data.msg
+                  })
+                }
+              })
+            }
           }
         })
-      }
     },
 
     // 删除
@@ -304,20 +333,24 @@ export default {
         type: 'warning'
       })
         .then(() => {
-          // deleteUser(row.userId).then(response => {
-          //   if (response.status === 200) {
-          //     this.$message({
-          //       type: 'success',
-          //       message: '操作成功'
-          //     })
-          //     that.adminList()
-          //   } else {
-          //     this.$message({
-          //       type: 'error',
-          //       message: response.data.msg
-          //     })
-          //   }
-          // })
+         let info={
+            isDelete : 1,
+            packageId:row.packageId,
+          }
+          ProductEdit(info).then(response => {
+            if (response.status === 200) {
+              this.$message({
+                type: 'success',
+                message: '操作成功'
+              })
+              that.getTenantList()
+            } else {
+              this.$message({
+                type: 'error',
+                message: response.data.msg
+              })
+            }
+          })
         })
         .catch(() => {
           this.$message({
@@ -362,7 +395,9 @@ export default {
   .flexend{
    display: flex;
    justify-content: flex-end;
-   padding-right: 2rem;
+   /* padding-right: 2rem; */
+   width: 100%;
+   /* margin: 0 auto; */
    padding-bottom: 20px;
  }
 </style>

src/views/userList/index.vue

@@ -336,11 +336,5 @@ export default {
 </script>
 
 <style>
-.textSpan{
-   position: relative;
-   top: 0;
-     font-size: 14px;
-     font-weight: 600;
-     color:rgb(87, 86, 86)
- }
+
 </style>