ck_zero

config/index.js

@@ -10,11 +10,11 @@ module.exports = {
       '/pre': {
         // target: 'http://app.bluefire.top:7999',//后端接口地址
         // target: 'http://192.168.2.130:8081',//后端接口地址
-        target: 'http://192.168.3.54:8081',//后端接口地址
+        // target: 'http://192.168.3.54:8081',//后端接口地址
         // target: 'http://192.168.3.130:8081',//后端接口地址
-        // target: 'http://47.106.133.48:8081/',//后端接口地址
-        // target: 'http://139.155.226.217:8088/pre',//后端接口地址
-        // target: 'http://127.0.0.1:8081',//后端接口地址
+        // target: 'http://47.106.133.48:8081/',//后端接口地址i
+        // target: 'http://139.155.226.217:8088/pre',//后端接口地址  
+        target: 'http://127.0.0.1:8081',//后端接口地址
         changeOrigin: true,  //是否跨域
         pathRewrite: {
           '^/pre': '/',//重写,
@@ -24,7 +24,7 @@ module.exports = {
 
     // 本地开发使用
     host: '192.168.3.38',
-    port: 54,
+    port: 48,
     autoOpenBrowser: true,
     errorOverlay: true,
     notifyOnErrors: false,

src/api/flow.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+  //列表加款
+  export function  flowList(operator) {
+    return request({
+      url: '/transaction/search',
+      method: 'POST',
+      data: operator
+    })
+  }

src/filters/index.js

@@ -37,6 +37,7 @@ export function numberFormatter(num, digits) {
   return num.toString()
 }
 
+
 export function toThousandFilter(num) {
   return (+num || 0).toString().replace(/^-?\d+/g, m => m.replace(/(?=(?!\b)(\d{3})+$)/g, ','))
 }

src/main.js

@@ -30,8 +30,12 @@ Object.keys(filters).forEach(key => {
   Vue.filter(key, filters[key])
 })
 
+
+
 Vue.config.productionTip = false
 
+
+
 new Vue({
   el: '#app',
   router,

src/views/channel/account.vue

@@ -27,21 +27,27 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="可用余额" width="100" align="center" show-overflow-tooltip>
+      <el-table-column label="可用余额" width="160" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span>{{ scope.row.balance }}</span>
+          <span>{{ scope.row.availableBalance | toThousandFilter }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="累计充值" width="110" align="center" show-overflow-tooltip>
+      <el-table-column label="查询余额" width="160" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span>{{ scope.row.rechargeAmount  }}</span>
+          <span>{{ scope.row.balance | toThousandFilter}}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="累计消费" width="110" align="center" show-overflow-tooltip>
+      <el-table-column label="累计充值" width="160" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span>{{ scope.row.consumeAmount }}</span>
+          <span>{{ scope.row.rechargeAmount | toThousandFilter }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="累计消费" width="160" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.consumeAmount | toThousandFilter}}</span>
         </template>
       </el-table-column>
 
@@ -87,17 +93,24 @@
                   </div>
                   <div>
                     <span class="flex_Name">可用余额:</span>
-                    <span class="flex_Number">{{detail.balance}}</span>
+                    <span class="flex_Number">{{detail.availableBalance | toThousandFilter}}</span>
                   </div>
               </div>
+            
               <div class="flex_supplier">
                   <div class="flex_width">
                     <span class="flex_Name">　累计充值:</span>
-                    <span class="flex_Number">{{detail.rechargeAmount }}</span>
+                    <span class="flex_Number">{{detail.rechargeAmount | toThousandFilter }}</span>
                   </div>
                   <div>
                     <span class="flex_Name">累计消费:</span>
-                    <span class="flex_Number">{{detail.consumeAmount}}</span>
+                    <span class="flex_Number">{{detail.consumeAmount | toThousandFilter}}</span>
+                  </div>
+              </div>
+                <div class="flex_supplier">
+                  <div class="flex_width">
+                    <span class="flex_Name">　查询余额:</span>
+                    <span class="flex_Number">{{detail.balance | toThousandFilter}}</span>
                   </div>
               </div>
             </div> 
@@ -123,9 +136,9 @@
                                 <el-button type="text" @click="hookLook(scope.row)">{{ scope.row.supplierName }}</el-button>
                               </template>
                             </el-table-column>
-                        <el-table-column label="加款金额" width="110" align="center" show-overflow-tooltip>
+                        <el-table-column label="加款金额" width="150" align="center" show-overflow-tooltip>
                               <template slot-scope="scope">
-                                <span>{{ scope.row.amount / 10000 }}</span>
+                                <span>{{ scope.row.amount / 10000  | toThousandFilter}}</span>
                               </template>
                             </el-table-column>
                             <el-table-column label="出款账户" width="110"  align="center" show-overflow-tooltip>

src/views/channel/channelGroup.vue

@@ -170,8 +170,15 @@
                    <el-button  type="primary" plain icon="el-icon-edit" circle @click="priceEdie(scope.row,scope.$index,$event)"></el-button>
                  </el-tooltip> -->
                  <el-tooltip class="item" effect="dark" content="删除分发组" placement="top">
-                    <el-button type="danger" plain icon="el-icon-delete" circle  @click="priceDelete(scope.row,scope.$index,$event)"></el-button>
+                    <el-button type="danger" plain icon="el-icon-delete" circle  @click="priceDelete(scope.row,scope.$index,$event)"></el-button>  
                  </el-tooltip>
+                      <el-tooltip placement="top" effect="light" style="padding: 10px; 0 0 0">
+                            <div slot="content">
+                                <p>分发组信息:</p>
+                                <p>其中不能有为空的操作！！！</p>
+                                </div>
+                            <i class="el-icon-warning" />
+                            </el-tooltip>
               </template>
             </el-table-column>
         </el-table>

src/views/channel/index.vue

@@ -255,7 +255,14 @@
 
           <el-table-column label="操作"  width="165" min-width="150" align="center">
               <template slot-scope="scope">
-                <el-button type="danger" icon="el-icon-delete" @click="priceDelete(scope.row,scope.$index,$event)">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" circle @click="priceDelete(scope.row,scope.$index,$event)"></el-button>
+                  <el-tooltip placement="top" effect="light" style="padding: 10px; 0 0 0">
+                            <div slot="content">
+                                <p>银行账户信息:</p>
+                                <p>其中不能有为空的操作！！！</p>
+                                </div>
+                            <i class="el-icon-warning" />
+                            </el-tooltip>
               </template>
             </el-table-column>
         </el-table>

src/views/channel/supplierFlow.vue

@@ -0,0 +1,347 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container" style="margin: 10px 0 10px 0">
+      <div class="flex">
+        <div class="w_input">
+          <span class="textSpan">　　订单号：</span>
+          <el-input
+            v-model="body.orderId"
+            style="width:65%;"
+            placeholder="请输入订单号"
+            size="small"
+            clearable
+          />
+        </div>
+        <div class="w_input">
+          <span class="textSpan">　供应商名称：</span>
+          <el-input
+            v-model="body.name"
+            style="width:65%;"
+            placeholder="请输入供应商名称"
+            size="small"
+            clearable
+          />
+        </div>
+        <div class="w_input">
+          <span class="textSpan">　服务类型：</span>
+          <el-select v-model="body.serviceType" size="small" clearable placeholder="请选择服务类型" style="width: 65%" @change="changeScope">
+            <el-option
+              v-for="item in status"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </div>
+     
+      </div>
+
+      <div class="flex">
+        <div class="w_date" >
+          <span class="textSpan">　发送时间：</span>
+          <el-date-picker
+            v-model="applyDateStart"
+            size="small"
+            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"
+            :clearable ="false"
+            />
+
+        </div>
+
+      </div>
+      <div class="flexend">
+        <el-button class="classitem"  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 label="订单号" width="180" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.orderId }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="供应商名称" width="100" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.name }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="流水号" width="180" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.seqNo }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="入账时间" width="160" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.createTime }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="服务类型" width="100" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span v-if="scope.row.serviceType==1">订单扣款</span>
+          <span v-if="scope.row.serviceType==2">订单退款</span>
+          <span v-if="scope.row.serviceType==3">财务加款</span>
+          <span v-if="scope.row.serviceType==4">财务撤销</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作前金额" width="120" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.beforeAmount / 10000}}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作金额" width="120" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.operatingAmount / 10000}}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作后金额" width="120" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.afterAmount  / 10000}}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="分发订单号" width="250" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.extorderId }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作人" width="160" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.operatorName }}</span>
+        </template>
+      </el-table-column>
+
+     <el-table-column label="业务描述" width="300" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.note }}</span>
+        </template>
+      </el-table-column>
+
+    </el-table>
+
+
+    <!--分页-->
+    <div class="pagination">
+      <el-pagination
+        current-page.sync="body.page"
+        :current-page="body.page"
+        :page-sizes="[10, 20, 30, 50]"
+        :page-size="body.size"
+        layout="total, sizes, prev, pager, next, jumper"
+        background
+        :total="total"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import {flowList} from '@/api/flow'
+export default {
+  data() {
+    return {
+      Name: '',
+      tableData: [],
+      applyDateStart: '', // 发送时间
+      checkTimeStart: '', // 回调时间
+      flowAmount: '', // 面额乘以10000
+      flowAmount1: '', // 面额乘以10000
+      body: {
+        distinguish:2,   //1:供应商  2：供应商
+        page: 1,
+        size: 10
+      },
+      total: 0, // 总数据
+      loading: false,
+      status: [
+        { id: 1, name: '订单扣款' },
+        { id: 2, name: '订单退款' },
+        { id: 3, name: '财务加款' },
+        { id: 4, name: '财务撤销' },
+      ],
+
+    }
+  },
+  created() {
+    const nowDate = new Date()
+    const date = {
+      year: nowDate.getFullYear(),
+      month: nowDate.getMonth() + 1,
+      date: nowDate.getDate()
+    }
+    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.createTimeStart = systemTime + ' 00:00:00'
+    this.body.createTimeEnd = systemTime + ' 23:59:59'
+    // this.body.applyDateEnd = systemTime + " 23:59:59"
+    // this.
+    this.getTenantList()
+  },
+  methods: {
+    // 获取数据
+    getTenantList() {
+      this.loading = true
+      flowList(this.body).then(res => {
+        this.loading = false
+        // this.tableData=res.data.data.records
+        // limitedDate ：发送时间
+        // lastModifyDate ：回调
+        // usedTime   ：用时
+        const tableData = res.data.data.records
+        const arry = tableData.map((res) => {
+          if (res.lastModifyDate != null && res.lastModifyDate != '') {
+            const limitedDate = res.limitedDate
+            const lastModifyDate = res.lastModifyDate
+            // 发送时间 减去  回调时间
+            const date = new Date(limitedDate)
+            const time = date.valueOf()
+            const modify = new Date(lastModifyDate)
+            const last = modify.valueOf()
+            const used = last - time
+            res.usedTime = used
+          }
+          return res
+        })
+        this.tableData = arry
+        console.log(arry)
+        this.total = res.data.data.total
+        console.log(res.data.data.records)
+      })
+    },
+    // 搜索手机号
+    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
+      this.body.createTimeStart = applyDateStart[0]
+      this.body.createTimeEnd = applyDateStart[1]
+      // console.log(applyDateStart)
+      // console.log(this.body.applyDateStart)
+    },
+    // 搜索回调时间
+    oncheckTimeStart() {
+      // checkTimeStart:"",
+      //   checkTimeEnd:"",
+      const checkTimeStart = this.checkTimeStart
+      this.body.checkTimeStart = checkTimeStart[0]
+      this.body.checkTimeEnd = checkTimeStart[1]
+    },
+    // 搜索状态
+    changeScope() {
+      console.log(this.body.status)
+    },
+    // 运营商
+    changeoperator() {
+      console.log(this.body.mobileOperator)
+    },
+    // 搜索
+    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 = ''
+      }
+
+      this.currentPage = '1'
+      this.getTenantList()
+    },
+    //
+    handleReset() {
+
+    },
+    // 分页
+    handleSizeChange: function(val) {
+      this.body.size = val
+      this.getTenantList()
+    },
+    // 换页
+    handleCurrentChange: function(val) {
+      this.body.page = val
+      this.getTenantList()
+    }
+  }
+}
+</script>
+
+<style scoped>
+ .textSpan{
+   position: relative;
+   top: 0;
+     font-size: 14px;
+     font-weight: 600;
+     color:rgb(87, 86, 86)
+ }
+ .stylephone{
+    display: flex;
+ }
+ .marginphone{
+   padding-top: 9px;
+ }
+ .flex{
+     width: 100%;
+     display: flex;
+     flex-direction: row;
+     margin-bottom: 10px;
+     /* flex-wrap: wrap; */
+     /* justify-content: space-evenly; */
+ }
+ .w_date{
+     width: 66%;
+ }
+ .w_input{
+     width:33.33%;
+ }
+ .flexend{
+   display: flex;
+   justify-content: flex-end;
+   padding-top:20px;
+   padding-right: 40px;
+ }
+ .phone{
+   width:66.5% !important ;
+   z-index: 100;
+ }
+ /* .classitem{
+   background: salmon;
+ } */
+</style>

src/views/layout/Layout.vue

@@ -1,5 +1,7 @@
 <template>
-  <div :class="classObj" class="app-wrapper">
+  <div>
+    <!-- <div style="height:50px;width:100%;border:1px solid red"></div> -->
+     <div :class="classObj" class="app-wrapper">
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
     <sidebar class="sidebar-container" />
     <div :class="{hasTagsView:needTagsView}" class="main-container">
@@ -12,6 +14,8 @@
         <settings />
       </right-panel>
     </div>
+  </div>
+ 
 
   </div>
 </template>

src/views/layout/components/AppMain.vue

@@ -1,5 +1,5 @@
 <template>
-  <section class="app-main">
+  <section class="app-main" >
     <transition name="fade-transform" mode="out-in">
       <keep-alive :include="cachedViews">
         <router-view :key="key" />

src/views/log/index.vue

@@ -2,7 +2,6 @@
   <div class="app-container">
     <div class="filter-container" style="margin: 10px 0 10px 0">
       <div class="flex">
-        
         <div class="w_input">
           <span class="textSpan">      操作人：</span>
           <el-input
@@ -14,6 +13,11 @@
           >
           </el-input>
         </div>
+        <!-- <div class="w_input">
+          <span class="textSpan">操作类型：</span>
+          <el-input v-model="body.interfaceDesc" placeholder="请输入操作类型" size="small" style="width:65%" clearable>
+          </el-input>
+        </div> -->
         <div class="w_input">
           <span class="textSpan">日志类型：</span>
           <el-select v-model="body.type" placeholder="请选择日志类型" size="small" style="width:65%" clearable>
@@ -25,33 +29,27 @@
             >
             </el-option>
           </el-select>
-         
-        </div>
+        </div> 
       </div>
      
-      <div class="flex">
  <!-- 时间范围筛选 -->
         <div class="w_date">
           <span class="textSpan">时间范围：</span>
           <el-date-picker
-            v-model="callbackTime"
+            v-model="createTime"
             size="small"
             type="datetimerange"
             range-separator="至"
-            style="width:80%"
+            style="width:40%"
             @change="oncheckTimeStart"
             value-format="yyyy-MM-dd HH:mm:ss"
             :default-time="['00:00:00', '23:59:59']"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
           >
-          </el-date-picker>
-        </div>
-        <el-button type="primary" plain @click="handleSearch" icon="el-icon-search"
-          >查询</el-button
-        >
-         </div>
-   
+          </el-date-picker> 
+          <el-button type="primary" plain @click="handleSearch" icon="el-icon-search">查询</el-button>
+              </div>
       
     </div>
 
@@ -85,7 +83,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="操作信息" align="center" show-overflow-tooltip width="180">
+      <el-table-column label="操作信息" align="center" show-overflow-tooltip width="300">
         <template slot-scope="scope">
           <span>{{ scope.row.optInfo}}</span>
         </template>
@@ -127,7 +125,7 @@ import api from "@/api/optLog.js";
 export default {
   data() {
     return {
-      callbackTime: "",
+      createTime: "",
       loading: false,
       tableData: [],
       total: 30,
@@ -135,11 +133,12 @@ export default {
         current: 1, //当前页
         size: 10, //每页条数
         optUser: "", //操作人
-        
+        // createTime: "",
         optInfo:"",//操作接口
         type:"",
         startTime:"",
         endTime:"",
+        interfaceDesc:""
       },
      status:[
        {id:1,name:"订单"},
@@ -154,10 +153,11 @@ export default {
   },
   methods: {
     handleSearch(){
+      this.body.current = 1
       // console.log(this.body.optInfo)
-      if(this.callbackTime==null){
+      if(this.createTime==null){
         //发送时间为空时清空 body 里的发送时间
-        this.callbackTime=""
+        this.createTime=""
         this.body.startTime="";
         this.body.endTime="";
       }
@@ -185,10 +185,10 @@ export default {
       this.getData();
     },
      oncheckTimeStart() {
-      if(this.callbackTime!==null){
-        console.log(this.callbackTime);
-        this.body.startTime=this.callbackTime[0];
-        this.body.endTime=this.callbackTime[1];
+      if(this.createTime!==null){
+        console.log(this.createTime);
+        this.body.startTime=this.createTime[0];
+        this.body.endTime=this.createTime[1];
       }     
     }
   }
@@ -197,7 +197,7 @@ export default {
 
 <style scoped>
 .w_date {
-  width:50%;
+  width:90%;
 }
 .flex {
   display: flex;

src/views/orderList/Distribute.vue

@@ -128,6 +128,7 @@
             start-placeholder="开始日期"
             end-placeholder="结束日期" 
             @change="oncustom"
+            :clearable ="false"
             />
 
         </div>
@@ -198,6 +199,18 @@
         </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="160" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.sendCount }}</span>
@@ -335,21 +348,21 @@ export default {
       api.dispatch.Search(this.body).then(res => {
         this.loading = false
         // this.tableData=res.data.data.records
-        // limitedDate ：发送时间
-        // lastModifyDate ：回调
+        // createDate ：发送时间
+        // callbackTime ：回调
         // usedTime   ：用时
         const tableData = res.data.data.records
         const arry = tableData.map((res) => {
-          if (res.lastModifyDate != null && res.lastModifyDate != '') {
-            const limitedDate = res.limitedDate
-            const lastModifyDate = res.lastModifyDate
+          if (res.callbackTime != null && res.callbackTime != '') {
+            const createDate = res.createDate
+            const callbackTime = res.callbackTime
             // 发送时间 减去  回调时间
-            const date = new Date(limitedDate)
+            const date = new Date(createDate)
             const time = date.valueOf()
-            const modify = new Date(lastModifyDate)
+            const modify = new Date(callbackTime)
             const last = modify.valueOf()
             const used = last - time
-            res.usedTime = used
+            res.usedTime = used / 1000
           }
           return res
         })

src/views/orderList/finance.vue

@@ -70,6 +70,7 @@
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             @change="oncustom"
+            :clearable ="false"
           />
         </div>
       </div>
@@ -227,7 +228,7 @@
       <span class="money_span">{{ sumPrice /10000 }}</span>
       <span
         class="money"
-      >合作伙伴结算总价:</span>
+      >代理商结算总价:</span>
       <span class="money_span">{{ sumPartnerPrice/10000 }}</span>
       <span
         class="money"
@@ -288,13 +289,13 @@
 
       <el-table-column label="运营商价格" width="100" align="center">
         <template slot-scope="scope">
-          <span>{{ scope.row.operatorBalancePrice }}</span>
+          <span>{{ scope.row.operatorBalancePrice / 10000 }}</span>
         </template>
       </el-table-column>
 
       <el-table-column label="代理商价格" width="100" align="center">
         <template slot-scope="scope">
-          <span>{{ scope.row.partnerBalancePrice }}</span>
+          <span>{{ scope.row.partnerBalancePrice / 10000 }}</span>
         </template>
       </el-table-column>
 

src/views/orderList/index.vue

@@ -63,6 +63,7 @@
             :default-time="['00:00:00', '23:59:59']"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
+            :clearable ="false"
           >
           </el-date-picker>
         </div>
@@ -250,7 +251,7 @@
           @click="handleReseted(6)"
           >置成功
         </el-button>
-        <el-button
+        <!-- <el-button
           class="filter-item"
           size="small"
           type="success"
@@ -258,7 +259,7 @@
           plain
           @click="handleReset"
           >补单
-        </el-button>
+        </el-button> -->
 
         <el-button
           class="classitem"
@@ -413,6 +414,7 @@
           <el-tag v-if="scope.row.status === 4" size="small" style="danger">充值失败</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 === 7" size="small">队列中</el-tag>
         </template>
       </el-table-column>
 
@@ -488,7 +490,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="通道错误原因"
+        label="通道状态"
         width="120"
         align="center"
         show-overflow-tooltip
@@ -591,6 +593,18 @@ export default {
     getTenantList() {
       this.loading = true;
       ordersearch(this.body).then(res => {
+
+          //  let limitedDate ='2021-07-07 14:07:05'	;
+          //   let lastModifyDate = "2021-07-07 14:07:18";
+          //   //发送时间 减去  回调时间
+          //   let date = new Date(limitedDate);
+          //   let time = date.valueOf();
+          //   let modify = new Date(lastModifyDate);
+          //   let last = modify.valueOf();
+          //   let used = last - time;
+          //   let info = used / 1000;
+          //   console.log(info)
+
         this.loading = false;
         // this.tableData=res.data.data.records
         // limitedDate ：发送时间
@@ -609,6 +623,7 @@ export default {
             let last = modify.valueOf();
             let used = last - time;
             res.usedTime = used / 1000;
+            //  res.usedTime = (used % (1000 * 60)) / 1000 
             console.log(limitedDate);
             console.log(lastModifyDate);
             console.log(used);
@@ -777,6 +792,13 @@ export default {
                 type: "success",
                 message: `已置为${msg}状态`
               });
+              if (i == 10) {
+                 that.$confirm(`回调以成功,需等待一段时间,稍后重新查看回调状态`, "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                  })
+              }
               that.getTenantList();
             } else {
               that.$confirm(res.data.message, "提示", {

src/views/product/setting.vue

@@ -50,6 +50,7 @@
             />
           </el-select>
         </div>
+        
       </div>
       <div class="flex">
         <div class="w_input">
@@ -106,6 +107,20 @@
         </div>
          
       </div>
+      <div class="flex">
+          <div class="w_input"> 
+          <span class="textSpan">客户名称:</span>
+          <!-- <el-input v-model="body.customerName" style="width:200px;" placeholder="客户名称" size="small" clearable /> -->
+          <el-select size="small" v-model="body.customerId" filterable  clearable style="width: 65%"  placeholder="请选择">
+            <el-option
+              v-for="item in userDataList"
+              :key="item.customerId"
+              :label="item.customerName"
+              :value="item.customerId">   
+            </el-option>
+          </el-select>
+        </div>
+      </div>
       <!-- 按钮----查找  重置  新增  -->
       <div class="flexend">
         <el-button
@@ -172,6 +187,17 @@
           </template>
         </el-table-column>
 
+        <el-table-column
+          label="客户名称"
+          width="160"
+          align="center"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.customerName }}</span>
+          </template>
+        </el-table-column>
+   
         <el-table-column
           label="地区"
           width="120"
@@ -439,6 +465,29 @@
               />
             </el-select>
           </el-form-item>
+           <el-form-item
+            label="客户名称"
+            :label-width="formLabelWidth"
+            v-if=" operation"
+            prop="customerInfos"
+          >
+            <el-select
+              size="small"
+              v-model="dataForm.customerInfos"
+              filterable 
+              value-key="customerId"
+              multiple 
+              placeholder="请选择客户名称"
+              style="width:90%"
+            >
+              <el-option
+                v-for="item in userDataList"
+                :key="item.customerId"
+                :label="item.customerName"
+                :value="item"
+              />
+            </el-select>
+          </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="dialogFormVisible = false">取 消</el-button>
@@ -450,6 +499,7 @@
 </template>
 
 <script>
+import api from '@/api/userList'
 import { MaintSearch, province, MaintAdd, MaintDel } from "@/api/product";
 export default {
   data() {
@@ -464,6 +514,7 @@ export default {
         province: "", //地区
         status: "", //维护状态
         rechargeType:"",//维护范围
+        customerId:"",
         current: 1, //当前页码
         size: 10, //每页记录条数
         orderType: "" //维护类型
@@ -505,6 +556,9 @@ export default {
         ],
         rechargeType: [
           { required: true, message: "请选择维护范围", trigger: "blur" }
+        ], //充值方式
+        customerInfos: [
+          { required: true, message: "请选择客户", trigger: "blur" }
         ] //充值方式
       },
       relues: {},
@@ -519,14 +573,24 @@ export default {
         status: ""
       },
       total: 0,
-      loading: false
+      loading: false,
+      userDataList:[]
     };
   },
   created() {
     this.getTenantList();
     this.onprovince(); //省份
+    this.user()
   },
   methods: {
+     //客户名称
+    user(){
+      api.account.userList().then((res) => {
+        this.loading =false
+        let userDataList = res.data.data
+        this.userDataList = userDataList
+      })
+    },
     //表格数据
     getTenantList() {
       this.loading = true;
@@ -539,6 +603,7 @@ export default {
       params.append("status", this.body.status);
       params.append("startTime", this.body.startTime);
       params.append("endTime", this.body.endTime);
+      params.append("customerId", this.body.customerId);
       params.append("current", this.body.current);
       params.append("size", this.body.size);
       // console.log(params,"params")
@@ -672,7 +737,8 @@ export default {
             facePrice: row.facePrice,
             province: row.province,
             operator: row.operator,
-            rechargeType: row.rechargeType
+            rechargeType: row.rechargeType,
+            customerId:row.customerId
           };
           console.log(info, "info");
           MaintDel(info).then(res => {
@@ -730,7 +796,7 @@ export default {
     },
     // 换页
     handleCurrentChange: function(val) {
-      this.body.page = val;
+      this.body.current = val;
       this.getTenantList();
     }
   }

src/views/userList/account.vue

@@ -44,23 +44,23 @@
 
       <el-table-column label="可用余额" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span>{{ scope.row.balance }}</span>
+          <span>{{ scope.row.balance | toThousandFilter}}</span>
         </template>
       </el-table-column>
       <el-table-column label="累计充值" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
-          <!-- <span>{{ scope.row.balance }}</span> -->
+          <!-- <span>{{ scope.row.balance | toThousandFilter }}</span> -->
         </template>
       </el-table-column>
       <el-table-column label="累计消费" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
-          <!-- <span>{{ scope.row.balance }}</span> -->
+          <!-- <span>{{ scope.row.balance | toThousandFilter }}</span> -->
         </template>
       </el-table-column>
 
       <el-table-column label="授信额度" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span>{{ scope.row.creditAmount }}</span>
+          <span>{{ scope.row.creditAmount  / 0.0001 / 10000 | toThousandFilter}}</span>
         </template>
       </el-table-column>
 <!-- 
@@ -96,27 +96,27 @@
               <div class="flex_supplier">
                   <div class="flex_width">
                     <span class="flex_Name">客户名称:</span>
-                    <span class="flex_Number">{{detail.customerName}}</span>
+                    <span class="flex_Number">{{detail.customerName | toThousandFilter}}</span>
                   </div>
                   <div class="flex_width">
                     <span class="flex_Name">可用余额:</span>
-                    <span class="flex_Number">{{detail.balance}}</span>
+                    <span class="flex_Number">{{detail.balance | toThousandFilter}}</span>
                   </div>
               </div>
               <div class="flex_supplier">
                   <div class="flex_width">
                     <span class="flex_Name">授信额度:</span>
-                    <span class="flex_Number">{{detail.creditAmount}}</span>
+                    <span class="flex_Number">{{detail.creditAmount / 0.0001 / 10000 | toThousandFilter}}</span>
                   </div>
                   <div class="flex_width">
                     <span class="flex_Name">累计充值:</span>
-                    <span class="flex_Number">{{detail.currentAmount}}</span>
+                    <span class="flex_Number">{{detail.currentAmount | toThousandFilter}}</span>
                   </div>
               </div>
               <div class="flex_supplier">
                   <div class="flex_width">
                     <span class="flex_Name">累计消费:</span>
-                    <!-- <span class="flex_Number">{{detail.creditAmount}}</span> -->
+                    <!-- <span class="flex_Number">{{detail.creditAmount | toThousandFilter}}</span> -->
                   </div>
                   <div>
                     <!-- <span class="flex_Name">累计充值:</span>
@@ -144,21 +144,21 @@
                         <el-table-column label="客户" width="120" align="center" show-overflow-tooltip>
                               <template slot-scope="scope">
                                 <!-- <el-button type="text" @click="hookLook(scope.row)">{{ scope.row.customerName }}</el-button> -->
-                                <span>{{scope.row.customerName}}</span>
+                                <span>{{scope.row.customerName }}</span>
                               </template>
                             </el-table-column>
-                        <el-table-column label="加款金额" width="110" align="center" show-overflow-tooltip>
+                        <el-table-column label="加款金额" width="160"  align="center" show-overflow-tooltip>
                               <template slot-scope="scope">
-                                <span>{{ scope.row.amount / 10000 }}</span>
+                                <span>{{ scope.row.amount / 10000 | toThousandFilter}}</span>
                               </template>
                             </el-table-column>
                           
-                              <el-table-column label="出款账户" width="110"  align="center" show-overflow-tooltip>
+                              <el-table-column label="出款账户"  width="160"  align="center" show-overflow-tooltip>
                               <template slot-scope="scope">
-                                <span>{{ scope.row.paymentAccount }}</span>
+                                <span>{{ scope.row.paymentAccount | toThousandFilter }}</span>
                               </template>
                             </el-table-column>
-                              <el-table-column label="开户行"  width="170" align="center" show-overflow-tooltip>
+                              <el-table-column label="开户行" align="center" show-overflow-tooltip>
                               <template slot-scope="scope">
                                 <span>{{ scope.row.bankDeposit }}</span>
                               </template>
@@ -834,6 +834,9 @@ export default {
       },   
         //搜索
     Search() {
+        if(this.body.customerName == "所有客户"){
+         this.body.customerName = ""
+         }
       this.body.current = 1
       this.reLoad()
     },

src/views/userList/customerFlow.vue

@@ -0,0 +1,349 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container" style="margin: 10px 0 10px 0">
+      <div class="flex">
+        <div class="w_input">
+          <span class="textSpan">　　订单号：</span>
+          <el-input
+            v-model="body.orderId"
+            style="width:65%;"
+            placeholder="请输入订单号"
+            size="small"
+            clearable
+          />
+        </div>
+        <div class="w_input">
+          <span class="textSpan">　客户名称：</span>
+          <el-input
+            v-model="body.name"
+            style="width:65%;"
+            placeholder="请输入客户名称"
+            size="small"
+            clearable
+          />
+        </div>
+        <div class="w_input">
+          <span class="textSpan">　服务类型：</span>
+          <el-select v-model="body.serviceType" size="small" clearable placeholder="请选择服务类型" style="width: 65%" @change="changeScope">
+            <el-option
+              v-for="item in status"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </div>
+     
+      </div>
+
+      <div class="flex">
+        <div class="w_date" >
+          <span class="textSpan">　发送时间：</span>
+          <el-date-picker
+            v-model="applyDateStart"
+            size="small"
+            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"
+            :clearable ="false"
+
+            />
+
+        </div>
+
+      </div>
+      <div class="flexend">
+        <el-button class="classitem"  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 label="订单号" width="180" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.orderId }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="客户名称" width="100" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.name }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="流水号" width="180" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.seqNo }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="入账时间" width="160" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.createTime }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="服务类型" width="100" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span v-if="scope.row.serviceType==1">订单扣款</span>
+          <span v-if="scope.row.serviceType==2">订单退款</span>
+          <span v-if="scope.row.serviceType==3">财务加款</span>
+          <span v-if="scope.row.serviceType==4">财务撤销</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作前金额" width="120" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.beforeAmount / 10000}}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作金额" width="120" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.operatingAmount / 10000}}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作后金额" width="120" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.afterAmount  / 10000}}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="客户订单号" width="250" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.extorderId }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作人" width="160" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.operatorName }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="业务描述" width="300" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.note }}</span>
+        </template>
+      </el-table-column>
+
+     
+
+    </el-table>
+
+    <!--分页-->
+    <div class="pagination">
+      <el-pagination
+        current-page.sync="body.page"
+        :current-page="body.page"
+        :page-sizes="[10, 20, 30, 50]"
+        :page-size="body.size"
+        layout="total, sizes, prev, pager, next, jumper"
+        background
+        :total="total"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import {flowList} from '@/api/flow'
+export default {
+  data() {
+    return {
+      Name: '',
+      tableData: [],
+      applyDateStart: '', // 发送时间
+      checkTimeStart: '', // 回调时间
+      flowAmount: '', // 面额乘以10000
+      flowAmount1: '', // 面额乘以10000
+      body: {
+        distinguish:1,   //1:客户  2：客户
+        page: 1,
+        size: 10
+      },
+      total: 0, // 总数据
+      loading: false,
+      status: [
+        { id: 1, name: '订单扣款' },
+        { id: 2, name: '订单退款' },
+        { id: 3, name: '财务加款' },
+        { id: 4, name: '财务撤销' },
+      ],
+
+    }
+  },
+  created() {
+    const nowDate = new Date()
+    const date = {
+      year: nowDate.getFullYear(),
+      month: nowDate.getMonth() + 1,
+      date: nowDate.getDate()
+    }
+    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.createTimeStart = systemTime + ' 00:00:00'
+    this.body.createTimeEnd = systemTime + ' 23:59:59'
+    // this.body.applyDateEnd = systemTime + " 23:59:59"
+    // this.
+    this.getTenantList()
+  },
+  methods: {
+    // 获取数据
+    getTenantList() {
+      this.loading = true
+      flowList(this.body).then(res => {
+        this.loading = false
+        // this.tableData=res.data.data.records
+        // limitedDate ：发送时间
+        // lastModifyDate ：回调
+        // usedTime   ：用时
+        const tableData = res.data.data.records
+        const arry = tableData.map((res) => {
+          if (res.lastModifyDate != null && res.lastModifyDate != '') {
+            const limitedDate = res.limitedDate
+            const lastModifyDate = res.lastModifyDate
+            // 发送时间 减去  回调时间
+            const date = new Date(limitedDate)
+            const time = date.valueOf()
+            const modify = new Date(lastModifyDate)
+            const last = modify.valueOf()
+            const used = last - time
+            res.usedTime = used
+          }
+          return res
+        })
+        this.tableData = arry
+        console.log(arry)
+        this.total = res.data.data.total
+        console.log(res.data.data.records)
+      })
+    },
+    // 搜索手机号
+    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
+      this.body.createTimeStart = applyDateStart[0]
+      this.body.createTimeEnd = applyDateStart[1]
+      // console.log(applyDateStart)
+      // console.log(this.body.applyDateStart)
+    },
+    // 搜索回调时间
+    oncheckTimeStart() {
+      // checkTimeStart:"",
+      //   checkTimeEnd:"",
+      const checkTimeStart = this.checkTimeStart
+      this.body.checkTimeStart = checkTimeStart[0]
+      this.body.checkTimeEnd = checkTimeStart[1]
+    },
+    // 搜索状态
+    changeScope() {
+      console.log(this.body.status)
+    },
+    // 运营商
+    changeoperator() {
+      console.log(this.body.mobileOperator)
+    },
+    // 搜索
+    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 = ''
+      }
+
+      this.currentPage = '1'
+      this.getTenantList()
+    },
+    //
+    handleReset() {
+
+    },
+    // 分页
+    handleSizeChange: function(val) {
+      this.body.size = val
+      this.getTenantList()
+    },
+    // 换页
+    handleCurrentChange: function(val) {
+      this.body.page = val
+      this.getTenantList()
+    }
+  }
+}
+</script>
+
+<style scoped>
+ .textSpan{
+   position: relative;
+   top: 0;
+     font-size: 14px;
+     font-weight: 600;
+     color:rgb(87, 86, 86)
+ }
+ .stylephone{
+    display: flex;
+ }
+ .marginphone{
+   padding-top: 9px;
+ }
+ .flex{
+     width: 100%;
+     display: flex;
+     flex-direction: row;
+     margin-bottom: 10px;
+     /* flex-wrap: wrap; */
+     /* justify-content: space-evenly; */
+ }
+ .w_date{
+     width: 66%;
+ }
+ .w_input{
+     width:33.33%;
+ }
+ .flexend{
+   display: flex;
+   justify-content: flex-end;
+   padding-top:20px;
+   padding-right: 40px;
+ }
+ .phone{
+   width:66.5% !important ;
+   z-index: 100;
+ }
+ /* .classitem{
+   background: salmon;
+ } */
+</style>

src/views/userList/index.vue

@@ -121,11 +121,11 @@
                         <el-input v-model="dataForm.customerName" />
                       </el-form-item>
                     </el-col>
-                    <el-col v-if="!operation" :span="6" :xs="24" :sm="12" :md="12" :lg="8">
+                    <!-- <el-col v-if="!operation" :span="6" :xs="24" :sm="12" :md="12" :lg="8">
                         <el-form-item label="客户ID" :label-width="formLabelWidth"  >
                           <el-input disabled v-model="dataForm.customerId"  />
                         </el-form-item>
-                    </el-col>
+                    </el-col> -->
                     <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
                         <el-form-item label="客户简称" prop="shorterName" :label-width="formLabelWidth">
                           <el-input v-model="dataForm.shorterName"  />
@@ -189,12 +189,29 @@
                           </el-select>
                         </el-form-item>
                     </el-col>
+                    <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
+                        <el-form-item label="登录用户" :label-width="formLabelWidth"  >
+                          <el-select v-model="dataForm.userId" size="small" >
+                            <el-option
+                              v-for="item in onList"
+                              :key="item.userId"
+                              :label="item.username"
+                              :value="item.userId"
+                            />
+                          </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
+                      <el-form-item label="代理商提成比例" :label-width="formLabelWidth"  >
+                        <el-input v-model="dataForm.partnerCommission" style="width:75%"/> ‰
+                      </el-form-item>
+                    </el-col>
                   </el-row> 
                    
                     <el-row :gutter="20"  v-for="(element,index) in dataForm.partnerUsers" :key="element.id">
                       <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
                         <el-form-item label="代理商" :label-width="formLabelWidth"  >
-                          <el-select v-model="element.partnerName" @keyup.enter.native="addGroup(dataForm)" value-key="partnerId" @change="cooperativePartner($event,index)" size="small" >
+                          <el-select v-model="element.partnerName" filterable  @keyup.enter.native="addGroup(dataForm)" value-key="partnerId" @change="cooperativePartner($event,index)" size="small" >
                             <el-option
                               v-for="item in onuserList"
                               :key="item.partnerId"
@@ -204,11 +221,7 @@
                           </el-select>
                         </el-form-item>
                     </el-col>
-                     <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
-                      <el-form-item label="代理商提成比例" :label-width="formLabelWidth"  >
-                        <el-input v-model="element.partnerCommission" @keyup.enter.native="addGroup(dataForm)" />
-                      </el-form-item>
-                    </el-col>
+         
                  
                     <el-col :span="2">
               <el-button type="danger" plain icon="el-icon-delete" circle  @click="cooperativePartnerDelete(element,index,$event)"></el-button>
@@ -222,22 +235,11 @@
             <i class="el-icon-warning" />
             </el-tooltip>
             </el-col>
-                       <!-- <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
-                        <el-form-item label="登录用户" :label-width="formLabelWidth"  >
-                          <el-select v-model="dataForm.userId" size="small" >
-                            <el-option
-                              v-for="item in onList"
-                              :key="item.userId"
-                              :label="item.username"
-                              :value="item.userId"
-                            />
-                          </el-select>
-                        </el-form-item>
-                    </el-col> -->
+   
                   </el-row>
                   <el-row :gutter="20" > 
                       <div style="width:100%" >
-                            <el-button class="addGroupButton" type="primary" round plain @click="addGroup(dataForm)">添加合作伙伴</el-button>
+                            <el-button class="addGroupButton" type="primary" round plain @click="addGroup(dataForm)">添加代理商</el-button>
                       </div>
                   </el-row>
                 </div>
@@ -288,9 +290,17 @@
 
                     <el-table-column label="操作"  width="165" min-width="150" align="center">
                         <template slot-scope="scope">
-                          <el-button type="danger" icon="el-icon-delete" @click="CardsDelete(scope.row,scope.$index,$event)">删除</el-button>
+                          <el-button type="danger" plain icon="el-icon-delete" circle @click="CardsDelete(scope.row,scope.$index,$event)"></el-button>
+                          <el-tooltip placement="top" effect="light" style="padding: 10px; 0 0 0">
+                            <div slot="content">
+                                <p>银行账户信息:</p>
+                                <p>其中不能有为空的操作！！！</p>
+                                </div>
+                            <i class="el-icon-warning" />
+                            </el-tooltip>
                         </template>
                       </el-table-column>
+                      
                   </el-table>
                   </div>
                 </el-card>
@@ -777,7 +787,7 @@ export default {
       dialogVisible:false,
       formLabelWidth: '120px',   //新增宽度
       dataForm:{
-          userId:4,
+        
       },
       infoForm:{
         
@@ -851,8 +861,8 @@ export default {
     cooperativePartnerDelete(row,index,e){
             // row.splice(index,1)
             console.log(index)
-            if(row.partnerName && row.partnerCommission){
-               this.$confirm('是否删除该合作伙伴', '提示', {
+            if(row.partnerName){
+               this.$confirm('是否删除该代理商', '提示', {
                       confirmButtonText: '确定',
                       cancelButtonText: '取消',
                       type: 'warning'
@@ -890,7 +900,7 @@ export default {
         addGroup(row){
             let ipWhiteListList = {
                customerId:row.customerId,
-                partnerCommission:"",
+                // partnerCommission:"",
                 userId:"",
                 partnerName:""
             }
@@ -901,7 +911,7 @@ export default {
       this.operation = true
       this.dialogFormVisible = true
       this.dataForm = {
-          userId:4,
+          // userId:4,
           partnerUsers:[]
       }
     },
@@ -1145,11 +1155,11 @@ export default {
                       })
                 }
               })
-            let target=e.target;
-            if(target.nodeName == 'SPAN' || target.nodeName == 'I'){
-                  target = e.target.parentNode;
-            }
-            target.blur();  
+            // let target=e.target;
+            // if(target.nodeName == 'SPAN' || target.nodeName == 'I'){
+            //       target = e.target.parentNode;
+            // }
+            // target.blur();  
         },
     //文本框折扣编辑
     clicklong(row){
@@ -1311,6 +1321,9 @@ export default {
     },
     //搜索
     Search() {
+      if(this.body.customerName == "所有客户"){
+        this.body.customerName = ""
+      }
       this.body.current = 1
       this.getTenantList()
     },